From 78598d723607f4a45dda919fb48419e53d84874b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:27:59 +0000 Subject: [PATCH 01/21] Initialize branch F-12 for yum --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From ecc260fbcffe820a0e58fb6273ffc427b4c2bb3c Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Tue, 29 Sep 2009 21:14:25 +0000 Subject: [PATCH 02/21] history patch czech language trans fix --- yum-HEAD.patch | 7923 +++++++++++++++++++++++++++++++++++++++++++++++- yum.spec | 5 +- 2 files changed, 7861 insertions(+), 67 deletions(-) diff --git a/yum-HEAD.patch b/yum-HEAD.patch index 5de7494..9a19fab 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -21,27 +21,28 @@ index 615a1f6..332be99 100644 def sm_ui_time(x): return time.strftime("%Y-%m-%d %H:%M", time.gmtime(x)) diff --git a/docs/yum.8 b/docs/yum.8 -index 3520912..d0dfb79 100644 +index 3520912..9cd68dd 100644 --- a/docs/yum.8 +++ b/docs/yum.8 @@ -67,6 +67,10 @@ gnome\-packagekit application\&. .br .I \fR * repolist [all|enabled|disabled] .br -+.I \fR * version [all] ++.I \fR * version [all|installed|available|group-*|grouplist|groupinfo] +.br +.I \fR * history [info|list|summary|redo|undo|new] +.br .I \fR * help [command] .br .PP -@@ -225,6 +229,25 @@ Produces a list of configured repositories. The default is to list all +@@ -225,6 +229,26 @@ Produces a list of configured repositories. The default is to list all enabled repositories. If you pass \-v, for verbose mode, more information is listed. .IP +.IP "\fBversion\fP" +Produces a "version" of the rpmdb, and of the enabled repositories if "all" is -+given as the first argument. If you pass \-v, for verbose mode, more ++given as the first argument. You can also specify version groups in the ++version-groups config. file. If you pass \-v, for verbose mode, more +information is listed. The version is calculated by taking a sha1 hash of the +packages (in sorted order), and the checksum_type/checksum_data entries from +the yumdb. Note that this rpmdb version is now also used significantly within @@ -61,7 +62,7 @@ index 3520912..d0dfb79 100644 .IP "\fBhelp\fP" Produces help, either for all commands or if given a command name then the help for that particular command\&. -@@ -266,7 +289,8 @@ Sets the maximum amount of time yum will wait before performing a command \- it +@@ -266,7 +290,8 @@ Sets the maximum amount of time yum will wait before performing a command \- it Tells yum to run entirely from cache - does not download or update any headers unless it has to to perform the requested action. .IP "\fB\-\-version\fP" @@ -71,6 +72,14 @@ index 3520912..d0dfb79 100644 .IP "\fB\-\-showduplicates\fP" Doesn't limit packages to their latest versions in the info, list and search commands (will also affect plugins which use the doPackageLists() API). +@@ -450,6 +475,7 @@ configuration options. + .SH "FILES" + .nf + /etc/yum/yum.conf ++/etc/yum/version-groups.conf + /etc/yum/repos.d/ + /etc/yum/pluginconf.d/ + /var/cache/yum/ diff --git a/docs/yum.conf.5 b/docs/yum.conf.5 index 69b601d..8976b0c 100644 --- a/docs/yum.conf.5 @@ -107,6 +116,44 @@ index 69b601d..8976b0c 100644 \fBcommands\fR List of functional commands to run if no functional commands are specified on the command line (eg. "update foo bar baz quux"). None of the short options +diff --git a/etc/Makefile b/etc/Makefile +index 1ba5a1f..7a083f7 100644 +--- a/etc/Makefile ++++ b/etc/Makefile +@@ -1,3 +1,5 @@ ++YUMETC=$(DESTDIR)/etc/yum ++ + all: + echo "Nothing to do" + +@@ -8,7 +10,9 @@ install: + mkdir -p $(DESTDIR)/etc/yum/ + mkdir -p $(DESTDIR)/etc/yum/repos.d + +- install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf ++ install -m 644 yum.conf $(YUMETC)/yum.conf ++ ++ install -m 644 version-groups.conf $(YUMETC)/version-groups.conf + + mkdir -p $(DESTDIR)/etc/logrotate.d + install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum +diff --git a/etc/version-groups.conf b/etc/version-groups.conf +new file mode 100644 +index 0000000..57d97dd +--- /dev/null ++++ b/etc/version-groups.conf +@@ -0,0 +1,11 @@ ++# This file allows you to create "groups" of package names, which are used by ++# the version command. ++ ++[yum] ++# These are the top level things to do with yum, we don't list Eg. libselinux ++# even though that's require by rpm(-libs). ++run_with_packages = true ++pkglist = glibc, sqlite, libcurl, nss, ++ rpm, rpm-libs, rpm-python, ++ python, ++ python-iniparse, python-urlgrabber, python-pycurl diff --git a/output.py b/output.py index 2299a9c..d0b9f7f 100755 --- a/output.py @@ -3472,6 +3519,7269 @@ index 3bef4b5..1869dc2 100644 #~ msgstr "" #~ "La cadena de versió de dependència és invàlida, proveu-ho entre cometes." - +diff --git a/po/cs.po b/po/cs.po +new file mode 100644 +index 0000000..18305e3 +--- /dev/null ++++ b/po/cs.po +@@ -0,0 +1,2518 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Adam Pribyl , 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2009-09-29 09:25+0000\n" ++"PO-Revision-Date: 2009-09-29 17:44+0200\n" ++"Last-Translator: Adam Pribyl \n" ++"Language-Team: Czech \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" ++ ++#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 ++msgid "Updating" ++msgstr "Aktualizuje se" ++ ++#: ../callback.py:49 ../yum/rpmtrans.py:72 ++msgid "Erasing" ++msgstr "Maže se" ++ ++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 ++#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 ++msgid "Installing" ++msgstr "Instaluje se" ++ ++#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 ++msgid "Obsoleted" ++msgstr "Zastaralé" ++ ++#: ../callback.py:54 ../output.py:1063 ../output.py:1401 ++msgid "Updated" ++msgstr "Aktualizováno" ++ ++#: ../callback.py:55 ../output.py:1397 ++msgid "Erased" ++msgstr "Smazáno" ++ ++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 ++#: ../output.py:1393 ++msgid "Installed" ++msgstr "Nainstalováno" ++ ++#: ../callback.py:130 ++msgid "No header - huh?" ++msgstr "Bez hlavičky???" ++ ++#: ../callback.py:168 ++msgid "Repackage" ++msgstr "Přebalit" ++ ++#: ../callback.py:189 ++#, python-format ++msgid "Error: invalid output state: %s for %s" ++msgstr "Chyba: neplatný výstupní stav: %s pro %s" ++ ++#: ../callback.py:212 ++#, python-format ++msgid "Erased: %s" ++msgstr "Smazáno: %s" ++ ++#: ../callback.py:217 ../output.py:941 ++msgid "Removing" ++msgstr "Odstraňuje se" ++ ++#: ../callback.py:219 ../yum/rpmtrans.py:77 ++msgid "Cleanup" ++msgstr "Čiští se" ++ ++#: ../cli.py:108 ++#, python-format ++msgid "Command \"%s\" already defined" ++msgstr "Přikaz \"%s\" již definován" ++ ++#: ../cli.py:120 ++msgid "Setting up repositories" ++msgstr "Nastavují se repozitáře" ++ ++#: ../cli.py:131 ++msgid "Reading repository metadata in from local files" ++msgstr "Načítají se metadata repozitářů z lokálních souborů" ++ ++#: ../cli.py:194 ../utils.py:102 ++#, python-format ++msgid "Config Error: %s" ++msgstr "Chyba konfigurace: %s" ++ ++#: ../cli.py:197 ../cli.py:1253 ../utils.py:105 ++#, python-format ++msgid "Options Error: %s" ++msgstr "Chybná volba: %s" ++ ++#: ../cli.py:225 ++#, python-format ++msgid " Installed: %s-%s at %s" ++msgstr " Nainstalováno: %s-%s na %s" ++ ++#: ../cli.py:227 ++#, python-format ++msgid " Built : %s at %s" ++msgstr " Sestaveno : %s na %s" ++ ++#: ../cli.py:229 ++#, python-format ++msgid " Committed: %s at %s" ++msgstr " Odesláno : %s na %s" ++ ++#: ../cli.py:268 ++msgid "You need to give some command" ++msgstr "Musíte zadat nějaký příkaz" ++ ++#: ../cli.py:311 ++msgid "Disk Requirements:\n" ++msgstr "Diskové požadavky:\n" ++ ++#: ../cli.py:313 ++#, python-format ++msgid " At least %dMB needed on the %s filesystem.\n" ++msgstr " Je potřeba alespoň %dMB na souborovém systému %s.\n" ++ ++#. TODO: simplify the dependency errors? ++#. Fixup the summary ++#: ../cli.py:318 ++msgid "" ++"Error Summary\n" ++"-------------\n" ++msgstr "" ++"Přehled chyb\n" ++"------------\n" ++ ++#: ../cli.py:361 ++msgid "Trying to run the transaction but nothing to do. Exiting." ++msgstr "Pokus o spuštění transakce, ale není co dělat. Ukončeno." ++ ++#: ../cli.py:397 ++msgid "Exiting on user Command" ++msgstr "Ukončeno na přikaz uživatele" ++ ++#: ../cli.py:401 ++msgid "Downloading Packages:" ++msgstr "Stahují se balíčky:" ++ ++#: ../cli.py:406 ++msgid "Error Downloading Packages:\n" ++msgstr "Chyba stahování balíčků:\n" ++ ++#: ../cli.py:420 ../yum/__init__.py:3995 ++msgid "Running rpm_check_debug" ++msgstr "Spuští se rpm_check_debug" ++ ++#: ../cli.py:429 ../yum/__init__.py:4004 ++msgid "ERROR You need to update rpm to handle:" ++msgstr "CHYBA Je potřeba aktualizovat rpm k provedení:" ++ ++#: ../cli.py:431 ../yum/__init__.py:4007 ++msgid "ERROR with rpm_check_debug vs depsolve:" ++msgstr "CHYBA v rpm_check_debug vs depsolve:" ++ ++#: ../cli.py:437 ++msgid "RPM needs to be updated" ++msgstr "Je potřeba aktualizovat RPM" ++ ++#: ../cli.py:438 ++#, python-format ++msgid "Please report this error in %s" ++msgstr "Prosím nahlašte tuto chybu v %s" ++ ++#: ../cli.py:444 ++msgid "Running Transaction Test" ++msgstr "Spouští se test transakcí" ++ ++#: ../cli.py:460 ++msgid "Finished Transaction Test" ++msgstr "Test transakcí dokončen" ++ ++#: ../cli.py:462 ++msgid "Transaction Check Error:\n" ++msgstr "Chyba při kontrole transakcí:\n" ++ ++#: ../cli.py:469 ++msgid "Transaction Test Succeeded" ++msgstr "Test transakcí uspěl" ++ ++#: ../cli.py:491 ++msgid "Running Transaction" ++msgstr "Spouští se transakce" ++ ++#: ../cli.py:521 ++msgid "" ++"Refusing to automatically import keys when running unattended.\n" ++"Use \"-y\" to override." ++msgstr "" ++"Nelze automaticky importovat klíče při spuštění bez obsluhy.\n" ++"Použite \"-y\" k potlačení." ++ ++#: ../cli.py:540 ../cli.py:574 ++msgid " * Maybe you meant: " ++msgstr " * Možná jste myslel: " ++ ++#: ../cli.py:557 ../cli.py:565 ++#, python-format ++msgid "Package(s) %s%s%s available, but not installed." ++msgstr "Balíček(y) %s%s%s dostupné, ale nenainstalované." ++ ++#: ../cli.py:571 ../cli.py:602 ../cli.py:680 ++#, python-format ++msgid "No package %s%s%s available." ++msgstr "Žádné dostupné balíčky %s%s%s." ++ ++#: ../cli.py:607 ../cli.py:740 ++msgid "Package(s) to install" ++msgstr "Balíček(y) k instalaci" ++ ++#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741 ++#: ../yumcommands.py:159 ++msgid "Nothing to do" ++msgstr "Není co dělat" ++ ++#: ../cli.py:641 ++#, python-format ++msgid "%d packages marked for Update" ++msgstr "%d balíčků označeno k aktualizaci" ++ ++#: ../cli.py:644 ++msgid "No Packages marked for Update" ++msgstr "Žádné balíčky označené k aktualizaci" ++ ++#: ../cli.py:658 ++#, python-format ++msgid "%d packages marked for removal" ++msgstr "%d balíčků označeno ke smazání" ++ ++#: ../cli.py:661 ++msgid "No Packages marked for removal" ++msgstr "Žádné balíčky označené k odstranění" ++ ++#: ../cli.py:685 ++msgid "Package(s) to downgrade" ++msgstr "Balíček(y) ke snížení verze" ++ ++#: ../cli.py:709 ++#, python-format ++msgid " (from %s)" ++msgstr " (z %s)" ++ ++#: ../cli.py:711 ++#, python-format ++msgid "Installed package %s%s%s%s not available." ++msgstr "Instalované balíčky %s%s%s%s nejsou dostupné" ++ ++#: ../cli.py:718 ++msgid "Package(s) to reinstall" ++msgstr "Balíček(y) k reinstalaci" ++ ++#: ../cli.py:731 ++msgid "No Packages Provided" ++msgstr "Žádný balíček neposkytuje" ++ ++#: ../cli.py:815 ++#, python-format ++msgid "Warning: No matches found for: %s" ++msgstr "Varování: Žádný balíček odpovídající: %s" ++ ++#: ../cli.py:818 ++msgid "No Matches found" ++msgstr "Nebyla nalezena shoda" ++ ++#: ../cli.py:857 ++#, python-format ++msgid "" ++"Warning: 3.0.x versions of yum would erroneously match against filenames.\n" ++" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" ++msgstr "" ++"Varování: 3.0.x verze yumu by chybně hledala shodu se jménem souboru.\n" ++" Můžete použít \"%s*/%s%s\" a/nebo \"%s*bin/%s%s\" k dosažení tohoto chování" ++ ++#: ../cli.py:873 ++#, python-format ++msgid "No Package Found for %s" ++msgstr "Nebyly nalezeny balíčky pro %s" ++ ++#: ../cli.py:885 ++msgid "Cleaning up Everything" ++msgstr "Čistí se vše" ++ ++#: ../cli.py:899 ++msgid "Cleaning up Headers" ++msgstr "Čistí se hlavičky" ++ ++#: ../cli.py:902 ++msgid "Cleaning up Packages" ++msgstr "Čistí se balíčky" ++ ++#: ../cli.py:905 ++msgid "Cleaning up xml metadata" ++msgstr "Čistí se XML metadata" ++ ++#: ../cli.py:908 ++msgid "Cleaning up database cache" ++msgstr "Čistí se skladiště databáze" ++ ++#: ../cli.py:911 ++msgid "Cleaning up expire-cache metadata" ++msgstr "Čistí se vypršelá metadata ze skladiště" ++ ++#: ../cli.py:914 ++msgid "Cleaning up plugins" ++msgstr "Čistí se zásuvné moduly" ++ ++#: ../cli.py:939 ++msgid "Installed Groups:" ++msgstr "Naintalované skupiny:" ++ ++#: ../cli.py:951 ++msgid "Available Groups:" ++msgstr "Dostupné skupiny:" ++ ++#: ../cli.py:961 ++msgid "Done" ++msgstr "Dokončeno" ++ ++#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2621 ++#, python-format ++msgid "Warning: Group %s does not exist." ++msgstr "Varování: skupina %s neexistuje." ++ ++#: ../cli.py:1000 ++msgid "No packages in any requested group available to install or update" ++msgstr "" ++"V žádné s požadovaných skupin nejsou balíčky k instalaci nebo aktualizaci" ++ ++#: ../cli.py:1002 ++#, python-format ++msgid "%d Package(s) to Install" ++msgstr "%d balíček(ů) k instalaci" ++ ++#: ../cli.py:1012 ../yum/__init__.py:2633 ++#, python-format ++msgid "No group named %s exists" ++msgstr "Neexistuje skupina se jménem %s" ++ ++#: ../cli.py:1018 ++msgid "No packages to remove from groups" ++msgstr "Žádné balíčky k odstranění ve skupině" ++ ++#: ../cli.py:1020 ++#, python-format ++msgid "%d Package(s) to remove" ++msgstr "%d balíček(ů) k odstranění" ++ ++#: ../cli.py:1062 ++#, python-format ++msgid "Package %s is already installed, skipping" ++msgstr "Balíček %s je již nainstalován, přeskakuji." ++ ++#: ../cli.py:1073 ++#, python-format ++msgid "Discarding non-comparable pkg %s.%s" ++msgstr "Skartuje se neporovnatelný balíček %s.%s" ++ ++#. we've not got any installed that match n or n+a ++#: ../cli.py:1099 ++#, python-format ++msgid "No other %s installed, adding to list for potential install" ++msgstr "Žádný jiný %s nainstalován, přidán do seznamu k potenciální instalaci" ++ ++#: ../cli.py:1119 ++msgid "Plugin Options" ++msgstr "Možnosti zásuvného modulu" ++ ++#: ../cli.py:1127 ++#, python-format ++msgid "Command line error: %s" ++msgstr "Chyba příkazové řádky: %s" ++ ++#: ../cli.py:1140 ++#, python-format ++msgid "" ++"\n" ++"\n" ++"%s: %s option requires an argument" ++msgstr "" ++"\n" ++"\n" ++"%s: %s volba vyžaduje argument" ++ ++#: ../cli.py:1193 ++msgid "--color takes one of: auto, always, never" ++msgstr "--color přijímá jeden z: auto, always, never" ++ ++#: ../cli.py:1300 ++msgid "show this help message and exit" ++msgstr "ukázat tuto nápovedu a skončit" ++ ++#: ../cli.py:1304 ++msgid "be tolerant of errors" ++msgstr "tolerovat chyby" ++ ++#: ../cli.py:1306 ++msgid "run entirely from cache, don't update cache" ++msgstr "spustit vše z neaktualizovaného skladiště" ++ ++#: ../cli.py:1308 ++msgid "config file location" ++msgstr "umístění konfiguračního souboru" ++ ++#: ../cli.py:1310 ++msgid "maximum command wait time" ++msgstr "maximální čas čekání na příkaz" ++ ++#: ../cli.py:1312 ++msgid "debugging output level" ++msgstr "úroveň výstupních ladících informací" ++ ++#: ../cli.py:1316 ++msgid "show duplicates, in repos, in list/search commands" ++msgstr "ukázat duplikáty v repozitářích, v list/search příkazech" ++ ++#: ../cli.py:1318 ++msgid "error output level" ++msgstr "úroveň výstupu chyb" ++ ++#: ../cli.py:1321 ++msgid "quiet operation" ++msgstr "tichý chod" ++ ++#: ../cli.py:1323 ++msgid "verbose operation" ++msgstr "užvaněný chod" ++ ++#: ../cli.py:1325 ++msgid "answer yes for all questions" ++msgstr "odpovědět ano na všechny otázky" ++ ++#: ../cli.py:1327 ++msgid "show Yum version and exit" ++msgstr "ukázat verzi yumu a skončit" ++ ++#: ../cli.py:1328 ++msgid "set install root" ++msgstr "nastavit kořen instalace " ++ ++#: ../cli.py:1332 ++msgid "enable one or more repositories (wildcards allowed)" ++msgstr "povolit jeden nebo více repozitářů (zástupné znaky povoleny)" ++ ++#: ../cli.py:1336 ++msgid "disable one or more repositories (wildcards allowed)" ++msgstr "zakázat jeden nebo více repozitářů (zástupné znaky povoleny)" ++ ++#: ../cli.py:1339 ++msgid "exclude package(s) by name or glob" ++msgstr "vyřadit balíček(y) podle jména nebo globálně" ++ ++#: ../cli.py:1341 ++msgid "disable exclude from main, for a repo or for everything" ++msgstr "zakázat vyřazení z hlavní části pro repozitář nebo pro vše" ++ ++#: ../cli.py:1344 ++msgid "enable obsoletes processing during updates" ++msgstr "povolit zpracování zastaralých během aktualizací" ++ ++#: ../cli.py:1346 ++msgid "disable Yum plugins" ++msgstr "zakázat zásuvné moduly yumu" ++ ++#: ../cli.py:1348 ++msgid "disable gpg signature checking" ++msgstr "zakázat kontrolu GPG podpisů" ++ ++#: ../cli.py:1350 ++msgid "disable plugins by name" ++msgstr "zakázat zásuvné moduly podle jména" ++ ++#: ../cli.py:1353 ++msgid "enable plugins by name" ++msgstr "povolit zásuvné moduly podle jména" ++ ++#: ../cli.py:1356 ++msgid "skip packages with depsolving problems" ++msgstr "přeskočit balíčky s problémy v závislostech" ++ ++#: ../cli.py:1358 ++msgid "control whether color is used" ++msgstr "kontrola zda jsou použity barvy" ++ ++#: ../output.py:305 ++msgid "Jan" ++msgstr "Led" ++ ++#: ../output.py:305 ++msgid "Feb" ++msgstr "Úno" ++ ++#: ../output.py:305 ++msgid "Mar" ++msgstr "Bře" ++ ++#: ../output.py:305 ++msgid "Apr" ++msgstr "Dub" ++ ++#: ../output.py:305 ++msgid "May" ++msgstr "Kvě" ++ ++#: ../output.py:305 ++msgid "Jun" ++msgstr "Čer" ++ ++#: ../output.py:306 ++msgid "Jul" ++msgstr "Čec" ++ ++#: ../output.py:306 ++msgid "Aug" ++msgstr "Srp" ++ ++#: ../output.py:306 ++msgid "Sep" ++msgstr "Zář" ++ ++#: ../output.py:306 ++msgid "Oct" ++msgstr "Řij" ++ ++#: ../output.py:306 ++msgid "Nov" ++msgstr "Lis" ++ ++#: ../output.py:306 ++msgid "Dec" ++msgstr "Pro" ++ ++#: ../output.py:316 ++msgid "Trying other mirror." ++msgstr "Zkouší se jiné zrcadlo" ++ ++#: ../output.py:538 ++#, python-format ++msgid "Name : %s%s%s" ++msgstr "Jméno : %s%s%s" ++ ++#: ../output.py:539 ++#, python-format ++msgid "Arch : %s" ++msgstr "Arch : %s" ++ ++#: ../output.py:541 ++#, python-format ++msgid "Epoch : %s" ++msgstr "Epocha : %s" ++ ++#: ../output.py:542 ++#, python-format ++msgid "Version : %s" ++msgstr "Verze : %s" ++ ++#: ../output.py:543 ++#, python-format ++msgid "Release : %s" ++msgstr "Vydání : %s" ++ ++#: ../output.py:544 ++#, python-format ++msgid "Size : %s" ++msgstr "Velikost : %s" ++ ++#: ../output.py:545 ++#, python-format ++msgid "Repo : %s" ++msgstr "Repo : %s" ++ ++#: ../output.py:547 ++#, python-format ++msgid "From repo : %s" ++msgstr "Z repa : %s" ++ ++#: ../output.py:549 ++#, python-format ++msgid "Committer : %s" ++msgstr "Potvrzeno : %s" ++ ++#: ../output.py:550 ++#, python-format ++msgid "Committime : %s" ++msgstr "Čas povrzení : %s" ++ ++#: ../output.py:551 ++#, python-format ++msgid "Buildtime : %s" ++msgstr "Čas sestavení : %s" ++ ++#: ../output.py:553 ++#, python-format ++msgid "Installtime: %s" ++msgstr "Čas instalace : %s" ++ ++#: ../output.py:554 ++msgid "Summary : " ++msgstr "Souhrn : " ++ ++#: ../output.py:556 ++#, python-format ++msgid "URL : %s" ++msgstr "URL : %s" ++ ++#: ../output.py:557 ++#, python-format ++msgid "License : %s" ++msgstr "Licence : %s" ++ ++#: ../output.py:558 ++msgid "Description: " ++msgstr "Popis :" ++ ++#: ../output.py:626 ++msgid "y" ++msgstr "a" ++ ++#: ../output.py:626 ++msgid "yes" ++msgstr "ano" ++ ++#: ../output.py:627 ++msgid "n" ++msgstr "n" ++ ++#: ../output.py:627 ++msgid "no" ++msgstr "ne" ++ ++#: ../output.py:631 ++msgid "Is this ok [y/N]: " ++msgstr "V pořádku [a/N]: " ++ ++#: ../output.py:722 ++#, python-format ++msgid "" ++"\n" ++"Group: %s" ++msgstr "" ++"\n" ++"Skupina: %s" ++ ++#: ../output.py:726 ++#, python-format ++msgid " Group-Id: %s" ++msgstr " ID skupiny: %s" ++ ++#: ../output.py:731 ++#, python-format ++msgid " Description: %s" ++msgstr " Popis: %s" ++ ++#: ../output.py:733 ++msgid " Mandatory Packages:" ++msgstr " Povinné balíčky:" ++ ++#: ../output.py:734 ++msgid " Default Packages:" ++msgstr " Výchozí balíčky:" ++ ++#: ../output.py:735 ++msgid " Optional Packages:" ++msgstr " Volitelné balíčky:" ++ ++#: ../output.py:736 ++msgid " Conditional Packages:" ++msgstr " Podmínečné balíčky:" ++ ++#: ../output.py:756 ++#, python-format ++msgid "package: %s" ++msgstr "balíčky: %s" ++ ++#: ../output.py:758 ++msgid " No dependencies for this package" ++msgstr " Pro tento balíček nejsou žádné závislosti" ++ ++#: ../output.py:763 ++#, python-format ++msgid " dependency: %s" ++msgstr " závislosti: %s" ++ ++#: ../output.py:765 ++msgid " Unsatisfied dependency" ++msgstr " Neuspokojené závislosti" ++ ++#: ../output.py:837 ++#, python-format ++msgid "Repo : %s" ++msgstr "Repo : %s" ++ ++#: ../output.py:838 ++msgid "Matched from:" ++msgstr "Shoda s:" ++ ++#: ../output.py:847 ++msgid "Description : " ++msgstr "Popis : " ++ ++#: ../output.py:850 ++#, python-format ++msgid "URL : %s" ++msgstr "URL : %s" ++ ++#: ../output.py:853 ++#, python-format ++msgid "License : %s" ++msgstr "Licence : %s" ++ ++#: ../output.py:856 ++#, python-format ++msgid "Filename : %s" ++msgstr "Soubor : %s" ++ ++#: ../output.py:860 ++msgid "Other : " ++msgstr "Další : " ++ ++#: ../output.py:893 ++msgid "There was an error calculating total download size" ++msgstr "Pří výpočtu celkové velikosti stahování nastala chyba" ++ ++#: ../output.py:898 ++#, python-format ++msgid "Total size: %s" ++msgstr "Celková velikost: %s" ++ ++#: ../output.py:901 ++#, python-format ++msgid "Total download size: %s" ++msgstr "Celková velikost stahování: %s" ++ ++#: ../output.py:942 ++msgid "Reinstalling" ++msgstr "Reinstaluje se" ++ ++#: ../output.py:943 ++msgid "Downgrading" ++msgstr "Snižuje se verze" ++ ++#: ../output.py:944 ++msgid "Installing for dependencies" ++msgstr "Instaluje se kvůli závislostem" ++ ++#: ../output.py:945 ++msgid "Updating for dependencies" ++msgstr "Aktualizuje se kvůli závislostem" ++ ++#: ../output.py:946 ++msgid "Removing for dependencies" ++msgstr "Odstraňuje se kvůli závislostem" ++ ++#: ../output.py:953 ../output.py:1065 ++msgid "Skipped (dependency problems)" ++msgstr "Přeskočeno (problémy se závislostmi)" ++ ++#: ../output.py:976 ++msgid "Package" ++msgstr "Balíček" ++ ++#: ../output.py:976 ++msgid "Arch" ++msgstr "Arch" ++ ++#: ../output.py:977 ++msgid "Version" ++msgstr "Verze" ++ ++#: ../output.py:977 ++msgid "Repository" ++msgstr "Repozitář" ++ ++#: ../output.py:978 ++msgid "Size" ++msgstr "Velikost" ++ ++#: ../output.py:990 ++#, python-format ++msgid "" ++" replacing %s%s%s.%s %s\n" ++"\n" ++msgstr "" ++" nahrazuje se %s%s%s.%s %s\n" ++"\n" ++ ++#: ../output.py:999 ++#, python-format ++msgid "" ++"\n" ++"Transaction Summary\n" ++"%s\n" ++msgstr "" ++"\n" ++"Shrnutí transakce\n" ++"%s\n" ++ ++#: ../output.py:1006 ++#, python-format ++msgid "" ++"Install %5.5s Package(s)\n" ++"Upgrade %5.5s Package(s)\n" ++msgstr "" ++"Instalace %5.5s balíčku/ů\n" ++"Aktualizace %5.5s balíčku/ů\n" ++ ++#: ../output.py:1015 ++#, python-format ++msgid "" ++"Remove %5.5s Package(s)\n" ++"Reinstall %5.5s Package(s)\n" ++"Downgrade %5.5s Package(s)\n" ++msgstr "" ++"Odstraňení %5.5s balíčku/ů\n" ++"Reinstalace %5.5s balíčku/ů\n" ++"Snížení verze %5.5s balíčku/ů\n" ++ ++#: ../output.py:1059 ++msgid "Removed" ++msgstr "Odstraněno" ++ ++#: ../output.py:1060 ++msgid "Dependency Removed" ++msgstr "Odstraněné závislosti" ++ ++#: ../output.py:1062 ++msgid "Dependency Installed" ++msgstr "Nainstalované závislosti" ++ ++#: ../output.py:1064 ++msgid "Dependency Updated" ++msgstr "Aktualizované závislosti" ++ ++#: ../output.py:1066 ++msgid "Replaced" ++msgstr "Nahrazeno" ++ ++#: ../output.py:1067 ++msgid "Failed" ++msgstr "Selhalo" ++ ++#. Delta between C-c's so we treat as exit ++#: ../output.py:1133 ++msgid "two" ++msgstr "dvě" ++ ++#. For translators: This is output like: ++#. Current download cancelled, interrupt (ctrl-c) again within two seconds ++#. to exit. ++#. Where "interupt (ctrl-c) again" and "two" are highlighted. ++#: ../output.py:1144 ++#, python-format ++msgid "" ++"\n" ++" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " ++"seconds\n" ++"to exit.\n" ++msgstr "" ++"\n" ++" Aktuální stahování přerušeno, %spřerušte (ctrl-c) znovu%s během %s%s%s " ++"sekund\n" ++"pro ukončení.\n" ++ ++#: ../output.py:1155 ++msgid "user interrupt" ++msgstr "Přerušeno uživatelem" ++ ++#: ../output.py:1173 ++msgid "Total" ++msgstr "Celkem" ++ ++#: ../output.py:1201 ++msgid "" ++msgstr "" ++ ++#: ../output.py:1202 ++msgid "System" ++msgstr "Systém" ++ ++#: ../output.py:1238 ++msgid "Bad transaction IDs, or package(s), given" ++msgstr "Zadáné špatné ID transakce nebo balíčku/ů" ++ ++#: ../output.py:1282 ../yumcommands.py:1148 ../yum/__init__.py:1060 ++msgid "Warning: RPMDB has been altered since the last yum transaction." ++msgstr "Varování: RPMDB byla od poslední yum transakce změněna" ++ ++#: ../output.py:1287 ++msgid "No transaction ID given" ++msgstr "Nezadáno ID transakce" ++ ++#: ../output.py:1295 ++msgid "Bad transaction ID given" ++msgstr "Špatné ID transakce" ++ ++#: ../output.py:1300 ++msgid "Not found given transaction ID" ++msgstr "Zadané ID transakce nenalezeno" ++ ++#: ../output.py:1308 ++msgid "Found more than one transaction ID!" ++msgstr "Nalezeno více než jedno ID transakce!" ++ ++#: ../output.py:1329 ++msgid "No transaction ID, or package, given" ++msgstr "Nebylo zadáno ID transakce nebo balíčku/ů" ++ ++#: ../output.py:1355 ++msgid "Transaction ID :" ++msgstr "ID transakce:" ++ ++#: ../output.py:1357 ++msgid "Begin time :" ++msgstr "Čas startu :" ++ ++#: ../output.py:1360 ../output.py:1362 ++msgid "Begin rpmdb :" ++msgstr "Začátek rpmdb :" ++ ++#: ../output.py:1376, python-format ++msgid "(%s seconds)" ++msgstr "(%s sekund)" ++ ++#: ../output.py:1377 ++msgid "End time :" ++msgstr "Konečný čas :" ++ ++#: ../output.py:1380 ../output.py:1382 ++msgid "End rpmdb :" ++msgstr "Konec rpmdb :" ++ ++#: ../output.py:1383 ++msgid "User :" ++msgstr "Uživatel :" ++ ++#: ../output.py:1385 ../output.py:1387 ../output.py:1389 ++msgid "Return-Code :" ++msgstr "Vrácený kód :" ++ ++#: ../output.py:1385 ++msgid "Aborted" ++msgstr "Přerušeno" ++ ++#: ../output.py:1387 ++msgid "Failure:" ++msgstr "Selhalo:" ++ ++#: ../output.py:1389 ++msgid "Success" ++msgstr "Úspěch" ++ ++#: ../output.py:1390 ++msgid "Transaction performed with :" ++msgstr "Transakce proběhla s :" ++ ++#: ../output.py:1403 ++msgid "Downgraded" ++msgstr "Snížena verze" ++ ++#. multiple versions installed, both older and newer ++#: ../output.py:1405 ++msgid "Weird" ++msgstr "Divné" ++ ++#: ../output.py:1407 ++msgid "Packages Altered:" ++msgstr "Pozměněné balíčky:" ++ ++#: ../output.py:1475 ++msgid "Last day" ++msgstr "Poslední den" ++ ++#: ../output.py:1476 ++msgid "Last week" ++msgstr "Poslední týden" ++ ++#: ../output.py:1477 ++msgid "Last 2 weeks" ++msgstr "Poslední 2 týdny" ++ ++#. US default :p ++#: ../output.py:1478 ++msgid "Last 3 months" ++msgstr "Poslední 3 měsíce" ++ ++#: ../output.py:1479 ++msgid "Last 6 months" ++msgstr "Posledních 6 měsíců" ++ ++#: ../output.py:1480 ++msgid "Last year" ++msgstr "Poslední rok" ++ ++#: ../output.py:1481 ++msgid "Over a year ago" ++msgstr "Více než rok" ++ ++#: ../output.py:1510 ++msgid "installed" ++msgstr "nainstalováno" ++ ++#: ../output.py:1511 ++msgid "updated" ++msgstr "aktualizováno" ++ ++#: ../output.py:1512 ++msgid "obsoleted" ++msgstr "zastaralo" ++ ++#: ../output.py:1513 ++msgid "erased" ++msgstr "vymazáno" ++ ++#: ../output.py:1517 ++#, python-format ++msgid "---> Package %s.%s %s:%s-%s set to be %s" ++msgstr "---> Balíček %s.%s %s:%s-%s nastaven k/ke %s" ++ ++#: ../output.py:1524 ++msgid "--> Running transaction check" ++msgstr "--> Spouští se kontrola transakce" ++ ++#: ../output.py:1529 ++msgid "--> Restarting Dependency Resolution with new changes." ++msgstr "--> Restartuje se řešení závislostí s novými změnami." ++ ++#: ../output.py:1534 ++msgid "--> Finished Dependency Resolution" ++msgstr "--> Řešení závislostí dokončeno" ++ ++#: ../output.py:1539 ../output.py:1544 ++#, python-format ++msgid "--> Processing Dependency: %s for package: %s" ++msgstr "--> Zpracování závislosti: %s pro balíček: %s" ++ ++#: ../output.py:1548 ++#, python-format ++msgid "--> Unresolved Dependency: %s" ++msgstr "--> Nevyřešená závislost: %s" ++ ++#: ../output.py:1554 ../output.py:1559 ++#, python-format ++msgid "--> Processing Conflict: %s conflicts %s" ++msgstr "--> Zpracování konfliktu: %s je v konfliktu s %s" ++ ++#: ../output.py:1563 ++msgid "--> Populating transaction set with selected packages. Please wait." ++msgstr "--> Přidávají se do transakce vybrané balíčky. Prosím čekejte." ++ ++#: ../output.py:1567 ++#, python-format ++msgid "---> Downloading header for %s to pack into transaction set." ++msgstr "---> Stahují se hlavičky %s pro přidání do transakce." ++ ++#: ../utils.py:132 ../yummain.py:42 ++msgid "" ++"\n" ++"\n" ++"Exiting on user cancel" ++msgstr "" ++"\n" ++"\n" ++"Ukončeno na základě pokynu uživatele" ++ ++#: ../utils.py:138 ../yummain.py:48 ++msgid "" ++"\n" ++"\n" ++"Exiting on Broken Pipe" ++msgstr "" ++"\n" ++"\n" ++"Ukončeno kvůli nefunkční rouře" ++ ++#: ../utils.py:140 ../yummain.py:50, python-format ++msgid "" ++"\n" ++"\n" ++"%s" ++msgstr "" ++"\n" ++"\n" ++"%s" ++ ++#: ../utils.py:179 ../yummain.py:273 ++msgid "Complete!" ++msgstr "Hotovo!" ++ ++#: ../yumcommands.py:42 ++msgid "You need to be root to perform this command." ++msgstr "Pro spuštění tohoto příkazu potřebujete být root." ++ ++#: ../yumcommands.py:49 ++msgid "" ++"\n" ++"You have enabled checking of packages via GPG keys. This is a good thing. \n" ++"However, you do not have any GPG public keys installed. You need to " ++"download\n" ++"the keys for packages you wish to install and install them.\n" ++"You can do that by running the command:\n" ++" rpm --import public.gpg.key\n" ++"\n" ++"\n" ++"Alternatively you can specify the url to the key you would like to use\n" ++"for a repository in the 'gpgkey' option in a repository section and yum \n" ++"will install it for you.\n" ++"\n" ++"For more information contact your distribution or package provider.\n" ++msgstr "" ++"\n" ++"Povolili jste kontrolu balíčků pomocí GPG klíčů, což je dobrá věc.\n" ++"Bohužel nemáte ale nainstalován žádný veřejný GPG klíč. Musíte stáhnout " ++"klíč\n" ++"pro blíček, který si přejete nainstalovat a přidat jej příkazem.\n" ++" rpm --import public.gpg.key\n" ++"\n" ++"\n" ++"Jako druhou možnost můžete uvést URL ke klíči, který chcete použít\n" ++"pro repozitář ve volbě 'gpgkey' v nastavení repozitáře a yum\n" ++"jej nainstaluje.\n" ++"\n" ++"Pro více informací kontaktujte vašeho distributora nebo správce balíčku.\n" ++ ++#: ../yumcommands.py:69 ++#, python-format ++msgid "Error: Need to pass a list of pkgs to %s" ++msgstr "Chyba: Je potřeba předat seznam balíčků do %s" ++ ++#: ../yumcommands.py:75 ++msgid "Error: Need an item to match" ++msgstr "Chyba: K nalezení shody je potřeba předmět" ++ ++#: ../yumcommands.py:81 ++msgid "Error: Need a group or list of groups" ++msgstr "Chyba: Je potřeba skupina nebo seznam skupin" ++ ++#: ../yumcommands.py:90 ++#, python-format ++msgid "Error: clean requires an option: %s" ++msgstr "Chyba: clean vyžaduje volbu: %s" ++ ++#: ../yumcommands.py:95 ++#, python-format ++msgid "Error: invalid clean argument: %r" ++msgstr "Chyba: Neplatný argument pro clean: %r" ++ ++#: ../yumcommands.py:108 ++msgid "No argument to shell" ++msgstr "Shell nemá žádný argument" ++ ++#: ../yumcommands.py:110 ++#, python-format ++msgid "Filename passed to shell: %s" ++msgstr "Jméno souboru předané shelu: %s" ++ ++#: ../yumcommands.py:114 ++#, python-format ++msgid "File %s given as argument to shell does not exist." ++msgstr "Soubor %s předaný jako argument shellu neexistuje." ++ ++#: ../yumcommands.py:120 ++msgid "Error: more than one file given as argument to shell." ++msgstr "Chyba: Více než jeden soubor předán shellu jako argument." ++ ++#: ../yumcommands.py:169 ++msgid "PACKAGE..." ++msgstr "Balíček..." ++ ++#: ../yumcommands.py:172 ++msgid "Install a package or packages on your system" ++msgstr "Nainstalujte balíček nebo balíčky do vašeho systému" ++ ++#: ../yumcommands.py:180 ++msgid "Setting up Install Process" ++msgstr "Uspořádává se instalační průběh" ++ ++#: ../yumcommands.py:191 ++msgid "[PACKAGE...]" ++msgstr "[Balíček...]" ++ ++#: ../yumcommands.py:194 ++msgid "Update a package or packages on your system" ++msgstr "Aktualizujte balíček nebo balíčky na vašem systému" ++ ++#: ../yumcommands.py:201 ++msgid "Setting up Update Process" ++msgstr "Uspořádává se průběh aktualizace" ++ ++#: ../yumcommands.py:246 ++msgid "Display details about a package or group of packages" ++msgstr "Zobrazit detaily o balíčku nebo skupině balíčků" ++ ++#: ../yumcommands.py:295 ++msgid "Installed Packages" ++msgstr "Instalované balíčky" ++ ++#: ../yumcommands.py:303 ++msgid "Available Packages" ++msgstr "Dostupné balíčky" ++ ++#: ../yumcommands.py:307 ++msgid "Extra Packages" ++msgstr "Dodatečné balíčky" ++ ++#: ../yumcommands.py:311 ++msgid "Updated Packages" ++msgstr "Aktualizované balíčky" ++ ++#. This only happens in verbose mode ++#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:602 ++msgid "Obsoleting Packages" ++msgstr "Zastaralé balíčky" ++ ++#: ../yumcommands.py:328 ++msgid "Recently Added Packages" ++msgstr "Nově přidané balíčky" ++ ++#: ../yumcommands.py:335 ++msgid "No matching Packages to list" ++msgstr "Nenalezeny shodné balíčky" ++ ++#: ../yumcommands.py:349 ++msgid "List a package or groups of packages" ++msgstr "Vypsat balíček nebo skupiny balíčků" ++ ++#: ../yumcommands.py:361 ++msgid "Remove a package or packages from your system" ++msgstr "Odstranit balíček nebo balíčky ze systému" ++ ++#: ../yumcommands.py:368 ++msgid "Setting up Remove Process" ++msgstr "Uspořádává se průběh odstranění" ++ ++#: ../yumcommands.py:382 ++msgid "Setting up Group Process" ++msgstr "Uspořádává se zpracování skupiny" ++ ++#: ../yumcommands.py:388 ++msgid "No Groups on which to run command" ++msgstr "Nenalezeny skupiny, na které by šlo příkaz aplikovat" ++ ++#: ../yumcommands.py:401 ++msgid "List available package groups" ++msgstr "Vypsat dostupné skupiny balíčků" ++ ++#: ../yumcommands.py:418 ++msgid "Install the packages in a group on your system" ++msgstr "Instalovat balíčky ze skupiny do systému" ++ ++#: ../yumcommands.py:440 ++msgid "Remove the packages in a group from your system" ++msgstr "Odstranit balíčky ze skupiny ze systému" ++ ++#: ../yumcommands.py:467 ++msgid "Display details about a package group" ++msgstr "Zobrazit detaily o skupině balíčků" ++ ++#: ../yumcommands.py:491 ++msgid "Generate the metadata cache" ++msgstr "Vygenerovat skladiště metadat" ++ ++#: ../yumcommands.py:497 ++msgid "Making cache files for all metadata files." ++msgstr "Vytváří se skladišťové soubory pro všechna metadata " ++ ++#: ../yumcommands.py:498 ++msgid "This may take a while depending on the speed of this computer" ++msgstr "Může to chvíli trvat v závislosti na rychosti tohoto počítače" ++ ++#: ../yumcommands.py:519 ++msgid "Metadata Cache Created" ++msgstr "Skladiště metadat vytvořeno" ++ ++#: ../yumcommands.py:533 ++msgid "Remove cached data" ++msgstr "Odstranit data ze skladiště" ++ ++#: ../yumcommands.py:553 ++msgid "Find what package provides the given value" ++msgstr "Nalézt balíček, který poskytuje danou hodnotu" ++ ++#: ../yumcommands.py:573 ++msgid "Check for available package updates" ++msgstr "Zkontrolovat dostupné aktualizace balíčku" ++ ++#: ../yumcommands.py:622 ++msgid "Search package details for the given string" ++msgstr "Nalézt detaily balíčku pro daný řetězec" ++ ++#: ../yumcommands.py:628 ++msgid "Searching Packages: " ++msgstr "Prohledávají se balíčky: " ++ ++#: ../yumcommands.py:645 ++msgid "Update packages taking obsoletes into account" ++msgstr "Aktualizovat balíčky a brát v úvahu zastaralé" ++ ++#: ../yumcommands.py:653 ++msgid "Setting up Upgrade Process" ++msgstr "Upořádává se průběh aktualizace" ++ ++#: ../yumcommands.py:667 ++msgid "Install a local RPM" ++msgstr "Instalovat lokální RPM" ++ ++#: ../yumcommands.py:675 ++msgid "Setting up Local Package Process" ++msgstr "Uspořádává se zpracování lokálního balíčku" ++ ++#: ../yumcommands.py:694 ++msgid "Determine which package provides the given dependency" ++msgstr "Určit který balíček poskytuje danou závislost" ++ ++#: ../yumcommands.py:697 ++msgid "Searching Packages for Dependency:" ++msgstr "Prohledávají se balíčky kvůli závislostem:" ++ ++#: ../yumcommands.py:711 ++msgid "Run an interactive yum shell" ++msgstr "Spustit interaktivní shell yum" ++ ++#: ../yumcommands.py:717 ++msgid "Setting up Yum Shell" ++msgstr "Nastavuje se yum shell" ++ ++#: ../yumcommands.py:735 ++msgid "List a package's dependencies" ++msgstr "Zobrazit závislosti balíčku" ++ ++#: ../yumcommands.py:741 ++msgid "Finding dependencies: " ++msgstr "Hledají se závíslosti: " ++ ++#: ../yumcommands.py:757 ++msgid "Display the configured software repositories" ++msgstr "Zobrazit nastavené softwarová repozitáře" ++ ++#: ../yumcommands.py:809 ../yumcommands.py:810 ++msgid "enabled" ++msgstr "povoleno" ++ ++#: ../yumcommands.py:818 ../yumcommands.py:819 ++msgid "disabled" ++msgstr "zakázáno" ++ ++#: ../yumcommands.py:833 ++msgid "Repo-id : " ++msgstr "Repo-id : " ++ ++#: ../yumcommands.py:834 ++msgid "Repo-name : " ++msgstr "Repo-jméno : " ++ ++#: ../yumcommands.py:835 ++msgid "Repo-status : " ++msgstr "Repo-status : " ++ ++#: ../yumcommands.py:837 ++msgid "Repo-revision: " ++msgstr "Repo-revize : " ++ ++#: ../yumcommands.py:841 ++msgid "Repo-tags : " ++msgstr "Repo-tagy : " ++ ++#: ../yumcommands.py:847 ++msgid "Repo-distro-tags: " ++msgstr "Repo-distro-tagy: " ++ ++#: ../yumcommands.py:852 ++msgid "Repo-updated : " ++msgstr "Repo-aktuální: " ++ ++#: ../yumcommands.py:854 ++msgid "Repo-pkgs : " ++msgstr "Repo-bal. : " ++ ++#: ../yumcommands.py:855 ++msgid "Repo-size : " ++msgstr "Repo-velikost: " ++ ++#: ../yumcommands.py:862 ++msgid "Repo-baseurl : " ++msgstr "Repo-baseurl : " ++ ++#: ../yumcommands.py:870 ++msgid "Repo-metalink: " ++msgstr "Repo-metalink: " ++ ++#: ../yumcommands.py:874 ++msgid " Updated : " ++msgstr " Aktualizováno: " ++ ++#: ../yumcommands.py:877 ++msgid "Repo-mirrors : " ++msgstr "Repo-zrcadla : " ++ ++#: ../yumcommands.py:881 ../yummain.py:133 ++msgid "Unknown" ++msgstr "Neznámý" ++ ++#: ../yumcommands.py:887 ++#, python-format ++msgid "Never (last: %s)" ++msgstr "Nikdy (poslední: %s)" ++ ++#: ../yumcommands.py:889 ++#, python-format ++msgid "Instant (last: %s)" ++msgstr "Okamžitě (naposledy: %s)" ++ ++#: ../yumcommands.py:892 ++#, python-format ++msgid "%s second(s) (last: %s)" ++msgstr "%s sekund (naposledy: %s)" ++ ++#: ../yumcommands.py:894 ++msgid "Repo-expire : " ++msgstr "Repo-vyprší : " ++ ++#: ../yumcommands.py:897 ++msgid "Repo-exclude : " ++msgstr "Repo-vyřazeno: " ++ ++#: ../yumcommands.py:901 ++msgid "Repo-include : " ++msgstr "Repo-zahrnuto: " ++ ++#. Work out the first (id) and last (enabled/disalbed/count), ++#. then chop the middle (name)... ++#: ../yumcommands.py:911 ../yumcommands.py:937 ++msgid "repo id" ++msgstr "repo id" ++ ++#: ../yumcommands.py:925 ../yumcommands.py:926 ../yumcommands.py:940 ++msgid "status" ++msgstr "status" ++ ++#: ../yumcommands.py:938 ++msgid "repo name" ++msgstr "jméno repa" ++ ++#: ../yumcommands.py:964 ++msgid "Display a helpful usage message" ++msgstr "Zobrazit užitečnou nápovědu" ++ ++#: ../yumcommands.py:998 ++#, python-format ++msgid "No help available for %s" ++msgstr "Není dostupná nápověda pro %s" ++ ++#: ../yumcommands.py:1003 ++msgid "" ++"\n" ++"\n" ++"aliases: " ++msgstr "" ++"\n" ++"\n" ++"aliasy: " ++ ++#: ../yumcommands.py:1005 ++msgid "" ++"\n" ++"\n" ++"alias: " ++msgstr "" ++"\n" ++"\n" ++"alias: " ++ ++#: ../yumcommands.py:1033 ++msgid "Setting up Reinstall Process" ++msgstr "Uspořádává se průběh reinstalace" ++ ++#: ../yumcommands.py:1041 ++msgid "reinstall a package" ++msgstr "reinstalace balíčku" ++ ++#: ../yumcommands.py:1059 ++msgid "Setting up Downgrade Process" ++msgstr "Uspořádává se průběh snížení verze" ++ ++#: ../yumcommands.py:1066 ++msgid "downgrade a package" ++msgstr "snížení verze balíčku" ++ ++#: ../yumcommands.py:1080 ++msgid "Display a version for the machine and/or available repos." ++msgstr "Zobrazit verzi pro tento počítač a/nebo dostupné repozitáře." ++ ++#: ../yumcommands.py:1110 ++msgid " Yum version groups:" ++msgstr " Verze yum skupin:" ++ ++#: ../yumcommands.py:1120 ++msgid " Group :" ++msgstr " Skupina :" ++ ++#: ../yumcommands.py:1121 ++msgid " Packages:" ++msgstr " Balíčky :" ++ ++#: ../yumcommands.py:1151 ++msgid "Installed:" ++msgstr "Nainstalováno:" ++ ++#: ../yumcommands.py:1156 ++msgid "Group-Installed:" ++msgstr "Nainstalované skupiny:" ++ ++#: ../yumcommands.py:1165 ++msgid "Available:" ++msgstr "Dostupné:" ++ ++#: ../yumcommands.py:1171 ++msgid "Group-Available:" ++msgstr "Dostupné skupiny:" ++ ++#: ../yumcommands.py:1210 ++msgid "Display, or use, the transaction history" ++msgstr "Zobrazit nebo používat transakční historii" ++ ++#: ../yumcommands.py:1238 ++#, python-format ++msgid "Invalid history sub-command, use: %s." ++msgstr "Neplatný pod-příkaz historie, použijte: %s." ++ ++#: ../yummain.py:128 ++msgid "Running" ++msgstr "Běží" ++ ++#: ../yummain.py:129 ++msgid "Sleeping" ++msgstr "Spí" ++ ++#: ../yummain.py:130 ++msgid "Uninteruptable" ++msgstr "Nepřerušitelné" ++ ++#: ../yummain.py:131 ++msgid "Zombie" ++msgstr "Zombie" ++ ++#: ../yummain.py:132 ++msgid "Traced/Stopped" ++msgstr "Trasován/Zastaven" ++ ++#: ../yummain.py:137 ++msgid " The other application is: PackageKit" ++msgstr " Další aplikace je: PackageKit" ++ ++#: ../yummain.py:139 ++#, python-format ++msgid " The other application is: %s" ++msgstr " Další aplikace je: %s" ++ ++#: ../yummain.py:142 ++#, python-format ++msgid " Memory : %5s RSS (%5sB VSZ)" ++msgstr " Paměť : %5s RSS (%5sB VSZ)" ++ ++#: ../yummain.py:146 ++#, python-format ++msgid " Started: %s - %s ago" ++msgstr " Spuštěn: %s - %s nazpět" ++ ++#: ../yummain.py:148 ++#, python-format ++msgid " State : %s, pid: %d" ++msgstr " Stav : %s, pid: %d" ++ ++#: ../yummain.py:173 ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Zámek yumu je obsazen jinou aplikací; čeká se na její ukončení..." ++ ++#: ../yummain.py:201 ../yummain.py:240 ++#, python-format ++msgid "Error: %s" ++msgstr "Chyba: %s" ++ ++#: ../yummain.py:211 ../yummain.py:253 ++#, python-format ++msgid "Unknown Error(s): Exit Code: %d:" ++msgstr "Neznámá chyba/y: Výstupní kód: %d:" ++ ++#. Depsolve stage ++#: ../yummain.py:218 ++msgid "Resolving Dependencies" ++msgstr "Řeší se závislosti" ++ ++#: ../yummain.py:242 ++msgid " You could try using --skip-broken to work around the problem" ++msgstr " Můžete zkusit volbu --skip-broken k překonání tohoto problému" ++ ++#: ../yummain.py:243 ++msgid "" ++" You could try running: package-cleanup --problems\n" ++" package-cleanup --dupes\n" ++" rpm -Va --nofiles --nodigest" ++msgstr "" ++" Můžete zkusit spustit: package-cleanup --problems\n" ++" package-cleanup --dupes\n" ++" rpm -Va --nofiles --nodigest" ++ ++#: ../yummain.py:259 ++msgid "" ++"\n" ++"Dependencies Resolved" ++msgstr "" ++"\n" ++"Závislosti vyřešeny" ++ ++#: ../yummain.py:326 ++msgid "" ++"\n" ++"\n" ++"Exiting on user cancel." ++msgstr "" ++"\n" ++"\n" ++"Ukončeno na pokyn uživatele." ++ ++#: ../yum/depsolve.py:83 ++msgid "doTsSetup() will go away in a future version of Yum.\n" ++msgstr "doTsSetup() bude v následujících verzích yumu odstraněno.\n" ++ ++#: ../yum/depsolve.py:98 ++msgid "Setting up TransactionSets before config class is up" ++msgstr "Uspořádává se TransactionSet před tím než bude připravena třída config" ++ ++#: ../yum/depsolve.py:149 ++#, python-format ++msgid "Invalid tsflag in config file: %s" ++msgstr "Neplatný tsflag v konfiguračním souboru: %s" ++ ++#: ../yum/depsolve.py:160 ++#, python-format ++msgid "Searching pkgSack for dep: %s" ++msgstr "Hledá se pkgSack pro závislost: %s" ++ ++#: ../yum/depsolve.py:176 ++#, python-format ++msgid "Potential match for %s from %s" ++msgstr "Potenciálně shodné pro %s z %s" ++ ++#: ../yum/depsolve.py:184 ++#, python-format ++msgid "Matched %s to require for %s" ++msgstr "Shoda %s vyžadovaná pro %s" ++ ++#: ../yum/depsolve.py:225 ++#, python-format ++msgid "Member: %s" ++msgstr "Prvek: %s" ++ ++#: ../yum/depsolve.py:239 ../yum/depsolve.py:749 ++#, python-format ++msgid "%s converted to install" ++msgstr "%s zkonvertován na instalaci" ++ ++#: ../yum/depsolve.py:246 ++#, python-format ++msgid "Adding Package %s in mode %s" ++msgstr "Přidává se balíček %s v módu %s" ++ ++#: ../yum/depsolve.py:256 ++#, python-format ++msgid "Removing Package %s" ++msgstr "Odstraňuje se balíček %s" ++ ++#: ../yum/depsolve.py:278 ++#, python-format ++msgid "%s requires: %s" ++msgstr "%s vyžaduje: %s" ++ ++#: ../yum/depsolve.py:336 ++msgid "Needed Require has already been looked up, cheating" ++msgstr "Závazné požadavky již byly prohledány, švindluje se" ++ ++#: ../yum/depsolve.py:346 ++#, python-format ++msgid "Needed Require is not a package name. Looking up: %s" ++msgstr "Závazný požadavek není jméno balíčku. Hledá se: %s" ++ ++#: ../yum/depsolve.py:353 ++#, python-format ++msgid "Potential Provider: %s" ++msgstr "Možný poskytovatel: %s" ++ ++#: ../yum/depsolve.py:376 ++#, python-format ++msgid "Mode is %s for provider of %s: %s" ++msgstr "Mód je %s pro poskytovatele %s: %s" ++ ++#: ../yum/depsolve.py:380 ++#, python-format ++msgid "Mode for pkg providing %s: %s" ++msgstr "Mód pro bal. poskytující %s: %s" ++ ++#: ../yum/depsolve.py:384 ++#, python-format ++msgid "TSINFO: %s package requiring %s marked as erase" ++msgstr "TSINFO: %s balíček požaduje %s označený ke smazání" ++ ++#: ../yum/depsolve.py:397 ++#, python-format ++msgid "TSINFO: Obsoleting %s with %s to resolve dep." ++msgstr "TSINFO: Zastarává se %s s %s k vyřešení závislostí." ++ ++#: ../yum/depsolve.py:400 ++#, python-format ++msgid "TSINFO: Updating %s to resolve dep." ++msgstr "TSINFO: Aktualizuji %s k vyřešení závislostí." ++ ++#: ../yum/depsolve.py:408 ++#, python-format ++msgid "Cannot find an update path for dep for: %s" ++msgstr "Nelze nalézt cestu aktualizací pro závislost pro: %s" ++ ++#: ../yum/depsolve.py:418 ++#, python-format ++msgid "Unresolvable requirement %s for %s" ++msgstr "Neřešitelný požadavek %s pro %s" ++ ++#: ../yum/depsolve.py:441 ++#, python-format ++msgid "Quick matched %s to require for %s" ++msgstr "Rychlá shoda %s vyžadovaného pro %s" ++ ++#. is it already installed? ++#: ../yum/depsolve.py:483 ++#, python-format ++msgid "%s is in providing packages but it is already installed, removing." ++msgstr "" ++"%s je v poskytujících balíčcích, ale je již nainstalován, odstraňuje se." ++ ++#: ../yum/depsolve.py:499 ++#, python-format ++msgid "Potential resolving package %s has newer instance in ts." ++msgstr "Balíček %s, který může být řešení má v ts novější verzi." ++ ++#: ../yum/depsolve.py:510 ++#, python-format ++msgid "Potential resolving package %s has newer instance installed." ++msgstr "Balíček %s, který může být řešení je nainstalován v novější verzi." ++ ++#: ../yum/depsolve.py:518 ../yum/depsolve.py:564 ++#, python-format ++msgid "Missing Dependency: %s is needed by package %s" ++msgstr "Chybí závislost: %s je vyžadován balíčkem %s" ++ ++#: ../yum/depsolve.py:531 ++#, python-format ++msgid "%s already in ts, skipping this one" ++msgstr "%s je již v ts, vynechává se" ++ ++#: ../yum/depsolve.py:574 ++#, python-format ++msgid "TSINFO: Marking %s as update for %s" ++msgstr "TSINFO: Označuji %s jako aktualizaci %s" ++ ++#: ../yum/depsolve.py:582 ++#, python-format ++msgid "TSINFO: Marking %s as install for %s" ++msgstr "TSINFO: Označuji %s jako instalaci %s" ++ ++#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 ++msgid "Success - empty transaction" ++msgstr "Úspěch - prázdná transakce" ++ ++#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 ++msgid "Restarting Loop" ++msgstr "Restartuje se smyčka" ++ ++#: ../yum/depsolve.py:755 ++msgid "Dependency Process ending" ++msgstr "Proces zpracování závislostí končí" ++ ++#: ../yum/depsolve.py:761 ++#, python-format ++msgid "%s from %s has depsolving problems" ++msgstr "%s z %s má problémy se závislostmi" ++ ++#: ../yum/depsolve.py:768 ++msgid "Success - deps resolved" ++msgstr "Úspěch - závislosti vyřešeny" ++ ++#: ../yum/depsolve.py:782 ++#, python-format ++msgid "Checking deps for %s" ++msgstr "Kontroluji závislosti pro %s" ++ ++#: ../yum/depsolve.py:865 ++#, python-format ++msgid "looking for %s as a requirement of %s" ++msgstr "hledá se %s jako požadavek od %s" ++ ++#: ../yum/depsolve.py:1007 ++#, python-format ++msgid "Running compare_providers() for %s" ++msgstr "Spouští se compare_providers() pro %s" ++ ++#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 ++#, python-format ++msgid "better arch in po %s" ++msgstr "lepší architektura v po %s" ++ ++#: ../yum/depsolve.py:1142 ++#, python-format ++msgid "%s obsoletes %s" ++msgstr "%s zastarává %s" ++ ++#: ../yum/depsolve.py:1154 ++#, python-format ++msgid "" ++"archdist compared %s to %s on %s\n" ++" Winner: %s" ++msgstr "" ++"archdist porovnán pro %s k %s na %s\n" ++" Vítěz: %s" ++ ++#: ../yum/depsolve.py:1161 ++#, python-format ++msgid "common sourcerpm %s and %s" ++msgstr "společné zdrojové rpm %s a %s" ++ ++#: ../yum/depsolve.py:1167 ++#, python-format ++msgid "common prefix of %s between %s and %s" ++msgstr "společný prefix %s mezi %s a %s" ++ ++#: ../yum/depsolve.py:1175 ++#, python-format ++msgid "Best Order: %s" ++msgstr "Nejlepší pořádek: %s" ++ ++#: ../yum/__init__.py:187 ++msgid "doConfigSetup() will go away in a future version of Yum.\n" ++msgstr "doConfigSetup() bude odstraněn v příští verzi Yumu.\n" ++ ++#: ../yum/__init__.py:412 ++#, python-format ++msgid "Repository %r is missing name in configuration, using id" ++msgstr "Repozitáři %r chybí jméno v konfiguraci, používá se id" ++ ++#: ../yum/__init__.py:450 ++msgid "plugins already initialised" ++msgstr "zásuvný modul již inicializován" ++ ++#: ../yum/__init__.py:457 ++msgid "doRpmDBSetup() will go away in a future version of Yum.\n" ++msgstr "doRpmDBSetup() bude odstraněn v příští verzi Yumu.\n" ++ ++#: ../yum/__init__.py:468 ++msgid "Reading Local RPMDB" ++msgstr "Načítá se lokální RPMDB" ++ ++#: ../yum/__init__.py:489 ++msgid "doRepoSetup() will go away in a future version of Yum.\n" ++msgstr "doRepoSetup() bude odstraněn v příští verzi Yumu.\n" ++ ++#: ../yum/__init__.py:509 ++msgid "doSackSetup() will go away in a future version of Yum.\n" ++msgstr "doSackSetup() bude odstraněn v příští verzi Yumu.\n" ++ ++#: ../yum/__init__.py:539 ++msgid "Setting up Package Sacks" ++msgstr "Připravuji pytle balíčků" ++ ++#: ../yum/__init__.py:584 ++#, python-format ++msgid "repo object for repo %s lacks a _resetSack method\n" ++msgstr "objekt repozitáře pro repo %s postrádá metodu _resetSack\n" ++ ++#: ../yum/__init__.py:585 ++msgid "therefore this repo cannot be reset.\n" ++msgstr "proto nemůže toto repo být resetován.\n" ++ ++#: ../yum/__init__.py:590 ++msgid "doUpdateSetup() will go away in a future version of Yum.\n" ++msgstr "doUpdateSetup() bude odstraněn v příští verzi Yumu.\n" ++ ++#: ../yum/__init__.py:602 ++msgid "Building updates object" ++msgstr "Sestavuje se objekt aktualizací" ++ ++#: ../yum/__init__.py:637 ++msgid "doGroupSetup() will go away in a future version of Yum.\n" ++msgstr "doGroupSetup() bude odstraněn v příští verzi Yumu.\n" ++ ++#: ../yum/__init__.py:662 ++msgid "Getting group metadata" ++msgstr "Získávají se metadata skupin" ++ ++#: ../yum/__init__.py:688 ++#, python-format ++msgid "Adding group file from repository: %s" ++msgstr "Přidávám skupinový soubor pro repozitář: %s" ++ ++#: ../yum/__init__.py:697 ++#, python-format ++msgid "Failed to add groups file for repository: %s - %s" ++msgstr "Selhalo přidání skupinového souboru pro repozitář: %s - %s" ++ ++#: ../yum/__init__.py:703 ++msgid "No Groups Available in any repository" ++msgstr "V žádném repozitáři nejsou dostupné skupiny" ++ ++#: ../yum/__init__.py:763 ++msgid "Importing additional filelist information" ++msgstr "Importuji informace z dodatečného seznamu souborů" ++ ++#: ../yum/__init__.py:777 ++#, python-format ++msgid "The program %s%s%s is found in the yum-utils package." ++msgstr "Program %s %s %s byl nalezen v balíčku yum-utils." ++ ++#: ../yum/__init__.py:785 ++msgid "" ++"There are unfinished transactions remaining. You might consider running yum-" ++"complete-transaction first to finish them." ++msgstr "" ++"Existují nedokončené transakce. Měli byste zvážit možnost nejdříve spustit " ++"yum-complete-transaction k jejich dokončení." ++ ++#: ../yum/__init__.py:853 ++#, python-format ++msgid "Skip-broken round %i" ++msgstr "Přeskočení rozpadlých - kolo %i" ++ ++#: ../yum/__init__.py:906 ++#, python-format ++msgid "Skip-broken took %i rounds " ++msgstr "Přeskočení rozpadlých trvalo %i kol " ++ ++#: ../yum/__init__.py:907 ++msgid "" ++"\n" ++"Packages skipped because of dependency problems:" ++msgstr "\n
Balíčky přeskočené kvůli problémům se závislostmi:" ++ ++#: ../yum/__init__.py:911 ++#, python-format ++msgid " %s from %s" ++msgstr " %s z %s" ++ ++#: ../yum/__init__.py:1076 ++msgid "" ++"Warning: scriptlet or other non-fatal errors occurred during transaction." ++msgstr "" ++"Varování: Během transakce došlo k chybě skripletu nebo jiné nefatální chybě." ++ ++#: ../yum/__init__.py:1093 ++#, python-format ++msgid "Failed to remove transaction file %s" ++msgstr "Selhalo odstranění transakčního souboru %s." ++ ++#. maybe a file log here, too ++#. but raising an exception is not going to do any good ++#: ../yum/__init__.py:1122 ++#, python-format ++msgid "%s was supposed to be installed but is not!" ++msgstr "%s mělo být nainstalováno ale neni!" ++ ++#. maybe a file log here, too ++#. but raising an exception is not going to do any good ++#: ../yum/__init__.py:1161 ++#, python-format ++msgid "%s was supposed to be removed but is not!" ++msgstr "%s mělo být odstraněno ale není!" ++ ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1281 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Nedá se zkontrolovat zda je PID %s aktivní." ++ ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1285 ++#, python-format ++msgid "Existing lock %s: another copy is running as pid %s." ++msgstr "Existující zámek %s: jiná kopie běží s pid %s." ++ ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1320 ++#, python-format ++msgid "Could not create lock at %s: %s " ++msgstr "Nelze vytvořit zámek na %s: %s " ++ ++#: ../yum/__init__.py:1365 ++msgid "Package does not match intended download" ++msgstr "Balíček se neshoduje se zamýšleným stahováním" ++ ++#: ../yum/__init__.py:1380 ++msgid "Could not perform checksum" ++msgstr "Nelze zkontrolovat kontrolní součet" ++ ++#: ../yum/__init__.py:1383 ++msgid "Package does not match checksum" ++msgstr "Balíček neodpovídá kontrolnímu součtu" ++ ++#: ../yum/__init__.py:1425 ++#, python-format ++msgid "package fails checksum but caching is enabled for %s" ++msgstr "balíček neprošel kontrolním součtem ale skladiště je povoleno pro %s" ++ ++#: ../yum/__init__.py:1428 ../yum/__init__.py:1457 ++#, python-format ++msgid "using local copy of %s" ++msgstr "používá se lokální kopie %s" ++ ++#: ../yum/__init__.py:1469 ++#, python-format ++msgid "" ++"Insufficient space in download directory %s\n" ++" * free %s\n" ++" * needed %s" ++msgstr "" ++"Nedostatek diskového prostoru ve stahovacím adresáři %s\n" ++" * volno %s\n" ++" * potřeba %s" ++ ++#: ../yum/__init__.py:1518 ++msgid "Header is not complete." ++msgstr "Hlavička není komplet." ++ ++#: ../yum/__init__.py:1555 ++#, python-format ++msgid "" ++"Header not in local cache and caching-only mode enabled. Cannot download %s" ++msgstr "" ++"Hlavička není v lokálním skladišti ale je povoleno používat pouze skladiště. " ++"Nemohu stáhnout %s" ++ ++#: ../yum/__init__.py:1610 ++#, python-format ++msgid "Public key for %s is not installed" ++msgstr "Veřejný klíč %s není nainstalován" ++ ++#: ../yum/__init__.py:1614 ++#, python-format ++msgid "Problem opening package %s" ++msgstr "Problém s otevřením balíčku %s" ++ ++#: ../yum/__init__.py:1622 ++#, python-format ++msgid "Public key for %s is not trusted" ++msgstr "Veřejný klíč %s není důvěryhodný" ++ ++#: ../yum/__init__.py:1626 ++#, python-format ++msgid "Package %s is not signed" ++msgstr "Balíček %s není podepsán" ++ ++#: ../yum/__init__.py:1664 ++#, python-format ++msgid "Cannot remove %s" ++msgstr "Nemohu odstranit %s" ++ ++#: ../yum/__init__.py:1668 ++#, python-format ++msgid "%s removed" ++msgstr "%s odstraňen" ++ ++#: ../yum/__init__.py:1704 ++#, python-format ++msgid "Cannot remove %s file %s" ++msgstr "Nemohu odstranit %s soubor %s" ++ ++#: ../yum/__init__.py:1708 ++#, python-format ++msgid "%s file %s removed" ++msgstr "%s soubor %s odstraněn" ++ ++#: ../yum/__init__.py:1710 ++#, python-format ++msgid "%d %s files removed" ++msgstr "%d %s soubor odstraněn" ++ ++#: ../yum/__init__.py:1779 ++#, python-format ++msgid "More than one identical match in sack for %s" ++msgstr "Více než jedna identická shoda v pytly pro %s" ++ ++#: ../yum/__init__.py:1785 ++#, python-format ++msgid "Nothing matches %s.%s %s:%s-%s from update" ++msgstr "Nic se neshoduje s %s.%s %s:%s-%s z aktualizace" ++ ++#: ../yum/__init__.py:2018 ++msgid "" ++"searchPackages() will go away in a future version of " ++"Yum. Use searchGenerator() instead. \n" ++msgstr "" ++"searchPackages() bude odstraněno v příští verzi Yumu. " ++"Používejte místo ní searchGenerator(). \n" ++ ++#: ../yum/__init__.py:2057 ++#, python-format ++msgid "Searching %d packages" ++msgstr "Prohledává se %d balíčků" ++ ++#: ../yum/__init__.py:2061 ++#, python-format ++msgid "searching package %s" ++msgstr "prohledává se balíček %s" ++ ++#: ../yum/__init__.py:2073 ++msgid "searching in file entries" ++msgstr "hledá se v souborových položkách" ++ ++#: ../yum/__init__.py:2080 ++msgid "searching in provides entries" ++msgstr "hledá se v položkách poskytovatelů" ++ ++#: ../yum/__init__.py:2113 ++#, python-format ++msgid "Provides-match: %s" ++msgstr "Poskytovatel-shoda: %s" ++ ++#: ../yum/__init__.py:2162 ++msgid "No group data available for configured repositories" ++msgstr "Pro nastavený repozitář nejsou žádná dostupná skupinová data" ++ ++#: ../yum/__init__.py:2193 ../yum/__init__.py:2212 ../yum/__init__.py:2243 ++#: ../yum/__init__.py:2249 ../yum/__init__.py:2328 ../yum/__init__.py:2332 ++#: ../yum/__init__.py:2647 ++#, python-format ++msgid "No Group named %s exists" ++msgstr "Neexistuje skupina pojmenovaná %s" ++ ++#: ../yum/__init__.py:2224 ../yum/__init__.py:2345 ++#, python-format ++msgid "package %s was not marked in group %s" ++msgstr "balíček %s nebyl označen ve skupině %s" ++ ++#: ../yum/__init__.py:2271 ++#, python-format ++msgid "Adding package %s from group %s" ++msgstr "Přidává se balíček %s pro skupinu %s" ++ ++#: ../yum/__init__.py:2275 ++#, python-format ++msgid "No package named %s available to be installed" ++msgstr "Neexistuje žádný balíček pojmenovaný %s dostupný k instalaci" ++ ++#: ../yum/__init__.py:2372 ++#, python-format ++msgid "Package tuple %s could not be found in packagesack" ++msgstr "Uspořádaný seznam balíčků %s nenalezen v pytly balíčků" ++ ++#: ../yum/__init__.py:2391, python-format ++msgid "Package tuple %s could not be found in rpmdb" ++msgstr "Uspořádaný seznam balíčků %s nenalezen v rpmdb" ++ ++#: ../yum/__init__.py:2447 ../yum/__init__.py:2497 ++msgid "Invalid version flag" ++msgstr "Chybý příznak verze" ++ ++#: ../yum/__init__.py:2467 ../yum/__init__.py:2472 ++#, python-format ++msgid "No Package found for %s" ++msgstr "Nebyl nalezen balíček pro %s" ++ ++#: ../yum/__init__.py:2688 ++msgid "Package Object was not a package object instance" ++msgstr "Objekt balíčku nebyl instancí balíčkového objektu" ++ ++#: ../yum/__init__.py:2692 ++msgid "Nothing specified to install" ++msgstr "Nebylo určeno nic k instalaci" ++ ++#: ../yum/__init__.py:2708 ../yum/__init__.py:3472 ++#, python-format ++msgid "Checking for virtual provide or file-provide for %s" ++msgstr "Hledá se virtuální poskytovatel nebo soubor poskytující %s" ++ ++#: ../yum/__init__.py:2714 ../yum/__init__.py:3021 ../yum/__init__.py:3188 ++#: ../yum/__init__.py:3478 ++#, python-format ++msgid "No Match for argument: %s" ++msgstr "Nenalezena shoda pro argument: %s" ++ ++#: ../yum/__init__.py:2790 ++#, python-format ++msgid "Package %s installed and not available" ++msgstr "Balíček %s nainstalován ale není dostupný" ++ ++#: ../yum/__init__.py:2793 ++msgid "No package(s) available to install" ++msgstr "Žádný balíček/ky dostupný pro instalaci" ++ ++#: ../yum/__init__.py:2805 ++#, python-format ++msgid "Package: %s - already in transaction set" ++msgstr "Balíček: %s - již je v transakci" ++ ++#: ../yum/__init__.py:2831 ++#, python-format ++msgid "Package %s is obsoleted by %s which is already installed" ++msgstr "Balíček %s je zastaralý balíčkem %s, který je již nainstalován" ++ ++#: ../yum/__init__.py:2834 ++#, python-format ++msgid "Package %s is obsoleted by %s, trying to install %s instead" ++msgstr "Balíček %s je zastaralý balíčkem %s, zkouší se místo něj instalovat %s" ++ ++#: ../yum/__init__.py:2842 ++#, python-format ++msgid "Package %s already installed and latest version" ++msgstr "Balíček %s již nainstalován a v poslední verzi" ++ ++#: ../yum/__init__.py:2856 ++#, python-format ++msgid "Package matching %s already installed. Checking for update." ++msgstr "Balíček odpovídající %s je již nainstalován. Hledají se aktualizace." ++ ++#. update everything (the easy case) ++#: ../yum/__init__.py:2950 ++msgid "Updating Everything" ++msgstr "Aktualizuje se vše" ++ ++#: ../yum/__init__.py:2971 ../yum/__init__.py:3086 ../yum/__init__.py:3115 ++#: ../yum/__init__.py:3142 ++#, python-format ++msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" ++msgstr "Neaktualizuje se balíček, který je již zastaralý: %s.%s %s:%s-%s" ++ ++#: ../yum/__init__.py:3006 ../yum/__init__.py:3185 ++#, python-format ++msgid "%s" ++msgstr "%s" ++ ++#: ../yum/__init__.py:3077 ++#, python-format ++msgid "Package is already obsoleted: %s.%s %s:%s-%s" ++msgstr "Balíček je již zastaralý: %s.%s %s:%s-%s" ++ ++#: ../yum/__init__.py:3110 ++#, python-format ++msgid "Not Updating Package that is obsoleted: %s" ++msgstr "Neaktualizuje se balíček, který je zastaralý: %s" ++ ++#: ../yum/__init__.py:3119 ../yum/__init__.py:3146 ++#, python-format ++msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" ++msgstr "Neaktualizuje se balíček, který jej již aktuální: %s.%s %s:%s-%s" ++ ++#: ../yum/__init__.py:3201 ++msgid "No package matched to remove" ++msgstr "Nenalezen žádný shodný balíček pro odstranění" ++ ++#: ../yum/__init__.py:3234 ../yum/__init__.py:3338 ../yum/__init__.py:3427 ++#, python-format ++msgid "Cannot open file: %s. Skipping." ++msgstr "Nelze otevřít soubor: %s. Přeskakuje se." ++ ++#: ../yum/__init__.py:3237 ../yum/__init__.py:3341 ../yum/__init__.py:3430 ++#, python-format ++msgid "Examining %s: %s" ++msgstr "Zkoumá se %s: %s" ++ ++#: ../yum/__init__.py:3245 ../yum/__init__.py:3344 ../yum/__init__.py:3433 ++#, python-format ++msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" ++msgstr "Nelze přídat balíček %s do transakce. Nekompatibilní architektura: %s" ++ ++#: ../yum/__init__.py:3253 ++#, python-format ++msgid "" ++"Package %s not installed, cannot update it. Run yum install to install it " ++"instead." ++msgstr "" ++"Balíček %s není nainstalován, nelze jej aktualizovat. Spusťte místo toho yum " ++"install a nainstalujte jej." ++ ++#: ../yum/__init__.py:3288 ../yum/__init__.py:3355 ../yum/__init__.py:3444 ++#, python-format ++msgid "Excluding %s" ++msgstr "Vynechává se %s" ++ ++#: ../yum/__init__.py:3293 ++#, python-format ++msgid "Marking %s to be installed" ++msgstr "Označuje se %s k instalaci" ++ ++#: ../yum/__init__.py:3299 ++#, python-format ++msgid "Marking %s as an update to %s" ++msgstr "Označuje se %s jako aktualizace %s" ++ ++#: ../yum/__init__.py:3306 ++#, python-format ++msgid "%s: does not update installed package." ++msgstr "%s: není aktualizací instalovaného balíčku" ++ ++#: ../yum/__init__.py:3374 ++msgid "Problem in reinstall: no package matched to remove" ++msgstr "Problém při reinstalaci: žádný shodný balíček k odstranění" ++ ++#: ../yum/__init__.py:3387 ../yum/__init__.py:3506 ++#, python-format ++msgid "Package %s is allowed multiple installs, skipping" ++msgstr "Balíček %s má dovoleno vícero instalací, přeskakuje se" ++ ++#: ../yum/__init__.py:3408 ++#, python-format ++msgid "Problem in reinstall: no package %s matched to install" ++msgstr "Problém při reinstalaci: žádný shodný balíček %s k instalaci" ++ ++#: ../yum/__init__.py:3498 ++msgid "No package(s) available to downgrade" ++msgstr "Žádný balíček/ky dostupné ke snížení verze" ++ ++#: ../yum/__init__.py:3542 ++#, python-format ++msgid "No Match for available package: %s" ++msgstr "Neexistuje shoda pro dostupný balíček: %s" ++ ++#: ../yum/__init__.py:3548 ++#, python-format ++msgid "Only Upgrade available on package: %s" ++msgstr "Pouze aktualizace dostupná pro balíček: %s" ++ ++#: ../yum/__init__.py:3616 ../yum/__init__.py:3653, python-format ++msgid "Failed to downgrade: %s" ++msgstr "Nepodařilo se snížit verzi: %s" ++ ++#: ../yum/__init__.py:3685 ++#, python-format ++msgid "Retrieving GPG key from %s" ++msgstr "Získává se GPG klíč pro %s" ++ ++#: ../yum/__init__.py:3705 ++msgid "GPG key retrieval failed: " ++msgstr "Získání GPG klíč selhalo: " ++ ++#: ../yum/__init__.py:3716 ++#, python-format ++msgid "GPG key parsing failed: key does not have value %s" ++msgstr "Zpracování GPG klíče selhalo: klíč nemá žádnou hodnotu %s" ++ ++#: ../yum/__init__.py:3748 ++#, python-format ++msgid "GPG key at %s (0x%s) is already installed" ++msgstr "GPG klíč %s (0x%s) je již nainstalován" ++ ++#. Try installing/updating GPG key ++#: ../yum/__init__.py:3753 ../yum/__init__.py:3815 ++#, python-format ++msgid "Importing GPG key 0x%s \"%s\" from %s" ++msgstr "Importuje se GPG klíč 0x%s \"%s\" z %s" ++ ++#: ../yum/__init__.py:3770 ++msgid "Not installing key" ++msgstr "Neinstaluji klíč" ++ ++#: ../yum/__init__.py:3776 ++#, python-format ++msgid "Key import failed (code %d)" ++msgstr "Import klíče selhal (kód %d)" ++ ++#: ../yum/__init__.py:3777 ../yum/__init__.py:3836 ++msgid "Key imported successfully" ++msgstr "Import klíče proběhl úspěšně" ++ ++#: ../yum/__init__.py:3782 ../yum/__init__.py:3841 ++#, python-format ++msgid "" ++"The GPG keys listed for the \"%s\" repository are already installed but they " ++"are not correct for this package.\n" ++"Check that the correct key URLs are configured for this repository." ++msgstr "" ++"GPG klíč určený pro repozitář %s je již nainstalován, ale není správný pro " ++"tento balíček.\n" ++"Zkontrolujte, že URL klíče jsou pro repozitář správně nastavena." ++ ++#: ../yum/__init__.py:3791 ++msgid "Import of key(s) didn't help, wrong key(s)?" ++msgstr "Import klíče/ů nepomohl, špatný klíč(e)?" ++ ++#: ../yum/__init__.py:3810 ++#, python-format ++msgid "GPG key at %s (0x%s) is already imported" ++msgstr "GPG klíč %s (0x%s) je již naimportován" ++ ++#: ../yum/__init__.py:3830 ++#, python-format ++msgid "Not installing key for repo %s" ++msgstr "Neinstaluji klíč pro repozitář %s" ++ ++#: ../yum/__init__.py:3835 ++msgid "Key import failed" ++msgstr "Import klíče selhal" ++ ++#: ../yum/__init__.py:3957 ++msgid "Unable to find a suitable mirror." ++msgstr "Nemohu nalézt vhodné zrcadlo" ++ ++#: ../yum/__init__.py:3959 ++msgid "Errors were encountered while downloading packages." ++msgstr "Při stahování balíčků došlo k chybě." ++ ++#: ../yum/__init__.py:4009 ++#, python-format ++msgid "Please report this error at %s" ++msgstr "Prosím ohlašte tuto chybu na %s" ++ ++#: ../yum/__init__.py:4033 ++msgid "Test Transaction Errors: " ++msgstr "Chyby testu transakce: " ++ ++#. Mostly copied from YumOutput._outKeyValFill() ++#: ../yum/plugins.py:202 ++msgid "Loaded plugins: " ++msgstr "Zavedeny zásuvné moduly:" ++ ++#: ../yum/plugins.py:216 ../yum/plugins.py:222 ++#, python-format ++msgid "No plugin match for: %s" ++msgstr "Neexistuje zásuvný modul pro: %s" ++ ++#: ../yum/plugins.py:252 ++#, python-format ++msgid "Not loading \"%s\" plugin, as it is disabled" ++msgstr "Nezavádí se \"%s\" modul, protože je zakázán" ++ ++#. Give full backtrace: ++#: ../yum/plugins.py:264 ++#, python-format ++msgid "Plugin \"%s\" can't be imported" ++msgstr "Modul \"%s\" nemůže být importován" ++ ++#: ../yum/plugins.py:271 ++#, python-format ++msgid "Plugin \"%s\" doesn't specify required API version" ++msgstr "Modul \"%s\" neuvádí požadovanou verzi API" ++ ++#: ../yum/plugins.py:276 ++#, python-format ++msgid "Plugin \"%s\" requires API %s. Supported API is %s." ++msgstr "Modul \"%s\" požaduje API %s. Podporované API je %s." ++ ++#: ../yum/plugins.py:309 ++#, python-format ++msgid "Loading \"%s\" plugin" ++msgstr "Zavádí se zásvuný modul \"%s\"" ++ ++#: ../yum/plugins.py:316 ++#, python-format ++msgid "" ++"Two or more plugins with the name \"%s\" exist in the plugin search path" ++msgstr "V prohledávaných cestách jsou dva nebo více modulů se jménem \"%s\"" ++ ++#: ../yum/plugins.py:336 ++#, python-format ++msgid "Configuration file %s not found" ++msgstr "Konfigurační soubor %s nenalezen" ++ ++#. for ++#. Configuration files for the plugin not found ++#: ../yum/plugins.py:339 ++#, python-format ++msgid "Unable to find configuration file for plugin %s" ++msgstr "Nelze nalézt konfigurační soubor pro modul %s" ++ ++#: ../yum/plugins.py:501 ++msgid "registration of commands not supported" ++msgstr "registrace příkazů není podporována" ++ ++#: ../yum/rpmtrans.py:78 ++msgid "Repackaging" ++msgstr "Přebaluje se" ++ ++#: ../rpmUtils/oldUtils.py:33 ++#, python-format ++msgid "Header cannot be opened or does not match %s, %s." ++msgstr "Hlavička nemůže být otevřena nebo neodpovídá %s, %s." ++ ++#: ../rpmUtils/oldUtils.py:53 ++#, python-format ++msgid "RPM %s fails md5 check" ++msgstr "Pro RPM %s selhala kontrola md5" ++ ++#: ../rpmUtils/oldUtils.py:151 ++msgid "Could not open RPM database for reading. Perhaps it is already in use?" ++msgstr "Nelze otevřít databázi RPM pro čtení. Možná je jíž používána?" ++ ++#: ../rpmUtils/oldUtils.py:183 ++msgid "Got an empty Header, something has gone wrong" ++msgstr "Vrátila se prázdná hlavička. Něco se stalo špatně." ++ ++#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260 ++#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266 ++#, python-format ++msgid "Damaged Header %s" ++msgstr "Poškozená hlavička %s" ++ ++#: ../rpmUtils/oldUtils.py:281 ++#, python-format ++msgid "Error opening rpm %s - error %s" ++msgstr "Chyba při otevření rpm %s - chyba %s" ++ ++#~ msgid "" ++#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" ++#~ "().\n" ++#~ msgstr "" ++#~ "getInstalledPackageObject() bude odstraněno, používejte self.rpmdb." ++#~ "searchPkgTuple().\n" +diff --git a/po/ja.po b/po/ja.po +index 6f86fc8..e7b7084 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -6,17 +6,17 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: yum master\n" ++"Project-Id-Version: yum (yum-3_2_X)\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-05-07 11:34+0900\n" +-"PO-Revision-Date: 2009-05-20 03:23+0900\n" ++"POT-Creation-Date: 2009-09-21 03:07+0900\n" ++"PO-Revision-Date: 2009-09-21 04:52+0900\n" + "Last-Translator: Tadashi Jokagi \n" + "Language-Team: Japanese \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: callback.py:48 output.py:922 yum/rpmtrans.py:71 ++#: callback.py:48 output.py:938 yum/rpmtrans.py:71 + msgid "Updating" + msgstr "更新" + +@@ -24,7 +24,7 @@ msgstr "更新" + msgid "Erasing" + msgstr "削除中" + +-#: callback.py:50 callback.py:51 callback.py:53 output.py:921 ++#: callback.py:50 callback.py:51 callback.py:53 output.py:937 + #: yum/rpmtrans.py:73 yum/rpmtrans.py:74 yum/rpmtrans.py:76 + msgid "Installing" + msgstr "インストールしています" +@@ -33,7 +33,7 @@ msgstr "インストールしています" + msgid "Obsoleted" + msgstr "不要でした" + +-#: callback.py:54 output.py:1029 ++#: callback.py:54 output.py:1061 + msgid "Updated" + msgstr "更新しました" + +@@ -41,7 +41,7 @@ msgstr "更新しました" + msgid "Erased" + msgstr "削除しました" + +-#: callback.py:56 callback.py:57 callback.py:59 output.py:1027 ++#: callback.py:56 callback.py:57 callback.py:59 output.py:1059 + msgid "Installed" + msgstr "インストールしました" + +@@ -63,7 +63,7 @@ msgstr "エラー: 不正な出力状態: %s for %s" + msgid "Erased: %s" + msgstr "削除しました: %s" + +-#: callback.py:217 output.py:923 ++#: callback.py:217 output.py:939 + msgid "Removing" + msgstr "削除" + +@@ -71,58 +71,58 @@ msgstr "削除" + msgid "Cleanup" + msgstr "整理中" + +-#: cli.py:105 ++#: cli.py:107 + #, python-format + msgid "Command \"%s\" already defined" + msgstr "コマンド「%s」はすでに定義済みです" + +-#: cli.py:117 ++#: cli.py:119 + msgid "Setting up repositories" + msgstr "リポジトリーの設定" + +-#: cli.py:128 ++#: cli.py:130 + msgid "Reading repository metadata in from local files" + msgstr "ローカルファイルからリポジトリーのメタデータを読み込んでいます" + +-#: cli.py:192 utils.py:79 ++#: cli.py:193 utils.py:102 + #, python-format + msgid "Config Error: %s" + msgstr "設定エラー: %s" + +-#: cli.py:195 cli.py:1190 utils.py:82 ++#: cli.py:196 cli.py:1253 utils.py:105 + #, python-format + msgid "Options Error: %s" + msgstr "オプションエラー: %s" + +-#: cli.py:223 ++#: cli.py:225 + #, python-format + msgid " Installed: %s-%s at %s" + msgstr "" + +-#: cli.py:225 ++#: cli.py:227 + #, python-format + msgid " Built : %s at %s" + msgstr "" + +-#: cli.py:227 ++#: cli.py:229 + #, python-format + msgid " Committed: %s at %s" + msgstr "" + +-#: cli.py:266 ++#: cli.py:268 + msgid "You need to give some command" + msgstr "いくつかのコマンドを指定する必要があります" + +-#: cli.py:309 ++#: cli.py:311 + msgid "Disk Requirements:\n" + msgstr "ディスク要求:\n" + +-#: cli.py:311 ++#: cli.py:313 + #, python-format + msgid " At least %dMB needed on the %s filesystem.\n" + msgstr " 少なくとも %d MB の空き容量がファイルシステム %s で必要です。\n" + +-#: cli.py:316 ++#: cli.py:318 + msgid "" + "Error Summary\n" + "-------------\n" +@@ -130,220 +130,246 @@ msgstr "" + "エラーの要約\n" + "-------------\n" + +-#: cli.py:359 ++#: cli.py:361 + msgid "Trying to run the transaction but nothing to do. Exiting." + msgstr "" + "トランザクションの実行を試みましたが、何もありませんでした。終了します。" + +-#: cli.py:395 ++#: cli.py:397 + msgid "Exiting on user Command" + msgstr "ユーザーコマンドを終了しています" + +-#: cli.py:399 ++#: cli.py:401 + msgid "Downloading Packages:" + msgstr "パッケージをダウンロードしています:" + +-#: cli.py:404 ++#: cli.py:406 + msgid "Error Downloading Packages:\n" + msgstr "パッケージのダウンロードでエラー:\n" + +-#: cli.py:418 yum/__init__.py:3362 ++#: cli.py:420 yum/__init__.py:3873 + msgid "Running rpm_check_debug" + msgstr "rpm_check_debug を実行しています" + +-#: cli.py:421 yum/__init__.py:3365 ++#: cli.py:429 yum/__init__.py:3882 ++msgid "ERROR You need to update rpm to handle:" ++msgstr "" ++ ++#: cli.py:431 yum/__init__.py:3885 + msgid "ERROR with rpm_check_debug vs depsolve:" + msgstr "" + +-#: cli.py:425 ++#: cli.py:437 ++msgid "RPM needs to be updated" ++msgstr "" ++ ++#: cli.py:438 + #, python-format + msgid "Please report this error in %s" + msgstr "%s にこのエラーを報告してください" + +-#: cli.py:431 ++#: cli.py:444 + msgid "Running Transaction Test" + msgstr "トランザクションのテストを実行しています" + +-#: cli.py:447 ++#: cli.py:460 + msgid "Finished Transaction Test" + msgstr "トランザクションのテストを終了しました" + +-#: cli.py:449 ++#: cli.py:462 + msgid "Transaction Check Error:\n" + msgstr "トランザクションの確認エラー\n" + +-#: cli.py:456 ++#: cli.py:469 + msgid "Transaction Test Succeeded" + msgstr "トランザクションのテストを成功しました" + +-#: cli.py:477 ++#: cli.py:491 + msgid "Running Transaction" + msgstr "トランザクションを実行しています" + +-#: cli.py:507 ++#: cli.py:521 + msgid "" + "Refusing to automatically import keys when running unattended.\n" + "Use \"-y\" to override." + msgstr "" + +-#: cli.py:526 cli.py:560 ++#: cli.py:540 cli.py:574 + msgid " * Maybe you meant: " + msgstr "" + +-#: cli.py:543 cli.py:551 ++#: cli.py:557 cli.py:565 + #, python-format + msgid "Package(s) %s%s%s available, but not installed." + msgstr "パッケージ %s%s%s は利用できますが、インストールしませんでした。" + +-#: cli.py:557 cli.py:590 ++#: cli.py:571 cli.py:602 cli.py:680 + #, python-format + msgid "No package %s%s%s available." + msgstr "パッケージ %s%s%s は利用できません。" + +-#: cli.py:595 cli.py:670 yumcommands.py:1010 ++#: cli.py:607 cli.py:740 + msgid "Package(s) to install" + msgstr "インストールするパッケージ" + +-#: cli.py:596 cli.py:671 yumcommands.py:159 yumcommands.py:1011 ++#: cli.py:608 cli.py:686 cli.py:719 cli.py:741 yumcommands.py:157 + msgid "Nothing to do" + msgstr "何もしません" + +-#: cli.py:629 ++#: cli.py:641 + #, python-format + msgid "%d packages marked for Update" + msgstr "%d 個のパッケージが更新の設定しました" + +-#: cli.py:632 ++#: cli.py:644 + msgid "No Packages marked for Update" + msgstr "更新と設定されたパッケージがありません" + +-#: cli.py:646 ++#: cli.py:658 + #, python-format + msgid "%d packages marked for removal" + msgstr "%d 個のパッケージが削除の設定しました" + +-#: cli.py:649 ++#: cli.py:661 + msgid "No Packages marked for removal" + msgstr "削除と設定されたパッケージがありません" + +-#: cli.py:661 ++#: cli.py:685 ++msgid "Package(s) to downgrade" ++msgstr "ダウングレードするパッケージ" ++ ++#: cli.py:709 ++#, python-format ++msgid " (from %s)" ++msgstr "" ++ ++#: cli.py:711 ++#, python-format ++msgid "Installed package %s%s%s%s not available." ++msgstr "インストール済みパッケージ %s%s%s%s は利用できません。" ++ ++#: cli.py:718 ++msgid "Package(s) to reinstall" ++msgstr "再インストールするパッケージ" ++ ++#: cli.py:731 + msgid "No Packages Provided" + msgstr "パッケージが提供されていません" + +-#: cli.py:716 +-msgid "Matching packages for package list to user args" +-msgstr "ユーザーの引数にパッケージ一覧のパッケージを一致させています" +- +-#: cli.py:765 ++#: cli.py:815 + #, python-format + msgid "Warning: No matches found for: %s" + msgstr "警告: 一致するものが見つかりません: %s" + +-#: cli.py:768 ++#: cli.py:818 + msgid "No Matches found" + msgstr "見つかりませんでした" + +-#: cli.py:807 ++#: cli.py:857 + #, python-format + msgid "" + "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" + " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" + msgstr "" + +-#: cli.py:823 ++#: cli.py:873 + #, python-format + msgid "No Package Found for %s" + msgstr "%s のパッケージが見つかりません" + +-#: cli.py:835 ++#: cli.py:885 + msgid "Cleaning up Everything" + msgstr "すべて掃除しています" + +-#: cli.py:849 ++#: cli.py:899 + msgid "Cleaning up Headers" + msgstr "ヘッダーを掃除しています" + +-#: cli.py:852 ++#: cli.py:902 + msgid "Cleaning up Packages" + msgstr "パッケージを掃除しています" + +-#: cli.py:855 ++#: cli.py:905 + msgid "Cleaning up xml metadata" + msgstr "XML メタデータを掃除しています" + +-#: cli.py:858 ++#: cli.py:908 + msgid "Cleaning up database cache" + msgstr "データベースキャッシュを掃除しています" + +-#: cli.py:861 ++#: cli.py:911 + msgid "Cleaning up expire-cache metadata" + msgstr "期限切れのメタデータキャッシュを掃除しています" + +-#: cli.py:864 ++#: cli.py:914 + msgid "Cleaning up plugins" + msgstr "プラグインを掃除しています" + +-#: cli.py:889 ++#: cli.py:939 + msgid "Installed Groups:" + msgstr "インストール済みグループ:" + +-#: cli.py:896 ++#: cli.py:951 + msgid "Available Groups:" + msgstr "利用可能なグループ" + +-#: cli.py:902 ++#: cli.py:961 + msgid "Done" + msgstr "完了" + +-#: cli.py:913 cli.py:931 cli.py:937 yum/__init__.py:2410 ++#: cli.py:972 cli.py:990 cli.py:996 yum/__init__.py:2579 + #, python-format + msgid "Warning: Group %s does not exist." + msgstr "警告: グループ %s が存在しません。" + +-#: cli.py:941 ++#: cli.py:1000 + msgid "No packages in any requested group available to install or update" + msgstr "" + +-#: cli.py:943 ++#: cli.py:1002 + #, python-format + msgid "%d Package(s) to Install" + msgstr "%d 個のパッケージをインストールします" + +-#: cli.py:953 yum/__init__.py:2422 ++#: cli.py:1012 yum/__init__.py:2591 + #, python-format + msgid "No group named %s exists" + msgstr "グループ名 %s が存在しません" + +-#: cli.py:959 ++#: cli.py:1018 + msgid "No packages to remove from groups" + msgstr "グループから削除するパッケージがありません" + +-#: cli.py:961 ++#: cli.py:1020 + #, python-format + msgid "%d Package(s) to remove" + msgstr "%d 個のパッケージを削除します" + +-#: cli.py:1003 ++#: cli.py:1062 + #, python-format + msgid "Package %s is already installed, skipping" + msgstr "パッケージ %s は既にインストールされているので飛ばします" + +-#: cli.py:1014 ++#: cli.py:1073 + #, python-format + msgid "Discarding non-comparable pkg %s.%s" + msgstr "非互換のパッケージ %s.%s を破棄しています" + +-#: cli.py:1040 ++#: cli.py:1099 + #, python-format + msgid "No other %s installed, adding to list for potential install" + msgstr "" + +-#: cli.py:1059 ++#: cli.py:1119 ++msgid "Plugin Options" ++msgstr "" ++ ++#: cli.py:1127 + #, python-format + msgid "Command line error: %s" + msgstr "コマンドラインエラー: %s" + +-#: cli.py:1072 ++#: cli.py:1140 + #, python-format + msgid "" + "\n" +@@ -354,253 +380,258 @@ msgstr "" + "\n" + "%s: オプション %sは引数が必要です " + +-#: cli.py:1130 ++#: cli.py:1193 + msgid "--color takes one of: auto, always, never" + msgstr "--color がとることができる値な次のうちひとつです: auto、always、never" + +-#: cli.py:1232 ++#: cli.py:1300 + msgid "show this help message and exit" + msgstr "このヘルプメッセージを表示して終了する" + +-#: cli.py:1236 ++#: cli.py:1304 + msgid "be tolerant of errors" + msgstr "" + +-#: cli.py:1238 ++#: cli.py:1306 + msgid "run entirely from cache, don't update cache" + msgstr "キャッシュから完全に実行します。キャッシュを更新しません" + +-#: cli.py:1240 ++#: cli.py:1308 + msgid "config file location" + msgstr "構成ファイルの場所" + +-#: cli.py:1242 ++#: cli.py:1310 + msgid "maximum command wait time" + msgstr "コマンドの最大待ち時間" + +-#: cli.py:1244 ++#: cli.py:1312 + msgid "debugging output level" + msgstr "デバッグ情報の出力レベル" + +-#: cli.py:1248 ++#: cli.py:1316 + msgid "show duplicates, in repos, in list/search commands" + msgstr "一覧/検索コマンドのリポジトリーの重複の表示" + +-#: cli.py:1250 ++#: cli.py:1318 + msgid "error output level" + msgstr "エラー出力レベル" + +-#: cli.py:1253 ++#: cli.py:1321 + msgid "quiet operation" + msgstr "静かに処理をする" + +-#: cli.py:1255 ++#: cli.py:1323 + msgid "verbose operation" + msgstr "冗長に処理をする" + +-#: cli.py:1257 ++#: cli.py:1325 + msgid "answer yes for all questions" + msgstr "すべての問い合わせに「yes」で答える" + +-#: cli.py:1259 ++#: cli.py:1327 + msgid "show Yum version and exit" + msgstr "Yum のバージョンを表示して終了する" + +-#: cli.py:1260 ++#: cli.py:1328 + msgid "set install root" + msgstr "インストールのベースディレクトリを設定する" + +-#: cli.py:1264 ++#: cli.py:1332 + msgid "enable one or more repositories (wildcards allowed)" + msgstr "ひとつ以上のリポジトリーを有効にする (ワイルドカード許可)" + +-#: cli.py:1268 ++#: cli.py:1336 + msgid "disable one or more repositories (wildcards allowed)" + msgstr "ひとつ以上のリポジトリーを無効にする (ワイルドカード許可)" + +-#: cli.py:1271 ++#: cli.py:1339 + msgid "exclude package(s) by name or glob" + msgstr "名前かワイルドカードでパッケージを除外する" + +-#: cli.py:1273 ++#: cli.py:1341 + msgid "disable exclude from main, for a repo or for everything" + msgstr "" + +-#: cli.py:1276 ++#: cli.py:1344 + msgid "enable obsoletes processing during updates" + msgstr "更新中に不要な処理を有効にします" + +-#: cli.py:1278 ++#: cli.py:1346 + msgid "disable Yum plugins" + msgstr "Yum プラグインを無効にする" + +-#: cli.py:1280 ++#: cli.py:1348 + msgid "disable gpg signature checking" + msgstr "GPG 署名の確認を無効にする" + +-#: cli.py:1282 ++#: cli.py:1350 + msgid "disable plugins by name" + msgstr "名前でプラグインを無効にする" + +-#: cli.py:1285 ++#: cli.py:1353 + msgid "enable plugins by name" + msgstr "名前でプラグインを有効にする" + +-#: cli.py:1288 ++#: cli.py:1356 + msgid "skip packages with depsolving problems" + msgstr "依存性に問題があるパッケージを飛ばす" + +-#: cli.py:1290 ++#: cli.py:1358 + msgid "control whether color is used" + msgstr "" + +-#: output.py:298 ++#: output.py:303 + msgid "Jan" + msgstr "1 月" + +-#: output.py:298 ++#: output.py:303 + msgid "Feb" + msgstr "2 月" + +-#: output.py:298 ++#: output.py:303 + msgid "Mar" + msgstr "3 月" + +-#: output.py:298 ++#: output.py:303 + msgid "Apr" + msgstr "4 月" + +-#: output.py:298 ++#: output.py:303 + msgid "May" + msgstr "5 月" + +-#: output.py:298 ++#: output.py:303 + msgid "Jun" + msgstr "6 月" + +-#: output.py:299 ++#: output.py:304 + msgid "Jul" + msgstr "7 月" + +-#: output.py:299 ++#: output.py:304 + msgid "Aug" + msgstr "8 月" + +-#: output.py:299 ++#: output.py:304 + msgid "Sep" + msgstr "9 月" + +-#: output.py:299 ++#: output.py:304 + msgid "Oct" + msgstr "10 月" + +-#: output.py:299 ++#: output.py:304 + msgid "Nov" + msgstr "11 月" + +-#: output.py:299 ++#: output.py:304 + msgid "Dec" + msgstr "12 月" + +-#: output.py:309 ++#: output.py:314 + msgid "Trying other mirror." + msgstr "他のミラーを試します。" + +-#: output.py:525 ++#: output.py:536 + #, python-format + msgid "Name : %s%s%s" + msgstr "名前 : %s%s%s" + +-#: output.py:526 ++#: output.py:537 + #, python-format + msgid "Arch : %s" + msgstr "アーキテクチャ: %s" + +-#: output.py:528 ++#: output.py:539 + #, python-format + msgid "Epoch : %s" + msgstr "エポック : %s" + +-#: output.py:529 ++#: output.py:540 + #, python-format + msgid "Version : %s" + msgstr "バージョン : %s" + +-#: output.py:530 ++#: output.py:541 + #, python-format + msgid "Release : %s" + msgstr "リリース : %s" + +-#: output.py:531 ++#: output.py:542 + #, python-format + msgid "Size : %s" + msgstr "容量 : %s" + +-#: output.py:532 ++#: output.py:543 + #, python-format + msgid "Repo : %s" + msgstr "リポジトリー : %s" + +-#: output.py:534 ++#: output.py:545 ++#, python-format ++msgid "From repo : %s" ++msgstr "" ++ ++#: output.py:547 + #, python-format + msgid "Committer : %s" + msgstr "コミット者 : %s" + +-#: output.py:535 ++#: output.py:548 + #, python-format + msgid "Committime : %s" + msgstr "コミット日時 : %s" + +-#: output.py:536 ++#: output.py:549 + #, python-format + msgid "Buildtime : %s" + msgstr "ビルド日時 : %s" + +-#: output.py:538 ++#: output.py:551 + #, python-format + msgid "Installtime: %s" + msgstr "インストール日時 : %s " + +-#: output.py:539 ++#: output.py:552 + msgid "Summary : " + msgstr "要約 : " + +-#: output.py:541 ++#: output.py:554 + #, python-format + msgid "URL : %s" + msgstr "URL : %s" + +-#: output.py:542 ++#: output.py:555 + #, python-format + msgid "License : %s" + msgstr "ライセンス : %s" + +-#: output.py:543 ++#: output.py:556 + msgid "Description: " + msgstr "説明 : " + +-#: output.py:611 ++#: output.py:624 + msgid "y" + msgstr "y" + +-#: output.py:611 ++#: output.py:624 + msgid "yes" + msgstr "はい" + +-#: output.py:612 ++#: output.py:625 + msgid "n" + msgstr "n" + +-#: output.py:612 ++#: output.py:625 + msgid "no" + msgstr "いいえ" + + # REMEMBER to Translate [Y/N] to the current locale +-#: output.py:616 ++#: output.py:629 + msgid "Is this ok [y/N]: " + msgstr "これでいいですか? [y/N]" + +-#: output.py:704 ++#: output.py:720 + #, python-format + msgid "" + "\n" +@@ -609,264 +640,313 @@ msgstr "" + "\n" + "グループ: %s" + +-#: output.py:708 ++#: output.py:724 + #, python-format + msgid " Group-Id: %s" + msgstr " グループ ID: %s" + +-#: output.py:713 ++#: output.py:729 + #, python-format + msgid " Description: %s" + msgstr " 説明: %s" + +-#: output.py:715 ++#: output.py:731 + msgid " Mandatory Packages:" + msgstr " 強制的なパッケージ:" + +-#: output.py:716 ++#: output.py:732 + msgid " Default Packages:" + msgstr " 標準パッケージ:" + +-#: output.py:717 ++#: output.py:733 + msgid " Optional Packages:" + msgstr " オプションパッケージ:" + +-#: output.py:718 ++#: output.py:734 + msgid " Conditional Packages:" + msgstr " 条件付パッケージ:" + +-#: output.py:738 ++#: output.py:754 + #, python-format + msgid "package: %s" + msgstr "パッケージ : %s" + +-#: output.py:740 ++#: output.py:756 + msgid " No dependencies for this package" + msgstr " このパッケージの依存はありません" + +-#: output.py:745 ++#: output.py:761 + #, python-format + msgid " dependency: %s" + msgstr " 依存性 : %s" + +-#: output.py:747 ++#: output.py:763 + msgid " Unsatisfied dependency" + msgstr " 満たされていない依存性" + +-#: output.py:819 ++#: output.py:835 + #, python-format + msgid "Repo : %s" + msgstr "リポジトリー : %s" + +-#: output.py:820 ++#: output.py:836 + msgid "Matched from:" + msgstr "" + +-#: output.py:828 ++#: output.py:845 + msgid "Description : " + msgstr "説明 : " + +-#: output.py:831 ++#: output.py:848 + #, python-format + msgid "URL : %s" + msgstr "URL : %s" + +-#: output.py:834 ++#: output.py:851 + #, python-format + msgid "License : %s" + msgstr "ライセンス : %s" + +-#: output.py:837 ++#: output.py:854 + #, python-format + msgid "Filename : %s" + msgstr "リリース : %s" + +-#: output.py:841 ++#: output.py:858 + msgid "Other : " + msgstr "その他 : " + +-#: output.py:874 ++#: output.py:891 + msgid "There was an error calculating total download size" + msgstr "総ダウンロード容量の計算中にエラーです" + +-#: output.py:879 ++#: output.py:896 + #, python-format + msgid "Total size: %s" + msgstr "合計容量: %s" + +-#: output.py:882 ++#: output.py:899 + #, python-format + msgid "Total download size: %s" + msgstr "総ダウンロード容量: %s" + +-#: output.py:924 ++#: output.py:940 ++msgid "Reinstalling" ++msgstr "再インストールをしています" ++ ++#: output.py:941 ++msgid "Downgrading" ++msgstr "ダウングレードをしています" ++ ++#: output.py:942 + msgid "Installing for dependencies" +-msgstr "依存性関連でのインストールをします" ++msgstr "依存性関連でのインストールをしています" + +-#: output.py:925 ++#: output.py:943 + msgid "Updating for dependencies" +-msgstr "依存性関連での更新をします" ++msgstr "依存性関連での更新をしています" + +-#: output.py:926 ++#: output.py:944 + msgid "Removing for dependencies" + msgstr "依存性関連での削除をします" + +-#: output.py:933 output.py:1031 ++#: output.py:951 output.py:1063 + msgid "Skipped (dependency problems)" + msgstr "飛ばしました (依存性の問題)" + +-#: output.py:954 ++#: output.py:974 + msgid "Package" + msgstr "" + +-#: output.py:954 ++#: output.py:974 + msgid "Arch" + msgstr "" + +-#: output.py:955 ++#: output.py:975 + msgid "Version" + msgstr "" + +-#: output.py:955 ++#: output.py:975 + msgid "Repository" + msgstr "" + +-#: output.py:956 ++#: output.py:976 + msgid "Size" + msgstr "" + +-#: output.py:968 ++#: output.py:988 + #, python-format + msgid "" + " replacing %s%s%s.%s %s\n" + "\n" +-msgstr " 置き換えています %s%s%s.%s %s\n\n" ++msgstr "" ++" 置き換えています %s%s%s.%s %s\n" ++"\n" + +-#: output.py:977 ++#: output.py:997 + #, python-format + msgid "" + "\n" + "Transaction Summary\n" + "%s\n" +-"Install %5.5s Package(s) \n" +-"Update %5.5s Package(s) \n" +-"Remove %5.5s Package(s) \n" + msgstr "" +-"\n" +-"トランザクションの要約\n" +-"%s\n" +-"インストール %5.5s パッケージ \n" +-"更新 %5.5s パッケージ \n" +-"削除 %5.5s パッケージ \n" + +-#: output.py:1025 ++#: output.py:1004 ++#, python-format ++msgid "" ++"Install %5.5s Package(s)\n" ++"Upgrade %5.5s Package(s)\n" ++msgstr "" ++ ++#: output.py:1013 ++#, python-format ++msgid "" ++"Remove %5.5s Package(s)\n" ++"Reinstall %5.5s Package(s)\n" ++"Downgrade %5.5s Package(s)\n" ++msgstr "" ++ ++#: output.py:1057 + msgid "Removed" + msgstr "削除しました" + +-#: output.py:1026 ++#: output.py:1058 + msgid "Dependency Removed" + msgstr "依存性の削除をしました" + +-#: output.py:1028 ++#: output.py:1060 + msgid "Dependency Installed" + msgstr "依存性関連をインストールしました" + +-#: output.py:1030 ++#: output.py:1062 + msgid "Dependency Updated" + msgstr "依存性を更新しました" + +-#: output.py:1032 ++#: output.py:1064 + msgid "Replaced" + msgstr "置換しました" + +-#: output.py:1033 ++#: output.py:1065 + msgid "Failed" + msgstr "失敗しました" + +-#: output.py:1099 ++#: output.py:1131 + msgid "two" + msgstr "" + +-#: output.py:1106 ++#: output.py:1142 + #, python-format + msgid "" + "\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " +-"seconds to exit.\n" ++"seconds\n" ++"to exit.\n" + msgstr "" + +-#: output.py:1116 ++#: output.py:1153 + msgid "user interrupt" + msgstr "ユーザーの割り込み" + +-#: output.py:1132 ++#: output.py:1171 + msgid "Total" + msgstr "合計" + +-#: output.py:1146 ++#: output.py:1186 + msgid "installed" + msgstr "インストール" + +-#: output.py:1147 ++#: output.py:1187 + msgid "updated" + msgstr "更新" + +-#: output.py:1148 ++#: output.py:1188 + msgid "obsoleted" + msgstr "不要" + +-#: output.py:1149 ++#: output.py:1189 + msgid "erased" + msgstr "削除" + +-#: output.py:1153 ++#: output.py:1193 + #, python-format + msgid "---> Package %s.%s %s:%s-%s set to be %s" + msgstr "---> パッケージ %s.%s %s:%s-%s を%sに設定しました" + +-#: output.py:1160 ++#: output.py:1200 + msgid "--> Running transaction check" + msgstr "--> トランザクションの確認を実行しています" + +-#: output.py:1165 ++#: output.py:1205 + msgid "--> Restarting Dependency Resolution with new changes." + msgstr "--> 新しい変更と依存性の解決を再開しています。" + +-#: output.py:1170 ++#: output.py:1210 + msgid "--> Finished Dependency Resolution" + msgstr "--> 依存性解決を終了しました" + +-#: output.py:1175 ++#: output.py:1215 output.py:1220 + #, python-format + msgid "--> Processing Dependency: %s for package: %s" + msgstr "--> 依存性の処理をしています: %s のパッケージ: %s" + +-#: output.py:1180 ++#: output.py:1224 + #, python-format + msgid "--> Unresolved Dependency: %s" + msgstr "--> 未解決の依存性: %s" + +-#: output.py:1186 ++#: output.py:1230 output.py:1235 + #, python-format + msgid "--> Processing Conflict: %s conflicts %s" + msgstr "--> 衝突を処理しています: %s は %s と衝突しています" + +-#: output.py:1189 ++#: output.py:1239 + msgid "--> Populating transaction set with selected packages. Please wait." + msgstr "" + +-#: output.py:1193 ++#: output.py:1243 + #, python-format + msgid "---> Downloading header for %s to pack into transaction set." + msgstr "" + "---> トランザクションセットに束ねるために %s のヘッダーをダウンロードしていま" + "す" + +-#: yumcommands.py:41 ++#: utils.py:132 yummain.py:42 ++msgid "" ++"\n" ++"\n" ++"Exiting on user cancel" ++msgstr "" ++"\n" ++"\n" ++"ユーザーの取り消しで終了しています" ++ ++#: utils.py:138 yummain.py:48 ++msgid "" ++"\n" ++"\n" ++"Exiting on Broken Pipe" ++msgstr "" ++"\n" ++"\n" ++"パイプが壊れたため終了しています" ++ ++#: utils.py:140 yummain.py:50 ++#, python-format ++msgid "" ++"\n" ++"\n" ++"%s" ++msgstr "\n\n%s" ++ ++#: utils.py:179 yummain.py:273 ++msgid "Complete!" ++msgstr "完了しました!" ++ ++#: yumcommands.py:40 + msgid "You need to be root to perform this command." + msgstr "このコマンドを実行するには root である必要があります。" + +-#: yumcommands.py:48 ++#: yumcommands.py:47 + msgid "" + "\n" + "You have enabled checking of packages via GPG keys. This is a good thing. \n" +@@ -884,156 +964,156 @@ msgid "" + "For more information contact your distribution or package provider.\n" + msgstr "" + +-#: yumcommands.py:68 ++#: yumcommands.py:67 + #, python-format + msgid "Error: Need to pass a list of pkgs to %s" + msgstr "エラー: パッケージの一覧を %s に渡す必要があります" + +-#: yumcommands.py:74 ++#: yumcommands.py:73 + msgid "Error: Need an item to match" + msgstr "エラー: 一致する項目が必要です" + +-#: yumcommands.py:80 ++#: yumcommands.py:79 + msgid "Error: Need a group or list of groups" + msgstr "エラー: グループ化グループの一覧が必要です" + +-#: yumcommands.py:89 ++#: yumcommands.py:88 + #, python-format + msgid "Error: clean requires an option: %s" + msgstr "エラー: clean は引数をひとつ要求します: %s" + +-#: yumcommands.py:94 ++#: yumcommands.py:93 + #, python-format + msgid "Error: invalid clean argument: %r" + msgstr "エラー: 不正な clean の引数です: %r" + +-#: yumcommands.py:107 ++#: yumcommands.py:106 + msgid "No argument to shell" + msgstr "シェルへの引数がありません" + +-#: yumcommands.py:110 ++#: yumcommands.py:108 + #, python-format + msgid "Filename passed to shell: %s" + msgstr "シェルに渡すファイル名: %s" + +-#: yumcommands.py:114 ++#: yumcommands.py:112 + #, python-format + msgid "File %s given as argument to shell does not exist." + msgstr "シェルへの引数として渡したファイル %s は存在しません。" + +-#: yumcommands.py:120 ++#: yumcommands.py:118 + msgid "Error: more than one file given as argument to shell." + msgstr "エラー: シェルへの引数としてひとつ以上のファイルを渡しました。" + +-#: yumcommands.py:169 ++#: yumcommands.py:167 + msgid "PACKAGE..." + msgstr "パッケージ..." + +-#: yumcommands.py:172 ++#: yumcommands.py:170 + msgid "Install a package or packages on your system" + msgstr "システムにパッケージをインストールする" + +-#: yumcommands.py:180 ++#: yumcommands.py:178 + msgid "Setting up Install Process" + msgstr "インストール処理の設定をしています" + +-#: yumcommands.py:191 ++#: yumcommands.py:189 + msgid "[PACKAGE...]" + msgstr "[パッケージ...]" + +-#: yumcommands.py:194 ++#: yumcommands.py:192 + msgid "Update a package or packages on your system" + msgstr "システムのパッケージを更新する" + +-#: yumcommands.py:201 ++#: yumcommands.py:199 + msgid "Setting up Update Process" + msgstr "更新処理の設定をしています" + +-#: yumcommands.py:243 ++#: yumcommands.py:244 + msgid "Display details about a package or group of packages" + msgstr "パッケージもしくはパッケージのグループについての詳細を表示する" + +-#: yumcommands.py:292 ++#: yumcommands.py:293 + msgid "Installed Packages" + msgstr "インストール済みパッケージ" + +-#: yumcommands.py:300 ++#: yumcommands.py:301 + msgid "Available Packages" + msgstr "利用可能なパッケージ" + +-#: yumcommands.py:304 ++#: yumcommands.py:305 + msgid "Extra Packages" + msgstr "外部パッケージ" + +-#: yumcommands.py:308 ++#: yumcommands.py:309 + msgid "Updated Packages" + msgstr "更新したパッケージ" + +-#: yumcommands.py:316 yumcommands.py:323 yumcommands.py:600 ++#: yumcommands.py:317 yumcommands.py:324 yumcommands.py:600 + msgid "Obsoleting Packages" + msgstr "パッケージを不要にしています" + +-#: yumcommands.py:325 ++#: yumcommands.py:326 + msgid "Recently Added Packages" + msgstr "最近追加したパッケージ" + +-#: yumcommands.py:332 ++#: yumcommands.py:333 + msgid "No matching Packages to list" + msgstr "表示するパッケージはありません" + +-#: yumcommands.py:346 ++#: yumcommands.py:347 + msgid "List a package or groups of packages" + msgstr "パッケージグループの一覧を表示する" + +-#: yumcommands.py:358 ++#: yumcommands.py:359 + msgid "Remove a package or packages from your system" + msgstr "システムから削除するパッケージ" + +-#: yumcommands.py:365 ++#: yumcommands.py:366 + msgid "Setting up Remove Process" + msgstr "削除処理の設定をしています" + +-#: yumcommands.py:379 ++#: yumcommands.py:380 + msgid "Setting up Group Process" + msgstr "グループ処理の設定をしています" + +-#: yumcommands.py:385 ++#: yumcommands.py:386 + msgid "No Groups on which to run command" + msgstr "" + +-#: yumcommands.py:398 ++#: yumcommands.py:399 + msgid "List available package groups" + msgstr "利用できるパッケージグループの一覧" + +-#: yumcommands.py:415 ++#: yumcommands.py:416 + msgid "Install the packages in a group on your system" + msgstr "システムのグループのパッケージをインストールする" + +-#: yumcommands.py:437 ++#: yumcommands.py:438 + msgid "Remove the packages in a group from your system" + msgstr "システムからグループのパッケージを削除する" + +-#: yumcommands.py:464 ++#: yumcommands.py:465 + msgid "Display details about a package group" + msgstr "パッケージグループについての詳細を表示する" + +-#: yumcommands.py:488 ++#: yumcommands.py:489 + msgid "Generate the metadata cache" + msgstr "メタデータキャッシュを生成する" + +-#: yumcommands.py:494 ++#: yumcommands.py:495 + msgid "Making cache files for all metadata files." + msgstr "すべて飲めたデータファイルのキャッシュを作成します。" + +-#: yumcommands.py:495 ++#: yumcommands.py:496 + msgid "This may take a while depending on the speed of this computer" + msgstr "" + +-#: yumcommands.py:516 ++#: yumcommands.py:517 + msgid "Metadata Cache Created" + msgstr "メタデータのキャッシュを作成しました" + +-#: yumcommands.py:530 ++#: yumcommands.py:531 + msgid "Remove cached data" + msgstr "キャッシュデータを削除する" + +@@ -1106,15 +1186,15 @@ msgid "disabled" + msgstr "無効" + + #: yumcommands.py:827 +-msgid "Repo-id : " +-msgstr "リポジトリーID : " ++msgid "Repo-id : " ++msgstr "リポジトリーID : " + + #: yumcommands.py:828 +-msgid "Repo-name : " +-msgstr "リポジトリー名 : " ++msgid "Repo-name : " ++msgstr "リポジトリー名 : " + + #: yumcommands.py:829 +-msgid "Repo-status : " ++msgid "Repo-status : " + msgstr "リポジトリーの状態: " + + #: yumcommands.py:831 +@@ -1122,67 +1202,94 @@ msgid "Repo-revision: " + msgstr "リポジトリーのリビジョン: " + + #: yumcommands.py:835 +-msgid "Repo-tags : " +-msgstr "リポジトリータグ : " ++msgid "Repo-tags : " ++msgstr "リポジトリータグ : " + + #: yumcommands.py:841 + msgid "Repo-distro-tags: " + msgstr "" + + #: yumcommands.py:846 +-msgid "Repo-updated: " ++msgid "Repo-updated : " + msgstr "" + + #: yumcommands.py:848 +-msgid "Repo-pkgs : " ++msgid "Repo-pkgs : " + msgstr "" + + #: yumcommands.py:849 +-msgid "Repo-size : " +-msgstr "リポジトリー容量 : %s" ++msgid "Repo-size : " ++msgstr "リポジトリー容量 : " + + #: yumcommands.py:856 +-msgid "Repo-baseurl: " +-msgstr "" ++msgid "Repo-baseurl : " ++msgstr "リポジトリー基点 URL: " + +-#: yumcommands.py:860 ++#: yumcommands.py:864 + msgid "Repo-metalink: " +-msgstr "" +- +-#: yumcommands.py:863 +-msgid "Repo-mirrors: " +-msgstr "" ++msgstr "リポジトリー メタリンク: " + +-#: yumcommands.py:867 +-msgid "Repo-exclude: " +-msgstr "" ++#: yumcommands.py:868 ++msgid " Updated : " ++msgstr "更新しました : " + + #: yumcommands.py:871 +-msgid "Repo-include: " ++msgid "Repo-mirrors : " ++msgstr "リポジトリー ミラー: " ++ ++#: yumcommands.py:875 yummain.py:133 ++msgid "Unknown" ++msgstr "不明" ++ ++#: yumcommands.py:881 ++#, python-format ++msgid "Never (last: %s)" + msgstr "" + +-#: yumcommands.py:881 yumcommands.py:907 ++#: yumcommands.py:883 ++#, python-format ++msgid "Instant (last: %s)" ++msgstr "インスタント (最終: %s)" ++ ++#: yumcommands.py:886 ++#, python-format ++msgid "%s second(s) (last: %s)" ++msgstr "%s 秒 (最終: %s)" ++ ++#: yumcommands.py:888 ++msgid "Repo-expire : " ++msgstr "リポジトリー期限 : " ++ ++#: yumcommands.py:891 ++msgid "Repo-exclude : " ++msgstr "リポジトリー除外 : " ++ ++#: yumcommands.py:895 ++msgid "Repo-include : " ++msgstr "リポジトリー内包 : " ++ ++#: yumcommands.py:905 yumcommands.py:931 + msgid "repo id" +-msgstr "" ++msgstr "リポジトリー ID" + +-#: yumcommands.py:895 yumcommands.py:896 yumcommands.py:910 ++#: yumcommands.py:919 yumcommands.py:920 yumcommands.py:934 + msgid "status" +-msgstr "" ++msgstr "状態" + +-#: yumcommands.py:908 ++#: yumcommands.py:932 + msgid "repo name" +-msgstr "" ++msgstr "リポジトリー名" + +-#: yumcommands.py:934 ++#: yumcommands.py:958 + msgid "Display a helpful usage message" + msgstr "役立つ使い方のメッセージを表示する" + +-#: yumcommands.py:968 ++#: yumcommands.py:992 + #, python-format + msgid "No help available for %s" + msgstr "%s のヘルプは利用できません" + +-#: yumcommands.py:973 ++#: yumcommands.py:997 + msgid "" + "\n" + "\n" +@@ -1192,7 +1299,7 @@ msgstr "" + "\n" + "別名: " + +-#: yumcommands.py:975 ++#: yumcommands.py:999 + msgid "" + "\n" + "\n" +@@ -1202,108 +1309,104 @@ msgstr "" + "\n" + "別名: " + +-#: yumcommands.py:1003 ++#: yumcommands.py:1027 + msgid "Setting up Reinstall Process" + msgstr "再インストール処理の設定をしています" + +-#: yumcommands.py:1017 ++#: yumcommands.py:1035 + msgid "reinstall a package" + msgstr "パッケージの再インストール" + +-#: yummain.py:42 +-msgid "" +-"\n" +-"\n" +-"Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"ユーザーの取り消しで終了しています" ++#: yumcommands.py:1053 ++msgid "Setting up Downgrade Process" ++msgstr "ダウングレード処理の設定をしています" + +-#: yummain.py:48 +-msgid "" +-"\n" +-"\n" +-"Exiting on Broken Pipe" ++#: yumcommands.py:1060 ++msgid "downgrade a package" ++msgstr "パッケージのダウングレード" ++ ++#: yumcommands.py:1074 ++msgid "Display a version for the machine and/or available repos." + msgstr "" +-"\n" +-"\n" +-"パイプが壊れたため終了しています" + +-#: yummain.py:126 ++#: yumcommands.py:1101 ++msgid "Installed:" ++msgstr "インストール済み:" ++ ++#: yumcommands.py:1110 ++msgid "Available:" ++msgstr "利用可能:" ++ ++#: yummain.py:128 + msgid "Running" + msgstr "実行中" + +-#: yummain.py:127 ++#: yummain.py:129 + msgid "Sleeping" + msgstr "スリープ中" + +-#: yummain.py:128 ++#: yummain.py:130 + msgid "Uninteruptable" +-msgstr "" ++msgstr "割り込み不可" + +-#: yummain.py:129 ++#: yummain.py:131 + msgid "Zombie" + msgstr "ゾンビ" + +-#: yummain.py:130 ++#: yummain.py:132 + msgid "Traced/Stopped" + msgstr "" + +-#: yummain.py:131 +-msgid "Unknown" +-msgstr "不明" +- +-#: yummain.py:135 ++#: yummain.py:137 + msgid " The other application is: PackageKit" + msgstr " 他のアプリケーション: PackageKit" + +-#: yummain.py:137 ++#: yummain.py:139 + #, python-format + msgid " The other application is: %s" + msgstr " 他のアプリケーション: %s" + +-#: yummain.py:140 ++#: yummain.py:142 + #, python-format + msgid " Memory : %5s RSS (%5sB VSZ)" + msgstr " メモリー: %5s RSS (%5sB VSZ)" + +-#: yummain.py:144 ++#: yummain.py:146 + #, python-format + msgid " Started: %s - %s ago" + msgstr " 開始 : %s - %s 秒経過" + +-#: yummain.py:146 ++#: yummain.py:148 + #, python-format + msgid " State : %s, pid: %d" + msgstr " 状態 : %s、PID: %d" + +-#: yummain.py:171 ++#: yummain.py:173 + msgid "" + "Another app is currently holding the yum lock; waiting for it to exit..." + msgstr "" + "別のアプリケーションが現在 yum のロックを持っています。終了するまで待っていま" + "す..." + +-#: yummain.py:199 yummain.py:238 ++#: yummain.py:201 yummain.py:240 + #, python-format + msgid "Error: %s" + msgstr "エラー: %s" + +-#: yummain.py:209 yummain.py:250 ++#: yummain.py:211 yummain.py:253 + #, python-format + msgid "Unknown Error(s): Exit Code: %d:" + msgstr "不明なエラー: 終了コード: %d:" + +-#: yummain.py:216 ++#: yummain.py:218 + msgid "Resolving Dependencies" + msgstr "依存性の解決をしています" + +-#: yummain.py:240 ++#: yummain.py:242 + msgid " You could try using --skip-broken to work around the problem" + msgstr " 問題を回避するために --skip-broken を用いることができません" + +-#: yummain.py:241 ++#: yummain.py:243 + msgid "" + " You could try running: package-cleanup --problems\n" + " package-cleanup --dupes\n" +@@ -1313,7 +1416,7 @@ msgstr "" + " package-cleanup --dupes\n" + " rpm -Va --nofiles --nodigest" + +-#: yummain.py:256 ++#: yummain.py:259 + msgid "" + "\n" + "Dependencies Resolved" +@@ -1321,321 +1424,328 @@ msgstr "" + "\n" + "依存性を解決しました" + +-#: yummain.py:270 +-msgid "Complete!" +-msgstr "完了しました!" +- +-#: yummain.py:325 ++#: yummain.py:326 + msgid "" + "\n" + "\n" + "Exiting on user cancel." +-msgstr "\n\n\nユーザーによる取り消しで終了しています。" ++msgstr "" ++"\n" ++"\n" ++"\n" ++"ユーザーによる取り消しで終了しています。" + +-#: yum/depsolve.py:84 ++#: yum/depsolve.py:83 + msgid "doTsSetup() will go away in a future version of Yum.\n" + msgstr "doTsSetup() は Yum の将来のバージョンでなくなります。\n" + +-#: yum/depsolve.py:99 ++#: yum/depsolve.py:98 + msgid "Setting up TransactionSets before config class is up" + msgstr "構成クラスが終わる前にトランザクションセットを設定しています" + +-#: yum/depsolve.py:150 ++#: yum/depsolve.py:149 + #, python-format + msgid "Invalid tsflag in config file: %s" + msgstr "構成ファイルの tsflag が不正です: %s" + +-#: yum/depsolve.py:161 ++#: yum/depsolve.py:160 + #, python-format + msgid "Searching pkgSack for dep: %s" + msgstr "依存性の pkgSack を検索しています: %s" + +-#: yum/depsolve.py:184 ++#: yum/depsolve.py:183 + #, python-format + msgid "Potential match for %s from %s" + msgstr "" + +-#: yum/depsolve.py:192 ++#: yum/depsolve.py:191 + #, python-format + msgid "Matched %s to require for %s" +-msgstr "" ++msgstr "%s は %s の要求に一致しました" + +-#: yum/depsolve.py:233 ++#: yum/depsolve.py:232 + #, python-format + msgid "Member: %s" + msgstr "メンバー: %s" + +-#: yum/depsolve.py:247 yum/depsolve.py:738 ++#: yum/depsolve.py:246 yum/depsolve.py:756 + #, python-format + msgid "%s converted to install" + msgstr "%s をインストールに変更しました" + +-#: yum/depsolve.py:254 ++#: yum/depsolve.py:253 + #, python-format + msgid "Adding Package %s in mode %s" + msgstr "モード %s にパッケージ %s を追加しています" + +-#: yum/depsolve.py:264 ++#: yum/depsolve.py:263 + #, python-format + msgid "Removing Package %s" + msgstr "パッケージ %s の削除をしています" + +-#: yum/depsolve.py:275 ++#: yum/depsolve.py:285 + #, python-format + msgid "%s requires: %s" + msgstr "%s の要求: %s" + +-#: yum/depsolve.py:333 ++#: yum/depsolve.py:343 + msgid "Needed Require has already been looked up, cheating" + msgstr "必要な要求は既に調べましたが不正をしています" + +-#: yum/depsolve.py:343 ++#: yum/depsolve.py:353 + #, python-format + msgid "Needed Require is not a package name. Looking up: %s" + msgstr "必要な要求はパッケージ名ではありません。調べています: %s" + +-#: yum/depsolve.py:350 ++#: yum/depsolve.py:360 + #, python-format + msgid "Potential Provider: %s" + msgstr "" + +-#: yum/depsolve.py:373 ++#: yum/depsolve.py:383 + #, python-format + msgid "Mode is %s for provider of %s: %s" +-msgstr "" ++msgstr "%s のモードは %s が提供しています: %s" + +-#: yum/depsolve.py:377 ++#: yum/depsolve.py:387 + #, python-format + msgid "Mode for pkg providing %s: %s" +-msgstr "" ++msgstr "%s の提供しているパッケージのモード: %s" + +-#: yum/depsolve.py:381 ++#: yum/depsolve.py:391 + #, python-format + msgid "TSINFO: %s package requiring %s marked as erase" + msgstr "" + +-#: yum/depsolve.py:394 ++#: yum/depsolve.py:404 + #, python-format + msgid "TSINFO: Obsoleting %s with %s to resolve dep." + msgstr "" + +-#: yum/depsolve.py:397 ++#: yum/depsolve.py:407 + #, python-format + msgid "TSINFO: Updating %s to resolve dep." + msgstr "" + +-#: yum/depsolve.py:405 ++#: yum/depsolve.py:415 + #, python-format + msgid "Cannot find an update path for dep for: %s" +-msgstr "" ++msgstr "依存する更新パスを見つけられません: %s" + +-#: yum/depsolve.py:415 ++#: yum/depsolve.py:425 + #, python-format + msgid "Unresolvable requirement %s for %s" + msgstr "要求された %s は %s で解決しませんでした" + +-#: yum/depsolve.py:438 ++#: yum/depsolve.py:448 + #, python-format + msgid "Quick matched %s to require for %s" + msgstr "" + +-#: yum/depsolve.py:480 ++#: yum/depsolve.py:490 + #, python-format + msgid "%s is in providing packages but it is already installed, removing." + msgstr "" + "%s を提供するパッケージはすでにインストールされています。削除しています。" + +-#: yum/depsolve.py:496 ++#: yum/depsolve.py:506 + #, python-format + msgid "Potential resolving package %s has newer instance in ts." + msgstr "" + +-#: yum/depsolve.py:507 ++#: yum/depsolve.py:517 + #, python-format + msgid "Potential resolving package %s has newer instance installed." + msgstr "" + +-#: yum/depsolve.py:515 yum/depsolve.py:564 ++#: yum/depsolve.py:525 yum/depsolve.py:571 + #, python-format + msgid "Missing Dependency: %s is needed by package %s" + msgstr "依存性の欠落: %s はパッケージ %s が必要としています" + +-#: yum/depsolve.py:528 ++#: yum/depsolve.py:538 + #, python-format + msgid "%s already in ts, skipping this one" +-msgstr "" ++msgstr "%s はすでに ts にあります。これを飛ばします" + +-#: yum/depsolve.py:574 ++#: yum/depsolve.py:581 + #, python-format + msgid "TSINFO: Marking %s as update for %s" + msgstr "TSINFO: %s を更新として %s で設定しています" + +-#: yum/depsolve.py:582 ++#: yum/depsolve.py:589 + #, python-format + msgid "TSINFO: Marking %s as install for %s" + msgstr "TSINFO: %s をインストールとして %s で設定しています" + +-#: yum/depsolve.py:675 yum/depsolve.py:756 ++#: yum/depsolve.py:692 yum/depsolve.py:774 + msgid "Success - empty transaction" + msgstr "成功 - 空のトランザクション" + +-#: yum/depsolve.py:713 yum/depsolve.py:728 ++#: yum/depsolve.py:731 yum/depsolve.py:746 + msgid "Restarting Loop" + msgstr "ループを再開しています" + +-#: yum/depsolve.py:744 ++#: yum/depsolve.py:762 + msgid "Dependency Process ending" + msgstr "依存性の処理を終了しています" + +-#: yum/depsolve.py:750 ++#: yum/depsolve.py:768 + #, python-format + msgid "%s from %s has depsolving problems" + msgstr "%s(%s) は依存性に問題があります" + +-#: yum/depsolve.py:757 ++#: yum/depsolve.py:775 + msgid "Success - deps resolved" + msgstr "成功 - 依存性を解決しました" + +-#: yum/depsolve.py:771 ++#: yum/depsolve.py:789 + #, python-format + msgid "Checking deps for %s" + msgstr "%s の依存性を確認しています" + +-#: yum/depsolve.py:854 ++#: yum/depsolve.py:872 + #, python-format + msgid "looking for %s as a requirement of %s" +-msgstr "" ++msgstr "%s の要求として %s を検索しています" + +-#: yum/depsolve.py:996 ++#: yum/depsolve.py:1014 + #, python-format + msgid "Running compare_providers() for %s" + msgstr "%s の compare_providers() を実行しています" + +-#: yum/depsolve.py:1024 yum/depsolve.py:1030 ++#: yum/depsolve.py:1048 yum/depsolve.py:1054 + #, python-format + msgid "better arch in po %s" + msgstr "" + +-#: yum/depsolve.py:1091 ++#: yum/depsolve.py:1149 + #, python-format + msgid "%s obsoletes %s" + msgstr "" + +-#: yum/depsolve.py:1107 ++#: yum/depsolve.py:1161 + #, python-format + msgid "" + "archdist compared %s to %s on %s\n" + " Winner: %s" + msgstr "" + +-#: yum/depsolve.py:1114 ++#: yum/depsolve.py:1168 + #, python-format + msgid "common sourcerpm %s and %s" + msgstr "%s と %s の共通ソース RPM(SRPM)" + +-#: yum/depsolve.py:1120 ++#: yum/depsolve.py:1174 + #, python-format + msgid "common prefix of %s between %s and %s" + msgstr "%s から %s と %s の共通接頭辞" + +-#: yum/depsolve.py:1128 ++#: yum/depsolve.py:1182 + #, python-format + msgid "Best Order: %s" + msgstr "最適の順序: %s" + +-#: yum/__init__.py:176 ++#: yum/__init__.py:180 + msgid "doConfigSetup() will go away in a future version of Yum.\n" + msgstr "doConfigSetup() は Yum の将来のバージョンでなくなります。\n" + +-#: yum/__init__.py:386 ++#: yum/__init__.py:401 + #, python-format + msgid "Repository %r is missing name in configuration, using id" + msgstr "リポジトリー %r は構成中に名前がありませんので ID を使います" + +-#: yum/__init__.py:424 ++#: yum/__init__.py:439 + msgid "plugins already initialised" + msgstr "プラグインは既に初期化されています" + +-#: yum/__init__.py:431 ++#: yum/__init__.py:446 + msgid "doRpmDBSetup() will go away in a future version of Yum.\n" + msgstr "dbRpmDBSetup() は Yum の将来のバージョンでなくなります。\n" + +-#: yum/__init__.py:441 ++#: yum/__init__.py:457 + msgid "Reading Local RPMDB" + msgstr "ローカルの RPMDB を読み込んでいます" + +-#: yum/__init__.py:459 ++#: yum/__init__.py:478 + msgid "doRepoSetup() will go away in a future version of Yum.\n" + msgstr "doRepoSetup() は Yum の将来のバージョンでなくなります。\n" + +-#: yum/__init__.py:479 ++#: yum/__init__.py:498 + msgid "doSackSetup() will go away in a future version of Yum.\n" + msgstr "doSackSetup() は Yum の将来のバージョンでなくなります。\n" + +-#: yum/__init__.py:496 ++#: yum/__init__.py:528 + msgid "Setting up Package Sacks" + msgstr "" + +-#: yum/__init__.py:539 ++#: yum/__init__.py:573 + #, python-format + msgid "repo object for repo %s lacks a _resetSack method\n" + msgstr "" + +-#: yum/__init__.py:540 ++#: yum/__init__.py:574 + msgid "therefore this repo cannot be reset.\n" +-msgstr "" ++msgstr "したがって、このリポジトリーはリセットできません。\n" + +-#: yum/__init__.py:545 ++#: yum/__init__.py:579 + msgid "doUpdateSetup() will go away in a future version of Yum.\n" + msgstr "doUpdateSetup() は Yum の将来のバージョンでなくなります。\n" + +-#: yum/__init__.py:557 ++#: yum/__init__.py:591 + msgid "Building updates object" + msgstr "オブジェクトの更新を構築しています" + +-#: yum/__init__.py:588 ++#: yum/__init__.py:626 + msgid "doGroupSetup() will go away in a future version of Yum.\n" + msgstr "doGroupSetup() は Yum の将来のバージョンでなくなります。\n" + +-#: yum/__init__.py:612 ++#: yum/__init__.py:651 + msgid "Getting group metadata" + msgstr "グループメタデータを取得しています" + +-#: yum/__init__.py:637 ++#: yum/__init__.py:677 + #, python-format + msgid "Adding group file from repository: %s" + msgstr "リポジトリーからグループファイルを追加しています: %s" + +-#: yum/__init__.py:642 ++#: yum/__init__.py:686 + #, python-format + msgid "Failed to add groups file for repository: %s - %s" + msgstr "リポジトリーのグループファイルに追加できませんでした: %s - %s" + +-#: yum/__init__.py:648 ++#: yum/__init__.py:692 + msgid "No Groups Available in any repository" + msgstr "いずれかのリポジトリーに利用できるグループはありません" + +-#: yum/__init__.py:698 ++#: yum/__init__.py:742 + msgid "Importing additional filelist information" + msgstr "追加ファイル一覧情報にインポートしています" + +-#: yum/__init__.py:706 ++#: yum/__init__.py:756 ++#, python-format ++msgid "The program %s%s%s is found in the yum-utils package." ++msgstr "プログラム %s%s%s を yum-utils パッケージ内で発見しました。" ++ ++#: yum/__init__.py:764 + msgid "" + "There are unfinished transactions remaining. You might consider running yum-" + "complete-transaction first to finish them." +-msgstr "終了していない残作業があります。それらを終了するためにはじめに yum-complete-transaction の実行を検討するかもしれません。" ++msgstr "" ++"終了していない残作業があります。それらを終了するためにはじめに yum-complete-" ++"transaction の実行を検討するかもしれません。" + +-#: yum/__init__.py:772 ++#: yum/__init__.py:832 + #, python-format + msgid "Skip-broken round %i" + msgstr "" + +-#: yum/__init__.py:824 ++#: yum/__init__.py:885 + #, python-format + msgid "Skip-broken took %i rounds " + msgstr "" + +-#: yum/__init__.py:825 ++#: yum/__init__.py:886 + msgid "" + "\n" + "Packages skipped because of dependency problems:" +@@ -1643,87 +1753,73 @@ msgstr "" + "\n" + "パッケージは依存関係に問題があるため、飛ばします:" + +-#: yum/__init__.py:829 ++#: yum/__init__.py:890 + #, python-format + msgid " %s from %s" + msgstr "" + +-#: yum/__init__.py:968 ++#: yum/__init__.py:1043 + msgid "" + "Warning: scriptlet or other non-fatal errors occurred during transaction." +-msgstr "警告: スクリプト、もしくはその他で処理の間に致命的ではないエラーが発生しました。" +- +-#: yum/__init__.py:983 +-#, python-format +-msgid "Failed to remove transaction file %s" +-msgstr "トランザクションファイル %s の削除に失敗しました" +- +-#: yum/__init__.py:1025 +-#, python-format +-msgid "excluding for cost: %s from %s" + msgstr "" +- +-#: yum/__init__.py:1056 +-msgid "Excluding Packages in global exclude list" +-msgstr "全体の除外一覧でパッケージを除外します" ++"警告: スクリプト、もしくはその他で処理の間に致命的ではないエラーが発生しまし" ++"た。" + + #: yum/__init__.py:1058 + #, python-format +-msgid "Excluding Packages from %s" +-msgstr "%s からパッケージを除外しています" +- +-#: yum/__init__.py:1085 +-#, python-format +-msgid "Reducing %s to included packages only" +-msgstr "" ++msgid "Failed to remove transaction file %s" ++msgstr "トランザクションファイル %s の削除に失敗しました" + +-#: yum/__init__.py:1091 ++#: yum/__init__.py:1087 + #, python-format +-msgid "Keeping included package %s" ++msgid "%s was supposed to be installed but is not!" + msgstr "" + +-#: yum/__init__.py:1097 ++#: yum/__init__.py:1126 + #, python-format +-msgid "Removing unmatched package %s" ++msgid "%s was supposed to be removed but is not!" + msgstr "" + +-#: yum/__init__.py:1100 +-msgid "Finished" +-msgstr "完了しました" +- +-#: yum/__init__.py:1130 ++#: yum/__init__.py:1241 + #, python-format + msgid "Unable to check if PID %s is active" +-msgstr "" ++msgstr "PID %s がアクティブかどうかの確認に失敗しました" + +-#: yum/__init__.py:1134 ++#: yum/__init__.py:1245 + #, python-format + msgid "Existing lock %s: another copy is running as pid %s." + msgstr "ロックファイル %s が存在します: PID %s として別に実行されています。" + +-#: yum/__init__.py:1204 ++#: yum/__init__.py:1280 ++#, python-format ++msgid "Could not create lock at %s: %s " ++msgstr "%s でロックを作成できません: %s" ++ ++#: yum/__init__.py:1325 + msgid "Package does not match intended download" + msgstr "パッケージは意図したダウンロードと一致しません" + +-#: yum/__init__.py:1219 ++#: yum/__init__.py:1340 + msgid "Could not perform checksum" + msgstr "チェックサムの実行ができません" + +-#: yum/__init__.py:1222 ++#: yum/__init__.py:1343 + msgid "Package does not match checksum" + msgstr "パッケージのチェックサムが一致しません" + +-#: yum/__init__.py:1265 ++#: yum/__init__.py:1385 + #, python-format + msgid "package fails checksum but caching is enabled for %s" +-msgstr "%s のためにキャッシュを有効にしていますが、パッケージのチェックサム演算に失敗します。" ++msgstr "" ++"%s のためにキャッシュを有効にしていますが、パッケージのチェックサム演算に失敗" ++"します。" + +-#: yum/__init__.py:1268 yum/__init__.py:1297 ++#: yum/__init__.py:1388 yum/__init__.py:1417 + #, python-format + msgid "using local copy of %s" + msgstr "%s のローカルコピーを使う" + +-#: yum/__init__.py:1309 ++#: yum/__init__.py:1429 + #, python-format + msgid "" + "Insufficient space in download directory %s\n" +@@ -1734,72 +1830,74 @@ msgstr "" + " * 空き容量 %s\n" + " * 必要容量 %s" + +-#: yum/__init__.py:1356 ++#: yum/__init__.py:1478 + msgid "Header is not complete." + msgstr "ヘッダーが完了していません。" + +-#: yum/__init__.py:1393 ++#: yum/__init__.py:1515 + #, python-format + msgid "" + "Header not in local cache and caching-only mode enabled. Cannot download %s" +-msgstr "ヘッダーはキャッシュのみのモードが有効で、ローカルにありません。%s のダウンロードができません" ++msgstr "" ++"ヘッダーはキャッシュのみのモードが有効で、ローカルにありません。%s のダウン" ++"ロードができません" + +-#: yum/__init__.py:1448 ++#: yum/__init__.py:1570 + #, python-format + msgid "Public key for %s is not installed" + msgstr "%s の公開鍵がインストールされていません" + +-#: yum/__init__.py:1452 ++#: yum/__init__.py:1574 + #, python-format + msgid "Problem opening package %s" + msgstr "パッケージ %s を開いている最中に問題です" + +-#: yum/__init__.py:1460 ++#: yum/__init__.py:1582 + #, python-format + msgid "Public key for %s is not trusted" + msgstr "%s の公開鍵が信頼されません" + +-#: yum/__init__.py:1464 ++#: yum/__init__.py:1586 + #, python-format + msgid "Package %s is not signed" + msgstr "パッケージ %s は署名されていません" + +-#: yum/__init__.py:1502 ++#: yum/__init__.py:1624 + #, python-format + msgid "Cannot remove %s" + msgstr "%s を削除できません" + +-#: yum/__init__.py:1505 ++#: yum/__init__.py:1628 + #, python-format + msgid "%s removed" + msgstr "%s を削除しました" + +-#: yum/__init__.py:1541 ++#: yum/__init__.py:1664 + #, python-format + msgid "Cannot remove %s file %s" + msgstr "%s のファイル %s を削除できませんでした" + +-#: yum/__init__.py:1544 ++#: yum/__init__.py:1668 + #, python-format + msgid "%s file %s removed" + msgstr "%s のファイル %s を削除しました" + +-#: yum/__init__.py:1546 ++#: yum/__init__.py:1670 + #, python-format + msgid "%d %s files removed" + msgstr "%d %sファイルを削除しました" + +-#: yum/__init__.py:1614 ++#: yum/__init__.py:1739 + #, python-format + msgid "More than one identical match in sack for %s" + msgstr "" + +-#: yum/__init__.py:1619 ++#: yum/__init__.py:1745 + #, python-format + msgid "Nothing matches %s.%s %s:%s-%s from update" + msgstr "更新から %s.%s %s:%s-%s に一致しません" + +-#: yum/__init__.py:1838 ++#: yum/__init__.py:1978 + msgid "" + "searchPackages() will go away in a future version of " + "Yum. Use searchGenerator() instead. \n" +@@ -1807,172 +1905,185 @@ msgstr "" + "searchPackages() は Yum の将来のバージョンでなくなりま" + "す。 代わりに searchGenerator() を使います。\n" + +-#: yum/__init__.py:1876 ++#: yum/__init__.py:2020 + #, python-format + msgid "Searching %d packages" + msgstr "%d 個のパッケージを検索しています" + +-#: yum/__init__.py:1879 ++#: yum/__init__.py:2024 + #, python-format + msgid "searching package %s" + msgstr "パッケージ %s を検索しています" + +-#: yum/__init__.py:1890 ++#: yum/__init__.py:2036 + msgid "searching in file entries" + msgstr "ファイルのエントリーから検索しています" + +-#: yum/__init__.py:1896 ++#: yum/__init__.py:2043 + msgid "searching in provides entries" + msgstr "提供されたエントリーを検索しています" + +-#: yum/__init__.py:1929 ++#: yum/__init__.py:2076 + #, python-format + msgid "Provides-match: %s" + msgstr "" + +-#: yum/__init__.py:1978 ++#: yum/__init__.py:2125 + msgid "No group data available for configured repositories" + msgstr "構成されたリポジトリーに利用できるグループはありません" + +-#: yum/__init__.py:2009 yum/__init__.py:2028 yum/__init__.py:2058 +-#: yum/__init__.py:2064 yum/__init__.py:2143 yum/__init__.py:2147 ++#: yum/__init__.py:2156 yum/__init__.py:2175 yum/__init__.py:2206 ++#: yum/__init__.py:2212 yum/__init__.py:2291 yum/__init__.py:2295 ++#: yum/__init__.py:2605 + #, python-format + msgid "No Group named %s exists" + msgstr "グループ名 %s が存在しません" + +-#: yum/__init__.py:2039 yum/__init__.py:2159 ++#: yum/__init__.py:2187 yum/__init__.py:2308 + #, python-format + msgid "package %s was not marked in group %s" + msgstr "パッケージ%s はグループ %s で設定されていません" + +-#: yum/__init__.py:2085 ++#: yum/__init__.py:2234 + #, python-format + msgid "Adding package %s from group %s" + msgstr "パッケージ %s をグループ %s から追加しています" + +-#: yum/__init__.py:2090 ++#: yum/__init__.py:2238 + #, python-format + msgid "No package named %s available to be installed" + msgstr "" + +-#: yum/__init__.py:2186 ++#: yum/__init__.py:2335 + #, python-format + msgid "Package tuple %s could not be found in packagesack" + msgstr "" + +-#: yum/__init__.py:2201 ++#: yum/__init__.py:2349 + msgid "" + "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n" + msgstr "" + +-#: yum/__init__.py:2253 yum/__init__.py:2294 ++#: yum/__init__.py:2405 yum/__init__.py:2455 + msgid "Invalid version flag" + msgstr "不正なバージョンフラグ" + +-#: yum/__init__.py:2268 yum/__init__.py:2272 ++#: yum/__init__.py:2425 yum/__init__.py:2430 + #, python-format + msgid "No Package found for %s" + msgstr "%s のパッケージが見つかりません" + +-#: yum/__init__.py:2449 ++#: yum/__init__.py:2646 + msgid "Package Object was not a package object instance" + msgstr "" ++"パッケージ オブジェクトはパッケージ オブジェクト インスタンスではありません" + +-#: yum/__init__.py:2453 ++#: yum/__init__.py:2650 + msgid "Nothing specified to install" + msgstr "インストールへの指定がありません" + +-#: yum/__init__.py:2469 ++#: yum/__init__.py:2666 yum/__init__.py:3430 + #, python-format + msgid "Checking for virtual provide or file-provide for %s" + msgstr "" + +-#: yum/__init__.py:2475 yum/__init__.py:2740 yum/__init__.py:2900 ++#: yum/__init__.py:2672 yum/__init__.py:2979 yum/__init__.py:3146 ++#: yum/__init__.py:3436 + #, python-format + msgid "No Match for argument: %s" + msgstr "引数に一致しません: %s" + +-#: yum/__init__.py:2548 ++#: yum/__init__.py:2748 + #, python-format + msgid "Package %s installed and not available" + msgstr "パッケージ %s はインストール済みか利用できません" + +-#: yum/__init__.py:2551 ++#: yum/__init__.py:2751 + msgid "No package(s) available to install" + msgstr "インストールに利用できるパッケージはありません" + +-#: yum/__init__.py:2564 ++#: yum/__init__.py:2763 + #, python-format + msgid "Package: %s - already in transaction set" + msgstr "パッケージ: %s - すでにトランザクション設定をしています" + +-#: yum/__init__.py:2580 ++#: yum/__init__.py:2789 ++#, python-format ++msgid "Package %s is obsoleted by %s which is already installed" ++msgstr "パッケージ %s は既にインストールされている %s で古くなっています" ++ ++#: yum/__init__.py:2792 + #, python-format + msgid "Package %s is obsoleted by %s, trying to install %s instead" + msgstr "" + "パッケージ %s は %s に不要です。代わりに %s のインストールを試みています" + +-#: yum/__init__.py:2588 ++#: yum/__init__.py:2800 + #, python-format + msgid "Package %s already installed and latest version" + msgstr "パッケージ %s はインストール済みか最新バージョンです" + +-#: yum/__init__.py:2595 ++#: yum/__init__.py:2814 + #, python-format + msgid "Package matching %s already installed. Checking for update." + msgstr "" + "一致したパッケージ %s はすでにインストールされています。更新を確認していま" + "す。" + +-#: yum/__init__.py:2675 ++#: yum/__init__.py:2908 + msgid "Updating Everything" + msgstr "すべて更新しています" + +-#: yum/__init__.py:2693 yum/__init__.py:2802 yum/__init__.py:2823 +-#: yum/__init__.py:2849 ++#: yum/__init__.py:2929 yum/__init__.py:3044 yum/__init__.py:3073 ++#: yum/__init__.py:3100 + #, python-format + msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" + msgstr "既に不要なパッケージの更新はありません: %s.%s %s:%s-%s" + +-#: yum/__init__.py:2728 yum/__init__.py:2897 ++#: yum/__init__.py:2964 yum/__init__.py:3143 + #, python-format + msgid "%s" + msgstr "%s" + +-#: yum/__init__.py:2793 ++#: yum/__init__.py:3035 + #, python-format + msgid "Package is already obsoleted: %s.%s %s:%s-%s" + msgstr "パッケージは既に不要です: %s.%s %s:%s-%s" + +-#: yum/__init__.py:2826 yum/__init__.py:2852 ++#: yum/__init__.py:3068 ++#, python-format ++msgid "Not Updating Package that is obsoleted: %s" ++msgstr "既に不要なパッケージの更新はありません: %s" ++ ++#: yum/__init__.py:3077 yum/__init__.py:3104 + #, python-format + msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" + msgstr "" + "既にアップデートされているのでパッケージをアップデートしません: %s.%s %s:%s-%" + "s" + +-#: yum/__init__.py:2913 ++#: yum/__init__.py:3159 + msgid "No package matched to remove" + msgstr "削除に一致するパッケージはありません" + +-#: yum/__init__.py:2947 ++#: yum/__init__.py:3192 yum/__init__.py:3296 yum/__init__.py:3385 + #, python-format + msgid "Cannot open file: %s. Skipping." + msgstr "ファイル %s が開けません。飛ばします。" + +-#: yum/__init__.py:2949 ++#: yum/__init__.py:3195 yum/__init__.py:3299 yum/__init__.py:3388 + #, python-format + msgid "Examining %s: %s" + msgstr "%s を調べています: %s" + +-#: yum/__init__.py:2957 ++#: yum/__init__.py:3203 yum/__init__.py:3302 yum/__init__.py:3391 + #, python-format + msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" + msgstr "" + "トランザクションにパッケージ %s を追加できません。アーキテクチャに互換性があ" + "りません: %s" + +-#: yum/__init__.py:2965 ++#: yum/__init__.py:3211 + #, python-format + msgid "" + "Package %s not installed, cannot update it. Run yum install to install it " +@@ -1981,77 +2092,92 @@ msgstr "" + "パッケージ %s はインストールされていないので更新できません。代わりに「yum " + "install」を実行してインストールしてください。" + +-#: yum/__init__.py:2998 ++#: yum/__init__.py:3246 yum/__init__.py:3313 yum/__init__.py:3402 + #, python-format + msgid "Excluding %s" + msgstr "%s の除外中" + +-#: yum/__init__.py:3002 ++#: yum/__init__.py:3251 + #, python-format + msgid "Marking %s to be installed" + msgstr "%s をインストール済みとして設定しています" + +-#: yum/__init__.py:3007 ++#: yum/__init__.py:3257 + #, python-format + msgid "Marking %s as an update to %s" + msgstr "次のリポジトリーへの更新として %s を設定します: %s" + +-#: yum/__init__.py:3012 ++#: yum/__init__.py:3264 + #, python-format + msgid "%s: does not update installed package." + msgstr "%s: インストールされたパッケージを更新しません。" + +-#: yum/__init__.py:3029 ++#: yum/__init__.py:3332 + msgid "Problem in reinstall: no package matched to remove" + msgstr "再インストール中に問題: 削除するパッケージがありません" + +-#: yum/__init__.py:3040 ++#: yum/__init__.py:3345 yum/__init__.py:3463 + #, python-format + msgid "Package %s is allowed multiple installs, skipping" + msgstr "パッケージ %s は複数インストールが許可されています。飛ばします" + +-#: yum/__init__.py:3050 +-msgid "Problem in reinstall: no package matched to install" +-msgstr "再インストール中に問題: インストールするパッケージがありません" ++#: yum/__init__.py:3366 ++#, python-format ++msgid "Problem in reinstall: no package %s matched to install" ++msgstr "再インストール中に問題: %s に一致したインストール用パッケージがありません" ++ ++#: yum/__init__.py:3455 ++msgid "No package(s) available to downgrade" ++msgstr "ダウングレードに利用できるパッケージはありません" + +-#: yum/__init__.py:3085 ++#: yum/__init__.py:3499 ++#, python-format ++msgid "No Match for available package: %s" ++msgstr "利用可能なパッケージが一致しません: %s" ++ ++#: yum/__init__.py:3505 ++#, python-format ++msgid "Only Upgrade available on package: %s" ++msgstr "アップグレードでのみ利用できるパッケージ: %s" ++ ++#: yum/__init__.py:3564 + #, python-format + msgid "Retrieving GPG key from %s" + msgstr "%s から GPG 鍵を取得しています" + +-#: yum/__init__.py:3105 ++#: yum/__init__.py:3584 + msgid "GPG key retrieval failed: " + msgstr "GPG 鍵の取得に失敗しました: " + +-#: yum/__init__.py:3116 ++#: yum/__init__.py:3595 + #, python-format + msgid "GPG key parsing failed: key does not have value %s" + msgstr "GPG 鍵の解析に失敗しました: 鍵は値 %s を持っていません" + +-#: yum/__init__.py:3148 ++#: yum/__init__.py:3627 + #, python-format + msgid "GPG key at %s (0x%s) is already installed" + msgstr "GPG 鍵 %s (0x%s) はすでにインストールしています" + +-#: yum/__init__.py:3153 yum/__init__.py:3214 ++#: yum/__init__.py:3632 yum/__init__.py:3694 + #, python-format + msgid "Importing GPG key 0x%s \"%s\" from %s" + msgstr "GPG 公開鍵 0x%s 「%s」を %s からインポートしています" + +-#: yum/__init__.py:3169 ++#: yum/__init__.py:3649 + msgid "Not installing key" + msgstr "インストールする鍵がありません" + +-#: yum/__init__.py:3175 ++#: yum/__init__.py:3655 + #, python-format + msgid "Key import failed (code %d)" + msgstr "鍵のインポートに失敗しました (コード: %d)" + +-#: yum/__init__.py:3176 yum/__init__.py:3236 ++#: yum/__init__.py:3656 yum/__init__.py:3715 + msgid "Key imported successfully" + msgstr "鍵のインポートに成功しました" + +-#: yum/__init__.py:3181 yum/__init__.py:3241 ++#: yum/__init__.py:3661 yum/__init__.py:3720 + #, python-format + msgid "" + "The GPG keys listed for the \"%s\" repository are already installed but they " +@@ -2059,93 +2185,93 @@ msgid "" + "Check that the correct key URLs are configured for this repository." + msgstr "" + +-#: yum/__init__.py:3190 ++#: yum/__init__.py:3670 + msgid "Import of key(s) didn't help, wrong key(s)?" + msgstr "" + +-#: yum/__init__.py:3209 ++#: yum/__init__.py:3689 + #, python-format + msgid "GPG key at %s (0x%s) is already imported" + msgstr "GPG 鍵 %s (0x%s) はすでにインポートしています" + +-#: yum/__init__.py:3228 ++#: yum/__init__.py:3709 + #, python-format + msgid "Not installing key for repo %s" + msgstr "リポジトリー %s の鍵がインストールされていません" + +-#: yum/__init__.py:3235 ++#: yum/__init__.py:3714 + msgid "Key import failed" + msgstr "鍵のインポートに失敗しました" + +-#: yum/__init__.py:3325 ++#: yum/__init__.py:3835 + msgid "Unable to find a suitable mirror." + msgstr "適当なミラーを見つけることができませんでした。" + +-#: yum/__init__.py:3327 ++#: yum/__init__.py:3837 + msgid "Errors were encountered while downloading packages." + msgstr "パッケージのダウンロード中にエラーに遭遇しました。" + +-#: yum/__init__.py:3367 ++#: yum/__init__.py:3887 + #, python-format + msgid "Please report this error at %s" + msgstr "%s にこのエラーを報告してください" + +-#: yum/__init__.py:3391 ++#: yum/__init__.py:3911 + msgid "Test Transaction Errors: " + msgstr "テストトランザクションでエラー: " + +-#: yum/plugins.py:204 ++#: yum/plugins.py:202 + msgid "Loaded plugins: " + msgstr "読み込んだプラグイン:" + +-#: yum/plugins.py:218 yum/plugins.py:224 ++#: yum/plugins.py:216 yum/plugins.py:222 + #, python-format + msgid "No plugin match for: %s" + msgstr "プラグインが一致しません: %s" + +-#: yum/plugins.py:254 ++#: yum/plugins.py:252 + #, python-format + msgid "Not loading \"%s\" plugin, as it is disabled" + msgstr "無効になっているため、プラグイン「%s」は読み込みません" + +-#: yum/plugins.py:266 ++#: yum/plugins.py:264 + #, python-format + msgid "Plugin \"%s\" can't be imported" + msgstr "プラグイン「%s」はインポートできませんでした" + +-#: yum/plugins.py:273 ++#: yum/plugins.py:271 + #, python-format + msgid "Plugin \"%s\" doesn't specify required API version" + msgstr "プラグイン「%s」は要求された API バージョンを明記していません" + +-#: yum/plugins.py:278 ++#: yum/plugins.py:276 + #, python-format + msgid "Plugin \"%s\" requires API %s. Supported API is %s." + msgstr "" + "プラグイン「%s」は API %s を要求しています。サポートした API は %s です。" + +-#: yum/plugins.py:311 ++#: yum/plugins.py:309 + #, python-format + msgid "Loading \"%s\" plugin" + msgstr "プラグイン「%s」を読み込んでいます" + +-#: yum/plugins.py:318 ++#: yum/plugins.py:316 + #, python-format + msgid "" + "Two or more plugins with the name \"%s\" exist in the plugin search path" + msgstr "" + +-#: yum/plugins.py:338 ++#: yum/plugins.py:336 + #, python-format + msgid "Configuration file %s not found" + msgstr "構成ファイル %s が見つかりません" + +-#: yum/plugins.py:341 ++#: yum/plugins.py:339 + #, python-format + msgid "Unable to find configuration file for plugin %s" + msgstr "プラグイン %s の構成ファイルの検索に失敗しました" + +-#: yum/plugins.py:495 ++#: yum/plugins.py:497 + msgid "registration of commands not supported" + msgstr "コマンドの登録をサポートしていません" + +@@ -2153,39 +2279,69 @@ msgstr "コマンドの登録をサポートしていません" + msgid "Repackaging" + msgstr "再パッケージをしています" + +-#: rpmUtils/oldUtils.py:26 ++#: rpmUtils/oldUtils.py:33 + #, python-format + msgid "Header cannot be opened or does not match %s, %s." + msgstr "%s (%s) が一致しないかヘッダーが開けません" + +-#: rpmUtils/oldUtils.py:46 ++#: rpmUtils/oldUtils.py:53 + #, python-format + msgid "RPM %s fails md5 check" + msgstr "RPM %s は MD5 検査に失敗しました" + +-#: rpmUtils/oldUtils.py:144 ++#: rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" + msgstr "" + "読み込みのために RPM データベースを開くことができません。おそらく既に使用して" + "いませんか?" + +-#: rpmUtils/oldUtils.py:174 ++#: rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" + msgstr "空のヘッダーを取得しました。何かがうまくいっていません" + +-#: rpmUtils/oldUtils.py:244 rpmUtils/oldUtils.py:251 rpmUtils/oldUtils.py:254 +-#: rpmUtils/oldUtils.py:257 ++#: rpmUtils/oldUtils.py:253 rpmUtils/oldUtils.py:260 rpmUtils/oldUtils.py:263 ++#: rpmUtils/oldUtils.py:266 + #, python-format + msgid "Damaged Header %s" + msgstr "ヘッダー %s は損傷があります" + +-#: rpmUtils/oldUtils.py:272 ++#: rpmUtils/oldUtils.py:281 + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "RPM %s へのアクセスでエラー - %s エラー" + ++#~ msgid "Matching packages for package list to user args" ++#~ msgstr "ユーザーの引数にパッケージ一覧のパッケージを一致させています" ++ ++#~ msgid "" ++#~ "\n" ++#~ "Transaction Summary\n" ++#~ "%s\n" ++#~ "Install %5.5s Package(s) \n" ++#~ "Update %5.5s Package(s) \n" ++#~ "Remove %5.5s Package(s) \n" ++#~ msgstr "" ++#~ "\n" ++#~ "トランザクションの要約\n" ++#~ "%s\n" ++#~ "インストール %5.5s パッケージ \n" ++#~ "更新 %5.5s パッケージ \n" ++#~ "削除 %5.5s パッケージ \n" ++ ++#~ msgid "Excluding Packages in global exclude list" ++#~ msgstr "全体の除外一覧でパッケージを除外します" ++ ++#~ msgid "Excluding Packages from %s" ++#~ msgstr "%s からパッケージを除外しています" ++ ++#~ msgid "Keeping included package %s" ++#~ msgstr "%s を含んで維持しています" ++ ++#~ msgid "Removing unmatched package %s" ++#~ msgstr "%s に一致しないものを削除しています" ++ ++#~ msgid "Finished" ++#~ msgstr "完了しました" ++ + #~ msgid "Parsing package install arguments" + #~ msgstr "パッケージインストールの引数を解析しています" +- +-#~ msgid "Could not find update match for %s" +-#~ msgstr "%s に一致する更新を見つけることができません" +diff --git a/po/pl.po b/po/pl.po +index ba98fc0..e159b2d 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -5,15 +5,15 @@ msgid "" + msgstr "" + "Project-Id-Version: pl\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-06-22 21:06+0200\n" +-"PO-Revision-Date: 2009-06-22 21:07+0200\n" ++"POT-Creation-Date: 2009-09-04 22:38+0200\n" ++"PO-Revision-Date: 2009-09-04 22:54+0200\n" + "Last-Translator: Piotr Drąg \n" +-"Language-Team: Polish \n" ++"Language-Team: Polish \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../callback.py:48 ../output.py:939 ../yum/rpmtrans.py:71 ++#: ../callback.py:48 ../output.py:938 ../yum/rpmtrans.py:71 + msgid "Updating" + msgstr "Aktualizowanie" + +@@ -21,7 +21,7 @@ msgstr "Aktualizowanie" + msgid "Erasing" + msgstr "Usuwanie" + +-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:938 ++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:937 + #: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 + msgid "Installing" + msgstr "Instalowanie" +@@ -30,7 +30,7 @@ msgstr "Instalowanie" + msgid "Obsoleted" + msgstr "Przestarzałe" + +-#: ../callback.py:54 ../output.py:1060 ++#: ../callback.py:54 ../output.py:1061 + msgid "Updated" + msgstr "Zaktualizowano" + +@@ -38,7 +38,7 @@ msgstr "Zaktualizowano" + msgid "Erased" + msgstr "Usunięto" + +-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1058 ++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1059 + msgid "Installed" + msgstr "Zainstalowano" + +@@ -60,7 +60,7 @@ msgstr "Błąd: nieprawidłowy stan wyjścia: %s dla %s" + msgid "Erased: %s" + msgstr "Usunięto: %s" + +-#: ../callback.py:217 ../output.py:940 ++#: ../callback.py:217 ../output.py:939 + msgid "Removing" + msgstr "Usuwanie" + +@@ -86,7 +86,7 @@ msgstr "Odczytywanie metadanych repozytoriów z lokalnych plików" + msgid "Config Error: %s" + msgstr "Błąd konfiguracji: %s" + +-#: ../cli.py:196 ../cli.py:1242 ../utils.py:90 ++#: ../cli.py:196 ../cli.py:1253 ../utils.py:90 + #, python-format + msgid "Options Error: %s" + msgstr "Błąd opcji: %s" +@@ -145,40 +145,48 @@ msgstr "Pobieranie pakietów:" + msgid "Error Downloading Packages:\n" + msgstr "Błąd podczas pobierania pakietów:\n" + +-#: ../cli.py:420 ../yum/__init__.py:3750 ++#: ../cli.py:420 ../yum/__init__.py:3854 + msgid "Running rpm_check_debug" + msgstr "Wykonywanie rpm_check_debug" + +-#: ../cli.py:423 ../yum/__init__.py:3753 ++#: ../cli.py:429 ../yum/__init__.py:3863 ++msgid "ERROR You need to update rpm to handle:" ++msgstr "BŁĄD należy zaktualizować pakiet RPM, aby obsłużyć:" ++ ++#: ../cli.py:431 ../yum/__init__.py:3866 + msgid "ERROR with rpm_check_debug vs depsolve:" + msgstr "BŁĄD rpm_check_debug i rozwiązywania zależności:" + +-#: ../cli.py:427 ++#: ../cli.py:437 ++msgid "RPM needs to be updated" ++msgstr "Pakiet RPM musi zostać zaktualizowany" ++ ++#: ../cli.py:438 + #, python-format + msgid "Please report this error in %s" + msgstr "Zgłoś ten błąd na %s" + +-#: ../cli.py:433 ++#: ../cli.py:444 + msgid "Running Transaction Test" + msgstr "Wykonywanie testu transakcji" + +-#: ../cli.py:449 ++#: ../cli.py:460 + msgid "Finished Transaction Test" + msgstr "Zakończono test transakcji" + +-#: ../cli.py:451 ++#: ../cli.py:462 + msgid "Transaction Check Error:\n" + msgstr "Błąd podczas sprawdzania transakcji:\n" + +-#: ../cli.py:458 ++#: ../cli.py:469 + msgid "Transaction Test Succeeded" + msgstr "Test transakcji został zakończony powodzeniem" + +-#: ../cli.py:480 ++#: ../cli.py:491 + msgid "Running Transaction" + msgstr "Wykonywanie transakcji" + +-#: ../cli.py:510 ++#: ../cli.py:521 + msgid "" + "Refusing to automatically import keys when running unattended.\n" + "Use \"-y\" to override." +@@ -187,189 +195,189 @@ msgstr "" + "uruchomienia.\n" + "Użyj \"-y\", aby wymusić." + +-#: ../cli.py:529 ../cli.py:563 ++#: ../cli.py:540 ../cli.py:574 + msgid " * Maybe you meant: " + msgstr " * Czy chodziło o: " + +-#: ../cli.py:546 ../cli.py:554 ++#: ../cli.py:557 ../cli.py:565 + #, python-format + msgid "Package(s) %s%s%s available, but not installed." + msgstr "Pakiety %s%s%s są dostępne, ale nie są zainstalowane." + +-#: ../cli.py:560 ../cli.py:591 ../cli.py:669 ++#: ../cli.py:571 ../cli.py:602 ../cli.py:680 + #, python-format + msgid "No package %s%s%s available." + msgstr "Nie ma pakietu %s%s%s." + +-#: ../cli.py:596 ../cli.py:729 ++#: ../cli.py:607 ../cli.py:740 + msgid "Package(s) to install" + msgstr "Pakiety do zainstalowania" + +-#: ../cli.py:597 ../cli.py:675 ../cli.py:708 ../cli.py:730 ++#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741 + #: ../yumcommands.py:157 + msgid "Nothing to do" + msgstr "Nie ma niczego do zrobienia" + +-#: ../cli.py:630 ++#: ../cli.py:641 + #, python-format + msgid "%d packages marked for Update" + msgstr "%d pakietów oznaczonych do aktualizacji" + +-#: ../cli.py:633 ++#: ../cli.py:644 + msgid "No Packages marked for Update" + msgstr "Brak pakietów oznaczonych do aktualizacji" + +-#: ../cli.py:647 ++#: ../cli.py:658 + #, python-format + msgid "%d packages marked for removal" + msgstr "%d pakietów oznaczonych do usunięcia" + +-#: ../cli.py:650 ++#: ../cli.py:661 + msgid "No Packages marked for removal" + msgstr "Brak pakietów oznaczonych do usunięcia" + +-#: ../cli.py:674 ++#: ../cli.py:685 + msgid "Package(s) to downgrade" + msgstr "Pakiety do instalacji starszej wersji" + +-#: ../cli.py:698 ++#: ../cli.py:709 + #, python-format + msgid " (from %s)" + msgstr " (z %s)" + +-#: ../cli.py:700 ++#: ../cli.py:711 + #, python-format + msgid "Installed package %s%s%s%s not available." + msgstr "Zainstalowany pakiet %s%s%s%s jest niedostępny." + +-#: ../cli.py:707 ++#: ../cli.py:718 + msgid "Package(s) to reinstall" + msgstr "Pakiety do ponownego zainstalowania" + +-#: ../cli.py:720 ++#: ../cli.py:731 + msgid "No Packages Provided" + msgstr "Nie podano pakietów" + +-#: ../cli.py:804 ++#: ../cli.py:815 + #, python-format + msgid "Warning: No matches found for: %s" + msgstr "Ostrzeżenie: nie znaleziono wyników dla: %s" + +-#: ../cli.py:807 ++#: ../cli.py:818 + msgid "No Matches found" + msgstr "Brak wyników" + +-#: ../cli.py:846 ++#: ../cli.py:857 + #, python-format + msgid "" + "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" + " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" + msgstr "" +-"Ostrzeżenie: wersje 3.0.x yuma błędnie dopasowują nazwy plików.\n" ++"Ostrzeżenie: wersje 3.0.x programu yum błędnie dopasowują nazwy plików.\n" + " Można użyć \"%s*/%s%s\" i/lub \"%s*bin/%s%s\", aby uzyskać to zachowanie" + +-#: ../cli.py:862 ++#: ../cli.py:873 + #, python-format + msgid "No Package Found for %s" + msgstr "Nie znaleziono pakietów dla %s" + +-#: ../cli.py:874 ++#: ../cli.py:885 + msgid "Cleaning up Everything" + msgstr "Czyszczenie wszystkiego" + +-#: ../cli.py:888 ++#: ../cli.py:899 + msgid "Cleaning up Headers" + msgstr "Czyszczenie nagłówków" + +-#: ../cli.py:891 ++#: ../cli.py:902 + msgid "Cleaning up Packages" + msgstr "Czyszczenie pakietów" + +-#: ../cli.py:894 ++#: ../cli.py:905 + msgid "Cleaning up xml metadata" + msgstr "Czytanie metadanych XML" + +-#: ../cli.py:897 ++#: ../cli.py:908 + msgid "Cleaning up database cache" + msgstr "Czyszczenie pamięci podręcznej bazy danych" + +-#: ../cli.py:900 ++#: ../cli.py:911 + msgid "Cleaning up expire-cache metadata" + msgstr "Czytanie metadanych wygasłej pamięci podręcznej" + +-#: ../cli.py:903 ++#: ../cli.py:914 + msgid "Cleaning up plugins" + msgstr "Czyszczenie wtyczek" + +-#: ../cli.py:928 ++#: ../cli.py:939 + msgid "Installed Groups:" + msgstr "Zainstalowane grupy:" + +-#: ../cli.py:940 ++#: ../cli.py:951 + msgid "Available Groups:" + msgstr "Dostępne grupy:" + +-#: ../cli.py:950 ++#: ../cli.py:961 + msgid "Done" + msgstr "Zakończono" + +-#: ../cli.py:961 ../cli.py:979 ../cli.py:985 ../yum/__init__.py:2513 ++#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2560 + #, python-format + msgid "Warning: Group %s does not exist." + msgstr "Ostrzeżenie: grupa %s nie istnieje." + +-#: ../cli.py:989 ++#: ../cli.py:1000 + msgid "No packages in any requested group available to install or update" + msgstr "" + "Brak pakietów dostępnych do instalacji lub aktualizacji w żadnej z żądanych " + "grup" + +-#: ../cli.py:991 ++#: ../cli.py:1002 + #, python-format + msgid "%d Package(s) to Install" + msgstr "%d pakietów do instalacji" + +-#: ../cli.py:1001 ../yum/__init__.py:2525 ++#: ../cli.py:1012 ../yum/__init__.py:2572 + #, python-format + msgid "No group named %s exists" + msgstr "Grupa o nazwie %s nie istnieje" + +-#: ../cli.py:1007 ++#: ../cli.py:1018 + msgid "No packages to remove from groups" + msgstr "Brak pakietów do usunięcia z grup" + +-#: ../cli.py:1009 ++#: ../cli.py:1020 + #, python-format + msgid "%d Package(s) to remove" + msgstr "%d pakietów do usunięcia" + +-#: ../cli.py:1051 ++#: ../cli.py:1062 + #, python-format + msgid "Package %s is already installed, skipping" + msgstr "Pakiet %s jest już zainstalowany, pomijanie" + +-#: ../cli.py:1062 ++#: ../cli.py:1073 + #, python-format + msgid "Discarding non-comparable pkg %s.%s" + msgstr "Odrzucanie pakietu %s.%s, którego nie można porównać" + + #. we've not got any installed that match n or n+a +-#: ../cli.py:1088 ++#: ../cli.py:1099 + #, python-format + msgid "No other %s installed, adding to list for potential install" + msgstr "" + "Inne %s nie są zainstalowane, dodawanie do listy potencjalnie instalowanych" + +-#: ../cli.py:1108 ++#: ../cli.py:1119 + msgid "Plugin Options" + msgstr "Opcje wtyczki" + +-#: ../cli.py:1116 ++#: ../cli.py:1127 + #, python-format + msgid "Command line error: %s" + msgstr "Błąd wiersza poleceń: %s" + +-#: ../cli.py:1129 ++#: ../cli.py:1140 + #, python-format + msgid "" + "\n" +@@ -380,103 +388,103 @@ msgstr "" + "\n" + "%s: opcja %s wymaga parametru" + +-#: ../cli.py:1182 ++#: ../cli.py:1193 + msgid "--color takes one of: auto, always, never" + msgstr "--color przyjmuje jedną z: auto, always, never" + +-#: ../cli.py:1289 ++#: ../cli.py:1300 + msgid "show this help message and exit" + msgstr "wyświetla ten komunikat pomocy i wyłącza" + +-#: ../cli.py:1293 ++#: ../cli.py:1304 + msgid "be tolerant of errors" + msgstr "toleruje błędy" + +-#: ../cli.py:1295 ++#: ../cli.py:1306 + msgid "run entirely from cache, don't update cache" + msgstr "uruchamia wyłącznie z pamięci podręcznej i nie aktualizuje jej" + +-#: ../cli.py:1297 ++#: ../cli.py:1308 + msgid "config file location" + msgstr "położenie pliku konfiguracji" + +-#: ../cli.py:1299 ++#: ../cli.py:1310 + msgid "maximum command wait time" + msgstr "maksymalny czas oczekiwania na polecenie" + +-#: ../cli.py:1301 ++#: ../cli.py:1312 + msgid "debugging output level" + msgstr "poziom wyjścia debugowania" + +-#: ../cli.py:1305 ++#: ../cli.py:1316 + msgid "show duplicates, in repos, in list/search commands" + msgstr "wyświetla duplikaty w repozytoriach w poleceniach list/search" + +-#: ../cli.py:1307 ++#: ../cli.py:1318 + msgid "error output level" + msgstr "poziom wyjścia błędów" + +-#: ../cli.py:1310 ++#: ../cli.py:1321 + msgid "quiet operation" + msgstr "mało komunikatów" + +-#: ../cli.py:1312 ++#: ../cli.py:1323 + msgid "verbose operation" + msgstr "dużo komunikatów" + +-#: ../cli.py:1314 ++#: ../cli.py:1325 + msgid "answer yes for all questions" + msgstr "odpowiada tak na wszystkie pytania" + +-#: ../cli.py:1316 ++#: ../cli.py:1327 + msgid "show Yum version and exit" +-msgstr "wyświetla wersję yuma i wyłącza" ++msgstr "wyświetla wersję programu yum i wyłącza" + +-#: ../cli.py:1317 ++#: ../cli.py:1328 + msgid "set install root" + msgstr "ustawia roota instalacji" + +-#: ../cli.py:1321 ++#: ../cli.py:1332 + msgid "enable one or more repositories (wildcards allowed)" + msgstr "włącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" + +-#: ../cli.py:1325 ++#: ../cli.py:1336 + msgid "disable one or more repositories (wildcards allowed)" + msgstr "wyłącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" + +-#: ../cli.py:1328 ++#: ../cli.py:1339 + msgid "exclude package(s) by name or glob" + msgstr "wyklucza pakiety po nazwie lub wyrażeniu regularnym" + +-#: ../cli.py:1330 ++#: ../cli.py:1341 + msgid "disable exclude from main, for a repo or for everything" + msgstr "wyłącza wykluczanie z głównego, dla repozytorium lub wszystkiego" + +-#: ../cli.py:1333 ++#: ../cli.py:1344 + msgid "enable obsoletes processing during updates" + msgstr "włącza przetwarzanie przestarzałych pakietów podczas aktualizacji" + +-#: ../cli.py:1335 ++#: ../cli.py:1346 + msgid "disable Yum plugins" +-msgstr "wyłącza wtyczki yuma" ++msgstr "wyłącza wtyczki programu yum" + +-#: ../cli.py:1337 ++#: ../cli.py:1348 + msgid "disable gpg signature checking" + msgstr "wyłącza sprawdzanie podpisu GPG" + +-#: ../cli.py:1339 ++#: ../cli.py:1350 + msgid "disable plugins by name" + msgstr "wyłącza wtyczki po nazwie" + +-#: ../cli.py:1342 ++#: ../cli.py:1353 + msgid "enable plugins by name" + msgstr "włącza wtyczki po nazwie" + +-#: ../cli.py:1345 ++#: ../cli.py:1356 + msgid "skip packages with depsolving problems" + msgstr "pomija pakiety mające problemy z rozwiązaniem zależności" + +-#: ../cli.py:1347 ++#: ../cli.py:1358 + msgid "control whether color is used" + msgstr "kontroluje użycie kolorów" + +@@ -599,7 +607,7 @@ msgstr "Podsumowanie : " + #: ../output.py:554 + #, python-format + msgid "URL : %s" +-msgstr "URL : %s" ++msgstr "Adres URL : %s" + + #: ../output.py:555 + #, python-format +@@ -699,7 +707,7 @@ msgstr "Opis : " + #: ../output.py:848 + #, python-format + msgid "URL : %s" +-msgstr "URL : %s" ++msgstr "Adres URL : %s" + + #: ../output.py:851 + #, python-format +@@ -729,51 +737,51 @@ msgstr "Całkowity rozmiar: %s" + msgid "Total download size: %s" + msgstr "Całkowity rozmiar pobierania: %s" + +-#: ../output.py:941 ++#: ../output.py:940 + msgid "Reinstalling" + msgstr "Ponowne instalowanie" + +-#: ../output.py:942 ++#: ../output.py:941 + msgid "Downgrading" + msgstr "Instalowanie starszej wersji" + +-#: ../output.py:943 ++#: ../output.py:942 + msgid "Installing for dependencies" + msgstr "Instalowanie, aby rozwiązać zależności" + +-#: ../output.py:944 ++#: ../output.py:943 + msgid "Updating for dependencies" + msgstr "Aktualizowanie, aby rozwiązać zależności" + +-#: ../output.py:945 ++#: ../output.py:944 + msgid "Removing for dependencies" + msgstr "Usuwanie, aby rozwiązać zależności" + +-#: ../output.py:952 ../output.py:1062 ++#: ../output.py:951 ../output.py:1063 + msgid "Skipped (dependency problems)" + msgstr "Pominięto (problemy z zależnościami)" + +-#: ../output.py:973 ++#: ../output.py:974 + msgid "Package" + msgstr "Pakiet" + +-#: ../output.py:973 ++#: ../output.py:974 + msgid "Arch" + msgstr "Architektura" + +-#: ../output.py:974 ++#: ../output.py:975 + msgid "Version" + msgstr "Wersja" + +-#: ../output.py:974 ++#: ../output.py:975 + msgid "Repository" + msgstr "Repozytorium" + +-#: ../output.py:975 ++#: ../output.py:976 + msgid "Size" + msgstr "Rozmiar" + +-#: ../output.py:987 ++#: ../output.py:988 + #, python-format + msgid "" + " replacing %s%s%s.%s %s\n" +@@ -782,7 +790,7 @@ msgstr "" + " zastępuje %s%s%s.%s %s\n" + "\n" + +-#: ../output.py:996 ++#: ../output.py:997 + #, python-format + msgid "" + "\n" +@@ -793,7 +801,7 @@ msgstr "" + "Podsumowanie transakcji\n" + "%s\n" + +-#: ../output.py:1003 ++#: ../output.py:1004 + #, python-format + msgid "" + "Install %5.5s Package(s)\n" +@@ -802,7 +810,7 @@ msgstr "" + "Instalacja %5.5s pakiet(y)\n" + "Aktualizacja %5.5s pakiet(y)\n" + +-#: ../output.py:1012 ++#: ../output.py:1013 + #, python-format + msgid "" + "Remove %5.5s Package(s)\n" +@@ -813,32 +821,32 @@ msgstr "" + "Ponowna instalacja %5.5s pakiet(y)\n" + "Instalacja starszej wersji %5.5s pakiet(y)\n" + +-#: ../output.py:1056 ++#: ../output.py:1057 + msgid "Removed" + msgstr "Usunięto" + +-#: ../output.py:1057 ++#: ../output.py:1058 + msgid "Dependency Removed" + msgstr "Usunięto zależność" + +-#: ../output.py:1059 ++#: ../output.py:1060 + msgid "Dependency Installed" + msgstr "Zainstalowano zależność" + +-#: ../output.py:1061 ++#: ../output.py:1062 + msgid "Dependency Updated" + msgstr "Zaktualizowano zależność" + +-#: ../output.py:1063 ++#: ../output.py:1064 + msgid "Replaced" + msgstr "Zastąpiono" + +-#: ../output.py:1064 ++#: ../output.py:1065 + msgid "Failed" + msgstr "Nie powiodło się" + + #. Delta between C-c's so we treat as exit +-#: ../output.py:1130 ++#: ../output.py:1131 + msgid "two" + msgstr "dwóch" + +@@ -846,7 +854,7 @@ msgstr "dwóch" + #. Current download cancelled, interrupt (ctrl-c) again within two seconds + #. to exit. + #. Where "interupt (ctrl-c) again" and "two" are highlighted. +-#: ../output.py:1141 ++#: ../output.py:1142 + #, python-format + msgid "" + "\n" +@@ -858,67 +866,67 @@ msgstr "" + " Obecne pobieranie zostało anulowane, %sprzerwij (ctrl-c) ponownie%s w ciągu " + "%s%s%s sekund, aby zakończyć.\n" + +-#: ../output.py:1152 ++#: ../output.py:1153 + msgid "user interrupt" + msgstr "przerwane przez użytkownika" + +-#: ../output.py:1168 ++#: ../output.py:1171 + msgid "Total" + msgstr "Razem" + +-#: ../output.py:1183 ++#: ../output.py:1186 + msgid "installed" + msgstr "zainstalowany" + +-#: ../output.py:1184 ++#: ../output.py:1187 + msgid "updated" + msgstr "zaktualizowany" + +-#: ../output.py:1185 ++#: ../output.py:1188 + msgid "obsoleted" + msgstr "zastąpiony" + +-#: ../output.py:1186 ++#: ../output.py:1189 + msgid "erased" + msgstr "usunięty" + +-#: ../output.py:1190 ++#: ../output.py:1193 + #, python-format + msgid "---> Package %s.%s %s:%s-%s set to be %s" + msgstr "---> Pakiet %s.%s %s:%s-%s zostanie %s" + +-#: ../output.py:1197 ++#: ../output.py:1200 + msgid "--> Running transaction check" + msgstr "--> Wykonywanie sprawdzania transakcji" + +-#: ../output.py:1202 ++#: ../output.py:1205 + msgid "--> Restarting Dependency Resolution with new changes." + msgstr "--> Ponowne uruchamianie rozwiązywania zależności z nowymi zmianami." + +-#: ../output.py:1207 ++#: ../output.py:1210 + msgid "--> Finished Dependency Resolution" + msgstr "--> Zakończono rozwiązywanie zależności" + +-#: ../output.py:1212 ../output.py:1217 ++#: ../output.py:1215 ../output.py:1220 + #, python-format + msgid "--> Processing Dependency: %s for package: %s" + msgstr "--> Przetwarzanie zależności: %s dla pakietu: %s" + +-#: ../output.py:1221 ++#: ../output.py:1224 + #, python-format + msgid "--> Unresolved Dependency: %s" + msgstr "--> Nierozwiązana zależność: %s" + +-#: ../output.py:1227 ../output.py:1232 ++#: ../output.py:1230 ../output.py:1235 + #, python-format + msgid "--> Processing Conflict: %s conflicts %s" + msgstr "--> Przetwarzanie konfliktów: %s jest w konflikcie z %s" + +-#: ../output.py:1236 ++#: ../output.py:1239 + msgid "--> Populating transaction set with selected packages. Please wait." + msgstr "--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać." + +-#: ../output.py:1240 ++#: ../output.py:1243 + #, python-format + msgid "---> Downloading header for %s to pack into transaction set." + msgstr "---> Pobieranie nagłówka dla %s do umieszczenia w zestawie transakcji." +@@ -952,8 +960,8 @@ msgstr "" + " rpm --import klucz.publiczny.gpg\n" + "\n" + "\n" +-"Można także podać URL klucza, którego chcesz używać dla repozytorium w\n" +-"opcji \"gpgkey\" w sekcji repozytorium, a yum go zainstaluje.\n" ++"Można także podać adres URL klucza, którego chcesz używać dla repozytorium\n" ++"w opcji \"gpgkey\" w sekcji repozytorium, a program yum go zainstaluje.\n" + "\n" + "Aby dowiedzieć się więcej, skontaktuj się z dostawcą dystrybucji lub\n" + "pakietu.\n" +@@ -1154,11 +1162,11 @@ msgstr "Wyszukiwanie pakietów dla zależności:" + + #: ../yumcommands.py:709 + msgid "Run an interactive yum shell" +-msgstr "Uruchom interaktywną powłokę yuma" ++msgstr "Uruchom interaktywną powłokę programu yum" + + #: ../yumcommands.py:715 + msgid "Setting up Yum Shell" +-msgstr "Ustawianie powłoki yuma" ++msgstr "Ustawianie powłoki programu yum" + + #: ../yumcommands.py:733 + msgid "List a package's dependencies" +@@ -1181,15 +1189,15 @@ msgid "disabled" + msgstr "wyłączone" + + #: ../yumcommands.py:827 +-msgid "Repo-id : " ++msgid "Repo-id : " + msgstr "Identyfikator repozytorium : " + + #: ../yumcommands.py:828 +-msgid "Repo-name : " ++msgid "Repo-name : " + msgstr "Nazwa repozytorium : " + + #: ../yumcommands.py:829 +-msgid "Repo-status : " ++msgid "Repo-status : " + msgstr "Stan repozytorium : " + + #: ../yumcommands.py:831 +@@ -1197,7 +1205,7 @@ msgid "Repo-revision: " + msgstr "Wersja repozytorium : " + + #: ../yumcommands.py:835 +-msgid "Repo-tags : " ++msgid "Repo-tags : " + msgstr "Znaczniki repozytorium : " + + #: ../yumcommands.py:841 +@@ -1205,20 +1213,20 @@ msgid "Repo-distro-tags: " + msgstr "Znaczniki dystrybucji repozytorium: " + + #: ../yumcommands.py:846 +-msgid "Repo-updated: " ++msgid "Repo-updated : " + msgstr "Aktualizacje repozytorium : " + + #: ../yumcommands.py:848 +-msgid "Repo-pkgs : " ++msgid "Repo-pkgs : " + msgstr "Pakiety repozytorium : " + + #: ../yumcommands.py:849 +-msgid "Repo-size : " ++msgid "Repo-size : " + msgstr "Rozmiar repozytorium : " + + #: ../yumcommands.py:856 +-msgid "Repo-baseurl: " +-msgstr "Podstawowy URL repozytorium : " ++msgid "Repo-baseurl : " ++msgstr "Podstawowy adres URL repozytorium : " + + #: ../yumcommands.py:864 + msgid "Repo-metalink: " +@@ -1229,41 +1237,64 @@ msgid " Updated : " + msgstr " Zaktualizowano : " + + #: ../yumcommands.py:871 +-msgid "Repo-mirrors: " ++msgid "Repo-mirrors : " + msgstr "Serwery lustrzane repozytorium : " + +-#: ../yumcommands.py:875 +-msgid "Repo-exclude: " ++#: ../yumcommands.py:875 ../yummain.py:133 ++msgid "Unknown" ++msgstr "Nieznane" ++ ++#: ../yumcommands.py:881 ++#, python-format ++msgid "Never (last: %s)" ++msgstr "Nigdy (ostatnio: %s)" ++ ++#: ../yumcommands.py:883 ++#, python-format ++msgid "Instant (last: %s)" ++msgstr "Natychmiast (ostatnio: %s)" ++ ++#: ../yumcommands.py:886 ++#, python-format ++msgid "%s second(s) (last: %s)" ++msgstr "%s sekundy (ostatnio: %s)" ++ ++#: ../yumcommands.py:888 ++msgid "Repo-expire : " ++msgstr "Wygaszenie repozytorium : " ++ ++#: ../yumcommands.py:891 ++msgid "Repo-exclude : " + msgstr "Wykluczenia z repozytorium : " + +-#: ../yumcommands.py:879 +-msgid "Repo-include: " ++#: ../yumcommands.py:895 ++msgid "Repo-include : " + msgstr "Dołączone z repozytorium : " + + #. Work out the first (id) and last (enabled/disalbed/count), + #. then chop the middle (name)... +-#: ../yumcommands.py:889 ../yumcommands.py:915 ++#: ../yumcommands.py:905 ../yumcommands.py:931 + msgid "repo id" + msgstr "ID repozytorium" + +-#: ../yumcommands.py:903 ../yumcommands.py:904 ../yumcommands.py:918 ++#: ../yumcommands.py:919 ../yumcommands.py:920 ../yumcommands.py:934 + msgid "status" + msgstr "stan" + +-#: ../yumcommands.py:916 ++#: ../yumcommands.py:932 + msgid "repo name" + msgstr "nazwa repozytorium" + +-#: ../yumcommands.py:942 ++#: ../yumcommands.py:958 + msgid "Display a helpful usage message" + msgstr "Wyświetl pomocny komunikat o używaniu" + +-#: ../yumcommands.py:976 ++#: ../yumcommands.py:992 + #, python-format + msgid "No help available for %s" + msgstr "Brak pomocy dla %s" + +-#: ../yumcommands.py:981 ++#: ../yumcommands.py:997 + msgid "" + "\n" + "\n" +@@ -1273,7 +1304,7 @@ msgstr "" + "\n" + "aliasy: " + +-#: ../yumcommands.py:983 ++#: ../yumcommands.py:999 + msgid "" + "\n" + "\n" +@@ -1283,31 +1314,31 @@ msgstr "" + "\n" + "alias: " + +-#: ../yumcommands.py:1011 ++#: ../yumcommands.py:1027 + msgid "Setting up Reinstall Process" + msgstr "Ustawianie procesu ponownej instalacji" + +-#: ../yumcommands.py:1019 ++#: ../yumcommands.py:1035 + msgid "reinstall a package" + msgstr "ponownie zainstaluj pakiet" + +-#: ../yumcommands.py:1037 ++#: ../yumcommands.py:1053 + msgid "Setting up Downgrade Process" + msgstr "Ustawianie procesu instalacji starszej wersji pakietu" + +-#: ../yumcommands.py:1044 ++#: ../yumcommands.py:1060 + msgid "downgrade a package" + msgstr "zainstaluj starszą wersję pakietu" + +-#: ../yumcommands.py:1058 ++#: ../yumcommands.py:1074 + msgid "Display a version for the machine and/or available repos." + msgstr "Wyświetl wersję dla komputera i/lub dostępnych repozytoriów." + +-#: ../yumcommands.py:1085 ++#: ../yumcommands.py:1101 + msgid "Installed:" + msgstr "Zainstalowano:" + +-#: ../yumcommands.py:1094 ++#: ../yumcommands.py:1110 + msgid "Available:" + msgstr "Dostępne:" + +@@ -1331,79 +1362,87 @@ msgstr "" + "\n" + "Zamykanie na przerwanym potoku" + +-#: ../yummain.py:126 ++#: ../yummain.py:50 ++#, python-format ++msgid "" ++"\n" ++"\n" ++"%s" ++msgstr "" ++"\n" ++"\n" ++"%s" ++ ++#: ../yummain.py:128 + msgid "Running" + msgstr "Wykonywanie" + +-#: ../yummain.py:127 ++#: ../yummain.py:129 + msgid "Sleeping" + msgstr "Zasypianie" + +-#: ../yummain.py:128 ++#: ../yummain.py:130 + msgid "Uninteruptable" + msgstr "Nie można przerywać" + +-#: ../yummain.py:129 ++#: ../yummain.py:131 + msgid "Zombie" + msgstr "Zombie" + +-#: ../yummain.py:130 ++#: ../yummain.py:132 + msgid "Traced/Stopped" + msgstr "Śledzone/zatrzymane" + +-#: ../yummain.py:131 +-msgid "Unknown" +-msgstr "Nienznane" +- +-#: ../yummain.py:135 ++#: ../yummain.py:137 + msgid " The other application is: PackageKit" + msgstr " Inna aplikacja to PackageKit" + +-#: ../yummain.py:137 ++#: ../yummain.py:139 + #, python-format + msgid " The other application is: %s" + msgstr " Inna aplikacja to: %s" + +-#: ../yummain.py:140 ++#: ../yummain.py:142 + #, python-format + msgid " Memory : %5s RSS (%5sB VSZ)" + msgstr " Pamięć: %5s RSS (%5sB VSZ)" + +-#: ../yummain.py:144 ++#: ../yummain.py:146 + #, python-format + msgid " Started: %s - %s ago" + msgstr " Uruchomiono: %s - %s temu" + +-#: ../yummain.py:146 ++#: ../yummain.py:148 + #, python-format + msgid " State : %s, pid: %d" + msgstr " Stan: %s, PID: %d" + +-#: ../yummain.py:171 ++#: ../yummain.py:173 + msgid "" + "Another app is currently holding the yum lock; waiting for it to exit..." +-msgstr "Inna aplikacja obecnie blokuje yuma. Oczekiwanie na jej zakończenie..." ++msgstr "" ++"Inna aplikacja obecnie blokuje program yum. Oczekiwanie na jej zakończenie..." + +-#: ../yummain.py:199 ../yummain.py:238 ++#: ../yummain.py:201 ../yummain.py:240 + #, python-format + msgid "Error: %s" + msgstr "Błąd: %s" + +-#: ../yummain.py:209 ../yummain.py:251 ++#: ../yummain.py:211 ../yummain.py:253 + #, python-format + msgid "Unknown Error(s): Exit Code: %d:" + msgstr "Nieznane błędy: kod wyjścia: %d:" + + #. Depsolve stage +-#: ../yummain.py:216 ++#: ../yummain.py:218 + msgid "Resolving Dependencies" + msgstr "Rozwiązywanie zależności" + +-#: ../yummain.py:240 ++#: ../yummain.py:242 + msgid " You could try using --skip-broken to work around the problem" + msgstr " Powinieneś spróbować użyć --skip-broken, aby obejść problem" + +-#: ../yummain.py:241 ++#: ../yummain.py:243 + msgid "" + " You could try running: package-cleanup --problems\n" + " package-cleanup --dupes\n" +@@ -1413,7 +1452,7 @@ msgstr "" + " package-cleanup --dupes\n" + " rpm -Va --nofiles --nodigest" + +-#: ../yummain.py:257 ++#: ../yummain.py:259 + msgid "" + "\n" + "Dependencies Resolved" +@@ -1421,11 +1460,11 @@ msgstr "" + "\n" + "Rozwiązano zależności" + +-#: ../yummain.py:271 ++#: ../yummain.py:273 + msgid "Complete!" + msgstr "Zakończono!" + +-#: ../yummain.py:318 ++#: ../yummain.py:320 + msgid "" + "\n" + "\n" +@@ -1437,7 +1476,7 @@ msgstr "" + + #: ../yum/depsolve.py:83 + msgid "doTsSetup() will go away in a future version of Yum.\n" +-msgstr "doTsSetup() zostanie usunięte w przyszłych wersjach yuma.\n" ++msgstr "doTsSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + + #: ../yum/depsolve.py:98 + msgid "Setting up TransactionSets before config class is up" +@@ -1468,7 +1507,7 @@ msgstr "%s pasuje jako wymaganie dla %s" + msgid "Member: %s" + msgstr "Członek: %s" + +-#: ../yum/depsolve.py:246 ../yum/depsolve.py:759 ++#: ../yum/depsolve.py:246 ../yum/depsolve.py:756 + #, python-format + msgid "%s converted to install" + msgstr "%s przekonwertowano do zainstalowania" +@@ -1562,7 +1601,7 @@ msgstr "" + msgid "Potential resolving package %s has newer instance installed." + msgstr "Pakiet %s potencjalnie rozwiązujący ma zainstalowaną nowszą wersję." + +-#: ../yum/depsolve.py:525 ../yum/depsolve.py:574 ++#: ../yum/depsolve.py:525 ../yum/depsolve.py:571 + #, python-format + msgid "Missing Dependency: %s is needed by package %s" + msgstr "Brakująca zależność: %s jest wymagane przez pakiet %s" +@@ -1572,63 +1611,63 @@ msgstr "Brakująca zależność: %s jest wymagane przez pakiet %s" + msgid "%s already in ts, skipping this one" + msgstr "%s jest już w zestawie transakcji, pomijanie" + +-#: ../yum/depsolve.py:584 ++#: ../yum/depsolve.py:581 + #, python-format + msgid "TSINFO: Marking %s as update for %s" + msgstr "TSINFO: oznaczanie %s jako aktualizacji dla %s" + +-#: ../yum/depsolve.py:592 ++#: ../yum/depsolve.py:589 + #, python-format + msgid "TSINFO: Marking %s as install for %s" + msgstr "TSINFO: oznaczanie %s jako do zainstalowania dla %s" + +-#: ../yum/depsolve.py:695 ../yum/depsolve.py:777 ++#: ../yum/depsolve.py:692 ../yum/depsolve.py:774 + msgid "Success - empty transaction" + msgstr "Powodzenie - pusta transakcja" + +-#: ../yum/depsolve.py:734 ../yum/depsolve.py:749 ++#: ../yum/depsolve.py:731 ../yum/depsolve.py:746 + msgid "Restarting Loop" + msgstr "Ponowne uruchamianie pętli" + +-#: ../yum/depsolve.py:765 ++#: ../yum/depsolve.py:762 + msgid "Dependency Process ending" + msgstr "Kończenie procesu zależności" + +-#: ../yum/depsolve.py:771 ++#: ../yum/depsolve.py:768 + #, python-format + msgid "%s from %s has depsolving problems" + msgstr "%s z %s ma problemy z rozwiązywaniem zależności" + +-#: ../yum/depsolve.py:778 ++#: ../yum/depsolve.py:775 + msgid "Success - deps resolved" + msgstr "Powodzenie - rozwiązano zależności" + +-#: ../yum/depsolve.py:792 ++#: ../yum/depsolve.py:789 + #, python-format + msgid "Checking deps for %s" + msgstr "Sprawdzanie zależności dla %s" + +-#: ../yum/depsolve.py:875 ++#: ../yum/depsolve.py:872 + #, python-format + msgid "looking for %s as a requirement of %s" + msgstr "wyszukiwanie %s jako wymagania %s" + +-#: ../yum/depsolve.py:1017 ++#: ../yum/depsolve.py:1014 + #, python-format + msgid "Running compare_providers() for %s" + msgstr "Wykonywanie compare_providers() dla %s" + +-#: ../yum/depsolve.py:1051 ../yum/depsolve.py:1057 ++#: ../yum/depsolve.py:1048 ../yum/depsolve.py:1054 + #, python-format + msgid "better arch in po %s" + msgstr "lepsze arch w po %s" + +-#: ../yum/depsolve.py:1132 ++#: ../yum/depsolve.py:1140 + #, python-format + msgid "%s obsoletes %s" + msgstr "%s zastępuje %s" + +-#: ../yum/depsolve.py:1144 ++#: ../yum/depsolve.py:1152 + #, python-format + msgid "" + "archdist compared %s to %s on %s\n" +@@ -1637,103 +1676,105 @@ msgstr "" + "archdist porównało %s do %s na %s\n" + " Zwycięzca: %s" + +-#: ../yum/depsolve.py:1151 ++#: ../yum/depsolve.py:1159 + #, python-format + msgid "common sourcerpm %s and %s" + msgstr "wspólny źródłowy pakiet RPM %s i %s" + +-#: ../yum/depsolve.py:1157 ++#: ../yum/depsolve.py:1165 + #, python-format + msgid "common prefix of %s between %s and %s" + msgstr "wspólny przedrostek %s dla %s i %s" + +-#: ../yum/depsolve.py:1165 ++#: ../yum/depsolve.py:1173 + #, python-format + msgid "Best Order: %s" + msgstr "Najlepszy porządek: %s" + +-#: ../yum/__init__.py:159 ++#: ../yum/__init__.py:180 + msgid "doConfigSetup() will go away in a future version of Yum.\n" +-msgstr "doConfigSetup() zostanie usunięte w przyszłych wersjach yuma.\n" ++msgstr "" ++"doConfigSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + +-#: ../yum/__init__.py:380 ++#: ../yum/__init__.py:401 + #, python-format + msgid "Repository %r is missing name in configuration, using id" + msgstr "Repozytorium %r nie posiada nazwy w konfiguracji, używanie ID" + +-#: ../yum/__init__.py:418 ++#: ../yum/__init__.py:439 + msgid "plugins already initialised" + msgstr "wtyczki zostały już zainicjowane" + +-#: ../yum/__init__.py:425 ++#: ../yum/__init__.py:446 + msgid "doRpmDBSetup() will go away in a future version of Yum.\n" +-msgstr "doRpmDBSetup() zostanie usunięte w przyszłych wersjach yuma.\n" ++msgstr "doRpmDBSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + +-#: ../yum/__init__.py:436 ++#: ../yum/__init__.py:457 + msgid "Reading Local RPMDB" + msgstr "Odczytywanie lokalnej bazy danych RPM" + +-#: ../yum/__init__.py:457 ++#: ../yum/__init__.py:478 + msgid "doRepoSetup() will go away in a future version of Yum.\n" +-msgstr "doRepoSetup() zostanie usunięte w przyszłych wersjach yuma.\n" ++msgstr "doRepoSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + +-#: ../yum/__init__.py:477 ++#: ../yum/__init__.py:498 + msgid "doSackSetup() will go away in a future version of Yum.\n" +-msgstr "doSackSetup() zostanie usunięte w przyszłych wersjach yuma.\n" ++msgstr "doSackSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + +-#: ../yum/__init__.py:494 ++#: ../yum/__init__.py:528 + msgid "Setting up Package Sacks" + msgstr "Ustawianie zestawów pakietów" + +-#: ../yum/__init__.py:537 ++#: ../yum/__init__.py:573 + #, python-format + msgid "repo object for repo %s lacks a _resetSack method\n" + msgstr "obiekt repozytorium %s nie posiada metody _resetSack\n" + +-#: ../yum/__init__.py:538 ++#: ../yum/__init__.py:574 + msgid "therefore this repo cannot be reset.\n" + msgstr "więc to repozytorium nie może zostać przywrócone.\n" + +-#: ../yum/__init__.py:543 ++#: ../yum/__init__.py:579 + msgid "doUpdateSetup() will go away in a future version of Yum.\n" +-msgstr "doUpdateSetup() zostanie usunięte w przyszłych wersjach yuma.\n" ++msgstr "" ++"doUpdateSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + +-#: ../yum/__init__.py:555 ++#: ../yum/__init__.py:591 + msgid "Building updates object" + msgstr "Budowanie obiektu aktualizacji" + +-#: ../yum/__init__.py:590 ++#: ../yum/__init__.py:626 + msgid "doGroupSetup() will go away in a future version of Yum.\n" +-msgstr "doGroupSetup() zostanie usunięte w przyszłych wersjach yuma.\n" ++msgstr "doGroupSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + +-#: ../yum/__init__.py:615 ++#: ../yum/__init__.py:651 + msgid "Getting group metadata" + msgstr "Pobieranie metadanych grup" + +-#: ../yum/__init__.py:641 ++#: ../yum/__init__.py:677 + #, python-format + msgid "Adding group file from repository: %s" + msgstr "Dodawanie pliku grup z repozytorium: %s" + +-#: ../yum/__init__.py:650 ++#: ../yum/__init__.py:686 + #, python-format + msgid "Failed to add groups file for repository: %s - %s" + msgstr "Dodanie pliku grup dla repozytorium nie powiodło się: %s - %s" + +-#: ../yum/__init__.py:656 ++#: ../yum/__init__.py:692 + msgid "No Groups Available in any repository" + msgstr "Brak dostępnych grup we wszystkich repozytoriach" + +-#: ../yum/__init__.py:706 ++#: ../yum/__init__.py:742 + msgid "Importing additional filelist information" + msgstr "Importowanie dodatkowych informacji o liście plików" + +-#: ../yum/__init__.py:720 ++#: ../yum/__init__.py:756 + #, python-format + msgid "The program %s%s%s is found in the yum-utils package." + msgstr "Program %s%s%s można znaleźć w pakiecie yum-utils." + +-#: ../yum/__init__.py:728 ++#: ../yum/__init__.py:764 + msgid "" + "There are unfinished transactions remaining. You might consider running yum-" + "complete-transaction first to finish them." +@@ -1741,17 +1782,17 @@ msgstr "" + "Pozostały niezakończone transakcje. Rozważ wykonanie yum-complete-" + "transaction, aby najpierw je zakończyć." + +-#: ../yum/__init__.py:796 ++#: ../yum/__init__.py:832 + #, python-format + msgid "Skip-broken round %i" + msgstr "Pierwsza runda pomijania uszkodzonych %i" + +-#: ../yum/__init__.py:848 ++#: ../yum/__init__.py:884 + #, python-format + msgid "Skip-broken took %i rounds " + msgstr "Pomijanie uszkodzonych zajęło %i rund " + +-#: ../yum/__init__.py:849 ++#: ../yum/__init__.py:885 + msgid "" + "\n" + "Packages skipped because of dependency problems:" +@@ -1759,78 +1800,73 @@ msgstr "" + "\n" + "Pakiety pominięto z powodu problemów z zależnościami:" + +-#: ../yum/__init__.py:853 ++#: ../yum/__init__.py:889 + #, python-format + msgid " %s from %s" + msgstr " %s z %s" + +-#: ../yum/__init__.py:991 ++#: ../yum/__init__.py:1027 + msgid "" + "Warning: scriptlet or other non-fatal errors occurred during transaction." + msgstr "" + "Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie fatalne błędy." + +-#: ../yum/__init__.py:1006 ++#: ../yum/__init__.py:1042 + #, python-format + msgid "Failed to remove transaction file %s" + msgstr "Usunięcie pliku transakcji %s nie powiodło się" + + #. maybe a file log here, too + #. but raising an exception is not going to do any good +-#: ../yum/__init__.py:1035 ++#: ../yum/__init__.py:1071 + #, python-format + msgid "%s was supposed to be installed but is not!" + msgstr "%s miało zostać zainstalowane, ale nie zostało!" + + #. maybe a file log here, too + #. but raising an exception is not going to do any good +-#: ../yum/__init__.py:1074 ++#: ../yum/__init__.py:1110 + #, python-format + msgid "%s was supposed to be removed but is not!" + msgstr "%s miało zostać usunięte, ale nie zostało!" + +-#: ../yum/__init__.py:1120 +-#, python-format +-msgid "excluding for cost: %s from %s" +-msgstr "wykluczanie z kosztów: %s z %s" +- + #. Whoa. What the heck happened? +-#: ../yum/__init__.py:1191 ++#: ../yum/__init__.py:1225 + #, python-format + msgid "Unable to check if PID %s is active" + msgstr "Nie można sprawdzić, czy PID %s jest aktywny" + + #. Another copy seems to be running. +-#: ../yum/__init__.py:1195 ++#: ../yum/__init__.py:1229 + #, python-format + msgid "Existing lock %s: another copy is running as pid %s." + msgstr "Istnieje blokada %s: inna kopia jest uruchomiona jako PID %s." + +-#: ../yum/__init__.py:1272 ++#: ../yum/__init__.py:1306 + msgid "Package does not match intended download" + msgstr "Pakiet nie zgadza się z zamierzonym pobieraniem" + +-#: ../yum/__init__.py:1287 ++#: ../yum/__init__.py:1321 + msgid "Could not perform checksum" + msgstr "Nie można wykonać sprawdzenia sum kontrolnych" + +-#: ../yum/__init__.py:1290 ++#: ../yum/__init__.py:1324 + msgid "Package does not match checksum" + msgstr "Sumy kontrolne pakietu nie zgadzają się" + +-#: ../yum/__init__.py:1332 ++#: ../yum/__init__.py:1366 + #, python-format + msgid "package fails checksum but caching is enabled for %s" + msgstr "" + "sprawdzenie sum kontrolnych pakietu nie powiodło się, ale zapisywanie w " + "pamięci podręcznej dla %s jest włączone" + +-#: ../yum/__init__.py:1335 ../yum/__init__.py:1364 ++#: ../yum/__init__.py:1369 ../yum/__init__.py:1398 + #, python-format + msgid "using local copy of %s" + msgstr "używanie lokalnej kopii %s" + +-#: ../yum/__init__.py:1376 ++#: ../yum/__init__.py:1410 + #, python-format + msgid "" + "Insufficient space in download directory %s\n" +@@ -1841,11 +1877,11 @@ msgstr "" + " * wolne %s\n" + " * wymagane %s" + +-#: ../yum/__init__.py:1425 ++#: ../yum/__init__.py:1459 + msgid "Header is not complete." + msgstr "Nagłówek nie jest kompletny." + +-#: ../yum/__init__.py:1462 ++#: ../yum/__init__.py:1496 + #, python-format + msgid "" + "Header not in local cache and caching-only mode enabled. Cannot download %s" +@@ -1853,62 +1889,62 @@ msgstr "" + "Nagłówek nie jest w lokalnej pamięci podręcznej, a tryb używania tylko " + "pamięci podręcznej jest włączony. Nie można pobrać %s" + +-#: ../yum/__init__.py:1517 ++#: ../yum/__init__.py:1551 + #, python-format + msgid "Public key for %s is not installed" + msgstr "Klucz publiczny dla %s nie jest zainstalowany" + +-#: ../yum/__init__.py:1521 ++#: ../yum/__init__.py:1555 + #, python-format + msgid "Problem opening package %s" + msgstr "Podczas otwierania pakietu %s wystąpił problem" + +-#: ../yum/__init__.py:1529 ++#: ../yum/__init__.py:1563 + #, python-format + msgid "Public key for %s is not trusted" + msgstr "Klucz publiczny dla %s nie jest zaufany" + +-#: ../yum/__init__.py:1533 ++#: ../yum/__init__.py:1567 + #, python-format + msgid "Package %s is not signed" + msgstr "Pakiet %s nie jest podpisany" + +-#: ../yum/__init__.py:1571 ++#: ../yum/__init__.py:1605 + #, python-format + msgid "Cannot remove %s" + msgstr "Nie można usunąć %s" + +-#: ../yum/__init__.py:1575 ++#: ../yum/__init__.py:1609 + #, python-format + msgid "%s removed" + msgstr "Usunięto %s" + +-#: ../yum/__init__.py:1611 ++#: ../yum/__init__.py:1645 + #, python-format + msgid "Cannot remove %s file %s" + msgstr "Nie można usunąć %s pliku %s" + +-#: ../yum/__init__.py:1615 ++#: ../yum/__init__.py:1649 + #, python-format + msgid "%s file %s removed" + msgstr "Usunięto %s plik %s" + +-#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1651 + #, python-format + msgid "%d %s files removed" + msgstr "Usunięto %d %s plików" + +-#: ../yum/__init__.py:1686 ++#: ../yum/__init__.py:1720 + #, python-format + msgid "More than one identical match in sack for %s" + msgstr "Więcej niż jeden identyczny wynik znajduje się w zestawie dla %s" + +-#: ../yum/__init__.py:1692 ++#: ../yum/__init__.py:1726 + #, python-format + msgid "Nothing matches %s.%s %s:%s-%s from update" + msgstr "Nic nie pasuje do %s.%s %s:%s-%s z aktualizacji" + +-#: ../yum/__init__.py:1925 ++#: ../yum/__init__.py:1959 + msgid "" + "searchPackages() will go away in a future version of " + "Yum. Use searchGenerator() instead. \n" +@@ -1916,172 +1952,182 @@ msgstr "" + "searchPackages() zostanie usunięte w przyszłych wersjach " + "yuma. Zamiast tego użyj searchGenerator(). \n" + +-#: ../yum/__init__.py:1967 ++#: ../yum/__init__.py:2001 + #, python-format + msgid "Searching %d packages" + msgstr "Wyszukiwanie %d pakietów" + +-#: ../yum/__init__.py:1971 ++#: ../yum/__init__.py:2005 + #, python-format + msgid "searching package %s" + msgstr "wyszukiwanie pakietu %s" + +-#: ../yum/__init__.py:1983 ++#: ../yum/__init__.py:2017 + msgid "searching in file entries" + msgstr "wyszukiwanie we wpisach plików" + +-#: ../yum/__init__.py:1990 ++#: ../yum/__init__.py:2024 + msgid "searching in provides entries" + msgstr "wyszukiwanie we wpisach dostarczania" + +-#: ../yum/__init__.py:2023 ++#: ../yum/__init__.py:2057 + #, python-format + msgid "Provides-match: %s" + msgstr "Wyniki dostarczania: %s" + +-#: ../yum/__init__.py:2072 ++#: ../yum/__init__.py:2106 + msgid "No group data available for configured repositories" + msgstr "Brak dostępnych danych grup dla skonfigurowanych repozytoriów" + +-#: ../yum/__init__.py:2103 ../yum/__init__.py:2122 ../yum/__init__.py:2153 +-#: ../yum/__init__.py:2159 ../yum/__init__.py:2238 ../yum/__init__.py:2242 +-#: ../yum/__init__.py:2539 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2156 ../yum/__init__.py:2187 ++#: ../yum/__init__.py:2193 ../yum/__init__.py:2272 ../yum/__init__.py:2276 ++#: ../yum/__init__.py:2586 + #, python-format + msgid "No Group named %s exists" + msgstr "Grupa o nazwie %s nie istnieje" + +-#: ../yum/__init__.py:2134 ../yum/__init__.py:2255 ++#: ../yum/__init__.py:2168 ../yum/__init__.py:2289 + #, python-format + msgid "package %s was not marked in group %s" + msgstr "pakiet %s nie został oznaczony w grupie %s" + +-#: ../yum/__init__.py:2181 ++#: ../yum/__init__.py:2215 + #, python-format + msgid "Adding package %s from group %s" + msgstr "Dodawanie pakietu %s z grupy %s" + +-#: ../yum/__init__.py:2185 ++#: ../yum/__init__.py:2219 + #, python-format + msgid "No package named %s available to be installed" + msgstr "Brak dostępnego pakietu o nazwie %s do zainstalowania" + +-#: ../yum/__init__.py:2282 ++#: ../yum/__init__.py:2316 + #, python-format + msgid "Package tuple %s could not be found in packagesack" + msgstr "Nie można znaleźć krotki pakietu %s w zestawie pakietów" + +-#: ../yum/__init__.py:2296 ++#: ../yum/__init__.py:2330 + msgid "" + "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n" + msgstr "" + "getInstalledPackageObject() zostanie usunięte, użyj self.rpmdb.searchPkgTuple" + "().\n" + +-#: ../yum/__init__.py:2352 ../yum/__init__.py:2397 ++#: ../yum/__init__.py:2386 ../yum/__init__.py:2436 + msgid "Invalid version flag" + msgstr "Nieprawidłowa flaga wersji" + +-#: ../yum/__init__.py:2367 ../yum/__init__.py:2372 ++#: ../yum/__init__.py:2406 ../yum/__init__.py:2411 + #, python-format + msgid "No Package found for %s" + msgstr "Nie znaleziono pakietu %s" + +-#: ../yum/__init__.py:2572 ++#: ../yum/__init__.py:2627 + msgid "Package Object was not a package object instance" + msgstr "Obiekt pakietu nie był instancją obiektu pakietu" + +-#: ../yum/__init__.py:2576 ++#: ../yum/__init__.py:2631 + msgid "Nothing specified to install" + msgstr "Nie podano nic do zainstalowania" + +-#: ../yum/__init__.py:2592 ../yum/__init__.py:3307 ++#: ../yum/__init__.py:2647 ../yum/__init__.py:3411 + #, python-format + msgid "Checking for virtual provide or file-provide for %s" + msgstr "Sprawdzanie wirtualnych zależności lub plików dla %s" + +-#: ../yum/__init__.py:2598 ../yum/__init__.py:2874 ../yum/__init__.py:3037 +-#: ../yum/__init__.py:3313 ++#: ../yum/__init__.py:2653 ../yum/__init__.py:2960 ../yum/__init__.py:3127 ++#: ../yum/__init__.py:3417 + #, python-format + msgid "No Match for argument: %s" + msgstr "Brak wyników dla parametru: %s" + +-#: ../yum/__init__.py:2672 ++#: ../yum/__init__.py:2729 + #, python-format + msgid "Package %s installed and not available" + msgstr "Pakiet %s jest zainstalowany, ale nie jest dostępny" + +-#: ../yum/__init__.py:2675 ++#: ../yum/__init__.py:2732 + msgid "No package(s) available to install" + msgstr "Brak pakietów dostępnych do instalacji" + +-#: ../yum/__init__.py:2687 ++#: ../yum/__init__.py:2744 + #, python-format + msgid "Package: %s - already in transaction set" + msgstr "Pakiet: %s - jest już w zestawie transakcji" + +-#: ../yum/__init__.py:2702 ++#: ../yum/__init__.py:2770 ++#, python-format ++msgid "Package %s is obsoleted by %s which is already installed" ++msgstr "Pakiet %s został zastąpiony przez %s, który jest już zainstalowany" ++ ++#: ../yum/__init__.py:2773 + #, python-format + msgid "Package %s is obsoleted by %s, trying to install %s instead" + msgstr "" + "Pakiet %s został zastąpiony przez %s, próbowanie instalacji %s zamiast niego" + +-#: ../yum/__init__.py:2710 ++#: ../yum/__init__.py:2781 + #, python-format + msgid "Package %s already installed and latest version" + msgstr "Pakiet %s jest już zainstalowany w najnowszej wersji" + +-#: ../yum/__init__.py:2724 ++#: ../yum/__init__.py:2795 + #, python-format + msgid "Package matching %s already installed. Checking for update." + msgstr "" + "Pakiet pasujący do %s jest już zainstalowany. Sprawdzanie aktualizacji." + + #. update everything (the easy case) +-#: ../yum/__init__.py:2810 ++#: ../yum/__init__.py:2889 + msgid "Updating Everything" + msgstr "Aktualizowanie wszystkiego" + +-#: ../yum/__init__.py:2828 ../yum/__init__.py:2939 ../yum/__init__.py:2960 +-#: ../yum/__init__.py:2986 ++#: ../yum/__init__.py:2910 ../yum/__init__.py:3025 ../yum/__init__.py:3054 ++#: ../yum/__init__.py:3081 + #, python-format + msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" + msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s" + +-#: ../yum/__init__.py:2863 ../yum/__init__.py:3034 ++#: ../yum/__init__.py:2945 ../yum/__init__.py:3124 + #, python-format + msgid "%s" + msgstr "%s" + +-#: ../yum/__init__.py:2930 ++#: ../yum/__init__.py:3016 + #, python-format + msgid "Package is already obsoleted: %s.%s %s:%s-%s" + msgstr "Pakiet został już zastąpiony: %s.%s %s:%s-%s" + +-#: ../yum/__init__.py:2963 ../yum/__init__.py:2989 ++#: ../yum/__init__.py:3049 ++#, python-format ++msgid "Not Updating Package that is obsoleted: %s" ++msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s" ++ ++#: ../yum/__init__.py:3058 ../yum/__init__.py:3085 + #, python-format + msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" + msgstr "Już zaktualizowany pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s" + +-#: ../yum/__init__.py:3050 ++#: ../yum/__init__.py:3140 + msgid "No package matched to remove" + msgstr "Brak pasujących pakietów do usunięcia" + +-#: ../yum/__init__.py:3084 ../yum/__init__.py:3175 ../yum/__init__.py:3262 ++#: ../yum/__init__.py:3173 ../yum/__init__.py:3277 ../yum/__init__.py:3366 + #, python-format + msgid "Cannot open file: %s. Skipping." + msgstr "Nie można otworzyć pliku: %s. Pomijanie." + +-#: ../yum/__init__.py:3087 ../yum/__init__.py:3178 ../yum/__init__.py:3265 ++#: ../yum/__init__.py:3176 ../yum/__init__.py:3280 ../yum/__init__.py:3369 + #, python-format + msgid "Examining %s: %s" + msgstr "Sprawdzanie %s: %s" + +-#: ../yum/__init__.py:3095 ../yum/__init__.py:3181 ../yum/__init__.py:3268 ++#: ../yum/__init__.py:3184 ../yum/__init__.py:3283 ../yum/__init__.py:3372 + #, python-format + msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" + msgstr "Nie można dodać pakietu %s do transakcji. Niezgodna architektura: %s" + +-#: ../yum/__init__.py:3103 ++#: ../yum/__init__.py:3192 + #, python-format + msgid "" + "Package %s not installed, cannot update it. Run yum install to install it " +@@ -2090,98 +2136,98 @@ msgstr "" + "Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Uruchom yum " + "install, aby go zainstalować." + +-#: ../yum/__init__.py:3138 ../yum/__init__.py:3192 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3227 ../yum/__init__.py:3294 ../yum/__init__.py:3383 + #, python-format + msgid "Excluding %s" + msgstr "Wykluczanie %s" + +-#: ../yum/__init__.py:3143 ++#: ../yum/__init__.py:3232 + #, python-format + msgid "Marking %s to be installed" + msgstr "Oznaczanie %s do zainstalowania" + +-#: ../yum/__init__.py:3149 ++#: ../yum/__init__.py:3238 + #, python-format + msgid "Marking %s as an update to %s" + msgstr "Oznaczanie %s jako aktualizacji %s" + +-#: ../yum/__init__.py:3156 ++#: ../yum/__init__.py:3245 + #, python-format + msgid "%s: does not update installed package." + msgstr "%s: nie aktualizuj zainstalowanego pakietu." + +-#: ../yum/__init__.py:3211 ++#: ../yum/__init__.py:3313 + msgid "Problem in reinstall: no package matched to remove" + msgstr "" + "Podczas ponownego instalowania wystąpił problem: brak pasujących pakietów do " + "usunięcia" + +-#: ../yum/__init__.py:3223 ../yum/__init__.py:3340 ++#: ../yum/__init__.py:3326 ../yum/__init__.py:3444 + #, python-format + msgid "Package %s is allowed multiple installs, skipping" + msgstr "Pakiet %s może być wielokrotnie instalowany, pomijanie" + +-#: ../yum/__init__.py:3241 ++#: ../yum/__init__.py:3347 + #, python-format + msgid "Problem in reinstall: no package %s matched to install" + msgstr "" + "Podczas ponownego instalowania wystąpił problem: brak pakietu %s pasującego " + "do zainstalowania" + +-#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3436 + msgid "No package(s) available to downgrade" + msgstr "Brak pakietów dostępnych do instalacji starszej wersji" + +-#: ../yum/__init__.py:3376 ++#: ../yum/__init__.py:3480 + #, python-format + msgid "No Match for available package: %s" + msgstr "Brak wyników dla dostępnych pakietów: %s" + +-#: ../yum/__init__.py:3382 ++#: ../yum/__init__.py:3486 + #, python-format + msgid "Only Upgrade available on package: %s" + msgstr "Dla pakietu dostępna jest tylko aktualizacja: %s" + +-#: ../yum/__init__.py:3441 ++#: ../yum/__init__.py:3545 + #, python-format + msgid "Retrieving GPG key from %s" + msgstr "Pobieranie klucza GPG z %s" + +-#: ../yum/__init__.py:3461 ++#: ../yum/__init__.py:3565 + msgid "GPG key retrieval failed: " + msgstr "Pobranie klucza GPG nie powiodło się: " + +-#: ../yum/__init__.py:3472 ++#: ../yum/__init__.py:3576 + #, python-format + msgid "GPG key parsing failed: key does not have value %s" + msgstr "" + "Przeanalizowanie klucza GPG nie powiodło się: klucz nie posiada wartości %s" + +-#: ../yum/__init__.py:3504 ++#: ../yum/__init__.py:3608 + #, python-format + msgid "GPG key at %s (0x%s) is already installed" + msgstr "Klucz GPG %s (0x%s) jest już zainstalowany" + + #. Try installing/updating GPG key +-#: ../yum/__init__.py:3509 ../yum/__init__.py:3571 ++#: ../yum/__init__.py:3613 ../yum/__init__.py:3675 + #, python-format + msgid "Importing GPG key 0x%s \"%s\" from %s" + msgstr "Importowanie klucza GPG 0x%s \"%s\" z %s" + +-#: ../yum/__init__.py:3526 ++#: ../yum/__init__.py:3630 + msgid "Not installing key" + msgstr "Klucz nie zostanie zainstalowany" + +-#: ../yum/__init__.py:3532 ++#: ../yum/__init__.py:3636 + #, python-format + msgid "Key import failed (code %d)" + msgstr "Zaimportowanie klucza nie powiodło się (kod %d)" + +-#: ../yum/__init__.py:3533 ../yum/__init__.py:3592 ++#: ../yum/__init__.py:3637 ../yum/__init__.py:3696 + msgid "Key imported successfully" + msgstr "Klucz został pomyślnie zaimportowany" + +-#: ../yum/__init__.py:3538 ../yum/__init__.py:3597 ++#: ../yum/__init__.py:3642 ../yum/__init__.py:3701 + #, python-format + msgid "" + "The GPG keys listed for the \"%s\" repository are already installed but they " +@@ -2190,81 +2236,81 @@ msgid "" + msgstr "" + "Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie " + "są poprawne dla tego pakietu.\n" +-"Sprawdź, czy dla tego repozytorium skonfigurowane są poprawne adresy do " ++"Sprawdź, czy dla tego repozytorium skonfigurowane są poprawne adresy URL do " + "kluczy." + +-#: ../yum/__init__.py:3547 ++#: ../yum/__init__.py:3651 + msgid "Import of key(s) didn't help, wrong key(s)?" + msgstr "Zaimportowanie kluczy nie pomogło, błędne klucze?" + +-#: ../yum/__init__.py:3566 ++#: ../yum/__init__.py:3670 + #, python-format + msgid "GPG key at %s (0x%s) is already imported" + msgstr "Klucz GPG %s (0x%s) został już zaimportowany" + +-#: ../yum/__init__.py:3586 ++#: ../yum/__init__.py:3690 + #, python-format + msgid "Not installing key for repo %s" + msgstr "Klucz dla repozytorium %s nie zostanie zainstalowany" + +-#: ../yum/__init__.py:3591 ++#: ../yum/__init__.py:3695 + msgid "Key import failed" + msgstr "Zaimportowanie klucza nie powiodło się" + +-#: ../yum/__init__.py:3712 ++#: ../yum/__init__.py:3816 + msgid "Unable to find a suitable mirror." + msgstr "Nie można znaleźć odpowiedniego serwera lustrzanego." + +-#: ../yum/__init__.py:3714 ++#: ../yum/__init__.py:3818 + msgid "Errors were encountered while downloading packages." + msgstr "Podczas pobierania pakietów wystąpiły błędy." + +-#: ../yum/__init__.py:3755 ++#: ../yum/__init__.py:3868 + #, python-format + msgid "Please report this error at %s" + msgstr "Zgłoś ten błąd na %s" + +-#: ../yum/__init__.py:3779 ++#: ../yum/__init__.py:3892 + msgid "Test Transaction Errors: " + msgstr "Błędy testu transakcji: " + + #. Mostly copied from YumOutput._outKeyValFill() +-#: ../yum/plugins.py:205 ++#: ../yum/plugins.py:202 + msgid "Loaded plugins: " + msgstr "Wczytane wtyczki: " + +-#: ../yum/plugins.py:219 ../yum/plugins.py:225 ++#: ../yum/plugins.py:216 ../yum/plugins.py:222 + #, python-format + msgid "No plugin match for: %s" + msgstr "Brak wyników dla wtyczki: %s" + +-#: ../yum/plugins.py:255 ++#: ../yum/plugins.py:252 + #, python-format + msgid "Not loading \"%s\" plugin, as it is disabled" + msgstr "Wtyczka \"%s\" nie została wczytana, ponieważ jest wyłączona" + + #. Give full backtrace: +-#: ../yum/plugins.py:267 ++#: ../yum/plugins.py:264 + #, python-format + msgid "Plugin \"%s\" can't be imported" + msgstr "Nie można zaimportować wtyczki \"%s\"" + +-#: ../yum/plugins.py:274 ++#: ../yum/plugins.py:271 + #, python-format + msgid "Plugin \"%s\" doesn't specify required API version" + msgstr "Wtyczka \"%s\" nie określa wymaganej wersji API" + +-#: ../yum/plugins.py:279 ++#: ../yum/plugins.py:276 + #, python-format + msgid "Plugin \"%s\" requires API %s. Supported API is %s." + msgstr "Wtyczka \"%s\" wymaga API %s. Obsługiwane API to %s." + +-#: ../yum/plugins.py:312 ++#: ../yum/plugins.py:309 + #, python-format + msgid "Loading \"%s\" plugin" + msgstr "Wczytywanie wtyczki \"%s\"" + +-#: ../yum/plugins.py:319 ++#: ../yum/plugins.py:316 + #, python-format + msgid "" + "Two or more plugins with the name \"%s\" exist in the plugin search path" +@@ -2272,19 +2318,19 @@ msgstr "" + "Istnieją dwie lub więcej wtyczek o nazwie \"%s\" w ścieżce wyszukiwania " + "wtyczek" + +-#: ../yum/plugins.py:339 ++#: ../yum/plugins.py:336 + #, python-format + msgid "Configuration file %s not found" + msgstr "Nie znaleziono pliku konfiguracji %s" + + #. for + #. Configuration files for the plugin not found +-#: ../yum/plugins.py:342 ++#: ../yum/plugins.py:339 + #, python-format + msgid "Unable to find configuration file for plugin %s" + msgstr "Nie można naleźć pliku konfiguracji dla wtyczki %s" + +-#: ../yum/plugins.py:500 ++#: ../yum/plugins.py:497 + msgid "registration of commands not supported" + msgstr "rejestracja poleceń nie jest obsługiwana" + diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py index d22782b..edfc707 100644 --- a/rpmUtils/arch.py @@ -3663,6 +10973,18 @@ index 5456c68..945aa65 100644 def main(): name = 'testutil' ver = '0.1' +diff --git a/yum.spec b/yum.spec +index 5145061..5652586 100644 +--- a/yum.spec ++++ b/yum.spec +@@ -78,6 +78,7 @@ exit 0 + %defattr(-, root, root) + %doc README AUTHORS COPYING TODO INSTALL ChangeLog PLUGINS + %config(noreplace) %{_sysconfdir}/yum/yum.conf ++%config(noreplace) %{_sysconfdir}/yum/version-groups.conf + %dir %{_sysconfdir}/%{name} + %dir %{_sysconfdir}/yum/repos.d + %config %{_sysconfdir}/logrotate.d/%{name} diff --git a/yum/Errors.py b/yum/Errors.py index 6f0ffe4..3a5aca9 100644 --- a/yum/Errors.py @@ -3678,17 +11000,40 @@ index 6f0ffe4..3a5aca9 100644 pass diff --git a/yum/__init__.py b/yum/__init__.py -index 8211c70..35da1fb 100644 +index 8211c70..6e06005 100644 --- a/yum/__init__.py +++ b/yum/__init__.py -@@ -57,6 +57,7 @@ import plugins +@@ -32,9 +32,9 @@ import logging.config + import operator + import gzip + +-import yum.i18n +-_ = yum.i18n._ +-P_ = yum.i18n.P_ ++import i18n ++_ = i18n._ ++P_ = i18n.P_ + + import config + from config import ParsingError, ConfigParser +@@ -57,14 +57,15 @@ import plugins import logginglevels import yumRepo import callbacks -+import yum.history ++import history import warnings warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning) + + from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage, comparePoEVR + from constants import * +-from yum.rpmtrans import RPMTransaction,SimpleCliCallBack +-from yum.i18n import to_unicode ++from rpmtrans import RPMTransaction,SimpleCliCallBack ++from i18n import to_unicode, to_str + + import string + @@ -137,6 +138,7 @@ class YumBase(depsolve.Depsolve): self._rpmdb = None self._up = None @@ -3809,16 +11154,17 @@ index 8211c70..35da1fb 100644 errors = self.ts.run(cb.callback, '') # ts.run() exit codes are, hmm, "creative": None means all ok, empty # list means some errors happened in the transaction and non-empty -@@ -1028,6 +1077,8 @@ class YumBase(depsolve.Depsolve): +@@ -1028,6 +1077,9 @@ class YumBase(depsolve.Depsolve): self.verbose_logger.debug(errstring) resultobject.return_code = 1 else: + if self.conf.history_record: -+ self.history.end(rpmdbv, 2, errors=errors) ++ herrors = [to_unicode(to_str(x)) for x in errors] ++ self.history.end(rpmdbv, 2, errors=herrors) raise Errors.YumBaseError, errors if not self.conf.keepcache: -@@ -1044,10 +1095,10 @@ class YumBase(depsolve.Depsolve): +@@ -1044,10 +1096,10 @@ class YumBase(depsolve.Depsolve): self.rpmdb.dropCachedData() # drop out the rpm cache so we don't step on bad hdr indexes self.plugins.run('posttrans') # sync up what just happened versus what is in the rpmdb @@ -3831,7 +11177,7 @@ index 8211c70..35da1fb 100644 """checks that the transaction did what we expected it to do. Also propagates our external yumdb info""" -@@ -1071,7 +1122,7 @@ class YumBase(depsolve.Depsolve): +@@ -1071,7 +1123,7 @@ class YumBase(depsolve.Depsolve): self.logger.critical(_('%s was supposed to be installed' \ ' but is not!' % txmbr.po)) continue @@ -3840,7 +11186,7 @@ index 8211c70..35da1fb 100644 rpo = txmbr.po po.yumdb_info.from_repo = rpo.repoid po.yumdb_info.reason = txmbr.reason -@@ -1115,6 +1166,11 @@ class YumBase(depsolve.Depsolve): +@@ -1115,6 +1167,11 @@ class YumBase(depsolve.Depsolve): else: self.verbose_logger.log(logginglevels.DEBUG_2, 'What is this? %s' % txmbr.po) @@ -3852,7 +11198,7 @@ index 8211c70..35da1fb 100644 self.rpmdb.dropCachedData() def costExcludePackages(self): -@@ -1259,7 +1315,10 @@ class YumBase(depsolve.Depsolve): +@@ -1259,7 +1316,10 @@ class YumBase(depsolve.Depsolve): os.makedirs(lockdir, mode=0755) fd = os.open(filename, os.O_EXCL|os.O_CREAT|os.O_WRONLY, mode) except OSError, msg: @@ -3864,7 +11210,7 @@ index 8211c70..35da1fb 100644 return 0 else: os.write(fd, contents) -@@ -1783,7 +1842,7 @@ class YumBase(depsolve.Depsolve): +@@ -1783,7 +1843,7 @@ class YumBase(depsolve.Depsolve): for (pkgtup, instTup) in self.up.getObsoletesTuples(): (n,a,e,v,r) = pkgtup pkgs = self.pkgSack.searchNevra(name=n, arch=a, ver=v, rel=r, epoch=e) @@ -3873,7 +11219,7 @@ index 8211c70..35da1fb 100644 for po in pkgs: obsoletes.append(po) obsoletesTuples.append((po, instpo)) -@@ -1986,10 +2045,7 @@ class YumBase(depsolve.Depsolve): +@@ -1986,10 +2046,7 @@ class YumBase(depsolve.Depsolve): canBeFile = True else: isglob = True @@ -3885,7 +11231,7 @@ index 8211c70..35da1fb 100644 if not isglob: usedDepString = True -@@ -2326,11 +2382,16 @@ class YumBase(depsolve.Depsolve): +@@ -2326,11 +2383,16 @@ class YumBase(depsolve.Depsolve): return result def getInstalledPackageObject(self, pkgtup): @@ -3907,7 +11253,7 @@ index 8211c70..35da1fb 100644 return po def gpgKeyCheck(self): -@@ -2594,7 +2655,7 @@ class YumBase(depsolve.Depsolve): +@@ -2594,7 +2656,7 @@ class YumBase(depsolve.Depsolve): if not isinstance(po, YumLocalPackage): for (obstup, inst_tup) in self.up.getObsoletersTuples(name=po.name): if po.pkgtup == obstup: @@ -3916,7 +11262,7 @@ index 8211c70..35da1fb 100644 yield installed_pkg else: for (obs_n, obs_f, (obs_e, obs_v, obs_r)) in po.obsoletes: -@@ -2898,7 +2959,7 @@ class YumBase(depsolve.Depsolve): +@@ -2898,7 +2960,7 @@ class YumBase(depsolve.Depsolve): topkg = self._test_loop(obsoleting_pkg, self._pkg2obspkg) if topkg is not None: obsoleting_pkg = topkg @@ -3925,7 +11271,7 @@ index 8211c70..35da1fb 100644 txmbr = self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg) self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg) if requiringPo: -@@ -3059,7 +3120,7 @@ class YumBase(depsolve.Depsolve): +@@ -3059,7 +3121,7 @@ class YumBase(depsolve.Depsolve): updated) else: @@ -3934,7 +11280,7 @@ index 8211c70..35da1fb 100644 txmbr = self.tsInfo.addUpdate(available_pkg, updated_pkg) if requiringPo: txmbr.setAsDep(requiringPo) -@@ -3426,6 +3487,7 @@ class YumBase(depsolve.Depsolve): +@@ -3426,6 +3488,7 @@ class YumBase(depsolve.Depsolve): if not apkgs: # Do we still want to return errors here? # We don't in the cases below, so I didn't here... @@ -3942,7 +11288,7 @@ index 8211c70..35da1fb 100644 if 'pattern' in kwargs: pkgs = self.rpmdb.returnPackages(patterns=[kwargs['pattern']], ignore_case=False) -@@ -3534,6 +3596,84 @@ class YumBase(depsolve.Depsolve): +@@ -3534,6 +3597,84 @@ class YumBase(depsolve.Depsolve): return returndict @@ -4027,7 +11373,7 @@ index 8211c70..35da1fb 100644 def _retrievePublicKey(self, keyurl, repo=None): """ Retrieve a key file -@@ -3726,6 +3866,7 @@ class YumBase(depsolve.Depsolve): +@@ -3726,6 +3867,7 @@ class YumBase(depsolve.Depsolve): if True: # Don't to magic sorting, yet ret_mid.append(pkg) @@ -4035,8 +11381,21 @@ index 8211c70..35da1fb 100644 if pkg.yumdb_info.installonly == 'remove-first': ret_beg.append(pkg) +diff --git a/yum/comps.py b/yum/comps.py +index 2048c77..d310b1b 100755 +--- a/yum/comps.py ++++ b/yum/comps.py +@@ -26,7 +26,7 @@ from Errors import CompsException + # switch all compsexceptions to grouperrors after api break + import fnmatch + import re +-from yum.i18n import to_unicode ++from i18n import to_unicode + from misc import get_my_lang_code + + lang_attr = '{http://www.w3.org/XML/1998/namespace}lang' diff --git a/yum/config.py b/yum/config.py -index 2f057c3..0d7bc38 100644 +index 2f057c3..63b3d17 100644 --- a/yum/config.py +++ b/yum/config.py @@ -703,6 +703,8 @@ class YumConf(StartupConf): @@ -4048,7 +11407,40 @@ index 2f057c3..0d7bc38 100644 _reposlist = [] -@@ -893,7 +895,13 @@ def _getsysver(installroot, distroverpkg): +@@ -763,6 +765,11 @@ class RepoConf(BaseConfig): + sslclientkey = Inherit(YumConf.sslclientkey) + + ++class VersionGroupConf(BaseConfig): ++ pkglist = ListOption() ++ run_with_packages = BoolOption(False) ++ ++ + def readStartupConfig(configfile, root): + ''' + Parse Yum's main configuration file and return a StartupConf instance. +@@ -849,6 +856,20 @@ def readMainConfig(startupconf): + + return yumconf + ++def readVersionGroupsConfig(configfile="/etc/yum/version-groups.conf"): ++ parser = ConfigParser() ++ confpp_obj = ConfigPreProcessor(configfile) ++ try: ++ parser.readfp(confpp_obj) ++ except ParsingError, e: ++ raise Errors.ConfigError("Parsing file failed: %s" % e) ++ ret = {} ++ for section in parser.sections(): ++ ret[section] = VersionGroupConf() ++ ret[section].populate(parser, section) ++ return ret ++ ++ + def getOption(conf, section, name, option): + '''Convenience function to retrieve a parsed and converted value from a + ConfigParser. +@@ -893,7 +914,13 @@ def _getsysver(installroot, distroverpkg): idx = ts.dbMatch('provides', distroverpkg) except TypeError, e: # This is code for "cannot open rpmdb" @@ -4110,10 +11502,10 @@ index d6b1b02..c5baacb 100644 # obsoleted by pkgB but pkgB requires pkgA-2, now _if_ the pkgA txmbr diff --git a/yum/history.py b/yum/history.py new file mode 100644 -index 0000000..482587e +index 0000000..18d2a41 --- /dev/null +++ b/yum/history.py -@@ -0,0 +1,635 @@ +@@ -0,0 +1,639 @@ +#!/usr/bin/python -t +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by @@ -4139,10 +11531,10 @@ index 0000000..482587e +from weakref import proxy as weakref + +from sqlutils import sqlite, executeSQL -+import yum.misc -+import yum.constants -+from yum.constants import * -+from yum.packages import YumInstalledPackage, YumAvailablePackage, PackageObject ++import misc ++from constants import * ++from packages import YumInstalledPackage, YumAvailablePackage, PackageObject ++from i18n import to_unicode + +_history_dir = '/var/lib/yum/history' + @@ -4361,8 +11753,10 @@ index 0000000..482587e + if checksum == sql_checksum: + return sql_pkgtupid + ++ (n,a,e,v,r) = pkgtup ++ (n,a,e,v,r) = (to_unicode(n),to_unicode(a), ++ to_unicode(e),to_unicode(v),to_unicode(r)) + if checksum is not None: -+ (n,a,e,v,r) = pkgtup + res = executeSQL(cur, + """INSERT INTO pkgtups + (name, arch, epoch, version, release, checksum) @@ -4372,7 +11766,7 @@ index 0000000..482587e + res = executeSQL(cur, + """INSERT INTO pkgtups + (name, arch, epoch, version, release) -+ VALUES (?, ?, ?, ?, ?)""", pkgtup) ++ VALUES (?, ?, ?, ?, ?)""", (n,a,e,v,r)) + return cur.lastrowid + def _apkg2pid(self, po): + csum = po.returnIdSum() @@ -4462,6 +11856,7 @@ index 0000000..482587e + def _log_errors(self, errors): + cur = self._get_cursor() + for error in errors: ++ error = to_unicode(error) + executeSQL(cur, + """INSERT INTO trans_error + (tid, msg) VALUES (?, ?)""", (self._tid, error)) @@ -4474,6 +11869,7 @@ index 0000000..482587e + + cur = self._get_cursor() + for error in msg.split('\n'): ++ error = to_unicode(error) + executeSQL(cur, + """INSERT INTO trans_script_stdout + (tid, line) VALUES (?, ?)""", (self._tid, error)) @@ -4750,7 +12146,7 @@ index 0000000..482587e + WHERE +""" diff --git a/yum/misc.py b/yum/misc.py -index a8f7954..9793180 100644 +index a8f7954..16ffca0 100644 --- a/yum/misc.py +++ b/yum/misc.py @@ -76,35 +76,38 @@ def unshare_data(): @@ -4812,7 +12208,26 @@ index a8f7954..9793180 100644 return False _re_compiled_full_match = None -@@ -797,6 +800,21 @@ def unlink_f(filename): +@@ -290,7 +293,8 @@ def checksum(sumtype, file, CHUNK=2**16, datasize=None): + + data = Checksums([sumtype]) + while data.read(fo, CHUNK): +- pass ++ if datasize is not None and len(data) > datasize: ++ break + + if type(file) is types.StringType: + fo.close() +@@ -298,7 +302,7 @@ def checksum(sumtype, file, CHUNK=2**16, datasize=None): + + # This screws up the length, but that shouldn't matter. We only care + # if this checksum == what we expect. +- if datasize is not None and datasize > len(data): ++ if datasize is not None and datasize != len(data): + return '!%u!%s' % (datasize, data.hexdigest(sumtype)) + + return data.hexdigest(sumtype) +@@ -797,6 +801,21 @@ def unlink_f(filename): if e.errno != errno.ENOENT: raise @@ -4835,7 +12250,7 @@ index a8f7954..9793180 100644 import locale import sys diff --git a/yum/packageSack.py b/yum/packageSack.py -index 3716410..cc26d03 100644 +index 3716410..45e4e2d 100644 --- a/yum/packageSack.py +++ b/yum/packageSack.py @@ -35,6 +35,8 @@ class PackageSackVersion: @@ -4847,6 +12262,57 @@ index 3716410..cc26d03 100644 if self._num != other._num: return False if self._chksum.digest() != other._chksum.digest(): return False return True +@@ -182,23 +184,42 @@ class PackageSackBase(object): + then it's still not a huge wart. """ + raise NotImplementedError() + +- def simpleVersion(self): ++ def simpleVersion(self, main_only=False, groups={}): + """ Return a simple version for all available packages. """ ++ def _up_revs(arepos, repoid, rev, pkg, csum): ++ arevs = arepos.setdefault(repoid, {}) ++ rpsv = arevs.setdefault(None, PackageSackVersion()) ++ rpsv.update(pkg, csum) ++ if rev is not None: ++ rpsv = arevs.setdefault(rev, PackageSackVersion()) ++ rpsv.update(pkg, csum) ++ + main = PackageSackVersion() + arepos = {} ++ main_grps = {} ++ arepos_grps = {} + for pkg in sorted(self.returnPackages()): + csum = pkg.returnIdSum() + main.update(pkg, csum) + +- arevs = arepos.setdefault(pkg.repoid, {}) +- rpsv = arevs.setdefault(None, PackageSackVersion()) +- rpsv.update(pkg, csum) ++ for group in groups: ++ if pkg.name in groups[group]: ++ if group not in main_grps: ++ main_grps[group] = PackageSackVersion() ++ arepos_grps[group] = {} ++ main_grps[group].update(pkg, csum) + +- if pkg.repo.repoXML.revision is not None: +- rev = pkg.repo.repoXML.revision +- rpsv = arevs.setdefault(rev, PackageSackVersion()) +- rpsv.update(pkg, csum) ++ if main_only: ++ continue ++ ++ rev = pkg.repo.repoXML.revision ++ _up_revs(arepos, pkg.repoid, rev, pkg, csum) ++ for group in groups: ++ if pkg.name in groups[group]: ++ _up_revs(arepos_grps[group], pkg.repoid, rev, pkg, csum) + ++ if groups: ++ return [main, arepos, main_grps, arepos_grps] + return [main, arepos] + + def returnNewestByNameArch(self, naTup=None, diff --git a/yum/packages.py b/yum/packages.py index 9a56fc4..7bbb61d 100644 --- a/yum/packages.py @@ -4864,9 +12330,18 @@ index 9a56fc4..7bbb61d 100644 committer = property(_committer) diff --git a/yum/plugins.py b/yum/plugins.py -index 27b1aa5..02f0d57 100644 +index 27b1aa5..c0e510f 100644 --- a/yum/plugins.py +++ b/yum/plugins.py +@@ -34,7 +34,7 @@ from weakref import proxy as weakref + + from yum import _ + +-from yum.i18n import utf8_width ++from i18n import utf8_width + + # TODO: expose rpm package sack objects to plugins (once finished) + # TODO: allow plugins to use the existing config stuff to define options for @@ -457,6 +457,10 @@ class PluginConduit: ''' return config.getOption(self._conf, section, opt, config.BoolOption(default)) @@ -4879,32 +12354,90 @@ index 27b1aa5..02f0d57 100644 def registerOpt(self, name, valuetype, where, default): diff --git a/yum/rpmsack.py b/yum/rpmsack.py -index fbeb9b3..8368d52 100644 +index fbeb9b3..74dd69d 100644 --- a/yum/rpmsack.py +++ b/yum/rpmsack.py -@@ -339,7 +339,7 @@ class RPMDBPackageSack(PackageSackBase): +@@ -31,7 +31,7 @@ from packageSack import PackageSackBase, PackageSackVersion + import fnmatch + import re + +-from yum.i18n import to_unicode ++from i18n import to_unicode + import constants + + class RPMInstalledPackage(YumInstalledPackage): +@@ -339,10 +339,20 @@ class RPMDBPackageSack(PackageSackBase): pkgobjlist = pkgobjlist[0] + pkgobjlist[1] return pkgobjlist - def simpleVersion(self): -+ def simpleVersion(self, main_only=False): ++ def simpleVersion(self, main_only=False, groups={}): """ Return a simple version for all installed packages. """ ++ def _up_revs(irepos, repoid, rev, pkg, csum): ++ irevs = irepos.setdefault(repoid, {}) ++ rpsv = irevs.setdefault(None, PackageSackVersion()) ++ rpsv.update(pkg, csum) ++ if rev is not None: ++ rpsv = irevs.setdefault(rev, PackageSackVersion()) ++ rpsv.update(pkg, csum) ++ main = PackageSackVersion() irepos = {} -@@ -350,6 +350,9 @@ class RPMDBPackageSack(PackageSackBase): ++ main_grps = {} ++ irepos_grps = {} + for pkg in sorted(self.returnPackages()): + ydbi = pkg.yumdb_info + csum = None +@@ -350,19 +360,30 @@ class RPMDBPackageSack(PackageSackBase): csum = (ydbi.checksum_type, ydbi.checksum_data) main.update(pkg, csum) ++ for group in groups: ++ if pkg.name in groups[group]: ++ if group not in main_grps: ++ main_grps[group] = PackageSackVersion() ++ irepos_grps[group] = {} ++ main_grps[group].update(pkg, csum) ++ + if main_only: + continue + repoid = 'installed' rev = None if 'from_repo' in pkg.yumdb_info: + repoid = '@' + pkg.yumdb_info.from_repo + if 'from_repo_revision' in pkg.yumdb_info: + rev = pkg.yumdb_info.from_repo_revision +- irevs = irepos.setdefault(repoid, {}) +- rpsv = irevs.setdefault(None, PackageSackVersion()) +- rpsv.update(pkg, csum) +- if rev is not None: +- rpsv = irevs.setdefault(rev, PackageSackVersion()) +- rpsv.update(pkg, csum) + ++ _up_revs(irepos, repoid, rev, pkg, csum) ++ for group in groups: ++ if pkg.name in groups[group]: ++ _up_revs(irepos_grps[group], repoid, rev, pkg, csum) ++ ++ if groups: ++ return [main, irepos, main_grps, irepos_grps] + return [main, irepos] + + @staticmethod diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py -index 77b06a2..b1b896f 100644 +index 77b06a2..ed52df0 100644 --- a/yum/rpmtrans.py +++ b/yum/rpmtrans.py +@@ -23,7 +23,7 @@ import time + import logging + import types + import sys +-from yum.constants import * ++from constants import * + from yum import _ + import misc + @@ -230,6 +230,11 @@ class RPMTransaction: except IOError: pass @@ -4954,10 +12487,42 @@ index 77b06a2..b1b896f 100644 if self.test: return # and we're done self.ts_done(h, action) diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py -index b6c14c5..9bfcd93 100644 +index b6c14c5..89744ff 100644 --- a/yum/sqlitesack.py +++ b/yum/sqlitesack.py -@@ -929,15 +929,19 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): +@@ -33,8 +33,8 @@ import rpmUtils.miscutils + import sqlutils + import constants + import operator +-from yum.misc import seq_max_split +-from yum.i18n import to_utf8, to_unicode ++from misc import seq_max_split ++from i18n import to_utf8, to_unicode + import sys + import re + +@@ -911,6 +911,20 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): + dirname_check = "dirname GLOB ? and filenames LIKE ? %s and " % esc + sql_params.append(dirname) + sql_params.append('%' + pattern + '%') ++ elif filename == '*': ++ # We only care about matching on dirname... ++ for (rep,cache) in self.filelistsdb.items(): ++ if rep in self._all_excludes: ++ continue ++ ++ cur = cache.cursor() ++ sql_params.append(dirname) ++ executeSQL(cur, """SELECT pkgKey FROM filelist ++ WHERE dirname %s ?""" % (querytype,), ++ sql_params) ++ self._sql_pkgKey2po(rep, cur, pkgs) ++ ++ return misc.unique(pkgs) + + for (rep,cache) in self.filelistsdb.items(): + if rep in self._all_excludes: +@@ -929,15 +943,19 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): if file_glob: name_re = re.compile(fnmatch.translate(name)) def filelist_globber(sql_dirname, sql_filenames): @@ -4980,7 +12545,7 @@ index b6c14c5..9bfcd93 100644 cache.create_function("filelist_globber", 2, filelist_globber) # for all the ones where filenames is multiple files, -@@ -1277,7 +1281,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): +@@ -1277,7 +1295,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): # If it's not a provides or a filename, we are done if prcotype != "provides": return results @@ -5026,10 +12591,42 @@ index be772e5..bd7bf80 100644 self.failed.sort() +diff --git a/yum/update_md.py b/yum/update_md.py +index b3a120e..34179ea 100644 +--- a/yum/update_md.py ++++ b/yum/update_md.py +@@ -24,10 +24,10 @@ Update metadata (updateinfo.xml) parsing. + import sys + import gzip + +-from yum.i18n import utf8_text_wrap, to_utf8 +-from yum.yumRepo import YumRepository +-from yum.packages import FakeRepository +-from yum.misc import to_xml ++from i18n import utf8_text_wrap, to_utf8 ++from yumRepo import YumRepository ++from packages import FakeRepository ++from misc import to_xml + import Errors + + import rpmUtils.miscutils diff --git a/yum/yumRepo.py b/yum/yumRepo.py -index fac218a..bdca2ad 100644 +index fac218a..2bc7476 100644 --- a/yum/yumRepo.py +++ b/yum/yumRepo.py +@@ -32,9 +32,9 @@ from repos import Repository + import parser + import sqlitecachec + import sqlitesack +-from yum import config +-from yum import misc +-from yum import comps ++import config ++import misc ++import comps + from constants import * + import metalink + @@ -233,6 +233,7 @@ class YumRepository(Repository, config.RepoConf): Repository.__init__(self, repoid) @@ -5038,7 +12635,81 @@ index fac218a..bdca2ad 100644 self._urls = [] self.enablegroups = 0 self.groupsfilename = 'yumgroups.xml' # something some freaks might -@@ -1034,6 +1035,8 @@ class YumRepository(Repository, config.RepoConf): +@@ -712,7 +713,8 @@ class YumRepository(Repository, config.RepoConf): + fdel=lambda self: setattr(self, "_metalink", None)) + + def _getFile(self, url=None, relative=None, local=None, start=None, end=None, +- copy_local=None, checkfunc=None, text=None, reget='simple', cache=True): ++ copy_local=None, checkfunc=None, text=None, reget='simple', ++ cache=True, size=None): + """retrieve file from the mirrorgroup for the repo + relative to local, optionally get range from + start to end, also optionally retrieve from a specific baseurl""" +@@ -784,7 +786,8 @@ class YumRepository(Repository, config.RepoConf): + ssl_verify_host=self.sslverify, + ssl_ca_cert=self.sslcacert, + ssl_cert=self.sslclientcert, +- ssl_key=self.sslclientkey ++ ssl_key=self.sslclientkey, ++ size=size + ) + + ug.opts.user_agent = default_grabber.opts.user_agent +@@ -816,6 +819,7 @@ class YumRepository(Repository, config.RepoConf): + reget = reget, + checkfunc=checkfunc, + http_headers=headers, ++ size=size + ) + except URLGrabError, e: + errstr = "failure: %s from %s: %s" % (relative, self.id, e) +@@ -827,7 +831,7 @@ class YumRepository(Repository, config.RepoConf): + return result + __get = _getFile + +- def getPackage(self, package, checkfunc = None, text = None, cache = True): ++ def getPackage(self, package, checkfunc=None, text=None, cache=True): + remote = package.relativepath + local = package.localPkg() + basepath = package.basepath +@@ -842,7 +846,8 @@ class YumRepository(Repository, config.RepoConf): + local=local, + checkfunc=checkfunc, + text=text, +- cache=cache ++ cache=cache, ++ size=package.size, + ) + + def getHeader(self, package, checkfunc = None, reget = 'simple', +@@ -852,6 +857,7 @@ class YumRepository(Repository, config.RepoConf): + local = package.localHdr() + start = package.hdrstart + end = package.hdrend ++ size = end-start + basepath = package.basepath + # yes, I know, don't ask + if not os.path.exists(self.hdrdir): +@@ -859,7 +865,7 @@ class YumRepository(Repository, config.RepoConf): + + return self._getFile(url=basepath, relative=remote, local=local, start=start, + reget=None, end=end, checkfunc=checkfunc, copy_local=1, +- cache=cache, ++ cache=cache, size=size, + ) + + def metadataCurrent(self): +@@ -988,7 +994,8 @@ class YumRepository(Repository, config.RepoConf): + text=text, + reget=None, + checkfunc=checkfunc, +- cache=self.http_caching == 'all') ++ cache=self.http_caching == 'all', ++ size=102400) # setting max size as 100K + + except URLGrabError, e: + misc.unlink_f(tfname) +@@ -1034,6 +1041,8 @@ class YumRepository(Repository, config.RepoConf): old_local = local + '.old.tmp' # locked, so this is ok shutil.copy2(local, old_local) xml = self._parseRepoXML(old_local, True) @@ -5047,7 +12718,35 @@ index fac218a..bdca2ad 100644 self._oldRepoMDData = {'old_repo_XML' : xml, 'local' : local, 'old_local' : old_local, 'new_MD_files' : []} return xml -@@ -1605,8 +1608,8 @@ class YumRepository(Repository, config.RepoConf): +@@ -1419,7 +1428,8 @@ class YumRepository(Repository, config.RepoConf): + text='%s/signature' % self.id, + reget=None, + checkfunc=None, +- cache=self.http_caching == 'all') ++ cache=self.http_caching == 'all', ++ size=102400) + except URLGrabError, e: + raise URLGrabError(-1, 'Error finding signature for repomd.xml for %s: %s' % (self, e)) + +@@ -1533,9 +1543,14 @@ class YumRepository(Repository, config.RepoConf): + try: + checkfunc = (self.checkMD, (mdtype,), {}) + text = "%s/%s" % (self.id, mdtype) +- local = self._getFile(relative=remote, local=local, copy_local=1, +- checkfunc=checkfunc, reget=None, text=text, +- cache=self.http_caching == 'all') ++ local = self._getFile(relative=remote, ++ local=local, ++ copy_local=1, ++ checkfunc=checkfunc, ++ reget=None, ++ text=text, ++ cache=self.http_caching == 'all', ++ size=thisdata.size) + except (Errors.NoMoreMirrorsRepoError, Errors.RepoError): + if retrieve_can_fail: + return None +@@ -1605,8 +1620,8 @@ class YumRepository(Repository, config.RepoConf): for line in content: if re.match('^\s*\#.*', line) or re.match('^\s*$', line): continue @@ -5058,7 +12757,7 @@ index fac218a..bdca2ad 100644 returnlist.append(mirror) return (returnlist, content) -@@ -1807,8 +1810,8 @@ def getMirrorList(mirrorlist, pdict = None): +@@ -1807,8 +1822,8 @@ def getMirrorList(mirrorlist, pdict = None): for line in content: if re.match('^\s*\#.*', line) or re.match('^\s*$', line): continue @@ -5070,10 +12769,29 @@ index fac218a..bdca2ad 100644 return returnlist diff --git a/yumcommands.py b/yumcommands.py -index bd73d0c..f6c4e19 100644 +index bd73d0c..1451a36 100644 --- a/yumcommands.py +++ b/yumcommands.py -@@ -778,13 +778,17 @@ class RepoListCommand(YumCommand): +@@ -30,6 +30,8 @@ import fnmatch + import time + from yum.i18n import utf8_width, utf8_width_fill, to_unicode + ++import yum.config ++ + def checkRootUID(base): + """ + Verify that the program is being run by the root user. +@@ -575,7 +577,8 @@ class CheckUpdateCommand(YumCommand): + result = 0 + try: + ypl = base.returnPkgLists(extcmds) +- if base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3): ++ if (base.conf.obsoletes or ++ base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3)): + typl = base.returnPkgLists(['obsoletes']) + ypl.obsoletes = typl.obsoletes + ypl.obsoletesTuples = typl.obsoletesTuples +@@ -778,13 +781,17 @@ class RepoListCommand(YumCommand): arg = 'enabled' extcmds = map(lambda x: x.lower(), extcmds) @@ -5094,7 +12812,7 @@ index bd73d0c..f6c4e19 100644 if arg == 'all': ehibeg = base.term.FG_COLOR['green'] + base.term.MODE['bold'] dhibeg = base.term.FG_COLOR['red'] -@@ -1061,7 +1065,7 @@ class DowngradeCommand(YumCommand): +@@ -1061,7 +1068,7 @@ class DowngradeCommand(YumCommand): def needTs(self, base, basecmd, extcmds): return False @@ -5103,30 +12821,99 @@ index bd73d0c..f6c4e19 100644 class VersionCommand(YumCommand): def getNames(self): -@@ -1097,11 +1101,19 @@ class VersionCommand(YumCommand): +@@ -1092,25 +1099,80 @@ class VersionCommand(YumCommand): + cols.append((" %s" % repoid, str(cur[None]))) + cols.extend(ncols) + ++ verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) ++ groups = {} ++ gconf = yum.config.readVersionGroupsConfig() ++ for group in gconf: ++ groups[group] = set(gconf[group].pkglist) ++ if gconf[group].run_with_packages: ++ groups[group].update(base.run_with_package_names) ++ ++ if vcmd in ('grouplist'): ++ print _(" Yum version groups:") ++ for group in sorted(groups): ++ print " ", group ++ ++ return 0, ['version grouplist'] ++ ++ if vcmd in ('groupinfo'): ++ for group in groups: ++ if group not in extcmds[1:]: ++ continue ++ print _(" Group :"), group ++ print _(" Packages:") ++ if not verbose: ++ for pkgname in sorted(groups[group]): ++ print " ", pkgname ++ else: ++ data = {'envra' : {}, 'rid' : {}} ++ pkg_names = groups[group] ++ pkg_names2pkgs = base._group_names2aipkgs(pkg_names) ++ base._calcDataPkgColumns(data, pkg_names, pkg_names2pkgs) ++ data = [data['envra'], data['rid']] ++ columns = base.calcColumns(data) ++ columns = (-columns[0], -columns[1]) ++ base._displayPkgsFromNames(pkg_names, True, pkg_names2pkgs, ++ columns=columns) ++ ++ return 0, ['version groupinfo'] ++ + rel = base.yumvar['releasever'] + ba = base.yumvar['basearch'] cols = [] - if vcmd in ('installed', 'all'): +- if vcmd in ('installed', 'all'): ++ if vcmd in ('installed', 'all', 'group-installed', 'group-all'): try: - data = base.rpmdb.simpleVersion() -+ main_only = True -+ if base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3): -+ main_only = False -+ data = base.rpmdb.simpleVersion(main_only) +- cols.append(("%s %s/%s" % (_("Installed:"), rel, ba), +- str(data[0]))) +- if base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3): ++ data = base.rpmdb.simpleVersion(not verbose, groups=groups) + lastdbv = base.history.last() + if lastdbv is not None: + lastdbv = lastdbv.end_rpmdbversion + if lastdbv is not None and data[0] != lastdbv: + errstring = _('Warning: RPMDB has been altered since the last yum transaction.') + base.logger.warning(errstring) - cols.append(("%s %s/%s" % (_("Installed:"), rel, ba), - str(data[0]))) -- if base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3): -- _append_repos(cols, data[1]) -+ _append_repos(cols, data[1]) ++ if vcmd not in ('group-installed', 'group-all'): ++ cols.append(("%s %s/%s" % (_("Installed:"), rel, ba), ++ str(data[0]))) + _append_repos(cols, data[1]) ++ if groups: ++ for grp in sorted(data[2]): ++ cols.append(("%s %s" % (_("Group-Installed:"), grp), ++ str(data[2][grp]))) ++ _append_repos(cols, data[3][grp]) except yum.Errors.YumBaseError, e: return 1, [str(e)] - if vcmd in ('available', 'all'): -@@ -1126,10 +1138,83 @@ class VersionCommand(YumCommand): +- if vcmd in ('available', 'all'): ++ if vcmd in ('available', 'all', 'group-available', 'group-all'): + try: +- data = base.pkgSack.simpleVersion() +- cols.append(("%s %s/%s" % (_("Available:"), rel, ba), +- str(data[0]))) +- if base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3): +- _append_repos(cols, data[1]) ++ data = base.pkgSack.simpleVersion(not verbose, groups=groups) ++ if vcmd not in ('group-available', 'group-all'): ++ cols.append(("%s %s/%s" % (_("Available:"), rel, ba), ++ str(data[0]))) ++ if verbose: ++ _append_repos(cols, data[1]) ++ if groups: ++ for grp in sorted(data[2]): ++ cols.append(("%s %s" % (_("Group-Available:"), grp), ++ str(data[2][grp]))) ++ if verbose: ++ _append_repos(cols, data[3][grp]) + except yum.Errors.YumBaseError, e: + return 1, [str(e)] + +@@ -1126,10 +1188,86 @@ class VersionCommand(YumCommand): for line in cols: print base.fmtColumns(zip(line, columns)) @@ -5137,7 +12924,11 @@ index bd73d0c..f6c4e19 100644 vcmd = 'installed' if extcmds: vcmd = extcmds[0] - return vcmd in ('available', 'all') +- return vcmd in ('available', 'all') ++ verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) ++ if vcmd == 'groupinfo' and verbose: ++ return True ++ return vcmd in ('available', 'all', 'group-available', 'group-all') + + +class HistoryCommand(YumCommand): diff --git a/yum.spec b/yum.spec index 2776bad..a19f51b 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.24 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Tue Sep 29 2009 Seth Vidal - 3.2.24-7 +- fixes for odd outputs from ts.run and logs for what we store in history + * Wed Sep 23 2009 Seth Vidal - 3.2.24-6 - new head patch - fixes some issues with history and chroots From ec292b43a664e37e50c47052307ad4a33e186982 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Wed, 30 Sep 2009 14:38:15 +0000 Subject: [PATCH 03/21] add version-groups conf file to spec --- yum.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yum.spec b/yum.spec index a19f51b..c9f422a 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.24 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -92,6 +92,7 @@ rm -rf $RPM_BUILD_ROOT %doc README AUTHORS COPYING TODO INSTALL ChangeLog %config(noreplace) %{_sysconfdir}/yum.conf %dir %{_sysconfdir}/yum +%config(noreplace) %{_sysconfdir}/yum/version-groups.conf %dir %{_sysconfdir}/yum.repos.d %config(noreplace) %{_sysconfdir}/logrotate.d/yum %dir %{_datadir}/yum-cli @@ -108,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Wed Sep 30 2009 Seth Vidal - 3.2.24-8 +- fix up broken build b/c of version-groups.conf file + * Tue Sep 29 2009 Seth Vidal - 3.2.24-7 - fixes for odd outputs from ts.run and logs for what we store in history From 28575c176a7001d1d738e66b6a7c8e584d174fd5 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Wed, 30 Sep 2009 18:22:35 +0000 Subject: [PATCH 04/21] revert yum.import patch. my damned fault --- yum.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yum.spec b/yum.spec index c9f422a..656a2ef 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.24 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -16,6 +16,7 @@ Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch Patch6: yum-HEAD.patch +Patch7: revert-yum-dot-import.patch URL: http://yum.baseurl.org/ BuildArch: noarch @@ -60,6 +61,7 @@ can notify you when they are available via email, syslog or dbus. %patch4 -p0 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build make @@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Wed Sep 30 2009 Seth Vidal - 3.2.24-9 +- revert yum. import patch b/c it breaks a bunch of things + * Wed Sep 30 2009 Seth Vidal - 3.2.24-8 - fix up broken build b/c of version-groups.conf file From dd1d0216d4ccb886dbfe1421185b3884554a7e51 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Wed, 30 Sep 2009 18:22:49 +0000 Subject: [PATCH 05/21] add the revert-yum. patch, too --- revert-yum-dot-import.patch | 159 ++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 revert-yum-dot-import.patch diff --git a/revert-yum-dot-import.patch b/revert-yum-dot-import.patch new file mode 100644 index 0000000..37bab84 --- /dev/null +++ b/revert-yum-dot-import.patch @@ -0,0 +1,159 @@ +diff --git a/yum/__init__.py b/yum/__init__.py +index 6e06005..a5b4922 100644 +--- a/yum/__init__.py ++++ b/yum/__init__.py +@@ -32,9 +32,9 @@ import logging.config + import operator + import gzip + +-import i18n +-_ = i18n._ +-P_ = i18n.P_ ++import yum.i18n ++_ = yum.i18n._ ++P_ = yum.i18n.P_ + + import config + from config import ParsingError, ConfigParser +@@ -57,15 +57,15 @@ import plugins + import logginglevels + import yumRepo + import callbacks +-import history ++import yum.history + + import warnings + warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning) + + from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage, comparePoEVR + from constants import * +-from rpmtrans import RPMTransaction,SimpleCliCallBack +-from i18n import to_unicode, to_str ++from yum.rpmtrans import RPMTransaction,SimpleCliCallBack ++from yum.i18n import to_unicode, to_str + + import string + +diff --git a/yum/comps.py b/yum/comps.py +index d310b1b..2048c77 100755 +--- a/yum/comps.py ++++ b/yum/comps.py +@@ -26,7 +26,7 @@ from Errors import CompsException + # switch all compsexceptions to grouperrors after api break + import fnmatch + import re +-from i18n import to_unicode ++from yum.i18n import to_unicode + from misc import get_my_lang_code + + lang_attr = '{http://www.w3.org/XML/1998/namespace}lang' +diff --git a/yum/history.py b/yum/history.py +index 18d2a41..644c2fc 100644 +--- a/yum/history.py ++++ b/yum/history.py +@@ -23,10 +23,11 @@ import glob + from weakref import proxy as weakref + + from sqlutils import sqlite, executeSQL +-import misc +-from constants import * +-from packages import YumInstalledPackage, YumAvailablePackage, PackageObject +-from i18n import to_unicode ++import yum.misc ++import yum.constants ++from yum.constants import * ++from yum.packages import YumInstalledPackage, YumAvailablePackage, PackageObject ++from yum.i18n import to_unicode + + _history_dir = '/var/lib/yum/history' + +diff --git a/yum/plugins.py b/yum/plugins.py +index c0e510f..02f0d57 100644 +--- a/yum/plugins.py ++++ b/yum/plugins.py +@@ -34,7 +34,7 @@ from weakref import proxy as weakref + + from yum import _ + +-from i18n import utf8_width ++from yum.i18n import utf8_width + + # TODO: expose rpm package sack objects to plugins (once finished) + # TODO: allow plugins to use the existing config stuff to define options for +diff --git a/yum/rpmsack.py b/yum/rpmsack.py +index 74dd69d..fd05f9b 100644 +--- a/yum/rpmsack.py ++++ b/yum/rpmsack.py +@@ -31,7 +31,7 @@ from packageSack import PackageSackBase, PackageSackVersion + import fnmatch + import re + +-from i18n import to_unicode ++from yum.i18n import to_unicode + import constants + + class RPMInstalledPackage(YumInstalledPackage): +diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py +index ed52df0..b1b896f 100644 +--- a/yum/rpmtrans.py ++++ b/yum/rpmtrans.py +@@ -23,7 +23,7 @@ import time + import logging + import types + import sys +-from constants import * ++from yum.constants import * + from yum import _ + import misc + +diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py +index 89744ff..ce2988f 100644 +--- a/yum/sqlitesack.py ++++ b/yum/sqlitesack.py +@@ -33,8 +33,8 @@ import rpmUtils.miscutils + import sqlutils + import constants + import operator +-from misc import seq_max_split +-from i18n import to_utf8, to_unicode ++from yum.misc import seq_max_split ++from yum.i18n import to_utf8, to_unicode + import sys + import re + +diff --git a/yum/update_md.py b/yum/update_md.py +index 34179ea..b3a120e 100644 +--- a/yum/update_md.py ++++ b/yum/update_md.py +@@ -24,10 +24,10 @@ Update metadata (updateinfo.xml) parsing. + import sys + import gzip + +-from i18n import utf8_text_wrap, to_utf8 +-from yumRepo import YumRepository +-from packages import FakeRepository +-from misc import to_xml ++from yum.i18n import utf8_text_wrap, to_utf8 ++from yum.yumRepo import YumRepository ++from yum.packages import FakeRepository ++from yum.misc import to_xml + import Errors + + import rpmUtils.miscutils +diff --git a/yum/yumRepo.py b/yum/yumRepo.py +index 2bc7476..ea8518a 100644 +--- a/yum/yumRepo.py ++++ b/yum/yumRepo.py +@@ -32,9 +32,9 @@ from repos import Repository + import parser + import sqlitecachec + import sqlitesack +-import config +-import misc +-import comps ++from yum import config ++from yum import misc ++from yum import comps + from constants import * + import metalink + From 82262b83354a6bc635c79d3c7364d36529461187 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Wed, 14 Oct 2009 20:42:24 +0000 Subject: [PATCH 06/21] yum 3.2.25 - which really just gets rid of HEAD patch and fixes a number of minor things --- sources | 2 +- yum-multilib-policy-best.patch | 12 ++++++------ yum.spec | 11 +++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/sources b/sources index 869e0b6..9c1b1e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ee9e2cf220cd7a557d4193689a76eb2 yum-3.2.24.tar.gz +7fdea025aa8fb88376a283959d5d2d0f yum-3.2.25.tar.gz diff --git a/yum-multilib-policy-best.patch b/yum-multilib-policy-best.patch index 1af91e1..065047b 100644 --- a/yum-multilib-policy-best.patch +++ b/yum-multilib-policy-best.patch @@ -1,9 +1,9 @@ ---- yum/config.py~ 2008-03-14 15:52:03.000000000 -0400 -+++ yum/config.py 2008-03-14 15:52:03.000000000 -0400 -@@ -636,7 +636,7 @@ - mdpolicy = SelectionOption('group:primary', - ('instant', 'group:all', 'group:main', - 'group:small', 'group:primary')) +--- yum/config.py~ 2009-10-14 15:52:38.000000000 -0400 ++++ yum/config.py 2009-10-14 15:59:57.000000000 -0400 +@@ -670,7 +670,7 @@ + # similar but better :). + mdpolicy = ListOption(['group:primary']) + # ('instant', 'group:all', 'group:main', 'group:small', 'group:primary')) - multilib_policy = SelectionOption('all',('best', 'all')) + multilib_policy = SelectionOption('best',('best', 'all')) # all == install any/all arches you can diff --git a/yum.spec b/yum.spec index 656a2ef..ac6eea4 100644 --- a/yum.spec +++ b/yum.spec @@ -2,8 +2,8 @@ Summary: RPM installer/updater Name: yum -Version: 3.2.24 -Release: 9%{?dist} +Version: 3.2.25 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -15,8 +15,6 @@ Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch -Patch6: yum-HEAD.patch -Patch7: revert-yum-dot-import.patch URL: http://yum.baseurl.org/ BuildArch: noarch @@ -60,8 +58,6 @@ can notify you when they are available via email, syslog or dbus. %patch3 -p0 %patch4 -p0 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 %build make @@ -111,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Wed Oct 14 2009 Seth Vidal - 3.2.25-1 +- 3.2.25 + * Wed Sep 30 2009 Seth Vidal - 3.2.24-9 - revert yum. import patch b/c it breaks a bunch of things From 56b2b1b7ed08870dd843a3c60f007fd8827f097a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:40 +0000 Subject: [PATCH 07/21] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0391f08..cc96bb3 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: yum -# $Id: Makefile,v 1.1 2004/09/09 15:13:02 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:38:44 notting Exp $ NAME := yum SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 07bdc3599dc79333c940cb5137f90712b50d17cc Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Tue, 9 Feb 2010 20:23:18 +0000 Subject: [PATCH 08/21] 3.2.26 for f12, too --- sources | 2 +- yum.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9c1b1e9..de9bf69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fdea025aa8fb88376a283959d5d2d0f yum-3.2.25.tar.gz +84eede25288772f38719d5c9e13ae75e yum-3.2.26.tar.gz diff --git a/yum.spec b/yum.spec index ac6eea4..a2cec2c 100644 --- a/yum.spec +++ b/yum.spec @@ -2,7 +2,7 @@ Summary: RPM installer/updater Name: yum -Version: 3.2.25 +Version: 3.2.26 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -93,6 +93,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/yum/version-groups.conf %dir %{_sysconfdir}/yum.repos.d %config(noreplace) %{_sysconfdir}/logrotate.d/yum +%{_sysconfdir}/bash_completion.d %dir %{_datadir}/yum-cli %{_datadir}/yum-cli/* %{_bindir}/yum @@ -107,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Tue Feb 9 2010 Seth Vidal - 3.2.26-1 +- final 3.2.26 + * Wed Oct 14 2009 Seth Vidal - 3.2.25-1 - 3.2.25 From 9215e61c8703a8197d0eb6517c4c4c4808b20282 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Thu, 11 Feb 2010 03:01:09 +0000 Subject: [PATCH 09/21] fix rh bug 563740 --- fix-kernel-updates.patch | 19 +++++++++++++++++++ yum.spec | 7 ++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 fix-kernel-updates.patch diff --git a/fix-kernel-updates.patch b/fix-kernel-updates.patch new file mode 100644 index 0000000..7338052 --- /dev/null +++ b/fix-kernel-updates.patch @@ -0,0 +1,19 @@ +commit 50b01cf6329d00e09a8586527afd9b72466df506 +Author: Seth Vidal +Date: Wed Feb 10 21:50:23 2010 -0500 + + fix typo which makes all kernel updates die :( + +diff --git a/yum/__init__.py b/yum/__init__.py +index d0bd4cc..df952a8 100644 +--- a/yum/__init__.py ++++ b/yum/__init__.py +@@ -4101,7 +4101,7 @@ class YumBase(depsolve.Depsolve): + numleft -= 1 + + for po,rel in toremove: +- txmbr = self.tsInfo.addErase(toremove) ++ txmbr = self.tsInfo.addErase(po) + # Add a dep relation to the new version of the package, causing this one to be erased + # this way skipbroken, should clean out the old one, if the new one is skipped + txmbr.depends_on.append(rel) diff --git a/yum.spec b/yum.spec index a2cec2c..5607d8d 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.26 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -15,6 +15,7 @@ Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch +Patch6: fix-kernel-updates.patch URL: http://yum.baseurl.org/ BuildArch: noarch @@ -58,6 +59,7 @@ can notify you when they are available via email, syslog or dbus. %patch3 -p0 %patch4 -p0 %patch5 -p1 +%patch6 -p1 %build make @@ -108,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Wed Feb 10 2010 Seth Vidal - 3.2.26-2 +- grumble. + * Tue Feb 9 2010 Seth Vidal - 3.2.26-1 - final 3.2.26 From ccece1cac4513a238311502ce50c26f8c0043c38 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Thu, 4 Mar 2010 21:00:52 +0000 Subject: [PATCH 10/21] bring changes from f13 back to f12 for bugfixes --- yum-HEAD.patch | 23846 +++++++++------- ...kip-broken-with-post-depsolve-change.patch | 67 + yum.spec | 11 +- 3 files changed, 13748 insertions(+), 10176 deletions(-) create mode 100644 yum-fix-skip-broken-with-post-depsolve-change.patch diff --git a/yum-HEAD.patch b/yum-HEAD.patch index 9a19fab..8a56e43 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -1,11567 +1,16514 @@ -diff --git a/cli.py b/cli.py -index 615a1f6..332be99 100644 ---- a/cli.py -+++ b/cli.py -@@ -100,6 +100,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): - self.registerCommand(yumcommands.ReInstallCommand()) - self.registerCommand(yumcommands.DowngradeCommand()) - self.registerCommand(yumcommands.VersionCommand()) -+ self.registerCommand(yumcommands.HistoryCommand()) - - def registerCommand(self, command): - for name in command.getNames(): -@@ -206,8 +207,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): - - if opts.version: - self.conf.cache = 1 -- yum_progs = ['yum', 'yum-metadata-parser', 'rpm', -- 'yum-rhn-plugin'] -+ yum_progs = self.run_with_package_names - done = False - def sm_ui_time(x): - return time.strftime("%Y-%m-%d %H:%M", time.gmtime(x)) -diff --git a/docs/yum.8 b/docs/yum.8 -index 3520912..9cd68dd 100644 ---- a/docs/yum.8 -+++ b/docs/yum.8 -@@ -67,6 +67,10 @@ gnome\-packagekit application\&. - .br - .I \fR * repolist [all|enabled|disabled] - .br -+.I \fR * version [all|installed|available|group-*|grouplist|groupinfo] -+.br -+.I \fR * history [info|list|summary|redo|undo|new] -+.br - .I \fR * help [command] - .br - .PP -@@ -225,6 +229,26 @@ Produces a list of configured repositories. The default is to list all - enabled repositories. If you pass \-v, for verbose mode, more information is - listed. - .IP -+.IP "\fBversion\fP" -+Produces a "version" of the rpmdb, and of the enabled repositories if "all" is -+given as the first argument. You can also specify version groups in the -+version-groups config. file. If you pass \-v, for verbose mode, more -+information is listed. The version is calculated by taking a sha1 hash of the -+packages (in sorted order), and the checksum_type/checksum_data entries from -+the yumdb. Note that this rpmdb version is now also used significantly within -+yum (esp. in yum history). -+.IP -+.IP "\fBhistory\fP" -+The history command allows the user to view what has happened in past -+transactions (assuming the history_record config. option is set). You can use -+info/list/summary to view what happend, undo/redo to act on that information -+and new to start a new history file. -+ -+The info/list/summary commands take either a transactions id or a package (with -+wildcards, as in \fBSpecifying package names\fP), all three can also be passed -+no arguments. list can be passed the keyword "all" to list all the transactions. -+undo/redo just take a transaction id. -+.IP - .IP "\fBhelp\fP" - Produces help, either for all commands or if given a command name then the help - for that particular command\&. -@@ -266,7 +290,8 @@ Sets the maximum amount of time yum will wait before performing a command \- it - Tells yum to run entirely from cache - does not download or update any - headers unless it has to to perform the requested action. - .IP "\fB\-\-version\fP" --Reports the \fByum\fP version number and exits. -+Reports the \fByum\fP version number and installed package versions for -+everything in history_record_packages (can be added to by plugins). - .IP "\fB\-\-showduplicates\fP" - Doesn't limit packages to their latest versions in the info, list and search - commands (will also affect plugins which use the doPackageLists() API). -@@ -450,6 +475,7 @@ configuration options. - .SH "FILES" - .nf - /etc/yum/yum.conf -+/etc/yum/version-groups.conf - /etc/yum/repos.d/ - /etc/yum/pluginconf.d/ - /var/cache/yum/ -diff --git a/docs/yum.conf.5 b/docs/yum.conf.5 -index 69b601d..8976b0c 100644 ---- a/docs/yum.conf.5 -+++ b/docs/yum.conf.5 -@@ -128,6 +128,9 @@ Number of packages listed in installonlypkgs to keep installed at the same - time. Setting to 0 disables this feature. Default is '0'. Note that this - functionality used to be in the "installonlyn" plugin, where this option was - altered via. tokeep. -+Note that as of version 3.2.24, yum will now look in the yumdb for a installonly -+attribute on installed packages. If that attribute is "keep", then they will -+never be removed. - - .IP - \fBkernelpkgnames \fR -@@ -274,6 +277,21 @@ Path to the ssl client key yum should use to connect to repos/remote sites - Defaults to none. - - .IP -+\fBhistory_record \fR -+Boolean - should yum record history entries for transactions. This takes some -+disk space, and some extra time in the transactions. But it allos how to know a -+lot of information about what has happened before, and display it to the user -+with the history info/list/summary commands. yum also provides the -+history undo/redo commands. Defaults to True. -+ -+.IP -+\fBhistory_record_packages \fR -+This is a list of package names that should be recorded as having helped the -+transaction. yum plugins have an API to add themself to this, so it should not -+normally be necessary to add packages here. Not that this is also used for the -+packages to look for in --version. Defaults to rpm, yum, yum-metadata-parser. -+ -+.IP - \fBcommands\fR - List of functional commands to run if no functional commands are specified - on the command line (eg. "update foo bar baz quux"). None of the short options -diff --git a/etc/Makefile b/etc/Makefile -index 1ba5a1f..7a083f7 100644 ---- a/etc/Makefile -+++ b/etc/Makefile -@@ -1,3 +1,5 @@ -+YUMETC=$(DESTDIR)/etc/yum -+ - all: - echo "Nothing to do" - -@@ -8,7 +10,9 @@ install: - mkdir -p $(DESTDIR)/etc/yum/ - mkdir -p $(DESTDIR)/etc/yum/repos.d - -- install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf -+ install -m 644 yum.conf $(YUMETC)/yum.conf -+ -+ install -m 644 version-groups.conf $(YUMETC)/version-groups.conf - - mkdir -p $(DESTDIR)/etc/logrotate.d - install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum -diff --git a/etc/version-groups.conf b/etc/version-groups.conf -new file mode 100644 -index 0000000..57d97dd ---- /dev/null -+++ b/etc/version-groups.conf -@@ -0,0 +1,11 @@ -+# This file allows you to create "groups" of package names, which are used by -+# the version command. -+ -+[yum] -+# These are the top level things to do with yum, we don't list Eg. libselinux -+# even though that's require by rpm(-libs). -+run_with_packages = true -+pkglist = glibc, sqlite, libcurl, nss, -+ rpm, rpm-libs, rpm-python, -+ python, -+ python-iniparse, python-urlgrabber, python-pycurl -diff --git a/output.py b/output.py -index 2299a9c..d0b9f7f 100755 ---- a/output.py -+++ b/output.py -@@ -22,6 +22,7 @@ import time - import logging - import types - import gettext -+import pwd - import rpm - - import re # For YumTerm -@@ -40,6 +41,7 @@ from yum.constants import * - from yum import logginglevels, _ - from yum.rpmtrans import RPMBaseCallback - from yum.packageSack import packagesNewestByNameArch -+import yum.packages - - from yum.i18n import utf8_width, utf8_width_fill, utf8_text_fill - -@@ -1172,6 +1174,328 @@ to exit. - ui_bs, ui_size, ui_time, ui_end) - self.verbose_logger.log(logginglevels.INFO_2, msg) - -+ def _history_uiactions(self, hpkgs): -+ actions = set() -+ count = 0 -+ for hpkg in hpkgs: -+ st = hpkg.state -+ if st == 'True-Install': -+ st = 'Install' -+ if st == 'Obsoleted': # This is just a UI tweak, as we can't have -+ # just one but we need to count them all. -+ st = 'Obsoleting' -+ if st in ('Install', 'Update', 'Erase', 'Reinstall', 'Downgrade', -+ 'Obsoleting'): -+ actions.add(st) -+ count += 1 -+ assert len(actions) <= 6 -+ if len(actions) > 1: -+ return count, ", ".join([x[0] for x in sorted(actions)]) -+ -+ # So empty transactions work, although that "shouldn't" really happen -+ return count, "".join(list(actions)) -+ -+ def _pwd_ui_username(self, uid, limit=None): -+ # loginuid is set to -1 on init. -+ if uid is None or uid == 0xFFFFFFFF: -+ loginid = _("") -+ name = _("System") + " " + loginid -+ if limit is not None and len(name) > limit: -+ name = loginid -+ return name -+ -+ try: -+ user = pwd.getpwuid(uid) -+ fullname = user.pw_gecos.split(';', 2)[0] -+ name = "%s <%s>" % (fullname, user.pw_name) -+ if limit is not None and len(name) > limit: -+ name = "%s ... <%s>" % (fullname.split()[0], user.pw_name) -+ if len(name) > limit: -+ name = "<%s>" % user.pw_name -+ return name -+ except KeyError: -+ return str(uid) -+ -+ def _history_list_transactions(self, extcmds): -+ tids = set() -+ pats = [] -+ usertids = extcmds[1:] -+ printall = False -+ if usertids: -+ printall = True -+ if usertids[0] == 'all': -+ usertids.pop(0) -+ for tid in usertids: -+ try: -+ int(tid) -+ tids.add(tid) -+ except ValueError: -+ pats.append(tid) -+ if pats: -+ tids.update(self.history.search(pats)) -+ -+ if not tids and usertids: -+ self.logger.critical(_('Bad transaction IDs, or package(s), given')) -+ return None, None -+ return tids, printall -+ -+ def historyListCmd(self, extcmds): -+ """ Shows the user a list of data about the history. """ -+ -+ tids, printall = self._history_list_transactions(extcmds) -+ if tids is None: -+ return 1, ['Failed history info'] -+ -+ fmt = "%-6s | %-22s | %-16s | %-14s | %-7s" -+ print fmt % ("ID", "Login user", "Date and time", "Action(s)","Altered") -+ print "-" * 79 -+ fmt = "%6u | %-22.22s | %-16s | %-14s | %4u" -+ done = 0 -+ limit = 20 -+ if printall: -+ limit = None -+ for old in self.history.old(tids, limit=limit): -+ if not printall and done >= limit: -+ break -+ -+ done += 1 -+ name = self._pwd_ui_username(old.loginuid, 22) -+ tm = time.strftime("%Y-%m-%d %H:%M", -+ time.localtime(old.beg_timestamp)) -+ num, uiacts = self._history_uiactions(old.trans_data) -+ if old.altered_lt_rpmdb and old.altered_gt_rpmdb: -+ print fmt % (old.tid, name, tm, uiacts, num), "><" -+ elif old.return_code is None: -+ print fmt % (old.tid, name, tm, uiacts, num), "**" -+ elif old.altered_lt_rpmdb: -+ print fmt % (old.tid, name, tm, uiacts, num), " <" -+ elif old.altered_gt_rpmdb: -+ print fmt % (old.tid, name, tm, uiacts, num), "> " -+ else: -+ print fmt % (old.tid, name, tm, uiacts, num) -+ lastdbv = self.history.last() -+ if lastdbv is not None: -+ # If this is the last transaction, is good and it doesn't -+ # match the current rpmdb ... then mark it as bad. -+ rpmdbv = self.rpmdb.simpleVersion(main_only=True)[0] -+ if lastdbv.end_rpmdbversion != rpmdbv: -+ errstring = _('Warning: RPMDB has been altered since the last yum transaction.') -+ self.logger.warning(errstring) -+ -+ def _history_get_transactions(self, extcmds): -+ if len(extcmds) < 2: -+ self.logger.critical(_('No transaction ID given')) -+ return None -+ -+ tids = [] -+ try: -+ int(extcmds[1]) -+ tids.append(extcmds[1]) -+ except ValueError: -+ self.logger.critical(_('Bad transaction ID given')) -+ return None -+ -+ old = self.history.old(tids) -+ if not old: -+ self.logger.critical(_('Not found given transaction ID')) -+ return None -+ return old -+ def _history_get_transaction(self, extcmds): -+ old = self._history_get_transactions(extcmds) -+ if old is None: -+ return None -+ if len(old) > 1: -+ self.logger.critical(_('Found more than one transaction ID!')) -+ return old[0] -+ -+ def historyInfoCmd(self, extcmds): -+ tids = set() -+ pats = [] -+ for tid in extcmds[1:]: -+ try: -+ int(tid) -+ tids.add(tid) -+ except ValueError: -+ pats.append(tid) -+ if pats: -+ tids.update(self.history.search(pats)) -+ -+ if not tids and len(extcmds) < 2: -+ old = self.history.last() -+ if old is not None: -+ tids.add(old.tid) -+ -+ if not tids: -+ self.logger.critical(_('No transaction ID, or package, given')) -+ return 1, ['Failed history info'] -+ -+ lastdbv = self.history.last() -+ if lastdbv is not None: -+ lasttid = lastdbv.tid -+ lastdbv = lastdbv.end_rpmdbversion -+ -+ done = False -+ for tid in self.history.old(tids): -+ if lastdbv is not None and tid.tid == lasttid: -+ # If this is the last transaction, is good and it doesn't -+ # match the current rpmdb ... then mark it as bad. -+ rpmdbv = self.rpmdb.simpleVersion(main_only=True)[0] -+ if lastdbv != rpmdbv: -+ tid.altered_gt_rpmdb = True -+ lastdbv = None -+ -+ if done: -+ print "-" * 79 -+ done = True -+ self._historyInfoCmd(tid, pats) -+ -+ def _historyInfoCmd(self, old, pats=[]): -+ name = self._pwd_ui_username(old.loginuid) -+ -+ print _("Transaction ID :"), old.tid -+ begtm = time.ctime(old.beg_timestamp) -+ print _("Begin time :"), begtm -+ if old.beg_rpmdbversion is not None: -+ if old.altered_lt_rpmdb: -+ print _("Begin rpmdb :"), old.beg_rpmdbversion, "**" -+ else: -+ print _("Begin rpmdb :"), old.beg_rpmdbversion -+ if old.end_timestamp is not None: -+ endtm = time.ctime(old.end_timestamp) -+ endtms = endtm.split() -+ if begtm.startswith(endtms[0]): # Chop uninteresting prefix -+ begtms = begtm.split() -+ sofar = 0 -+ for i in range(len(endtms)): -+ if i > len(begtms): -+ break -+ if begtms[i] != endtms[i]: -+ break -+ sofar += len(begtms[i]) + 1 -+ endtm = (' ' * sofar) + endtm[sofar:] -+ diff = _("(%s seconds)") % (old.end_timestamp - old.beg_timestamp) -+ print _("End time :"), endtm, diff -+ if old.end_rpmdbversion is not None: -+ if old.altered_gt_rpmdb: -+ print _("End rpmdb :"), old.end_rpmdbversion, "**" -+ else: -+ print _("End rpmdb :"), old.end_rpmdbversion -+ print _("User :"), name -+ if old.return_code is None: -+ print _("Return-Code :"), "**", _("Aborted"), "**" -+ elif old.return_code: -+ print _("Return-Code :"), _("Failure:"), old.return_code -+ else: -+ print _("Return-Code :"), _("Success") -+ print _("Transaction performed with :") -+ for hpkg in old.trans_with: -+ prefix = " " * 4 -+ state = _('Installed') -+ ipkgs = self.rpmdb.searchNames([hpkg.name]) -+ ipkgs.sort() -+ if not ipkgs: -+ state = _('Erased') -+ elif hpkg.pkgtup in (ipkg.pkgtup for ipkg in ipkgs): -+ pass -+ elif ipkgs[-1] > hpkg: -+ state = _('Updated') -+ elif ipkgs[0] < hpkg: -+ state = _('Downgraded') -+ else: # multiple versions installed, both older and newer -+ state = _('Weird') -+ print "%s%-12s %s" % (prefix, state, hpkg) -+ print _("Packages Altered:") -+ self.historyInfoCmdPkgsAltered(old, pats) -+ -+ def historyInfoCmdPkgsAltered(self, old, pats=[]): -+ for hpkg in old.trans_data: -+ prefix = " " * 4 -+ if not hpkg.done: -+ prefix = " ** " -+ -+ highlight = 'normal' -+ if pats: -+ x,m,u = yum.packages.parsePackages([hpkg], pats) -+ if x or m: -+ highlight = 'bold' -+ (hibeg, hiend) = self._highlight(highlight) -+ -+ # To chop the name off we need nevra strings, str(pkg) gives envra -+ # so we have to do it by hand ... *sigh*. -+ if hpkg.epoch == '0': -+ cn = str(hpkg) -+ else: -+ cn = "%s-%s:%s-%s.%s" % (hpkg.name, hpkg.epoch, -+ hpkg.version, hpkg.release, hpkg.arch) -+ -+ if False: pass -+ elif hpkg.state == 'Update': -+ ln = len(hpkg.name) + 1 -+ cn = (" " * ln) + cn[ln:] -+ print "%s%s%-12s%s %s" % (prefix, hibeg, hpkg.state, hiend, cn) -+ elif hpkg.state == 'Downgraded': -+ ln = len(hpkg.name) + 1 -+ cn = (" " * ln) + cn[ln:] -+ print "%s%s%-12s%s %s" % (prefix, hibeg, hpkg.state, hiend, cn) -+ elif hpkg.state == 'True-Install': -+ print "%s%s%-12s%s %s" % (prefix, hibeg, "Install", hiend, cn) -+ else: -+ print "%s%s%-12s%s %s" % (prefix, hibeg, hpkg.state, hiend, cn) -+ -+ def historySummaryCmd(self, extcmds): -+ tids, printall = self._history_list_transactions(extcmds) -+ if tids is None: -+ return 1, ['Failed history info'] -+ -+ fmt = "%-26s | %-19s | %-16s | %-8s" -+ print fmt % ("Login user", "Time", "Action(s)", "Altered") -+ print "-" * 79 -+ fmt = "%-26.26s | %-19.19s | %-16s | %8u" -+ data = {'day' : {}, 'week' : {}, -+ 'fortnight' : {}, 'quarter' : {}, 'half' : {}, -+ 'year' : {}, 'all' : {}} -+ for old in self.history.old(tids): -+ name = self._pwd_ui_username(old.loginuid, 26) -+ period = 'all' -+ now = time.time() -+ if False: pass -+ elif old.beg_timestamp > (now - (24 * 60 * 60)): -+ period = 'day' -+ elif old.beg_timestamp > (now - (24 * 60 * 60 * 7)): -+ period = 'week' -+ elif old.beg_timestamp > (now - (24 * 60 * 60 * 14)): -+ period = 'fortnight' -+ elif old.beg_timestamp > (now - (24 * 60 * 60 * 7 * 13)): -+ period = 'quarter' -+ elif old.beg_timestamp > (now - (24 * 60 * 60 * 7 * 26)): -+ period = 'half' -+ elif old.beg_timestamp > (now - (24 * 60 * 60 * 365)): -+ period = 'year' -+ data[period].setdefault(name, []).append(old) -+ _period2user = {'day' : _("Last day"), -+ 'week' : _("Last week"), -+ 'fortnight' : _("Last 2 weeks"), # US default :p -+ 'quarter' : _("Last 3 months"), -+ 'half' : _("Last 6 months"), -+ 'year' : _("Last year"), -+ 'all' : _("Over a year ago")} -+ done = 0 -+ for period in ('day', 'week', 'fortnight', 'quarter', 'half', 'year', -+ 'all'): -+ if not data[period]: -+ continue -+ for name in sorted(data[period]): -+ if not printall and done > 19: -+ break -+ done += 1 -+ -+ hpkgs = [] -+ for old in data[period][name]: -+ hpkgs.extend(old.trans_data) -+ count, uiacts = self._history_uiactions(hpkgs) -+ uperiod = _period2user[period] -+ print fmt % (name, uperiod, uiacts, count) -+ - - class DepSolveProgressCallBack: - """provides text output callback functions for Dependency Solver callback""" -diff --git a/po/ca.po b/po/ca.po -index 3bef4b5..1869dc2 100644 ---- a/po/ca.po -+++ b/po/ca.po -@@ -5,6 +5,7 @@ +diff --git a/po/es.po b/po/es.po +index 49bf1c4..d9badab 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -1,15 +1,16 @@ + # Fedora Spanish translation of yum.yum-3_2_X. + # This file is distributed under the same license as the yum.yum-3_2_X. package. +-# Héctor Daniel Cabrera , 2009. ++# + # Domingo Becker , 2009. ++# Héctor Daniel Cabrera , 2009, 2010. # - # Josep Maria Brunetti Fernández , 2008 - # Xavier Conde Rueda , 2008 -+# Josep Torné Llavall , 2009 - # - # This file is translated according to the glossary and style guide of - # Softcatalà. If you plan to modify this file, please read first the page -@@ -21,8 +22,8 @@ msgid "" + msgid "" msgstr "" - "Project-Id-Version: yum\n" + "Project-Id-Version: Fedora Spanish translation of yum.yum-3_2_X.\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-03-27 19:24+0000\n" --"PO-Revision-Date: 2009-03-31 22:25+0100\n" -+"POT-Creation-Date: 2009-09-05 08:55+0000\n" -+"PO-Revision-Date: 2009-09-06 22:25+0100\n" - "Last-Translator: Agustí Grau \n" - "Language-Team: Catalan \n" +-"POT-Creation-Date: 2009-10-15 15:45+0200\n" ++"POT-Creation-Date: 2010-02-10 10:43-0500\n" + "PO-Revision-Date: \n" +-"Last-Translator: Héctor Daniel Cabrera \n" ++"Last-Translator: Héctor Daniel Cabrera \n" + "Language-Team: Fedora Spanish \n" "MIME-Version: 1.0\n" -@@ -31,46 +32,32 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=n != 1;\n" - "X-Poedit-Language: Catalan\n" + "Content-Type: text/plain; charset=UTF-8\n" +@@ -17,33 +18,53 @@ msgstr "" + "X-Poedit-Language: Spanish\n" + "X-Poedit-Country: ARGENTINA\n" --#: ../callback.py:48 --#: ../output.py:922 --#: ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:938 ../yum/rpmtrans.py:71 +-#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 ++#: ../callback.py:48 ++#: ../output.py:947 ++#: ../yum/rpmtrans.py:72 msgid "Updating" - msgstr "Actualitzant" + msgstr "Actualizando" --#: ../callback.py:49 --#: ../yum/rpmtrans.py:72 -+#: ../callback.py:49 ../yum/rpmtrans.py:72 +-#: ../callback.py:49 ../yum/rpmtrans.py:72 ++#: ../callback.py:49 ++#: ../yum/rpmtrans.py:73 msgid "Erasing" --msgstr "S'està esborrant" -- --#: ../callback.py:50 --#: ../callback.py:51 --#: ../callback.py:53 --#: ../output.py:921 --#: ../yum/rpmtrans.py:73 --#: ../yum/rpmtrans.py:74 --#: ../yum/rpmtrans.py:76 -+msgstr "Suprimint" -+ -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:937 -+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 + msgstr "Eliminando" + +-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 +-#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 ++#: ../callback.py:50 ++#: ../callback.py:51 ++#: ../callback.py:53 ++#: ../output.py:946 ++#: ../output.py:1659 ++#: ../yum/rpmtrans.py:74 ++#: ../yum/rpmtrans.py:75 ++#: ../yum/rpmtrans.py:77 msgid "Installing" - msgstr "Instal·lant" + msgstr "Instalando" --#: ../callback.py:52 --#: ../callback.py:58 --#: ../yum/rpmtrans.py:75 -+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 +-#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 ++#: ../callback.py:52 ++#: ../callback.py:58 ++#: ../output.py:1484 ++#: ../yum/rpmtrans.py:76 msgid "Obsoleted" - msgstr "Obsolet" + msgstr "Obsoleto" --#: ../callback.py:54 --#: ../output.py:1029 -+#: ../callback.py:54 ../output.py:1061 +-#: ../callback.py:54 ../output.py:1063 ../output.py:1403 ++#: ../callback.py:54 ++#: ../output.py:1070 ++#: ../output.py:1442 ++#: ../output.py:1491 msgid "Updated" - msgstr "Actualitzat" + msgstr "Actualizado" - #: ../callback.py:55 +-#: ../callback.py:55 ../output.py:1399 ++#: ../callback.py:55 ++#: ../output.py:1438 msgid "Erased" --msgstr "Esborrat" -+msgstr "Suprimit" + msgstr "Eliminado" --#: ../callback.py:56 --#: ../callback.py:57 --#: ../callback.py:59 --#: ../output.py:1027 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1059 +-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 +-#: ../output.py:1395 ++#: ../callback.py:56 ++#: ../callback.py:57 ++#: ../callback.py:59 ++#: ../output.py:1068 ++#: ../output.py:1434 ++#: ../output.py:1646 msgid "Installed" - msgstr "Instal·lat" + msgstr "Instalado" -@@ -90,75 +77,70 @@ msgstr "Error: estat de sortida invàlid: %s per a %s" - #: ../callback.py:212 - #, python-format +@@ -65,68 +86,79 @@ msgstr "Error: estado de salida no válido: %s de %s" msgid "Erased: %s" --msgstr "Esborrat: %s" -+msgstr "Suprimit: %s" + msgstr "Eliminado: %s" --#: ../callback.py:217 --#: ../output.py:923 -+#: ../callback.py:217 ../output.py:939 +-#: ../callback.py:217 ../output.py:941 ++#: ../callback.py:217 ++#: ../output.py:948 ++#: ../output.py:1648 msgid "Removing" --msgstr "S'està esborrant" -+msgstr "Suprimint" + msgstr "Eliminando" --#: ../callback.py:219 --#: ../yum/rpmtrans.py:77 -+#: ../callback.py:219 ../yum/rpmtrans.py:77 +-#: ../callback.py:219 ../yum/rpmtrans.py:77 ++#: ../callback.py:219 ++#: ../yum/rpmtrans.py:78 msgid "Cleanup" - msgstr "Neteja" + msgstr "Limpieza" -#: ../cli.py:106 +#: ../cli.py:107 #, python-format msgid "Command \"%s\" already defined" - msgstr "L'ordre «%s» ja està definida" + msgstr "El comando \"%s\" ya ha sido definido" -#: ../cli.py:118 +#: ../cli.py:119 msgid "Setting up repositories" - msgstr "Configurant repositoris" + msgstr "Configurando los repositorios" -#: ../cli.py:129 +#: ../cli.py:130 msgid "Reading repository metadata in from local files" - msgstr "S'estan llegint les metadades de repositoris des de fitxers locals" + msgstr "Leyendo en archivos locales los metadatos de los repositorios" --#: ../cli.py:192 --#: ../utils.py:79 -+#: ../cli.py:193 ../utils.py:87 +-#: ../cli.py:192 ../utils.py:107 ++#: ../cli.py:194 ++#: ../utils.py:193 #, python-format msgid "Config Error: %s" - msgstr "Error de configuració: %s" + msgstr "Error de configuración: %s" --#: ../cli.py:195 --#: ../cli.py:1224 --#: ../utils.py:82 -+#: ../cli.py:196 ../cli.py:1253 ../utils.py:90 +-#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 ++#: ../cli.py:197 ++#: ../cli.py:1272 ++#: ../utils.py:196 #, python-format msgid "Options Error: %s" - msgstr "Error d'opcions: %s" + msgstr "Error de opciones: %s" -#: ../cli.py:223 -+#: ../cli.py:225 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr " Instal·lat: %s-%s a %s" - --#: ../cli.py:225 +#: ../cli.py:227 #, python-format - msgid " Built : %s at %s" - msgstr " Muntat : %s a %s" + msgid " Installed: %s-%s at %s" + msgstr " Instalado: %s-%s en %s" --#: ../cli.py:227 +-#: ../cli.py:225 +#: ../cli.py:229 + #, python-format + msgid " Built : %s at %s" + msgstr " Construido: %s en %s" + +-#: ../cli.py:227 ++#: ../cli.py:231 #, python-format msgid " Committed: %s at %s" - msgstr " Pujat: %s a %s" + msgstr " Enviado: %s en %s" -#: ../cli.py:266 -+#: ../cli.py:268 ++#: ../cli.py:270 msgid "You need to give some command" - msgstr "Cal que doneu alguna ordre" + msgstr "Necesita ingresar algún comando" -#: ../cli.py:309 -+#: ../cli.py:311 ++#: ../cli.py:284 ++#, python-format ++msgid "No such command: %s. Please use %s --help" ++msgstr "No existe el comando: %s. Por favor, utilice %s --help" ++ ++#: ../cli.py:314 msgid "Disk Requirements:\n" - msgstr "Requeriments de disc:\n" + msgstr "Requerimientos de disco:\n" -#: ../cli.py:311 -+#: ../cli.py:313 ++#: ../cli.py:316 #, python-format - msgid " At least %dMB needed on the %s filesystem.\n" - msgstr " Es necessiten almenys %dMB al sistema de fitxers %s.\n" +-msgid " At least %dMB needed on the %s filesystem.\n" +-msgstr " Como mínimo se necesitan %dMB en el sistema de archivos %s.\n" ++msgid " At least %dMB more space needed on the %s filesystem.\n" ++msgstr " Como mínimo se necesitan %dMB más en el sistema de archivos %s.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:316 -+#: ../cli.py:318 ++#: ../cli.py:321 msgid "" "Error Summary\n" "-------------\n" -@@ -166,58 +148,66 @@ msgstr "" - "Resum d'errors\n" +@@ -134,259 +166,271 @@ msgstr "" + "Resumen de errores\n" "-------------\n" -#: ../cli.py:359 -+#: ../cli.py:361 ++#: ../cli.py:364 msgid "Trying to run the transaction but nothing to do. Exiting." --msgstr "S'ha intentat executar la transacció però no hi ha cap tasca a fer. S'està sortint." -+msgstr "" -+"S'ha intentat executar la transacció però no hi ha cap tasca a fer. S'està " -+"sortint." +-msgstr "" +-"Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo." ++msgstr "Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo." -#: ../cli.py:395 -+#: ../cli.py:397 ++#: ../cli.py:403 msgid "Exiting on user Command" - msgstr "S'està sortint de l'ordre de l'usuari" + msgstr "Saliendo de acuerdo al comando del usuario" -#: ../cli.py:399 -+#: ../cli.py:401 ++#: ../cli.py:407 msgid "Downloading Packages:" --msgstr "S'estan descarregant els següents paquets:" -+msgstr "S'estan baixant els següents paquets:" + msgstr "Descargando paquetes:" -#: ../cli.py:404 -+#: ../cli.py:406 ++#: ../cli.py:412 msgid "Error Downloading Packages:\n" --msgstr "S'ha produït un error descarregant els següents paquets:\n" -+msgstr "S'ha produït un error baixant els següents paquets:\n" + msgstr "Error al descargar los paquetes:\n" --#: ../cli.py:418 --#: ../yum/__init__.py:3520 -+#: ../cli.py:420 ../yum/__init__.py:3854 +-#: ../cli.py:418 ../yum/__init__.py:4014 ++#: ../cli.py:426 ++#: ../yum/__init__.py:4194 msgid "Running rpm_check_debug" - msgstr "S'està executant rpm_check_debug" + msgstr "Ejecutando el rpm_check_debug" --#: ../cli.py:421 --#: ../yum/__init__.py:3523 -+#: ../cli.py:429 ../yum/__init__.py:3863 -+msgid "ERROR You need to update rpm to handle:" -+msgstr "S'ha produït un error. Necessiteu actualitzar el gestor rpm:" -+ -+#: ../cli.py:431 ../yum/__init__.py:3866 - msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "S'ha produït un error amb rpm_check_debug contra depsolve:" +-#: ../cli.py:427 ../yum/__init__.py:4023 ++#: ../cli.py:435 ++#: ../yum/__init__.py:4203 + msgid "ERROR You need to update rpm to handle:" + msgstr "ERROR Necesita actualizar el rpm para manipular:" --#: ../cli.py:425 +-#: ../cli.py:429 ../yum/__init__.py:4026 +#: ../cli.py:437 -+msgid "RPM needs to be updated" -+msgstr "Cal actualitzar l'RPM" -+ -+#: ../cli.py:438 ++#: ../yum/__init__.py:4206 + msgid "ERROR with rpm_check_debug vs depsolve:" + msgstr "ERROR con el rpm_check_debug vs depsolve:" + +-#: ../cli.py:435 ++#: ../cli.py:443 + msgid "RPM needs to be updated" + msgstr "El RPM necesita ser actualizado" + +-#: ../cli.py:436 ++#: ../cli.py:444 #, python-format msgid "Please report this error in %s" - msgstr "Siusplau, informeu d'aquest error a %s" + msgstr "Por favor, reporte este error en %s" --#: ../cli.py:431 -+#: ../cli.py:444 +-#: ../cli.py:442 ++#: ../cli.py:450 msgid "Running Transaction Test" - msgstr "S'està executant la transacció de prova" + msgstr "Ejecutando prueba de transacción" --#: ../cli.py:447 -+#: ../cli.py:460 - msgid "Finished Transaction Test" - msgstr "Ha acabat la transacció de prova" - --#: ../cli.py:449 -+#: ../cli.py:462 +-#: ../cli.py:458 +-msgid "Finished Transaction Test" +-msgstr "Prueba de transacción finalizada" +- +-#: ../cli.py:460 ++#: ../cli.py:466 msgid "Transaction Check Error:\n" - msgstr "S'ha produït un error en la transacció de prova:\n" + msgstr "Error en la verificación de la transacción:\n" --#: ../cli.py:456 -+#: ../cli.py:469 +-#: ../cli.py:467 ++#: ../cli.py:473 msgid "Transaction Test Succeeded" - msgstr "La transacció de prova ha acabat amb èxit" + msgstr "La prueba de transacción ha sido exitosa" --#: ../cli.py:477 -+#: ../cli.py:491 +-#: ../cli.py:489 ++#: ../cli.py:495 msgid "Running Transaction" - msgstr "S'està executant la transacció" + msgstr "Ejecutando transacción" --#: ../cli.py:507 -+#: ../cli.py:521 +-#: ../cli.py:519 ++#: ../cli.py:525 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -225,184 +215,191 @@ msgstr "" - "No s'importaran automàticament les claus en una execució desatesa.\n" - "Feu servir \"-y\" per a importar les claus." + msgstr "" +-"Se rechaza la importación automática de claves cuando se ejecuta " +-"desatendida.\n" ++"Se rechaza la importación automática de claves cuando se ejecuta desatendida.\n" + "Utilice \"-y\" para forzar." --#: ../cli.py:526 --#: ../cli.py:560 -+#: ../cli.py:540 ../cli.py:574 +-#: ../cli.py:538 ../cli.py:572 ++#: ../cli.py:544 ++#: ../cli.py:578 msgid " * Maybe you meant: " - msgstr " * Potser volíeu dir: " + msgstr " * Tal vez quería decir: " --#: ../cli.py:543 --#: ../cli.py:551 -+#: ../cli.py:557 ../cli.py:565 +-#: ../cli.py:555 ../cli.py:563 ++#: ../cli.py:561 ++#: ../cli.py:569 #, python-format msgid "Package(s) %s%s%s available, but not installed." - msgstr "Paquets %s%s%s disponibles, però no instal·lats." +-msgstr "" +-"El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) " +-"instalado." ++msgstr "El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) instalado." --#: ../cli.py:557 --#: ../cli.py:588 --#: ../cli.py:668 -+#: ../cli.py:571 ../cli.py:602 ../cli.py:680 +-#: ../cli.py:569 ../cli.py:600 ../cli.py:678 ++#: ../cli.py:575 ++#: ../cli.py:607 ++#: ../cli.py:687 #, python-format msgid "No package %s%s%s available." - msgstr "El paquet %s%s%s no està disponible." + msgstr "No existe disponible ningún paquete %s%s%s." --#: ../cli.py:593 --#: ../cli.py:695 -+#: ../cli.py:607 ../cli.py:740 +-#: ../cli.py:605 ../cli.py:738 ++#: ../cli.py:612 ++#: ../cli.py:748 msgid "Package(s) to install" - msgstr "Paquets a instal·lar" + msgstr "Paquete(s) a instalarse" --#: ../cli.py:594 --#: ../cli.py:674 --#: ../cli.py:696 +-#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 -#: ../yumcommands.py:159 --#: ../yumcommands.py:1013 -+#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741 -+#: ../yumcommands.py:157 ++#: ../cli.py:613 ++#: ../cli.py:693 ++#: ../cli.py:727 ++#: ../cli.py:749 ++#: ../yumcommands.py:160 msgid "Nothing to do" - msgstr "Res a fer" + msgstr "Nada para hacer" --#: ../cli.py:627 -+#: ../cli.py:641 +-#: ../cli.py:639 ++#: ../cli.py:647 #, python-format msgid "%d packages marked for Update" - msgstr "%d paquets marcats per a actualitzar" + msgstr "%d paquetes han sido seleccionados para ser actualizados" --#: ../cli.py:630 -+#: ../cli.py:644 +-#: ../cli.py:642 ++#: ../cli.py:650 msgid "No Packages marked for Update" - msgstr "No hi ha cap paquet marcat per a actualitzar" + msgstr "No se han seleccionando paquetes para ser actualizados" --#: ../cli.py:644 -+#: ../cli.py:658 +-#: ../cli.py:656 ++#: ../cli.py:664 #, python-format msgid "%d packages marked for removal" --msgstr "%d paquets marcats per a esborrar" -+msgstr "%d paquets marcats per a suprimir" + msgstr "%d paquetes han sido seleccionados para ser eliminados" --#: ../cli.py:647 -+#: ../cli.py:661 +-#: ../cli.py:659 ++#: ../cli.py:667 msgid "No Packages marked for removal" --msgstr "No hi ha cap paquet marcat per a esborrar" -+msgstr "No hi ha cap paquet marcat per a suprimir" + msgstr "No se han seleccionado paquetes para ser eliminados" --#: ../cli.py:673 -+#: ../cli.py:685 +-#: ../cli.py:683 ++#: ../cli.py:692 msgid "Package(s) to downgrade" - msgstr "Paquets per a desactualitzar" + msgstr "Paquete(s) a desactualizar" --#: ../cli.py:686 -+#: ../cli.py:709 -+#, python-format -+msgid " (from %s)" -+msgstr " (des de %s)" -+ -+#: ../cli.py:711 -+#, python-format -+msgid "Installed package %s%s%s%s not available." -+msgstr "El paquet instal·lat %s%s%s%s no està disponible." -+ -+#: ../cli.py:718 -+msgid "Package(s) to reinstall" -+msgstr "Paquets a reinstal·lar" -+ -+#: ../cli.py:731 +-#: ../cli.py:707 ++#: ../cli.py:717 + #, python-format + msgid " (from %s)" + msgstr " (desde %s)" + +-#: ../cli.py:709 ++#: ../cli.py:719 + #, python-format + msgid "Installed package %s%s%s%s not available." + msgstr "El paquete instalado %s%s%s%s no se encuentra disponible." + +-#: ../cli.py:716 ++#: ../cli.py:726 + msgid "Package(s) to reinstall" + msgstr "Paquete(s) a reinstalar" + +-#: ../cli.py:729 ++#: ../cli.py:739 msgid "No Packages Provided" - msgstr "No s'ha proporcionat cap paquet" + msgstr "No se ha ofrecido ningún paquete" --#: ../cli.py:741 --msgid "Matching packages for package list to user args" --msgstr "S'està comparant els paquets per a la llista de paquets amb els arguments de l'usuari" -- --#: ../cli.py:790 -+#: ../cli.py:815 +-#: ../cli.py:813 ++#: ../cli.py:818 ++#, python-format ++msgid "Matched: %s" ++msgstr "Concordante: %s" ++ ++#: ../cli.py:825 #, python-format msgid "Warning: No matches found for: %s" - msgstr "Avís: no s'ha trobat cap coincidència per a: %s" + msgstr "Aviso: No se ha encontrado ningún resultado para: %s" --#: ../cli.py:793 -+#: ../cli.py:818 +-#: ../cli.py:816 ++#: ../cli.py:828 msgid "No Matches found" - msgstr "No s'ha trobat cap coincidència" + msgstr "No se ha encontrado ningún resultado" --#: ../cli.py:832 -+#: ../cli.py:857 +-#: ../cli.py:855 ++#: ../cli.py:868 #, python-format msgid "" "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" msgstr "" --"Avís: les versions 3.0.x del yum comproven incorrectament els noms de fitxer.\n" -+"Avís: les versions 3.0.x del yum comproven incorrectament els noms de " -+"fitxer.\n" - " Podeu usar \"%s*/%s%s\" i/o \"%s*bin/%s%s\" per obtenir aquest comportament" +-"Aviso: las versiones 3.0.x de yum podrían hacer corresponder equivocadamente " +-"los nombres de los archivos.\n" ++"Aviso: las versiones 3.0.x de yum podrían hacer corresponder equivocadamente los nombres de los archivos.\n" + " Puede usar \"%s*/%s%s\" y/o \"%s*bin/%s%s\" para conseguir eso" --#: ../cli.py:848 -+#: ../cli.py:873 +-#: ../cli.py:871 ++#: ../cli.py:884 #, python-format msgid "No Package Found for %s" - msgstr "No s'ha trobat cap paquet per a %s" - --#: ../cli.py:860 -+#: ../cli.py:885 - msgid "Cleaning up Everything" - msgstr "S'està netejant tot" - --#: ../cli.py:874 -+#: ../cli.py:899 - msgid "Cleaning up Headers" - msgstr "S'estan netejant les capçaleres" - --#: ../cli.py:877 -+#: ../cli.py:902 - msgid "Cleaning up Packages" - msgstr "S'estan netejant els paquets" - --#: ../cli.py:880 -+#: ../cli.py:905 - msgid "Cleaning up xml metadata" - msgstr "S'estan netejant les metadades xml" + msgstr "No se ha encontrado ningún paquete para %s" -#: ../cli.py:883 -+#: ../cli.py:908 ++#: ../cli.py:896 + msgid "Cleaning up Everything" + msgstr "Limpiando todo" + +-#: ../cli.py:897 ++#: ../cli.py:912 + msgid "Cleaning up Headers" + msgstr "Limpiando encabezados" + +-#: ../cli.py:900 ++#: ../cli.py:915 + msgid "Cleaning up Packages" + msgstr "Limpiando paquetes" + +-#: ../cli.py:903 ++#: ../cli.py:918 + msgid "Cleaning up xml metadata" + msgstr "Limpiando metadatos xml" + +-#: ../cli.py:906 ++#: ../cli.py:921 msgid "Cleaning up database cache" - msgstr "S'està netejant la memòria cau de la base de dades" + msgstr "Limpiando el caché de la base de datos" --#: ../cli.py:886 -+#: ../cli.py:911 +-#: ../cli.py:909 ++#: ../cli.py:924 msgid "Cleaning up expire-cache metadata" - msgstr "S'està netejant la memòria cau de metadades que han vençut" + msgstr "Limpiando metadatos expirados del caché" --#: ../cli.py:889 -+#: ../cli.py:914 +-#: ../cli.py:912 ++#: ../cli.py:927 ++msgid "Cleaning up cached rpmdb data" ++msgstr "Limpiando datos de rpmdb en el caché" ++ ++#: ../cli.py:930 msgid "Cleaning up plugins" - msgstr "S'estan netejant els connectors" + msgstr "Limpiando complementos" --#: ../cli.py:914 -+#: ../cli.py:939 +-#: ../cli.py:937 ++#: ../cli.py:955 msgid "Installed Groups:" - msgstr "Grups instal·lats:" + msgstr "Grupos instalados:" --#: ../cli.py:926 -+#: ../cli.py:951 +-#: ../cli.py:949 ++#: ../cli.py:967 msgid "Available Groups:" - msgstr "Grups disponibles:" + msgstr "Grupos disponibles:" --#: ../cli.py:936 -+#: ../cli.py:961 +-#: ../cli.py:959 ++#: ../cli.py:977 msgid "Done" - msgstr "Fet" + msgstr "Listo" --#: ../cli.py:947 --#: ../cli.py:965 --#: ../cli.py:971 --#: ../yum/__init__.py:2421 -+#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2560 +-#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 ++#: ../cli.py:988 ++#: ../cli.py:1006 ++#: ../cli.py:1012 ++#: ../yum/__init__.py:2787 #, python-format msgid "Warning: Group %s does not exist." - msgstr "Avís: El grup %s no existeix." + msgstr "Aviso: el grupo %s no existe." --#: ../cli.py:975 -+#: ../cli.py:1000 +-#: ../cli.py:998 ++#: ../cli.py:1016 msgid "No packages in any requested group available to install or update" --msgstr "No hi ha cap paquet disponible per a instal·lar o actualitzar en els grups sol·licitats" -+msgstr "" -+"No hi ha cap paquet disponible per a instal·lar o actualitzar en els grups " -+"sol·licitats" +-msgstr "" +-"En los grupos solicitados no existe disponible ningún paquete para ser " +-"instalado o actualizado" ++msgstr "En los grupos solicitados no existe disponible ningún paquete para ser instalado o actualizado" --#: ../cli.py:977 -+#: ../cli.py:1002 +-#: ../cli.py:1000 ++#: ../cli.py:1018 #, python-format msgid "%d Package(s) to Install" - msgstr "%d paquets a instal·lar" + msgstr "%d paquete(s) a instalar" --#: ../cli.py:987 --#: ../yum/__init__.py:2433 -+#: ../cli.py:1012 ../yum/__init__.py:2572 +-#: ../cli.py:1010 ../yum/__init__.py:2641 ++#: ../cli.py:1028 ++#: ../yum/__init__.py:2799 #, python-format msgid "No group named %s exists" - msgstr "No existeix cap grup anomenat %s" + msgstr "No existe ningún grupo denominado %s" --#: ../cli.py:993 -+#: ../cli.py:1018 +-#: ../cli.py:1016 ++#: ../cli.py:1034 msgid "No packages to remove from groups" --msgstr "No hi ha cap paquet a esborrar dels grups" -+msgstr "No hi ha cap paquet a suprimir dels grups" + msgstr "No existen paquetes a eliminarse de los grupos" --#: ../cli.py:995 -+#: ../cli.py:1020 +-#: ../cli.py:1018 ++#: ../cli.py:1036 #, python-format msgid "%d Package(s) to remove" --msgstr "%d paquets a esborrar" -+msgstr "%d paquets a suprimir" + msgstr "%d paquete(s) a eliminar" --#: ../cli.py:1037 -+#: ../cli.py:1062 +-#: ../cli.py:1060 ++#: ../cli.py:1078 #, python-format msgid "Package %s is already installed, skipping" - msgstr "El paquet %s ja està instal·lat, s'ometrà" + msgstr "Ya se encuentra instalado el paquete %s, ignorando" --#: ../cli.py:1048 -+#: ../cli.py:1073 +-#: ../cli.py:1071 ++#: ../cli.py:1089 #, python-format msgid "Discarding non-comparable pkg %s.%s" - msgstr "S'està descartant el paquet no comparable %s.%s" + msgstr "Descartando paquete no comparable %s.%s" #. we've not got any installed that match n or n+a --#: ../cli.py:1074 -+#: ../cli.py:1099 +-#: ../cli.py:1097 ++#: ../cli.py:1115 #, python-format msgid "No other %s installed, adding to list for potential install" --msgstr "No hi ha cap altre %s instal·lat, s'afegeix a la llista per a una possible instal·lació" -+msgstr "" -+"No hi ha cap altre %s instal·lat, s'afegeix a la llista per a una possible " -+"instal·lació" +-msgstr "" +-"No existe instalado otro %s, agregando a la lista para instalación posible" ++msgstr "No existe instalado otro %s, agregando a la lista para instalación posible" --#: ../cli.py:1093 -+#: ../cli.py:1119 -+msgid "Plugin Options" -+msgstr "Opcions del connector" -+ -+#: ../cli.py:1127 +-#: ../cli.py:1117 ++#: ../cli.py:1135 + msgid "Plugin Options" + msgstr "Opciones de complementos" + +-#: ../cli.py:1125 ++#: ../cli.py:1143 #, python-format msgid "Command line error: %s" - msgstr "Error en la línia d'ordres: %s" + msgstr "Error en la línea de comando: %s" --#: ../cli.py:1106 -+#: ../cli.py:1140 +-#: ../cli.py:1138 ++#: ../cli.py:1156 #, python-format msgid "" "\n" -@@ -413,253 +410,259 @@ msgstr "" +@@ -397,109 +441,114 @@ msgstr "" "\n" - "%s: l'opció %s necessita un argument" + "%s: la opción %s necesita un argumento" --#: ../cli.py:1164 -+#: ../cli.py:1193 +-#: ../cli.py:1191 ++#: ../cli.py:1209 msgid "--color takes one of: auto, always, never" - msgstr "--color pren un valor d'entre: auto, always, never" - --#: ../cli.py:1266 -+#: ../cli.py:1300 - msgid "show this help message and exit" - msgstr "mostra el missatge d'ajuda i surt" - --#: ../cli.py:1270 -+#: ../cli.py:1304 - msgid "be tolerant of errors" - msgstr "sigues tolerant amb els errors" - --#: ../cli.py:1272 -+#: ../cli.py:1306 - msgid "run entirely from cache, don't update cache" - msgstr "executa totalment des de la memòria cau, no l'actualitzis" - --#: ../cli.py:1274 -+#: ../cli.py:1308 - msgid "config file location" - msgstr "ubicació del fitxer de configuració" - --#: ../cli.py:1276 -+#: ../cli.py:1310 - msgid "maximum command wait time" - msgstr "temps màxim d'espera d'ordres" - --#: ../cli.py:1278 -+#: ../cli.py:1312 - msgid "debugging output level" - msgstr "nivell de sortida de depuració" - --#: ../cli.py:1282 -+#: ../cli.py:1316 - msgid "show duplicates, in repos, in list/search commands" - msgstr "mostra duplicats, en repositoris, en les ordres per llistar i cercar" - --#: ../cli.py:1284 -+#: ../cli.py:1318 - msgid "error output level" - msgstr "nivell de sortida d'error" - --#: ../cli.py:1287 -+#: ../cli.py:1321 - msgid "quiet operation" - msgstr "operació silenciosa" - --#: ../cli.py:1289 -+#: ../cli.py:1323 - msgid "verbose operation" - msgstr "operació descriptiva" - --#: ../cli.py:1291 -+#: ../cli.py:1325 - msgid "answer yes for all questions" - msgstr "respon sí a totes les preguntes" - --#: ../cli.py:1293 -+#: ../cli.py:1327 - msgid "show Yum version and exit" - msgstr "mostra la versió del Yum i surt" - --#: ../cli.py:1294 -+#: ../cli.py:1328 - msgid "set install root" - msgstr "estableix l'arrel de la instal·lació" + msgstr "--color acepta una de las siguientes opciones: auto, always, never" -#: ../cli.py:1298 -+#: ../cli.py:1332 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "habilita un o més repositoris (es permeten caràcters de reemplaçament)" ++#: ../cli.py:1319 + msgid "show this help message and exit" + msgstr "muestra este mensaje de ayuda y cierra" -#: ../cli.py:1302 -+#: ../cli.py:1336 - msgid "disable one or more repositories (wildcards allowed)" --msgstr "deshabilita un o més repositoris (es permeten caràcters de reemplaçament)" -+msgstr "" -+"deshabilita un o més repositoris (es permeten caràcters de reemplaçament)" ++#: ../cli.py:1323 + msgid "be tolerant of errors" + msgstr "sea tolerante con los errores" --#: ../cli.py:1305 -+#: ../cli.py:1339 - msgid "exclude package(s) by name or glob" - msgstr "exclou els paquets per nom o expressió regular del glob" +-#: ../cli.py:1304 +-msgid "run entirely from cache, don't update cache" ++#: ../cli.py:1326 ++msgid "run entirely from system cache, don't update cache" + msgstr "se ejecuta completamente a partir del caché, pero no lo actualiza" --#: ../cli.py:1307 -+#: ../cli.py:1341 - msgid "disable exclude from main, for a repo or for everything" - msgstr "inhabilita l'exclusió des de l'inici, per a un repositori o per a tot" +-#: ../cli.py:1306 ++#: ../cli.py:1329 + msgid "config file location" + msgstr "configurar ubicación de archivo" + +-#: ../cli.py:1308 ++#: ../cli.py:1332 + msgid "maximum command wait time" + msgstr "tiempo máximo de espera del comando" -#: ../cli.py:1310 -+#: ../cli.py:1344 - msgid "enable obsoletes processing during updates" - msgstr "habilita el processament d'obsolets durant les actualitzacions" - --#: ../cli.py:1312 -+#: ../cli.py:1346 - msgid "disable Yum plugins" - msgstr "inhabilita els connectors de Yum" ++#: ../cli.py:1334 + msgid "debugging output level" + msgstr "nivel de depuración de la salida" -#: ../cli.py:1314 -+#: ../cli.py:1348 - msgid "disable gpg signature checking" - msgstr "inhabilita la comprobació de signatures gpg" ++#: ../cli.py:1338 + msgid "show duplicates, in repos, in list/search commands" +-msgstr "" +-"muestra duplicados en los repositorios, y en los comandos para mostrar/buscar" ++msgstr "muestra duplicados en los repositorios, y en los comandos para mostrar/buscar" -#: ../cli.py:1316 -+#: ../cli.py:1350 - msgid "disable plugins by name" - msgstr "inhabilita els connectors pel seu nom" ++#: ../cli.py:1340 + msgid "error output level" + msgstr "nivel de error de la salida" -#: ../cli.py:1319 -+#: ../cli.py:1353 - msgid "enable plugins by name" - msgstr "habilita els connectors pel seu nom" - --#: ../cli.py:1322 -+#: ../cli.py:1356 - msgid "skip packages with depsolving problems" - msgstr "omet paquets amb problemes de resolució de dependències" - --#: ../cli.py:1324 -+#: ../cli.py:1358 - msgid "control whether color is used" - msgstr "controla sempre que s'usi color" - --#: ../output.py:298 -+#: ../output.py:303 - msgid "Jan" - msgstr "Gen" - --#: ../output.py:298 -+#: ../output.py:303 - msgid "Feb" - msgstr "Feb" - --#: ../output.py:298 -+#: ../output.py:303 - msgid "Mar" - msgstr "Mar" - --#: ../output.py:298 -+#: ../output.py:303 - msgid "Apr" - msgstr "Abr" - --#: ../output.py:298 -+#: ../output.py:303 - msgid "May" - msgstr "Mai" - --#: ../output.py:298 -+#: ../output.py:303 - msgid "Jun" - msgstr "Jun" - --#: ../output.py:299 -+#: ../output.py:304 - msgid "Jul" - msgstr "Jul" - --#: ../output.py:299 -+#: ../output.py:304 - msgid "Aug" - msgstr "Ago" - --#: ../output.py:299 -+#: ../output.py:304 - msgid "Sep" - msgstr "Set" - --#: ../output.py:299 -+#: ../output.py:304 - msgid "Oct" - msgstr "Oct" - --#: ../output.py:299 -+#: ../output.py:304 - msgid "Nov" - msgstr "Nov" - --#: ../output.py:299 -+#: ../output.py:304 - msgid "Dec" - msgstr "Des" - --#: ../output.py:309 -+#: ../output.py:314 - msgid "Trying other mirror." - msgstr "S'està intentant un altre servidor rèplica." - --#: ../output.py:525 -+#: ../output.py:536 - #, python-format - msgid "Name : %s%s%s" - msgstr "Nom : %s%s%s" - --#: ../output.py:526 -+#: ../output.py:537 - #, python-format - msgid "Arch : %s" - msgstr "Arq : %s" - --#: ../output.py:528 -+#: ../output.py:539 - #, python-format - msgid "Epoch : %s" - msgstr "Època : %s" - --#: ../output.py:529 -+#: ../output.py:540 - #, python-format - msgid "Version : %s" - msgstr "Versió : %s" - --#: ../output.py:530 -+#: ../output.py:541 - #, python-format - msgid "Release : %s" - msgstr "Release : %s" - --#: ../output.py:531 -+#: ../output.py:542 - #, python-format - msgid "Size : %s" - msgstr "Mida : %s" - --#: ../output.py:532 -+#: ../output.py:543 - #, python-format - msgid "Repo : %s" - msgstr "Repo : %s" - --#: ../output.py:534 -+#: ../output.py:545 -+#, python-format -+msgid "From repo : %s" -+msgstr "Des del repo : %s" ++#: ../cli.py:1343 ++msgid "debugging output level for rpm" ++msgstr "nivel de depuración de salida para rpm" + -+#: ../output.py:547 - #, python-format - msgid "Committer : %s" - msgstr "Desenvolupador : %s" ++#: ../cli.py:1346 + msgid "quiet operation" + msgstr "operación discreta" --#: ../output.py:535 -+#: ../output.py:548 - #, python-format - msgid "Committime : %s" - msgstr "Pujat : %s" +-#: ../cli.py:1321 ++#: ../cli.py:1348 + msgid "verbose operation" + msgstr "operación detallada" --#: ../output.py:536 -+#: ../output.py:549 - #, python-format - msgid "Buildtime : %s" - msgstr "Temps de creació : %s" +-#: ../cli.py:1323 ++#: ../cli.py:1350 + msgid "answer yes for all questions" + msgstr "responde \"si\" a todas las preguntas" + +-#: ../cli.py:1325 ++#: ../cli.py:1352 + msgid "show Yum version and exit" + msgstr "muestra la versión de Yum y finaliza" + +-#: ../cli.py:1326 ++#: ../cli.py:1353 + msgid "set install root" + msgstr "define la raíz de instalación" + +-#: ../cli.py:1330 ++#: ../cli.py:1357 + msgid "enable one or more repositories (wildcards allowed)" + msgstr "activa uno o más repositorios (los comodines son permitidos)" + +-#: ../cli.py:1334 ++#: ../cli.py:1361 + msgid "disable one or more repositories (wildcards allowed)" + msgstr "desactiva uno o más repositorios (los comodines son permitidos)" + +-#: ../cli.py:1337 ++#: ../cli.py:1364 + msgid "exclude package(s) by name or glob" + msgstr "excluya paquete(s) de acuerdo a su nombre o glob " + +-#: ../cli.py:1339 ++#: ../cli.py:1366 + msgid "disable exclude from main, for a repo or for everything" +-msgstr "" +-"deshabilita la posibilidad de exclusión desde main, para un repositorio o " +-"para todos" ++msgstr "deshabilita la posibilidad de exclusión desde main, para un repositorio o para todos" + +-#: ../cli.py:1342 ++#: ../cli.py:1369 + msgid "enable obsoletes processing during updates" + msgstr "habilita el proceso de paquetes obsoletos durante las actualizaciones" + +-#: ../cli.py:1344 ++#: ../cli.py:1371 + msgid "disable Yum plugins" + msgstr "deshabilita los complementos de Yum" + +-#: ../cli.py:1346 ++#: ../cli.py:1373 + msgid "disable gpg signature checking" + msgstr "deshabilita la verificación de firmas GPG" + +-#: ../cli.py:1348 ++#: ../cli.py:1375 + msgid "disable plugins by name" + msgstr "deshabilita complementos de acuerdo a su nombre" + +-#: ../cli.py:1351 ++#: ../cli.py:1378 + msgid "enable plugins by name" + msgstr "habilita complementos de acuerdo a su nombre" + +-#: ../cli.py:1354 ++#: ../cli.py:1381 + msgid "skip packages with depsolving problems" + msgstr "ignora paquetes con problemas de resolución de dependencias" + +-#: ../cli.py:1356 ++#: ../cli.py:1383 + msgid "control whether color is used" + msgstr "controla la utilización de colores" + ++#: ../cli.py:1385 ++msgid "set value of $releasever in yum config and repo files" ++msgstr "define el valor de $releasever en los aarchivos de configuración de yum y de los repositorios" ++ + #: ../output.py:305 + msgid "Jan" + msgstr "Ene" +@@ -552,105 +601,104 @@ msgstr "Dic" + msgid "Trying other mirror." + msgstr "Intentando con otro espejo." -#: ../output.py:538 -+#: ../output.py:551 ++#: ../output.py:534 #, python-format - msgid "Installtime: %s" - msgstr "Temps d'instal·lació: %s" + msgid "Name : %s%s%s" + msgstr "Nombre : %s%s%s" -#: ../output.py:539 -+#: ../output.py:552 - msgid "Summary : " - msgstr "Resum : " ++#: ../output.py:535 + #, python-format + msgid "Arch : %s" + msgstr "Arquitectura : %s" -#: ../output.py:541 -+#: ../output.py:554 ++#: ../output.py:537 + #, python-format + msgid "Epoch : %s" + msgstr "Período : %s" + +-#: ../output.py:542 ++#: ../output.py:538 + #, python-format + msgid "Version : %s" + msgstr "Versión : %s" + +-#: ../output.py:543 ++#: ../output.py:539 + #, python-format + msgid "Release : %s" + msgstr "Lanzamiento : %s" + +-#: ../output.py:544 ++#: ../output.py:540 + #, python-format + msgid "Size : %s" + msgstr "Tamaño : %s" + +-#: ../output.py:545 ++#: ../output.py:541 + #, python-format + msgid "Repo : %s" + msgstr "Repositorio : %s" + +-#: ../output.py:547 ++#: ../output.py:543 + #, python-format + msgid "From repo : %s" + msgstr "Desde el repositorio : %s" + +-#: ../output.py:549 ++#: ../output.py:545 + #, python-format + msgid "Committer : %s" + msgstr "Enviado por : %s" + +-#: ../output.py:550 ++#: ../output.py:546 + #, python-format + msgid "Committime : %s" + msgstr "Horario del envio : %s" + +-#: ../output.py:551 ++#: ../output.py:547 + #, python-format + msgid "Buildtime : %s" + msgstr "Horario de la construcción : %s" + +-#: ../output.py:553 ++#: ../output.py:549 + #, python-format + msgid "Installtime: %s" + msgstr "Horario de la instalación: %s" + +-#: ../output.py:554 ++#: ../output.py:550 + msgid "Summary : " + msgstr "Resumen : " + +-#: ../output.py:556 ++#: ../output.py:552 #, python-format msgid "URL : %s" msgstr "URL : %s" --#: ../output.py:542 -+#: ../output.py:555 - #, python-format - msgid "License : %s" - msgstr "Llicència : %s" +-#: ../output.py:557 +-#, python-format +-msgid "License : %s" +-msgstr "Licencia : %s" ++#: ../output.py:553 ++msgid "License : " ++msgstr "Licencia : " --#: ../output.py:543 -+#: ../output.py:556 +-#: ../output.py:558 ++#: ../output.py:554 msgid "Description: " - msgstr "Descripció: " + msgstr "Descripción:" --#: ../output.py:611 -+#: ../output.py:624 +-#: ../output.py:626 ++#: ../output.py:622 msgid "y" msgstr "s" --#: ../output.py:611 -+#: ../output.py:624 +-#: ../output.py:626 ++#: ../output.py:622 msgid "yes" - msgstr "sí" + msgstr "si" --#: ../output.py:612 -+#: ../output.py:625 +-#: ../output.py:627 ++#: ../output.py:623 msgid "n" msgstr "n" --#: ../output.py:612 -+#: ../output.py:625 +-#: ../output.py:627 ++#: ../output.py:623 msgid "no" msgstr "no" - # REMEMBER to Translate [Y/N] to the current locale --#: ../output.py:616 -+#: ../output.py:629 +-#: ../output.py:631 ++#: ../output.py:627 msgid "Is this ok [y/N]: " - msgstr "És correcte [s/N]: " + msgstr "Está de acuerdo [s/N]:" --#: ../output.py:704 -+#: ../output.py:720 +-#: ../output.py:722 ++#: ../output.py:715 #, python-format msgid "" "\n" -@@ -668,134 +671,142 @@ msgstr "" +@@ -659,150 +707,152 @@ msgstr "" "\n" - "Grup: %s" + "Grupo: %s" --#: ../output.py:708 -+#: ../output.py:724 +-#: ../output.py:726 ++#: ../output.py:719 #, python-format msgid " Group-Id: %s" - msgstr " Id de Grup: %s" + msgstr " Group-Id: %s" --#: ../output.py:713 -+#: ../output.py:729 +-#: ../output.py:731 ++#: ../output.py:724 #, python-format msgid " Description: %s" - msgstr " Descripció: %s" + msgstr " Descripción: %s" --#: ../output.py:715 -+#: ../output.py:731 +-#: ../output.py:733 ++#: ../output.py:726 msgid " Mandatory Packages:" - msgstr " Paquets obligatoris:" + msgstr " Paquetes obligatorios:" --#: ../output.py:716 -+#: ../output.py:732 +-#: ../output.py:734 ++#: ../output.py:727 msgid " Default Packages:" - msgstr " Paquets per defecte:" + msgstr " Paquetes predeterminados:" --#: ../output.py:717 -+#: ../output.py:733 +-#: ../output.py:735 ++#: ../output.py:728 msgid " Optional Packages:" - msgstr " Paquets opcionals:" + msgstr " Paquetes opcionales:" --#: ../output.py:718 -+#: ../output.py:734 +-#: ../output.py:736 ++#: ../output.py:729 msgid " Conditional Packages:" - msgstr " Paquets condicionals:" + msgstr " Paquetes condicionales:" --#: ../output.py:738 -+#: ../output.py:754 +-#: ../output.py:756 ++#: ../output.py:749 #, python-format msgid "package: %s" - msgstr "paquet: %s" + msgstr "paquete: %s" --#: ../output.py:740 -+#: ../output.py:756 +-#: ../output.py:758 ++#: ../output.py:751 msgid " No dependencies for this package" - msgstr " No hi ha dependències per a aquest paquet" + msgstr " No existen dependencias para este paquete" --#: ../output.py:745 -+#: ../output.py:761 +-#: ../output.py:763 ++#: ../output.py:756 #, python-format msgid " dependency: %s" - msgstr " dependència: %s" + msgstr " dependencia: %s" --#: ../output.py:747 -+#: ../output.py:763 +-#: ../output.py:765 ++#: ../output.py:758 msgid " Unsatisfied dependency" - msgstr " Dependència insatisfeta" + msgstr " Dependencia no satisfecha" --#: ../output.py:819 -+#: ../output.py:835 +-#: ../output.py:837 ++#: ../output.py:830 #, python-format msgid "Repo : %s" - msgstr "Repo : %s" + msgstr "Repositorio : %s" --#: ../output.py:820 -+#: ../output.py:836 +-#: ../output.py:838 ++#: ../output.py:831 msgid "Matched from:" - msgstr "Coincidències amb:" + msgstr "Resultado obtenido desde:" --#: ../output.py:828 -+#: ../output.py:845 +-#: ../output.py:847 ++#: ../output.py:840 msgid "Description : " - msgstr "Descripció : " + msgstr "Descripción :" --#: ../output.py:831 -+#: ../output.py:848 +-#: ../output.py:850 ++#: ../output.py:843 #, python-format msgid "URL : %s" msgstr "URL : %s" --#: ../output.py:834 -+#: ../output.py:851 +-#: ../output.py:853 ++#: ../output.py:846 #, python-format msgid "License : %s" - msgstr "Llicència : %s" + msgstr "Licencia : %s" --#: ../output.py:837 -+#: ../output.py:854 +-#: ../output.py:856 ++#: ../output.py:849 #, python-format msgid "Filename : %s" - msgstr "Fitxer : %s" + msgstr "Nombre del archivo : %s" --#: ../output.py:841 -+#: ../output.py:858 +-#: ../output.py:860 ++#: ../output.py:853 msgid "Other : " - msgstr "Altre : " + msgstr "Otro : " --#: ../output.py:874 -+#: ../output.py:891 - msgid "There was an error calculating total download size" - msgstr "S'ha produït un error en calcular la mida total de la descàrrega" - --#: ../output.py:879 +-#: ../output.py:893 +#: ../output.py:896 + msgid "There was an error calculating total download size" + msgstr "Hubo un error mientras se calculaba el tamaño total de la descarga" + +-#: ../output.py:898 ++#: ../output.py:901 #, python-format msgid "Total size: %s" - msgstr "Mida total: %s" + msgstr "Tamaño total: %s" --#: ../output.py:882 -+#: ../output.py:899 +-#: ../output.py:901 ++#: ../output.py:904 #, python-format msgid "Total download size: %s" - msgstr "Mida total de la descàrrega: %s" + msgstr "Tamaño total de la descarga: %s" --#: ../output.py:924 -+#: ../output.py:940 -+#, -+msgid "Reinstalling" -+msgstr "Tornant a instal·lar" +-#: ../output.py:942 ++#: ../output.py:908 ++#, python-format ++msgid "Installed size: %s" ++msgstr "Tamaño instalado: %s" + -+#: ../output.py:941 -+msgid "Downgrading" -+msgstr "Desfent l'actualització" -+ -+#: ../output.py:942 ++#: ../output.py:949 + msgid "Reinstalling" + msgstr "Reinstalando" + +-#: ../output.py:943 ++#: ../output.py:950 + msgid "Downgrading" + msgstr "Desactualizando" + +-#: ../output.py:944 ++#: ../output.py:951 msgid "Installing for dependencies" - msgstr "S'està instal·lant per dependències" + msgstr "Instalando para las dependencias" --#: ../output.py:925 -+#: ../output.py:943 +-#: ../output.py:945 ++#: ../output.py:952 msgid "Updating for dependencies" - msgstr "S'està actualitzant degut a les dependències" + msgstr "Actualizando para las dependencias" --#: ../output.py:926 -+#: ../output.py:944 +-#: ../output.py:946 ++#: ../output.py:953 msgid "Removing for dependencies" --msgstr "S'està esborrant degut a les dependències" -+msgstr "S'està suprimint degut a les dependències" + msgstr "Eliminando para las dependencias" --#: ../output.py:933 --#: ../output.py:1031 -+#: ../output.py:951 ../output.py:1063 +-#: ../output.py:953 ../output.py:1065 ++#: ../output.py:960 ++#: ../output.py:1072 msgid "Skipped (dependency problems)" - msgstr "Ignorat degut a problemes de dependències:" + msgstr "Ignorando (problemas de dependencias)" --#: ../output.py:954 -+#: ../output.py:974 +-#: ../output.py:976 ++#: ../output.py:983 msgid "Package" - msgstr "Paquet" + msgstr "Paquete" --#: ../output.py:954 -+#: ../output.py:974 +-#: ../output.py:976 ++#: ../output.py:983 msgid "Arch" - msgstr "Arq" - --#: ../output.py:955 -+#: ../output.py:975 - msgid "Version" - msgstr "Versió" - --#: ../output.py:955 -+#: ../output.py:975 - msgid "Repository" - msgstr "Repositori" - --#: ../output.py:956 -+#: ../output.py:976 - msgid "Size" - msgstr "Mida" - --#: ../output.py:968 -+#: ../output.py:988 - #, python-format - msgid "" - " replacing %s%s%s.%s %s\n" -@@ -804,135 +815,164 @@ msgstr "" - " s'està reemplaçant %s%s%s.%s %s\n" - "\n" + msgstr "Arquitectura" -#: ../output.py:977 ++#: ../output.py:984 + msgid "Version" + msgstr "Versión" + +-#: ../output.py:977 ++#: ../output.py:984 + msgid "Repository" + msgstr "Repositorio" + +-#: ../output.py:978 ++#: ../output.py:985 + msgid "Size" + msgstr "Tamaño" + +-#: ../output.py:990 +#: ../output.py:997 #, python-format +-msgid "" +-" replacing %s%s%s.%s %s\n" +-"\n" +-msgstr "" +-" reemplazando %s%s%s.%s %s\n" +-"\n" ++msgid " replacing %s%s%s.%s %s\n" ++msgstr " reemplazando %s%s%s.%s %s\n" + +-#: ../output.py:999 ++#: ../output.py:1006 + #, python-format msgid "" "\n" - "Transaction Summary\n" +@@ -813,7 +863,7 @@ msgstr "" + "Resumen de la transacción\n" "%s\n" --"Install %5.5s Package(s) \n" --"Update %5.5s Package(s) \n" --"Remove %5.5s Package(s) \n" - msgstr "" - "\n" --"Resum de transaccions\n" -+"Resum de la transacció\n" - "%s\n" --"Instal·la %5.5s paquets \n" --"Actualitza %5.5s paquets \n" --"Esborra %5.5s paquets \n" --#: ../output.py:1025 -+#: ../output.py:1004 -+#, python-format -+msgid "" -+"Install %5.5s Package(s)\n" -+"Upgrade %5.5s Package(s)\n" -+msgstr "" -+"Instal·la %5.5s paquets\n" -+"Actualitza %5.5s paquets\n" -+ -+ +-#: ../output.py:1006 +#: ../output.py:1013 -+#, python-format //paraula downgrade -+msgid "" -+"Remove %5.5s Package(s)\n" -+"Reinstall %5.5s Package(s)\n" -+"Downgrade %5.5s Package(s)\n" -+msgstr "" -+"Suprimeix %5.5s paquets\n" -+"Reinstal·la %5.5s paquets\n" -+"Desactualitza %5.5s paquets\n" -+ -+#: ../output.py:1057 + #, python-format + msgid "" + "Install %5.5s Package(s)\n" +@@ -822,7 +872,7 @@ msgstr "" + "Instalar %5.5s Paquete(s)\n" + "Actualizar %5.5s Paquete(s)\n" + +-#: ../output.py:1015 ++#: ../output.py:1022 + #, python-format + msgid "" + "Remove %5.5s Package(s)\n" +@@ -833,32 +883,32 @@ msgstr "" + "Reinstalar %5.5s Paquete(s)\n" + "Desactualizar %5.5s Paquete(s)\n" + +-#: ../output.py:1059 ++#: ../output.py:1066 msgid "Removed" --msgstr "Esborrat" -+msgstr "Suprimit" + msgstr "Eliminado(s)" --#: ../output.py:1026 -+#: ../output.py:1058 +-#: ../output.py:1060 ++#: ../output.py:1067 msgid "Dependency Removed" --msgstr "Dependència esborrada" -+msgstr "Dependència suprimida" + msgstr "Dependencia(s) eliminada(s)" --#: ../output.py:1028 -+#: ../output.py:1060 +-#: ../output.py:1062 ++#: ../output.py:1069 msgid "Dependency Installed" - msgstr "Dependència instal·lada" + msgstr "Dependencia(s) instalada(s)" --#: ../output.py:1030 -+#: ../output.py:1062 +-#: ../output.py:1064 ++#: ../output.py:1071 msgid "Dependency Updated" - msgstr "Dependència actualitzada" + msgstr "Dependencia(s) actualizada(s)" --#: ../output.py:1032 -+#: ../output.py:1064 +-#: ../output.py:1066 ++#: ../output.py:1073 msgid "Replaced" - msgstr "Reemplaçat" + msgstr "Sustituido(s)" --#: ../output.py:1033 -+#: ../output.py:1065 +-#: ../output.py:1067 ++#: ../output.py:1074 msgid "Failed" - msgstr "Ha fallat" + msgstr "Falló" #. Delta between C-c's so we treat as exit --#: ../output.py:1099 -+#: ../output.py:1131 +-#: ../output.py:1133 ++#: ../output.py:1140 msgid "two" msgstr "dos" --#: ../output.py:1106 -+#. For translators: This is output like: -+#. Current download cancelled, interrupt (ctrl-c) again within two seconds -+#. to exit. -+#. Where "interupt (ctrl-c) again" and "two" are highlighted. -+#: ../output.py:1142 +@@ -866,228 +916,389 @@ msgstr "dos" + #. Current download cancelled, interrupt (ctrl-c) again within two seconds + #. to exit. + #. Where "interupt (ctrl-c) again" and "two" are highlighted. +-#: ../output.py:1144 ++#: ../output.py:1151 #, python-format msgid "" "\n" --" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds to exit.\n" -+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " -+"seconds\n" -+"to exit.\n" +-" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " +-"seconds\n" ++" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" msgstr "" "\n" --" S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%s segons per a sortir.\n" -+" S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%s " -+"segons\n" -+"per a sortir.\n" +-" Se ha cancelado la descarga actual, %sinterrumpa con (ctrl-c) nuevamente%s " +-"dentro de %s%s%s segundos\n" ++" Se ha cancelado la descarga actual, %sinterrumpa con (ctrl-c) nuevamente%s dentro de %s%s%s segundos\n" + "para finalizar.\n" --#: ../output.py:1116 -+#: ../output.py:1153 +-#: ../output.py:1155 ++#: ../output.py:1162 msgid "user interrupt" - msgstr "interrupció de l'usuari" + msgstr "interrupción solicitada por el usuario" --#: ../output.py:1132 -+#: ../output.py:1171 +-#: ../output.py:1173 ++#: ../output.py:1180 msgid "Total" msgstr "Total" --#: ../output.py:1146 -+#: ../output.py:1186 ++#: ../output.py:1202 ++msgid "I" ++msgstr "I" ++ + #: ../output.py:1203 ++msgid "O" ++msgstr "O" ++ ++#: ../output.py:1204 ++msgid "E" ++msgstr "E" ++ ++#: ../output.py:1205 ++msgid "R" ++msgstr "R" ++ ++#: ../output.py:1206 ++msgid "D" ++msgstr "D" ++ ++#: ../output.py:1207 ++msgid "U" ++msgstr "U" ++ ++#: ../output.py:1217 + msgid "" + msgstr "" + +-#: ../output.py:1204 ++#: ../output.py:1218 + msgid "System" + msgstr "Sistema" + +-#: ../output.py:1240 ++#: ../output.py:1254 + msgid "Bad transaction IDs, or package(s), given" + msgstr "Se ha(n) indicado paquete(s), o IDs de transacciones erróneas" + +-#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 +-msgid "Warning: RPMDB has been altered since the last yum transaction." +-msgstr "" +-"Aviso: Desde la última transacción, han sido modificadas las bases de datos " +-"(RPMDB)." ++#: ../output.py:1266 ++msgid "ID" ++msgstr "ID" ++ ++#: ../output.py:1267 ++#: ../output.py:1520 ++msgid "Login user" ++msgstr "Registro de usuario" ++ ++#: ../output.py:1268 ++msgid "Date and time" ++msgstr "Día y hora" ++ ++#: ../output.py:1269 ++#: ../output.py:1522 ++msgid "Action(s)" ++msgstr "Acción(es)" + +-#: ../output.py:1289 ++#: ../output.py:1270 ++#: ../output.py:1523 ++msgid "Altered" ++msgstr "Modificado" ++ ++#: ../output.py:1310 + msgid "No transaction ID given" + msgstr "No se ha indicado un ID de transacción" + +-#: ../output.py:1297 ++#: ../output.py:1336 + msgid "Bad transaction ID given" + msgstr "Se ha indicado un ID de transacción no válido " + +-#: ../output.py:1302 ++#: ../output.py:1341 + msgid "Not found given transaction ID" + msgstr "No se ha encontrado el ID de transacción indicado" + +-#: ../output.py:1310 ++#: ../output.py:1349 + msgid "Found more than one transaction ID!" + msgstr "¡Se ha encontrado más de un ID de transacción!" + +-#: ../output.py:1331 ++#: ../output.py:1370 + msgid "No transaction ID, or package, given" + msgstr "No se ha indicado ningún paquete, o ID de transacción" + +-#: ../output.py:1357 ++#: ../output.py:1396 + msgid "Transaction ID :" + msgstr "ID de transacción :" + +-#: ../output.py:1359 ++#: ../output.py:1398 + msgid "Begin time :" + msgstr "Hora inicial :" + +-#: ../output.py:1362 ../output.py:1364 ++#: ../output.py:1401 ++#: ../output.py:1403 + msgid "Begin rpmdb :" + msgstr "Rpmdb inicial :" + +-#: ../output.py:1378 ++#: ../output.py:1417 + #, python-format + msgid "(%s seconds)" + msgstr "(%s segundos)" + +-#: ../output.py:1379 ++#: ../output.py:1418 + msgid "End time :" + msgstr "Hora final : " + +-#: ../output.py:1382 ../output.py:1384 ++#: ../output.py:1421 ++#: ../output.py:1423 + msgid "End rpmdb :" + msgstr "Rpmdb final :" + +-#: ../output.py:1385 ++#: ../output.py:1424 + msgid "User :" + msgstr "Usuario :" + +-#: ../output.py:1387 ../output.py:1389 ../output.py:1391 ++#: ../output.py:1426 ++#: ../output.py:1428 ++#: ../output.py:1430 + msgid "Return-Code :" + msgstr "Codigo-obtenido :" + +-#: ../output.py:1387 ++#: ../output.py:1426 + msgid "Aborted" + msgstr "Abortado" + +-#: ../output.py:1389 ++#: ../output.py:1428 + msgid "Failure:" + msgstr "Falla:" + +-#: ../output.py:1391 ++#: ../output.py:1430 + msgid "Success" + msgstr "Exito" + +-#: ../output.py:1392 ++#: ../output.py:1431 + msgid "Transaction performed with:" + msgstr "Transacción realizada con:" + +-#: ../output.py:1405 ++#: ../output.py:1444 ++#: ../output.py:1489 + msgid "Downgraded" + msgstr "Desactualizado" + + #. multiple versions installed, both older and newer +-#: ../output.py:1407 ++#: ../output.py:1446 + msgid "Weird" + msgstr "Extraño" + +-#: ../output.py:1409 ++#: ../output.py:1448 + msgid "Packages Altered:" + msgstr "Paquetes modificados:" + +-#: ../output.py:1412 ++#: ../output.py:1451 + msgid "Scriptlet output:" + msgstr "Información del scriptlet:" + +-#: ../output.py:1418 ++#: ../output.py:1457 + msgid "Errors:" + msgstr "Errores:" + +-#: ../output.py:1489 ++#: ../output.py:1481 ++#: ../output.py:1482 ++msgid "Install" ++msgstr "Instalar" ++ ++#: ../output.py:1483 ++msgid "Dep-Install" ++msgstr "Instalación de dependencias" ++ ++#: ../output.py:1485 ++msgid "Obsoleting" ++msgstr "Convirtiendo en obsoleto" ++ ++#: ../output.py:1486 ++msgid "Erase" ++msgstr "Eliminar" ++ ++#: ../output.py:1487 ++msgid "Reinstall" ++msgstr "Reinstalar" ++ ++#: ../output.py:1488 ++msgid "Downgrade" ++msgstr "Desactualizar" ++ ++#: ../output.py:1490 ++msgid "Update" ++msgstr "Actualizar" ++ ++#: ../output.py:1521 ++msgid "Time" ++msgstr "Hora" ++ ++#: ../output.py:1547 + msgid "Last day" + msgstr "Ultimo día" + +-#: ../output.py:1490 ++#: ../output.py:1548 + msgid "Last week" + msgstr "Ultima semana" + +-#: ../output.py:1491 ++#: ../output.py:1549 + msgid "Last 2 weeks" + msgstr "Ultimas 2 semanas" + + #. US default :p +-#: ../output.py:1492 ++#: ../output.py:1550 + msgid "Last 3 months" + msgstr "Ultimos 3 meses" + +-#: ../output.py:1493 ++#: ../output.py:1551 + msgid "Last 6 months" + msgstr "Ultimos 6 meses" + +-#: ../output.py:1494 ++#: ../output.py:1552 + msgid "Last year" + msgstr "Ultimo año" + +-#: ../output.py:1495 ++#: ../output.py:1553 + msgid "Over a year ago" + msgstr "Hace más de un año" + +-#: ../output.py:1524 ++#: ../output.py:1585 msgid "installed" - msgstr "instal·lat" + msgstr "instalado" --#: ../output.py:1147 -+#: ../output.py:1187 +-#: ../output.py:1525 ++#: ../output.py:1586 msgid "updated" - msgstr "actualitzat" + msgstr "actualizado" --#: ../output.py:1148 -+#: ../output.py:1188 +-#: ../output.py:1526 ++#: ../output.py:1587 msgid "obsoleted" - msgstr "obsolet" + msgstr "obsoleto" --#: ../output.py:1149 -+#: ../output.py:1189 +-#: ../output.py:1527 ++#: ../output.py:1588 msgid "erased" --msgstr "esborrat" -+msgstr "suprimit" + msgstr "eliminado" --#: ../output.py:1153 -+#: ../output.py:1193 +-#: ../output.py:1531 ++#: ../output.py:1592 #, python-format msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> Paquet %s.%s %s:%s-%s passarà a ser %s" + msgstr "---> Paquete %s.%s %s:%s-%s definido para ser %s" --#: ../output.py:1160 -+#: ../output.py:1200 +-#: ../output.py:1538 ++#: ../output.py:1599 msgid "--> Running transaction check" - msgstr "--> S'està executant la transacció de prova" + msgstr "--> Ejecutando prueba de transacción" --#: ../output.py:1165 -+#: ../output.py:1205 +-#: ../output.py:1543 ++#: ../output.py:1604 msgid "--> Restarting Dependency Resolution with new changes." --msgstr "--> Tornant a calcular la resolució de dependències amb els nous canvis." -+msgstr "" -+"--> Tornant a calcular la resolució de dependències amb els nous canvis." +-msgstr "" +-"--> Reiniciando la resolución de las dependencias con las nuevas " +-"modificaciones." ++msgstr "--> Reiniciando la resolución de las dependencias con las nuevas modificaciones." --#: ../output.py:1170 -+#: ../output.py:1210 +-#: ../output.py:1548 ++#: ../output.py:1609 msgid "--> Finished Dependency Resolution" - msgstr "--> Ha finalitzat la resolució de dependències" + msgstr "--> Resolución de dependencias finalizada" --#: ../output.py:1175 -+#: ../output.py:1215 ../output.py:1220 +-#: ../output.py:1553 ../output.py:1558 ++#: ../output.py:1614 ++#: ../output.py:1619 #, python-format msgid "--> Processing Dependency: %s for package: %s" - msgstr "--> S'està processant la dependència %s per al paquet: %s" + msgstr "--> Procesando dependencias: %s para el paquete: %s" --#: ../output.py:1180 -+#: ../output.py:1224 +-#: ../output.py:1562 ++#: ../output.py:1623 #, python-format msgid "--> Unresolved Dependency: %s" - msgstr "--> Dependència no resolta: %s" + msgstr "--> Dependencia no resuelta: %s" --#: ../output.py:1186 -+#: ../output.py:1230 ../output.py:1235 +-#: ../output.py:1568 ../output.py:1573 ++#: ../output.py:1634 ++#, python-format ++msgid "Package: %s" ++msgstr "Paquete: %s" ++ ++#: ../output.py:1636 ++#, python-format ++msgid "" ++"\n" ++" Requires: %s" ++msgstr "" ++"\n" ++" Necesita: %s" ++ ++#: ../output.py:1649 ++#: ../output.py:1660 ++#, python-format ++msgid "" ++"\n" ++" %s: %s (%s)" ++msgstr "" ++"\n" ++" %s: %s (%s)" ++ ++#: ../output.py:1657 ++msgid "Available" ++msgstr "Disponible" ++ ++#: ../output.py:1665 ++#: ../output.py:1670 #, python-format msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> S'està processant el conflicte: %s té un conflicte amb %s" + msgstr "--> Procesando conflictos: %s choca con %s" --#: ../output.py:1189 -+#: ../output.py:1239 +-#: ../output.py:1577 ++#: ../output.py:1674 msgid "--> Populating transaction set with selected packages. Please wait." --msgstr "--> S'està poblant la transacció amb els paquets sel·leccionats. Si us plau, espereu." -+msgstr "" -+"--> S'està poblant la transacció amb els paquets sel·leccionats. Si us plau, " -+"espereu." +-msgstr "" +-"--> Construyendo el conjunto de las transacciones con los paquetes " +-"seleccionados. Por favor aguarde." ++msgstr "--> Construyendo el conjunto de las transacciones con los paquetes seleccionados. Por favor aguarde." --#: ../output.py:1193 -+#: ../output.py:1243 +-#: ../output.py:1581 ++#: ../output.py:1678 #, python-format msgid "---> Downloading header for %s to pack into transaction set." --msgstr "---> S'està descarregant la capçalera per a %s per a empaquetar dins de la transacció de prova." -+msgstr "" -+"---> S'està baixant la capçalera per a %s per a empaquetar dins de la " -+"transacció de prova." +-msgstr "" +-"---> Descargando el encabezado de %s para incluirlo en el conjunto de " +-"transacciones." ++msgstr "---> Descargando el encabezado de %s para incluirlo en el conjunto de transacciones." ++ ++#: ../utils.py:93 ++msgid "Running" ++msgstr "Ejecutando" ++ ++#: ../utils.py:94 ++msgid "Sleeping" ++msgstr "Durmiendo" ++ ++#: ../utils.py:95 ++msgid "Uninterruptible" ++msgstr "Ininterrumplible" ++ ++#: ../utils.py:96 ++msgid "Zombie" ++msgstr "Zombi" ++ ++#: ../utils.py:97 ++msgid "Traced/Stopped" ++msgstr "Rastreado/Detenido" --#: ../yumcommands.py:41 -+#: ../yumcommands.py:40 +-#: ../utils.py:137 ../yummain.py:42 ++#: ../utils.py:98 ++#: ../yumcommands.py:917 ++msgid "Unknown" ++msgstr "Desconocido" ++ ++#: ../utils.py:109 ++msgid " The other application is: PackageKit" ++msgstr " La otra aplicación es: PackageKit" ++ ++#: ../utils.py:111 ++#, python-format ++msgid " The other application is: %s" ++msgstr " La otra aplicación es: %s" ++ ++#: ../utils.py:114 ++#, python-format ++msgid " Memory : %5s RSS (%5sB VSZ)" ++msgstr " Memoria : %5s RSS (%5sB VSZ)" ++ ++#: ../utils.py:119 ++#, python-format ++msgid " Started: %s - %s ago" ++msgstr " Iniciado: %s - %s atrás" ++ ++#: ../utils.py:121 ++#, python-format ++msgid " State : %s, pid: %d" ++msgstr " Estado : %s, pid: %d" ++ ++#: ../utils.py:199 ++#, python-format ++msgid "PluginExit Error: %s" ++msgstr "Error de PluginExit: %s" ++ ++#: ../utils.py:202 ++#, python-format ++msgid "Yum Error: %s" ++msgstr "Error de yum: %s" ++ ++#: ../utils.py:235 ++#: ../yummain.py:42 + msgid "" + "\n" + "\n" +@@ -1097,7 +1308,8 @@ msgstr "" + "\n" + "Saliendo por cancelación del usuario" + +-#: ../utils.py:143 ../yummain.py:48 ++#: ../utils.py:241 ++#: ../yummain.py:48 + msgid "" + "\n" + "\n" +@@ -1107,7 +1319,8 @@ msgstr "" + "\n" + "Saliendo por tubería rota" + +-#: ../utils.py:145 ../yummain.py:50 ++#: ../utils.py:243 ++#: ../yummain.py:50 + #, python-format + msgid "" + "\n" +@@ -1118,20 +1331,20 @@ msgstr "" + "\n" + "%s" + +-#: ../utils.py:184 ../yummain.py:273 ++#: ../utils.py:282 ++#: ../yummain.py:211 + msgid "Complete!" + msgstr "¡Listo!" + +-#: ../yumcommands.py:42 ++#: ../yumcommands.py:43 msgid "You need to be root to perform this command." - msgstr "Heu de ser root per a executar aquesta ordre." + msgstr "Necesita ser usuario root para poder ejecutar este comando." --#: ../yumcommands.py:48 -+#: ../yumcommands.py:47 +-#: ../yumcommands.py:49 ++#: ../yumcommands.py:50 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" --"However, you do not have any GPG public keys installed. You need to download\n" -+"However, you do not have any GPG public keys installed. You need to " -+"download\n" +-"However, you do not have any GPG public keys installed. You need to " +-"download\n" ++"However, you do not have any GPG public keys installed. You need to download\n" "the keys for packages you wish to install and install them.\n" "You can do that by running the command:\n" " rpm --import public.gpg.key\n" -@@ -945,8 +985,10 @@ msgid "" +@@ -1144,10 +1357,8 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" "\n" --"Heu habilitat la comprovació de paquets utilitzant claus GPG. És una bona opció. \n" --"No obstant, no teniu cap clau pública GPG instal·lada. Necessiteu descarregar\n" -+"Heu habilitat la comprovació de paquets utilitzant claus GPG. És una bona " -+"opció. \n" -+"No obstant, no teniu cap clau pública GPG instal·lada. Necessiteu " -+"baixar\n" - "les claus per als paquets que desitgeu instal·lar i instal·lar-les.\n" - "Podeu fer-ho executant l'ordre:\n" - " rpm --import clau.pública.gpg\n" -@@ -956,163 +998,164 @@ msgstr "" - "per a un repositori en l'opció 'gpgkey' en la secció d'un repositori i yum \n" - "la instal·larà per vosaltres.\n" +-"Usted tiene habilitada la verificación de paquetes mediante llaves GPG. Eso " +-"es bueno. \n" +-"Sin embargo, usted no tiene ninguna llave pública GPG instalada. Necesita " +-"descargar\n" ++"Usted tiene habilitada la verificación de paquetes mediante llaves GPG. Eso es bueno. \n" ++"Sin embargo, usted no tiene ninguna llave pública GPG instalada. Necesita descargar\n" + "e instalar las llaves de todos los paquetes que desee instalar.\n" + "Esto puede hacerlo si ejecuta el comando:\n" + " rpm --import public.gpg.key\n" +@@ -1157,339 +1368,344 @@ msgstr "" + "en la opción 'gpgkey' en la sección del repositorio, y yum \n" + "la instalará por usted.\n" "\n" --"Per a més informació contacteu el vostre distribuïdor o proveïdor de paquets.\n" -+"Per a més informació contacteu el vostre distribuïdor o proveïdor de " -+"paquets.\n" +-"Para obtener mayor información, póngase en contacto con su distribución o " +-"con su proveedor de paquetes.\n" ++"Para obtener mayor información, póngase en contacto con su distribución o con su proveedor de paquetes.\n" --#: ../yumcommands.py:68 -+#: ../yumcommands.py:67 +-#: ../yumcommands.py:69 ++#: ../yumcommands.py:70 #, python-format msgid "Error: Need to pass a list of pkgs to %s" - msgstr "Error: es necessita passar una llista de paquets a %s" + msgstr "Error: Necesita pasar una lista de paquetes a %s " --#: ../yumcommands.py:74 -+#: ../yumcommands.py:73 +-#: ../yumcommands.py:75 ++#: ../yumcommands.py:76 msgid "Error: Need an item to match" - msgstr "Error: es necessita algun element per comparar" + msgstr "Error: Es necesario un ítem con el cual corresponderse" --#: ../yumcommands.py:80 -+#: ../yumcommands.py:79 +-#: ../yumcommands.py:81 ++#: ../yumcommands.py:82 msgid "Error: Need a group or list of groups" - msgstr "Error: es necessita un grup o una llista de grups" + msgstr "Error: Es necesario un grupo o una lista de grupos" --#: ../yumcommands.py:89 -+#: ../yumcommands.py:88 +-#: ../yumcommands.py:90 ++#: ../yumcommands.py:91 #, python-format msgid "Error: clean requires an option: %s" - msgstr "Error: la neteja requereix una opció: %s" + msgstr "Error: la limpieza necesita una opción: %s" --#: ../yumcommands.py:94 -+#: ../yumcommands.py:93 +-#: ../yumcommands.py:95 ++#: ../yumcommands.py:96 #, python-format msgid "Error: invalid clean argument: %r" - msgstr "Error: argument invàlid per a la neteja: %r" + msgstr "Error: argumento de limpieza no válido: %r" --#: ../yumcommands.py:107 -+#: ../yumcommands.py:106 +-#: ../yumcommands.py:108 ++#: ../yumcommands.py:109 msgid "No argument to shell" - msgstr "No hi ha arguments per a l'intèrpret d'ordres" + msgstr "No hay argumento para el shell" -#: ../yumcommands.py:110 -+#: ../yumcommands.py:108 ++#: ../yumcommands.py:111 #, python-format msgid "Filename passed to shell: %s" - msgstr "Nom del fitxer passat a l'intèrpret d'ordres: %s" + msgstr "Nombre de archivo pasado al shell: %s" -#: ../yumcommands.py:114 -+#: ../yumcommands.py:112 ++#: ../yumcommands.py:115 #, python-format msgid "File %s given as argument to shell does not exist." - msgstr "El fitxer %s donat com a argument a l'intèrpret d'ordres no existeix." + msgstr "El archivo %s indicado como argumento para el shell no existe." -#: ../yumcommands.py:120 -+#: ../yumcommands.py:118 ++#: ../yumcommands.py:121 msgid "Error: more than one file given as argument to shell." --msgstr "Error: s'ha donat més d'un fitxer com a argument per a l'intèrpret d'ordres." -+msgstr "" -+"Error: s'ha donat més d'un fitxer com a argument per a l'intèrpret d'ordres." + msgstr "Error: se ha indicado más de un archivo como argumento para el shell" -#: ../yumcommands.py:169 -+#: ../yumcommands.py:167 ++#: ../yumcommands.py:170 msgid "PACKAGE..." - msgstr "PAQUET..." + msgstr "PAQUETE..." -#: ../yumcommands.py:172 -+#: ../yumcommands.py:170 ++#: ../yumcommands.py:173 msgid "Install a package or packages on your system" - msgstr "Instal·la un o més paquets al vostre sistema" + msgstr "Instala uno o varios paquetes en su sistema" -#: ../yumcommands.py:180 -+#: ../yumcommands.py:178 ++#: ../yumcommands.py:181 msgid "Setting up Install Process" - msgstr "S'està preparant el procés d'instal·lació" + msgstr "Configurando el proceso de instalación" -#: ../yumcommands.py:191 -+#: ../yumcommands.py:189 ++#: ../yumcommands.py:192 msgid "[PACKAGE...]" - msgstr "[PAQUET...]" + msgstr "[PAQUETE...]" -#: ../yumcommands.py:194 -+#: ../yumcommands.py:192 ++#: ../yumcommands.py:195 msgid "Update a package or packages on your system" - msgstr "S'ha actualitzat un o més paquets al vostre sistema" + msgstr "Actualiza uno o varios paquetes en su sistema" -#: ../yumcommands.py:201 -+#: ../yumcommands.py:199 ++#: ../yumcommands.py:202 msgid "Setting up Update Process" - msgstr "S'està preparant el procés d'actualització" + msgstr "Configurando el proceso de actualización" --#: ../yumcommands.py:243 +-#: ../yumcommands.py:246 +#: ../yumcommands.py:244 msgid "Display details about a package or group of packages" - msgstr "Mostra detalls sobre un paquet o un grup de paquets" + msgstr "Muestra detalles acerca de un paquete o de un grupo de paquetes" --#: ../yumcommands.py:292 +-#: ../yumcommands.py:295 +#: ../yumcommands.py:293 msgid "Installed Packages" - msgstr "Paquets instal·lats" + msgstr "Paquetes instalados" --#: ../yumcommands.py:300 +-#: ../yumcommands.py:303 +#: ../yumcommands.py:301 msgid "Available Packages" - msgstr "Paquets disponibles" + msgstr "Paquetes disponibles" --#: ../yumcommands.py:304 +-#: ../yumcommands.py:307 +#: ../yumcommands.py:305 msgid "Extra Packages" - msgstr "Paquets extra" + msgstr "Paquetes extra" --#: ../yumcommands.py:308 +-#: ../yumcommands.py:311 +#: ../yumcommands.py:309 msgid "Updated Packages" - msgstr "Paquets actualitzats" + msgstr "Paquetes actualizados" #. This only happens in verbose mode --#: ../yumcommands.py:316 --#: ../yumcommands.py:323 --#: ../yumcommands.py:600 -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:600 +-#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 ++#: ../yumcommands.py:317 ++#: ../yumcommands.py:324 ++#: ../yumcommands.py:601 msgid "Obsoleting Packages" - msgstr "Paquets obsolets" + msgstr "Convirtiendo paquetes en obsoletos" --#: ../yumcommands.py:325 +-#: ../yumcommands.py:328 +#: ../yumcommands.py:326 msgid "Recently Added Packages" - msgstr "Paquets recentment afegits" + msgstr "Paquetes añadidos recientemente" --#: ../yumcommands.py:332 +-#: ../yumcommands.py:335 +#: ../yumcommands.py:333 msgid "No matching Packages to list" - msgstr "No hi ha paquets coincidents per llistar" + msgstr "No hay paquetes que se correspondan con la lista" --#: ../yumcommands.py:346 +-#: ../yumcommands.py:349 +#: ../yumcommands.py:347 msgid "List a package or groups of packages" - msgstr "Llista un paquet o un grup de paquets" + msgstr "Muestra un paquete o grupos de paquete" --#: ../yumcommands.py:358 +-#: ../yumcommands.py:361 +#: ../yumcommands.py:359 msgid "Remove a package or packages from your system" --msgstr "Esborra un o més paquets del vostre sistema" -+msgstr "Suprimeix un o més paquets del vostre sistema" + msgstr "Elimina uno o varios paquetes de su sistema" --#: ../yumcommands.py:365 +-#: ../yumcommands.py:368 +#: ../yumcommands.py:366 msgid "Setting up Remove Process" --msgstr "S'està preparant el procés d'esborrat" -+msgstr "S'està preparant el procés de supressió" + msgstr "Configurando el proceso de eliminación" --#: ../yumcommands.py:379 +-#: ../yumcommands.py:382 +#: ../yumcommands.py:380 msgid "Setting up Group Process" - msgstr "S'està preparant el procés de grup" + msgstr "Configurando el proceso de grupo" --#: ../yumcommands.py:385 +-#: ../yumcommands.py:388 +#: ../yumcommands.py:386 msgid "No Groups on which to run command" - msgstr "No hi ha cap grup on executar l'ordre" + msgstr "No existen grupos sobre los cuales ejecutar el comando" --#: ../yumcommands.py:398 +-#: ../yumcommands.py:401 +#: ../yumcommands.py:399 msgid "List available package groups" - msgstr "Llista els grups de paquets disponibles" + msgstr "Muestra los grupos de paquetes disponibles" --#: ../yumcommands.py:415 +-#: ../yumcommands.py:418 +#: ../yumcommands.py:416 msgid "Install the packages in a group on your system" - msgstr "Instal·la els paquets en un grup en el vostre sistema" + msgstr "Instala los paquetes en un grupo de su sistema" --#: ../yumcommands.py:437 +-#: ../yumcommands.py:440 +#: ../yumcommands.py:438 msgid "Remove the packages in a group from your system" --msgstr "Esborra els paquets en un grup en el vostre sistema" -+msgstr "Suprimeix els paquets en un grup en el vostre sistema" + msgstr "Elimina los paquetes de un grupo de su sistema" --#: ../yumcommands.py:464 +-#: ../yumcommands.py:467 +#: ../yumcommands.py:465 msgid "Display details about a package group" - msgstr "Mostra detalls sobre un grup de paquets" + msgstr "Muestra detalles acerca de un grupo de paquetes" --#: ../yumcommands.py:488 +-#: ../yumcommands.py:491 +#: ../yumcommands.py:489 msgid "Generate the metadata cache" - msgstr "Genera les metadades de la memòria cau" + msgstr "Genera el caché de metadatos" --#: ../yumcommands.py:494 +-#: ../yumcommands.py:497 +#: ../yumcommands.py:495 msgid "Making cache files for all metadata files." --msgstr "S'estan fent els fitxers de memòria cau per a tots els fitxers de metadades." -+msgstr "" -+"S'estan fent els fitxers de memòria cau per a tots els fitxers de metadades." + msgstr "Creando los archivos de caché para todos los archivos de metadatos." --#: ../yumcommands.py:495 +-#: ../yumcommands.py:498 +#: ../yumcommands.py:496 msgid "This may take a while depending on the speed of this computer" - msgstr "Això pot trigar una estona depenent de la velocitat d'aquest ordinador" +-msgstr "" +-"Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo" ++msgstr "Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo" --#: ../yumcommands.py:516 +-#: ../yumcommands.py:519 +#: ../yumcommands.py:517 msgid "Metadata Cache Created" - msgstr "S'han creat les metadades per a la memòria cau" + msgstr "Se ha creado el caché de metadatos" --#: ../yumcommands.py:530 +-#: ../yumcommands.py:533 +#: ../yumcommands.py:531 msgid "Remove cached data" --msgstr "S'han esborrat les dades de la memòria cau" -+msgstr "S'han suprimit les dades de la memòria cau" + msgstr "Elimina los datos del caché" - #: ../yumcommands.py:551 +-#: ../yumcommands.py:553 ++#: ../yumcommands.py:551 msgid "Find what package provides the given value" -@@ -1174,99 +1217,122 @@ msgstr "S'estan trobant dependències: " + msgstr "Localiza el paquete que ofrezca el valor indicado" + +-#: ../yumcommands.py:573 ++#: ../yumcommands.py:571 + msgid "Check for available package updates" + msgstr "Verifica la existencia de actualizaciones de paquetes" + +-#: ../yumcommands.py:623 ++#: ../yumcommands.py:621 + msgid "Search package details for the given string" + msgstr "Busca detalles en los paquetes para la cadena indicada" + +-#: ../yumcommands.py:629 ++#: ../yumcommands.py:627 + msgid "Searching Packages: " + msgstr "Buscando paquetes:" + +-#: ../yumcommands.py:646 ++#: ../yumcommands.py:644 + msgid "Update packages taking obsoletes into account" + msgstr "Actualiza los paquetes tomando en cuenta los obsoletos" + +-#: ../yumcommands.py:654 ++#: ../yumcommands.py:652 + msgid "Setting up Upgrade Process" + msgstr "Configurando el proceso de actualización" + +-#: ../yumcommands.py:668 ++#: ../yumcommands.py:666 + msgid "Install a local RPM" + msgstr "Instala un RPM local" + +-#: ../yumcommands.py:676 ++#: ../yumcommands.py:674 + msgid "Setting up Local Package Process" + msgstr "Configurando el proceso de instalación local de paquetes" + +-#: ../yumcommands.py:695 ++#: ../yumcommands.py:693 + msgid "Determine which package provides the given dependency" + msgstr "Determina qué paquetes ofrecen la dependencia indicada" + +-#: ../yumcommands.py:698 ++#: ../yumcommands.py:696 + msgid "Searching Packages for Dependency:" + msgstr "Buscando paquetes para la dependencia:" + +-#: ../yumcommands.py:712 ++#: ../yumcommands.py:710 + msgid "Run an interactive yum shell" + msgstr "Ejecuta una shell de Yum interactiva " + +-#: ../yumcommands.py:718 ++#: ../yumcommands.py:716 + msgid "Setting up Yum Shell" + msgstr "Configurando la shell de Yum" + +-#: ../yumcommands.py:736 ++#: ../yumcommands.py:734 + msgid "List a package's dependencies" + msgstr "Muestra las dependencias que necesita un paquete" + +-#: ../yumcommands.py:742 ++#: ../yumcommands.py:740 + msgid "Finding dependencies: " + msgstr "Buscando dependencias:" + +-#: ../yumcommands.py:758 ++#: ../yumcommands.py:756 msgid "Display the configured software repositories" - msgstr "Mostra els repositoris de programari configurats" + msgstr "Muestra los repositorios de software configurados" --#: ../yumcommands.py:803 --#: ../yumcommands.py:804 -+#: ../yumcommands.py:803 ../yumcommands.py:804 +-#: ../yumcommands.py:810 ../yumcommands.py:811 ++#: ../yumcommands.py:822 ++#: ../yumcommands.py:823 msgid "enabled" - msgstr "habilitat" + msgstr "habilitado" --#: ../yumcommands.py:812 --#: ../yumcommands.py:813 -+#: ../yumcommands.py:812 ../yumcommands.py:813 +-#: ../yumcommands.py:819 ../yumcommands.py:820 ++#: ../yumcommands.py:849 ++#: ../yumcommands.py:850 msgid "disabled" - msgstr "deshabilitat" + msgstr "deshabilitado" - #: ../yumcommands.py:827 --msgid "Repo-id : " --msgstr "Id-repo : " -+msgid "Repo-id : " -+msgstr "Id-repo : " +-#: ../yumcommands.py:834 ++#: ../yumcommands.py:866 + msgid "Repo-id : " + msgstr "Repo-id : " - #: ../yumcommands.py:828 --msgid "Repo-name : " --msgstr "Nom-repo : " -+msgid "Repo-name : " -+msgstr "Nom-repo : " +-#: ../yumcommands.py:835 ++#: ../yumcommands.py:867 + msgid "Repo-name : " + msgstr "Repo-name : " - #: ../yumcommands.py:829 --msgid "Repo-status : " --msgstr "Estat-repo : " -+msgid "Repo-status : " -+msgstr "Estat-repo : " +-#: ../yumcommands.py:836 ++#: ../yumcommands.py:870 + msgid "Repo-status : " + msgstr "Repo-status : " - #: ../yumcommands.py:831 +-#: ../yumcommands.py:838 ++#: ../yumcommands.py:873 msgid "Repo-revision: " --msgstr "Repo-revisió : " -+msgstr "Repo-revisió : " + msgstr "Repo-revision: " - #: ../yumcommands.py:835 --msgid "Repo-tags : " --msgstr "Repo-etiquetes : " -+msgid "Repo-tags : " -+msgstr "Repo-etiquetes : " +-#: ../yumcommands.py:842 ++#: ../yumcommands.py:877 + msgid "Repo-tags : " + msgstr "Repo-tags : " - #: ../yumcommands.py:841 - msgid "Repo-distro-tags: " --msgstr "Repo-etiq-dist : " -+msgstr "Repo-etiq-dist : " - - #: ../yumcommands.py:846 --msgid "Repo-updated: " --msgstr "Repo-actualitzat: " -+msgid "Repo-updated : " -+msgstr "Repo-actualitzat : " - - #: ../yumcommands.py:848 --msgid "Repo-pkgs : " --msgstr "Paquets-repo : " -+msgid "Repo-pkgs : " -+msgstr "Paquets-repo : " - - #: ../yumcommands.py:849 --msgid "Repo-size : " --msgstr "Mida-repo : " -+msgid "Repo-size : " -+msgstr "Mida-repo : " - - #: ../yumcommands.py:856 --msgid "Repo-baseurl: " --msgstr "URL-base-repo : " -+msgid "Repo-baseurl : " -+msgstr "URL-base-repo : " - --#: ../yumcommands.py:860 -+#: ../yumcommands.py:864 - msgid "Repo-metalink: " --msgstr "Repo-metaenllaç : " -- --#: ../yumcommands.py:863 --msgid "Repo-mirrors: " --msgstr "Miralls-repo : " -+msgstr "Repo-metaenllaç : " - --#: ../yumcommands.py:867 --msgid "Repo-exclude: " --msgstr "Repo-exclou : " -+#: ../yumcommands.py:868 -+#, -+msgid " Updated : " -+msgstr " Actualitzat : " - - #: ../yumcommands.py:871 --msgid "Repo-include: " --msgstr "Repo-inclou : " -+msgid "Repo-mirrors : " -+msgstr "Miralls-repo : " -+ -+#: ../yumcommands.py:875 ../yummain.py:133 -+msgid "Unknown" -+msgstr "Desconegut" -+ -+#: ../yumcommands.py:881 -+#, python-format -+msgid "Never (last: %s)" -+msgstr "Mai (últim: %s)" -+ +-#: ../yumcommands.py:848 +#: ../yumcommands.py:883 -+#, python-format -+msgid "Instant (last: %s)" -+msgstr "Temps d'instal·lació (últim: %s)" -+ -+#: ../yumcommands.py:886 -+#, python-format -+msgid "%s second(s) (last: %s)" -+msgstr "%s segons (últim: %s)" -+ -+#: ../yumcommands.py:888 -+msgid "Repo-expire : " -+msgstr "Venç-repo : " -+ -+#: ../yumcommands.py:891 -+msgid "Repo-exclude : " -+msgstr "Repo-exclou : " -+ -+#: ../yumcommands.py:895 -+msgid "Repo-include : " -+msgstr "Repo-inclou : " + msgid "Repo-distro-tags: " + msgstr "Repo-distro-tags: " - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:881 --#: ../yumcommands.py:907 -+#: ../yumcommands.py:905 ../yumcommands.py:931 - msgid "repo id" - msgstr "id repo" +-#: ../yumcommands.py:853 ++#: ../yumcommands.py:888 + msgid "Repo-updated : " + msgstr "Repo-updated : " + +-#: ../yumcommands.py:855 ++#: ../yumcommands.py:890 + msgid "Repo-pkgs : " + msgstr "Repo-pkgs : " + +-#: ../yumcommands.py:856 ++#: ../yumcommands.py:891 + msgid "Repo-size : " + msgstr "Repo-size : " + +-#: ../yumcommands.py:863 ++#: ../yumcommands.py:898 + msgid "Repo-baseurl : " + msgstr "Repo-baseurl : " + +-#: ../yumcommands.py:871 ++#: ../yumcommands.py:906 + msgid "Repo-metalink: " + msgstr "Repo-metalink: " + +-#: ../yumcommands.py:875 ++#: ../yumcommands.py:910 + msgid " Updated : " + msgstr " Actualizados : " + +-#: ../yumcommands.py:878 ++#: ../yumcommands.py:913 + msgid "Repo-mirrors : " + msgstr "Repo-mirrors : " + +-#: ../yumcommands.py:882 ../yummain.py:133 +-msgid "Unknown" +-msgstr "Desconocido" +- +-#: ../yumcommands.py:888 ++#: ../yumcommands.py:923 + #, python-format + msgid "Never (last: %s)" + msgstr "Nunca (último: %s)" + +-#: ../yumcommands.py:890 ++#: ../yumcommands.py:925 + #, python-format + msgid "Instant (last: %s)" + msgstr "Instante (último: %s)" + +-#: ../yumcommands.py:893 ++#: ../yumcommands.py:928 + #, python-format + msgid "%s second(s) (last: %s)" + msgstr "%s segundo(s) (último: %s)" -#: ../yumcommands.py:895 --#: ../yumcommands.py:896 --#: ../yumcommands.py:910 -+#: ../yumcommands.py:919 ../yumcommands.py:920 ../yumcommands.py:934 ++#: ../yumcommands.py:930 + msgid "Repo-expire : " + msgstr "Repo-expire : " + +-#: ../yumcommands.py:898 ++#: ../yumcommands.py:933 + msgid "Repo-exclude : " + msgstr "Repo-exclude : " + +-#: ../yumcommands.py:902 ++#: ../yumcommands.py:937 + msgid "Repo-include : " + msgstr "Repo-include : " + ++#: ../yumcommands.py:941 ++msgid "Repo-excluded: " ++msgstr "Repositorio excluído:" ++ + #. Work out the first (id) and last (enabled/disalbed/count), + #. then chop the middle (name)... +-#: ../yumcommands.py:912 ../yumcommands.py:938 ++#: ../yumcommands.py:951 ++#: ../yumcommands.py:980 + msgid "repo id" + msgstr "id del repositorio" + +-#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 ++#: ../yumcommands.py:968 ++#: ../yumcommands.py:969 ++#: ../yumcommands.py:987 msgid "status" - msgstr "estat" + msgstr "estado" --#: ../yumcommands.py:908 -+#: ../yumcommands.py:932 +-#: ../yumcommands.py:939 ++#: ../yumcommands.py:981 msgid "repo name" - msgstr "nom repo" + msgstr "nombre del repositorio" --#: ../yumcommands.py:934 -+#: ../yumcommands.py:958 +-#: ../yumcommands.py:965 ++#: ../yumcommands.py:1018 msgid "Display a helpful usage message" - msgstr "Mostra un missatge d'ajuda d'ús" + msgstr "Muestra un mensaje de ayuda del uso" --#: ../yumcommands.py:968 -+#: ../yumcommands.py:992 +-#: ../yumcommands.py:999 ++#: ../yumcommands.py:1052 #, python-format msgid "No help available for %s" - msgstr "No hi ha ajuda disponible per a %s" + msgstr "No existe asistencia disponible para %s" --#: ../yumcommands.py:973 -+#: ../yumcommands.py:997 +-#: ../yumcommands.py:1004 ++#: ../yumcommands.py:1057 msgid "" "\n" "\n" -@@ -1276,7 +1342,7 @@ msgstr "" +@@ -1499,7 +1715,7 @@ msgstr "" "\n" - "àlies: " + "apodos: " --#: ../yumcommands.py:975 -+#: ../yumcommands.py:999 +-#: ../yumcommands.py:1006 ++#: ../yumcommands.py:1059 msgid "" "\n" "\n" -@@ -1286,26 +1352,36 @@ msgstr "" +@@ -1509,144 +1725,98 @@ msgstr "" "\n" - "àlies: " + "apodo: " --#: ../yumcommands.py:1003 -+#: ../yumcommands.py:1027 +-#: ../yumcommands.py:1034 ++#: ../yumcommands.py:1087 msgid "Setting up Reinstall Process" - msgstr "S'està preparant el procés de reinstal·lació" + msgstr "Configurando el proceso de reinstalación" --#: ../yumcommands.py:1012 --msgid "Package(s) to reinstall" --msgstr "Paquets a reinstal·lar" -- --#: ../yumcommands.py:1019 -+#: ../yumcommands.py:1035 +-#: ../yumcommands.py:1042 ++#: ../yumcommands.py:1095 msgid "reinstall a package" - msgstr "reinstal·la un paquet" + msgstr "reinstalar un paquete" --#: ../yumcommands.py:1037 -+#: ../yumcommands.py:1053 +-#: ../yumcommands.py:1060 ++#: ../yumcommands.py:1113 msgid "Setting up Downgrade Process" - msgstr "S'està preparant el procés de desactualització" + msgstr "Configurando el proceso de desactualización" --#: ../yumcommands.py:1044 -+#: ../yumcommands.py:1060 +-#: ../yumcommands.py:1067 ++#: ../yumcommands.py:1120 msgid "downgrade a package" - msgstr "desactualitza un paquet" + msgstr "desactualizar un paquete a una versión anterior" -+#: ../yumcommands.py:1074 -+msgid "Display a version for the machine and/or available repos." -+msgstr "Mostra una versió per a la màquina i/o repositoris disponibles" -+ -+#: ../yumcommands.py:1101 -+#, -+msgid "Installed:" -+msgstr "Instal·lat:" -+ -+#: ../yumcommands.py:1110 -+#, -+msgid "Available:" -+msgstr "Disponible:" -+ - #: ../yummain.py:42 - msgid "" - "\n" -@@ -1326,80 +1402,87 @@ msgstr "" - "\n" - "S'està sortint en trobar la canonada trencada" +-#: ../yumcommands.py:1081 ++#: ../yumcommands.py:1134 + msgid "Display a version for the machine and/or available repos." + msgstr "Muestra una versión para la máquina y/o los repositorios disponibles." --#: ../yummain.py:126 -+#: ../yummain.py:50 -+#, python-format -+msgid "" -+"\n" -+"\n" -+"%s" -+msgstr "" -+"\n" -+"\n" -+"%s" -+ -+#: ../yummain.py:128 - msgid "Running" - msgstr "S'està executant" +-#: ../yumcommands.py:1111 ++#: ../yumcommands.py:1173 + msgid " Yum version groups:" + msgstr " Grupos de la versión de Yum:" --#: ../yummain.py:127 -+#: ../yummain.py:129 - msgid "Sleeping" - msgstr "Està dormint" +-#: ../yumcommands.py:1121 ++#: ../yumcommands.py:1183 + msgid " Group :" + msgstr " Grupo :" + +-#: ../yumcommands.py:1122 ++#: ../yumcommands.py:1184 + msgid " Packages:" + msgstr " Paquetes:" + +-#: ../yumcommands.py:1152 ++#: ../yumcommands.py:1213 + msgid "Installed:" + msgstr "Instalado:" + +-#: ../yumcommands.py:1157 ++#: ../yumcommands.py:1218 + msgid "Group-Installed:" + msgstr "Grupo-Instalado:" + +-#: ../yumcommands.py:1166 ++#: ../yumcommands.py:1227 + msgid "Available:" + msgstr "Disponible:" + +-#: ../yumcommands.py:1172 ++#: ../yumcommands.py:1233 + msgid "Group-Available:" + msgstr "Grupo-Disponible:" + +-#: ../yumcommands.py:1211 ++#: ../yumcommands.py:1272 + msgid "Display, or use, the transaction history" + msgstr "Mostrar, o utilizar, el historial de la transacción" + +-#: ../yumcommands.py:1239 ++#: ../yumcommands.py:1300 + #, python-format + msgid "Invalid history sub-command, use: %s." + msgstr "Sub-comando de historia no válido, utilice: %s" -#: ../yummain.py:128 -+#: ../yummain.py:130 - msgid "Uninteruptable" - msgstr "Ininterrumpible" +-msgid "Running" +-msgstr "Ejecutando" ++#: ../yumcommands.py:1345 ++msgid "Check for problems in the rpmdb" ++msgstr "Verifica si hay problemas en la base de datos (rpmdb)" -#: ../yummain.py:129 -+#: ../yummain.py:131 - msgid "Zombie" - msgstr "Zombi" +-msgid "Sleeping" +-msgstr "Durmiendo" ++#: ../yummain.py:102 ++msgid "Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " --#: ../yummain.py:130 -+#: ../yummain.py:132 - msgid "Traced/Stopped" - msgstr "Traçat/aturat" - + #: ../yummain.py:130 +-msgid "Uninteruptable" +-msgstr "Ininterrumplible" +- -#: ../yummain.py:131 --msgid "Unknown" --msgstr "Desconegut" +-msgid "Zombie" +-msgstr "Zombi" +- +-#: ../yummain.py:132 +-msgid "Traced/Stopped" +-msgstr "Rastreado/Detenido" - --#: ../yummain.py:135 -+#: ../yummain.py:137 - msgid " The other application is: PackageKit" - msgstr " L'altre aplicatiu és: PackageKit" - -#: ../yummain.py:137 -+#: ../yummain.py:139 - #, python-format - msgid " The other application is: %s" - msgstr " L'altre aplicatiu és: %s" - --#: ../yummain.py:140 -+#: ../yummain.py:142 - #, python-format - msgid " Memory : %5s RSS (%5sB VSZ)" - msgstr " Memòria : %5s RSS (%5sB VSZ)" - --#: ../yummain.py:144 -+#: ../yummain.py:146 - #, python-format - msgid " Started: %s - %s ago" - msgstr " Iniciat: fa %s-%s" - +-msgid " The other application is: PackageKit" +-msgstr " La otra aplicación es: PackageKit" +- +-#: ../yummain.py:139 +-#, python-format +-msgid " The other application is: %s" +-msgstr " La otra aplicación es: %s" +- +-#: ../yummain.py:142 +-#, python-format +-msgid " Memory : %5s RSS (%5sB VSZ)" +-msgstr " Memoria : %5s RSS (%5sB VSZ)" +- -#: ../yummain.py:146 -+#: ../yummain.py:148 - #, python-format - msgid " State : %s, pid: %d" - msgstr " Estat : %s, pid: %d" - --#: ../yummain.py:171 --msgid "Another app is currently holding the yum lock; waiting for it to exit..." --msgstr "Alguna altra aplicació té el bloqueig del yum; s'està esperant a que surti..." -+#: ../yummain.py:173 -+msgid "" -+"Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "" -+"Alguna altra aplicació té el bloqueig del yum; s'està esperant a que surti..." - --#: ../yummain.py:199 --#: ../yummain.py:238 -+#: ../yummain.py:201 ../yummain.py:240 +-#, python-format +-msgid " Started: %s - %s ago" +-msgstr " Iniciado: %s - %s atrás" +- +-#: ../yummain.py:148 +-#, python-format +-msgid " State : %s, pid: %d" +-msgstr " Estado : %s, pid: %d" +- +-#: ../yummain.py:173 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +-msgstr "" +-"Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " +- +-#: ../yummain.py:201 ../yummain.py:240 ++#: ../yummain.py:169 #, python-format msgid "Error: %s" msgstr "Error: %s" --#: ../yummain.py:209 --#: ../yummain.py:250 -+#: ../yummain.py:211 ../yummain.py:253 +-#: ../yummain.py:211 ../yummain.py:253 ++#: ../yummain.py:140 ++#: ../yummain.py:182 #, python-format msgid "Unknown Error(s): Exit Code: %d:" - msgstr "Errors desconeguts: Codi de sortida: %d:" + msgstr "Error(es) desconocido(s): Código de salida: %d:" #. Depsolve stage --#: ../yummain.py:216 -+#: ../yummain.py:218 +-#: ../yummain.py:218 ++#: ../yummain.py:147 msgid "Resolving Dependencies" - msgstr "S'estan resolent dependències" + msgstr "Resolviendo dependencias" --#: ../yummain.py:240 -+#: ../yummain.py:242 +-#: ../yummain.py:242 ++#: ../yummain.py:173 msgid " You could try using --skip-broken to work around the problem" - msgstr " Hauríeu de provar utilitzant --skip-broken per evitar el problema" +-msgstr "" +-" Podría intentar utilizar el comando --skip-broken para sortear el problema" ++msgstr " Podría intentar utilizar el comando --skip-broken para sortear el problema" --#: ../yummain.py:241 -+#: ../yummain.py:243 - msgid "" - " You could try running: package-cleanup --problems\n" - " package-cleanup --dupes\n" -@@ -1409,7 +1492,7 @@ msgstr "" - " package-cleanup --dupes\n" - " rpm -Va --nofiles --nodigest" +-#: ../yummain.py:243 +-msgid "" +-" You could try running: package-cleanup --problems\n" +-" package-cleanup --dupes\n" +-" rpm -Va --nofiles --nodigest" +-msgstr "" +-" Podría intentar ejecutar: package-cleanup --problems\n" +-" package-cleanup --dupes\n" +-" rpm -Va --nofiles --nodigest" ++#: ../yummain.py:175 ++#: ../yummain.py:208 ++msgid " You could try running: rpm -Va --nofiles --nodigest" ++msgstr "Podría intentar ejecutar: rpm- Va --nofiles --nodigest" --#: ../yummain.py:256 -+#: ../yummain.py:259 +-#: ../yummain.py:259 ++#: ../yummain.py:188 msgid "" "\n" "Dependencies Resolved" -@@ -1417,11 +1500,11 @@ msgstr "" +@@ -1654,7 +1824,7 @@ msgstr "" "\n" - "Dependències resoltes" + "Dependencias resueltas" --#: ../yummain.py:270 -+#: ../yummain.py:273 - msgid "Complete!" - msgstr "Completat!" - --#: ../yummain.py:317 -+#: ../yummain.py:320 +-#: ../yummain.py:326 ++#: ../yummain.py:265 msgid "" "\n" "\n" -@@ -1431,201 +1514,205 @@ msgstr "" - "\n" - "S'està sortint de l'ordre de l'usuari." +@@ -1670,8 +1840,7 @@ msgstr "doTsSetup() desaparecerá en alguna versión posterior de Yum.\n" --#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 - msgid "doTsSetup() will go away in a future version of Yum.\n" - msgstr "doTsSetup() desapareixerà en una futura versió de Yum.\n" - --#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 + #: ../yum/depsolve.py:97 msgid "Setting up TransactionSets before config class is up" --msgstr "S'està configurant TransactionSets abans que la classe de configuració estigui iniciada" -+msgstr "" -+"S'està configurant TransactionSets abans que la classe de configuració " -+"estigui iniciada" +-msgstr "" +-"Configurando TransactionSets antes de la activación de clase de configuración" ++msgstr "Configurando TransactionSets antes de la activación de clase de configuración" --#: ../yum/depsolve.py:150 -+#: ../yum/depsolve.py:149 - #, python-format - msgid "Invalid tsflag in config file: %s" - msgstr "Tsflag invàlid en el fitxer de configuració: %s" - --#: ../yum/depsolve.py:161 -+#: ../yum/depsolve.py:160 - #, python-format - msgid "Searching pkgSack for dep: %s" - msgstr "S'està buscant pkgSack per a la dependència: %s" - --#: ../yum/depsolve.py:184 -+#: ../yum/depsolve.py:183 - #, python-format - msgid "Potential match for %s from %s" - msgstr "Coincidència potencial per a %s de %s" - --#: ../yum/depsolve.py:192 -+#: ../yum/depsolve.py:191 + #: ../yum/depsolve.py:148 #, python-format +@@ -1693,177 +1862,167 @@ msgstr "Posible correspondencia para %s desde %s" msgid "Matched %s to require for %s" - msgstr "La coincidència %s es requereix per a %s" + msgstr "Se ha encontrado %s para poder solicitar %s" --#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:232 +-#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:225 #, python-format msgid "Member: %s" - msgstr "Membre: %s" + msgstr "Miembro: %s" --#: ../yum/depsolve.py:247 --#: ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:246 ../yum/depsolve.py:756 +-#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 ++#: ../yum/depsolve.py:239 ++#: ../yum/depsolve.py:754 #, python-format msgid "%s converted to install" - msgstr "%s convertits per a instal·lar" + msgstr "%s convertido para instalar" --#: ../yum/depsolve.py:254 -+#: ../yum/depsolve.py:253 +-#: ../yum/depsolve.py:245 ++#: ../yum/depsolve.py:246 #, python-format msgid "Adding Package %s in mode %s" - msgstr "S'està afegint el paquet %s en mode %s" + msgstr "Agregando paquete %s en modo %s" --#: ../yum/depsolve.py:264 -+#: ../yum/depsolve.py:263 +-#: ../yum/depsolve.py:255 ++#: ../yum/depsolve.py:256 #, python-format msgid "Removing Package %s" --msgstr "S'està esborrant el paquet %s" -+msgstr "S'està suprimint el paquet %s" + msgstr "Eliminando paquete %s" --#: ../yum/depsolve.py:275 -+#: ../yum/depsolve.py:285 +-#: ../yum/depsolve.py:277 ++#: ../yum/depsolve.py:278 #, python-format msgid "%s requires: %s" - msgstr "%s requereix: %s" + msgstr "%s necesita: %s" --#: ../yum/depsolve.py:333 -+#: ../yum/depsolve.py:343 +-#: ../yum/depsolve.py:335 ++#: ../yum/depsolve.py:319 ++#, python-format ++msgid "%s requires %s" ++msgstr "%s necesita %s" ++ ++#: ../yum/depsolve.py:346 msgid "Needed Require has already been looked up, cheating" --msgstr "El requeriment necessari ja s'ha buscat anteriorment, s'estan fent trampes" -+msgstr "" -+"El requeriment necessari ja s'ha buscat anteriorment, s'estan fent trampes" + msgstr "El requerimiento que se necesita ya fue buscado, haciendo trampa" --#: ../yum/depsolve.py:343 -+#: ../yum/depsolve.py:353 +-#: ../yum/depsolve.py:345 ++#: ../yum/depsolve.py:356 #, python-format msgid "Needed Require is not a package name. Looking up: %s" - msgstr "El requeriment necessari no és un nom de paquet. S'està buscant: %s" + msgstr "El requerimiento necesitado no es un nombre de paquete. Buscando: %s" --#: ../yum/depsolve.py:350 -+#: ../yum/depsolve.py:360 +-#: ../yum/depsolve.py:352 ++#: ../yum/depsolve.py:363 #, python-format msgid "Potential Provider: %s" - msgstr "Proveïdor potencial: %s" + msgstr "Proveedor posible: %s" --#: ../yum/depsolve.py:373 -+#: ../yum/depsolve.py:383 +-#: ../yum/depsolve.py:375 ++#: ../yum/depsolve.py:386 #, python-format msgid "Mode is %s for provider of %s: %s" - msgstr "El mode és %s per al proveïdor de %s: %s" + msgstr "El modo es %s para el proveedor de %s: %s" --#: ../yum/depsolve.py:377 -+#: ../yum/depsolve.py:387 +-#: ../yum/depsolve.py:379 ++#: ../yum/depsolve.py:390 #, python-format msgid "Mode for pkg providing %s: %s" - msgstr "Mode per al paquet que proporciona %s: %s" + msgstr "Modo para el paquete que ofrece %s: %s" --#: ../yum/depsolve.py:381 -+#: ../yum/depsolve.py:391 +-#: ../yum/depsolve.py:383 ++#: ../yum/depsolve.py:394 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" --msgstr "TSINFO: el paquet %s requereix %s marcat per a esborrar" -+msgstr "TSINFO: el paquet %s requereix %s marcat per a suprimir" + msgstr "TSINFO: el paquete %s que necesita %s ha sido marcado para eliminarse" --#: ../yum/depsolve.py:394 -+#: ../yum/depsolve.py:404 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." --msgstr "TSINFO: S'està marcant com a obsolet %s amb %s per resoldre dependències." -+msgstr "" -+"TSINFO: S'està marcant com a obsolet %s amb %s per resoldre dependències." - --#: ../yum/depsolve.py:397 +-#: ../yum/depsolve.py:396 +#: ../yum/depsolve.py:407 #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "TSINFO: S'està actualitzant %s per a resoldre dependències." + msgid "TSINFO: Obsoleting %s with %s to resolve dep." +-msgstr "" +-"TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la " +-"dependencia." ++msgstr "TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la dependencia." --#: ../yum/depsolve.py:405 -+#: ../yum/depsolve.py:415 +-#: ../yum/depsolve.py:399 ++#: ../yum/depsolve.py:410 + #, python-format + msgid "TSINFO: Updating %s to resolve dep." + msgstr "TSINFO: Actualizando %s para resolver la dependencia." + +-#: ../yum/depsolve.py:407 ++#: ../yum/depsolve.py:418 #, python-format msgid "Cannot find an update path for dep for: %s" - msgstr "No es pot trobar un camí d'actualització de dependències per a: %s" +-msgstr "" +-"No es posible encontrar un camino de actualización para la dependencia para: " +-"%s" +- +-#: ../yum/depsolve.py:417 +-#, python-format +-msgid "Unresolvable requirement %s for %s" +-msgstr "Requerimiento %s irresoluble para %s" ++msgstr "No es posible encontrar un camino de actualización para la dependencia para: %s" --#: ../yum/depsolve.py:415 -+#: ../yum/depsolve.py:425 - #, python-format - msgid "Unresolvable requirement %s for %s" - msgstr "No es pot resoldre el requeriment %s per a %s" - --#: ../yum/depsolve.py:438 -+#: ../yum/depsolve.py:448 +-#: ../yum/depsolve.py:440 ++#: ../yum/depsolve.py:449 #, python-format msgid "Quick matched %s to require for %s" - msgstr "La coincidència %s es requereix per a %s" + msgstr "Rápidamente se ha localizado %s al ser requerido por %s" #. is it already installed? --#: ../yum/depsolve.py:480 -+#: ../yum/depsolve.py:490 +-#: ../yum/depsolve.py:482 ++#: ../yum/depsolve.py:491 #, python-format msgid "%s is in providing packages but it is already installed, removing." --msgstr "%s es troba en els paquets proporcionats però ja es troba instal·lat, s'està esborrant." -+msgstr "" -+"%s es troba en els paquets proporcionats però ja es troba instal·lat, s'està " -+"suprimint." +-msgstr "" +-"%s se encuentra entre los paquetes provistos, pero ya está instalado, " +-"eliminando. " ++msgstr "%s se encuentra entre los paquetes provistos, pero ya está instalado, eliminando. " --#: ../yum/depsolve.py:496 -+#: ../yum/depsolve.py:506 +-#: ../yum/depsolve.py:498 ++#: ../yum/depsolve.py:507 #, python-format msgid "Potential resolving package %s has newer instance in ts." --msgstr "El paquet potencial que resol dependències %s té una instància nova a ts" -+msgstr "" -+"El paquet potencial que resol dependències %s té una instància nova a ts" + msgstr "El paquete de solución posible %s posee una nueva instancia en ts." --#: ../yum/depsolve.py:507 -+#: ../yum/depsolve.py:517 +-#: ../yum/depsolve.py:509 ++#: ../yum/depsolve.py:518 #, python-format msgid "Potential resolving package %s has newer instance installed." --msgstr "El paquet potencial que resol dependències %s té una nova instància insta·lada." -+msgstr "" -+"El paquet potencial que resol dependències %s té una nova instància " -+"insta·lada." +-msgstr "" +-"El paquete de solución posible %s posee una nueva instancia ya instalada." +- +-#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 +-#, python-format +-msgid "Missing Dependency: %s is needed by package %s" +-msgstr "" +-"No se encuentra una dependencia: es necesario %s para poder instalar el " +-"paquete %s" ++msgstr "El paquete de solución posible %s posee una nueva instancia ya instalada." --#: ../yum/depsolve.py:515 --#: ../yum/depsolve.py:564 -+#: ../yum/depsolve.py:525 ../yum/depsolve.py:571 - #, python-format - msgid "Missing Dependency: %s is needed by package %s" - msgstr "Manca una dependència: %s es necessita per al paquet %s" - --#: ../yum/depsolve.py:528 -+#: ../yum/depsolve.py:538 +-#: ../yum/depsolve.py:530 ++#: ../yum/depsolve.py:536 #, python-format msgid "%s already in ts, skipping this one" - msgstr "%s ja es troba en ts, s'està ometent" + msgstr "%s ya se encuentra en ts, ignorándolo" --#: ../yum/depsolve.py:574 -+#: ../yum/depsolve.py:581 +-#: ../yum/depsolve.py:573 ++#: ../yum/depsolve.py:578 #, python-format msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: S'està marcant %s com a actualització per a %s" + msgstr "TSINFO: Seleccionado %s como actualización de %s" --#: ../yum/depsolve.py:582 -+#: ../yum/depsolve.py:589 +-#: ../yum/depsolve.py:581 ++#: ../yum/depsolve.py:586 #, python-format msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: S'està marcant %s com a instal·lació per a %s" + msgstr "TSINFO: Seleccionando %s como una instalación para %s" --#: ../yum/depsolve.py:675 --#: ../yum/depsolve.py:757 -+#: ../yum/depsolve.py:692 ../yum/depsolve.py:774 +-#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 ++#: ../yum/depsolve.py:690 ++#: ../yum/depsolve.py:781 msgid "Success - empty transaction" - msgstr "Èxit - transacció buida" + msgstr "Exito - transacción vacía" --#: ../yum/depsolve.py:714 --#: ../yum/depsolve.py:729 -+#: ../yum/depsolve.py:731 ../yum/depsolve.py:746 +-#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 ++#: ../yum/depsolve.py:729 ++#: ../yum/depsolve.py:744 msgid "Restarting Loop" - msgstr "S'està recomençant el bucle" + msgstr "Reiniciando el bucle" --#: ../yum/depsolve.py:745 -+#: ../yum/depsolve.py:762 +-#: ../yum/depsolve.py:755 ++#: ../yum/depsolve.py:760 msgid "Dependency Process ending" - msgstr "Està acabant el procés de dependències" + msgstr "Finalizando el proceso de dependencias" --#: ../yum/depsolve.py:751 -+#: ../yum/depsolve.py:768 +-#: ../yum/depsolve.py:761 ++#: ../yum/depsolve.py:774 #, python-format msgid "%s from %s has depsolving problems" - msgstr "%s de %s té problemes resolent dependències" + msgstr "%s desde %s tiene problemas de resolución de dependencias" --#: ../yum/depsolve.py:758 -+#: ../yum/depsolve.py:775 +-#: ../yum/depsolve.py:768 ++#: ../yum/depsolve.py:782 msgid "Success - deps resolved" - msgstr "Èxit - dependències resoltes" + msgstr "Exito - dependencias resueltas" --#: ../yum/depsolve.py:772 -+#: ../yum/depsolve.py:789 +-#: ../yum/depsolve.py:782 ++#: ../yum/depsolve.py:796 #, python-format msgid "Checking deps for %s" - msgstr "S'estan comprobant les dependències per a %s" + msgstr "Verificando dependencias para %s" --#: ../yum/depsolve.py:855 -+#: ../yum/depsolve.py:872 +-#: ../yum/depsolve.py:865 ++#: ../yum/depsolve.py:874 #, python-format msgid "looking for %s as a requirement of %s" - msgstr "s'està buscant %s com a requeriment de %s" + msgstr "localizando a %s como un requerimiento de %s" --#: ../yum/depsolve.py:997 -+#: ../yum/depsolve.py:1014 +-#: ../yum/depsolve.py:1007 ++#: ../yum/depsolve.py:1090 #, python-format msgid "Running compare_providers() for %s" - msgstr "S'està executant compare_providers() per a %s" + msgstr "Ejecutando compare_providers() para %s" --#: ../yum/depsolve.py:1025 --#: ../yum/depsolve.py:1031 -+#: ../yum/depsolve.py:1048 ../yum/depsolve.py:1054 +-#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 ++#: ../yum/depsolve.py:1117 ++#: ../yum/depsolve.py:1123 #, python-format msgid "better arch in po %s" - msgstr "millor arq en el po %s" + msgstr "mejor arquitectura en po %s" --#: ../yum/depsolve.py:1092 -+#: ../yum/depsolve.py:1140 +-#: ../yum/depsolve.py:1142 ++#: ../yum/depsolve.py:1218 #, python-format msgid "%s obsoletes %s" - msgstr "%s fa obsolet %s" + msgstr "%s hace obsoleto a %s" --#: ../yum/depsolve.py:1108 -+#: ../yum/depsolve.py:1152 +-#: ../yum/depsolve.py:1154 ++#: ../yum/depsolve.py:1230 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -1634,112 +1721,121 @@ msgstr "" - "archdist ha comparat %s amb %s a %s\n" - " Ha guanyat: %s" +@@ -1872,124 +2031,137 @@ msgstr "" + "archdist comparó %s con %s en %s\n" + " Vencedor: %s" --#: ../yum/depsolve.py:1115 -+#: ../yum/depsolve.py:1159 +-#: ../yum/depsolve.py:1161 ++#: ../yum/depsolve.py:1237 #, python-format msgid "common sourcerpm %s and %s" - msgstr "rpm font comú %s i %s" + msgstr "sourcerpm común %s y %s" --#: ../yum/depsolve.py:1121 -+#: ../yum/depsolve.py:1165 +-#: ../yum/depsolve.py:1167 ++#: ../yum/depsolve.py:1241 ++#, python-format ++msgid "base package %s is installed for %s" ++msgstr "el paquete principal %s está instalado para %s" ++ ++#: ../yum/depsolve.py:1247 #, python-format msgid "common prefix of %s between %s and %s" - msgstr "prefix comú de %s entre %s i %s" + msgstr "prefijo común de %s entre %s y %s" --#: ../yum/depsolve.py:1129 -+#: ../yum/depsolve.py:1173 +-#: ../yum/depsolve.py:1175 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Best Order: %s" - msgstr "Millor ordre: %s" + msgstr "Mejor orden: %s" --#: ../yum/__init__.py:158 -+#: ../yum/__init__.py:180 +-#: ../yum/__init__.py:187 ++#: ../yum/__init__.py:192 msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "doConfigsetup() desapareixerà en una futura versió de Yum.\n" - --#: ../yum/__init__.py:367 -+#: ../yum/__init__.py:401 - #, python-format - msgid "Repository %r is missing name in configuration, using id" - msgstr "Falta el nom del repositori %r en la configuració, s'utilitzarà l'id" - --#: ../yum/__init__.py:405 -+#: ../yum/__init__.py:439 - msgid "plugins already initialised" - msgstr "els connectors ja estan inicialitzats" + msgstr "doConfigSetup() desaparecerá en alguna versión posterior de Yum.\n" -#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:446 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "doRpmDBSetup() desapareixerà en una futura versió de Yum.\n" - --#: ../yum/__init__.py:423 -+#: ../yum/__init__.py:457 - msgid "Reading Local RPMDB" - msgstr "S'està llegint un RPMDB local" - --#: ../yum/__init__.py:441 -+#: ../yum/__init__.py:478 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() desapareixerà en una futura versió de Yum.\n" - --#: ../yum/__init__.py:461 -+#: ../yum/__init__.py:498 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() desapareixerà en una versió futura de Yum.\n" - --#: ../yum/__init__.py:478 -+#: ../yum/__init__.py:528 - msgid "Setting up Package Sacks" - msgstr "S'estan configurant els sacs de paquets" - --#: ../yum/__init__.py:521 -+#: ../yum/__init__.py:573 ++#: ../yum/__init__.py:424 #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" - msgstr "l'objecte repositori per al repositori %s no té un mètode _resetSack\n" + msgid "Repository %r is missing name in configuration, using id" +-msgstr "" +-"Al repositorio %r le falta un nombre en su configuración, utilizando el id" ++msgstr "Al repositorio %r le falta un nombre en su configuración, utilizando el id" --#: ../yum/__init__.py:522 -+#: ../yum/__init__.py:574 - msgid "therefore this repo cannot be reset.\n" - msgstr "Aquest repositori no es pot reiniciar.\n" +-#: ../yum/__init__.py:450 ++#: ../yum/__init__.py:462 + msgid "plugins already initialised" + msgstr "los complementos ya se encuentran inicializados" --#: ../yum/__init__.py:527 -+#: ../yum/__init__.py:579 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "doUpdateSetup() desapareixerà en una futura versió de Yum.\n" +-#: ../yum/__init__.py:457 ++#: ../yum/__init__.py:469 + msgid "doRpmDBSetup() will go away in a future version of Yum.\n" + msgstr "doRpmDBSetup() desaparecerá en alguna versión posterior de Yum.\n" + +-#: ../yum/__init__.py:468 ++#: ../yum/__init__.py:480 + msgid "Reading Local RPMDB" + msgstr "Leyendo RPDMDB local" + +-#: ../yum/__init__.py:489 ++#: ../yum/__init__.py:504 + msgid "doRepoSetup() will go away in a future version of Yum.\n" + msgstr "doRepoSetup() desaparecerá en alguna versión posterior de Yum.\n" + +-#: ../yum/__init__.py:509 ++#: ../yum/__init__.py:524 + msgid "doSackSetup() will go away in a future version of Yum.\n" + msgstr "doSackSetup() desaparecerá en alguna versión posterior de Yum.\n" -#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:591 ++#: ../yum/__init__.py:554 + msgid "Setting up Package Sacks" + msgstr "Configurando sacos de paquetes" + +-#: ../yum/__init__.py:584 ++#: ../yum/__init__.py:599 + #, python-format + msgid "repo object for repo %s lacks a _resetSack method\n" +-msgstr "" +-"el objeto del repositorio para el repositorio %s necesita de un método a " +-"_resetSack\n" ++msgstr "el objeto del repositorio para el repositorio %s necesita de un método a _resetSack\n" + +-#: ../yum/__init__.py:585 ++#: ../yum/__init__.py:600 + msgid "therefore this repo cannot be reset.\n" + msgstr "por lo tanto, este repositorio no puede ser restaurado.\n" + +-#: ../yum/__init__.py:590 ++#: ../yum/__init__.py:605 + msgid "doUpdateSetup() will go away in a future version of Yum.\n" + msgstr "doUpdateSetup() desaparecerá en alguna versión posterior de Yum.\n" + +-#: ../yum/__init__.py:602 ++#: ../yum/__init__.py:617 msgid "Building updates object" - msgstr "S'està construint l'objecte d'actualitzacions" + msgstr "Construyendo objeto de actualizaciones" --#: ../yum/__init__.py:570 -+#: ../yum/__init__.py:626 +-#: ../yum/__init__.py:637 ++#: ../yum/__init__.py:652 msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() desapareixerà en una futura versió de Yum.\n" + msgstr "doGroupSetup() desaparecerá en alguna versión posterior de Yum.\n" --#: ../yum/__init__.py:595 -+#: ../yum/__init__.py:651 - msgid "Getting group metadata" - msgstr "S'estan obtenint les metadades del grup" - --#: ../yum/__init__.py:621 +-#: ../yum/__init__.py:662 +#: ../yum/__init__.py:677 + msgid "Getting group metadata" + msgstr "Obteniendo metadatos de grupo" + +-#: ../yum/__init__.py:688 ++#: ../yum/__init__.py:703 #, python-format msgid "Adding group file from repository: %s" - msgstr "S'està afegint el fitxer del grup des del repositori: %s" + msgstr "Agregando archivo de grupos desde el repositorio: %s" --#: ../yum/__init__.py:630 -+#: ../yum/__init__.py:686 +-#: ../yum/__init__.py:697 ++#: ../yum/__init__.py:712 #, python-format msgid "Failed to add groups file for repository: %s - %s" - msgstr "No s'ha pogut afegir el fitxer dels grups des del repositori: %s - %s" + msgstr "Falló al agregarse el archivo de grupos desde el repositorio: %s - %s" --#: ../yum/__init__.py:636 -+#: ../yum/__init__.py:692 +-#: ../yum/__init__.py:703 ++#: ../yum/__init__.py:718 msgid "No Groups Available in any repository" - msgstr "No hi ha cap grup disponible en cap repositori" + msgstr "No hay grupos disponibles en ningún repositorio" --#: ../yum/__init__.py:686 -+#: ../yum/__init__.py:742 - msgid "Importing additional filelist information" - msgstr "S'està important informació adicional de la llista de fitxers" - --#: ../yum/__init__.py:695 --msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them." --msgstr "Encara hi ha transaccions sense acabar. Hauríeu de considerar executar yum-complete-transaction abans per acabar-les." -+#: ../yum/__init__.py:756 -+#, python-format -+msgid "The program %s%s%s is found in the yum-utils package." -+msgstr "El programa %s%s%s es troba en el paquet yum-utils." +-#: ../yum/__init__.py:763 ++#: ../yum/__init__.py:730 ++msgid "Getting pkgtags metadata" ++msgstr "Obteniendo metadatos de etiquetas de paquete (pkgtags)" + -+#: ../yum/__init__.py:764 -+msgid "" -+"There are unfinished transactions remaining. You might consider running yum-" -+"complete-transaction first to finish them." -+msgstr "" -+"Encara hi ha transaccions sense acabar. Hauríeu de considerar executar yum-" -+"complete-transaction abans per acabar-les." ++#: ../yum/__init__.py:740 ++#, python-format ++msgid "Adding tags from repository: %s" ++msgstr "Agregando etiquetas del repositorio: %s" ++ ++#: ../yum/__init__.py:749 ++#, python-format ++msgid "Failed to add Pkg Tags for repository: %s - %s" ++msgstr "Falló al agregarse etiquetas de paquetes para el repositorio: %s - %s" ++ ++#: ../yum/__init__.py:827 + msgid "Importing additional filelist information" + msgstr "Importando información adicional de listas de archivo" --#: ../yum/__init__.py:761 -+#: ../yum/__init__.py:832 +-#: ../yum/__init__.py:777 ++#: ../yum/__init__.py:841 + #, python-format + msgid "The program %s%s%s is found in the yum-utils package." + msgstr "El programa %s%s%s se encuentra en el paquete yum-utils." + +-#: ../yum/__init__.py:785 +-msgid "" +-"There are unfinished transactions remaining. You might consider running yum-" +-"complete-transaction first to finish them." +-msgstr "" +-"Existen transacciones restantes no finalizadas. Podría considerar primero " +-"ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas." ++#: ../yum/__init__.py:849 ++msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them." ++msgstr "Existen transacciones restantes no finalizadas. Podría considerar primero ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas." + +-#: ../yum/__init__.py:853 ++#. Kind of hacky ++#: ../yum/__init__.py:922 #, python-format msgid "Skip-broken round %i" - msgstr "Intent %i d'omissió dels paquets trencats" + msgstr "Etapa %i ignorando dependencias rotas" --#: ../yum/__init__.py:813 -+#: ../yum/__init__.py:884 +-#: ../yum/__init__.py:906 ++#: ../yum/__init__.py:975 #, python-format msgid "Skip-broken took %i rounds " - msgstr "L'omissió dels paquets trencats ha necessitat %i intents" + msgstr "El proceso de ignorar dependencias rotas llevó %i vueltas" --#: ../yum/__init__.py:814 -+#: ../yum/__init__.py:885 +-#: ../yum/__init__.py:907 ++#: ../yum/__init__.py:976 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -1747,89 +1843,74 @@ msgstr "" +@@ -1997,81 +2169,88 @@ msgstr "" "\n" - "Paquets omesos degut a problemes de dependències:" + "Paquetes ignorados por problemas de dependencias:" --#: ../yum/__init__.py:818 -+#: ../yum/__init__.py:889 +-#: ../yum/__init__.py:911 ++#: ../yum/__init__.py:980 #, python-format msgid " %s from %s" - msgstr " %s des de %s" + msgstr " %s de %s" --#: ../yum/__init__.py:958 --msgid "Warning: scriptlet or other non-fatal errors occurred during transaction." --msgstr "Avís: ha fallat l'scriptlet o s'han produït altre tipus d'errors no fatals durant la transacció." -+#: ../yum/__init__.py:1027 -+msgid "" -+"Warning: scriptlet or other non-fatal errors occurred during transaction." -+msgstr "" -+"Avís: ha fallat l'scriptlet o s'han produït altre tipus d'errors no fatals " -+"durant la transacció." +-#: ../yum/__init__.py:1083 +-msgid "" +-"Warning: scriptlet or other non-fatal errors occurred during transaction." +-msgstr "" +-"Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la " +-"transacción." ++#: ../yum/__init__.py:1121 ++msgid "Warning: RPMDB altered outside of yum." ++msgstr "Advertencia: Las bases de datos (RPMDB) han sido modificadas por un elemento ajeno a yum." ++ ++#: ../yum/__init__.py:1126 ++msgid "missing requires" ++msgstr "no se encuentra necesita" ++ ++#: ../yum/__init__.py:1127 ++msgid "installed conflict" ++msgstr "conflicto instalado" --#: ../yum/__init__.py:973 -+#: ../yum/__init__.py:1042 +-#: ../yum/__init__.py:1101 ++#: ../yum/__init__.py:1180 ++msgid "Warning: scriptlet or other non-fatal errors occurred during transaction." ++msgstr "Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la transacción." ++ ++#: ../yum/__init__.py:1198 #, python-format msgid "Failed to remove transaction file %s" --msgstr "No s'ha pogut esborrar el fitxer de transaccions %s" -+msgstr "No s'ha pogut suprimir el fitxer de transaccions %s" + msgstr "Falló al eliminar archivo de transacción %s" --#: ../yum/__init__.py:1015 -+#. maybe a file log here, too -+#. but raising an exception is not going to do any good -+#: ../yum/__init__.py:1071 + #. maybe a file log here, too + #. but raising an exception is not going to do any good +-#: ../yum/__init__.py:1130 ++#: ../yum/__init__.py:1227 #, python-format --msgid "excluding for cost: %s from %s" --msgstr "s'està excloent per cost: %s de %s" -- --#: ../yum/__init__.py:1046 --msgid "Excluding Packages in global exclude list" --msgstr "S'estan excloent paquets en la llista global d'exclusió" -+msgid "%s was supposed to be installed but is not!" -+msgstr "S'havia d'instal·lar %s però no s'ha realitzat!" + msgid "%s was supposed to be installed but is not!" + msgstr "¡se suponía que %s estuviera instalado, pero no lo está! " --#: ../yum/__init__.py:1048 -+#. maybe a file log here, too -+#. but raising an exception is not going to do any good -+#: ../yum/__init__.py:1110 + #. maybe a file log here, too + #. but raising an exception is not going to do any good +-#: ../yum/__init__.py:1169 ++#: ../yum/__init__.py:1266 #, python-format --msgid "Excluding Packages from %s" --msgstr "S'estan excloent paquets de %s" -- --#: ../yum/__init__.py:1077 --#, python-format --msgid "Reducing %s to included packages only" --msgstr "S'està reduint %s únicament a paquets inclosos." -- --#: ../yum/__init__.py:1083 --#, python-format --msgid "Keeping included package %s" --msgstr "S'està mantenint el paquet inclòs %s" -- --#: ../yum/__init__.py:1089 --#, python-format --msgid "Removing unmatched package %s" --msgstr "S'està esborrant el paquet sense coincidències %s" -- --#: ../yum/__init__.py:1092 --msgid "Finished" --msgstr "Finalitzat" -+msgid "%s was supposed to be removed but is not!" -+msgstr "S'havia de suprimir %s però no s'ha realitzat!" + msgid "%s was supposed to be removed but is not!" + msgstr "¡se suponía que %s estuviera eliminado, pero no lo está! " #. Whoa. What the heck happened? --#: ../yum/__init__.py:1122 -+#: ../yum/__init__.py:1225 +-#: ../yum/__init__.py:1289 ++#: ../yum/__init__.py:1386 #, python-format msgid "Unable to check if PID %s is active" - msgstr "No s'ha pogut comprovar si el PID %s es troba actiu" + msgstr "No es posible verificar si se encuentra activo el PID %s" #. Another copy seems to be running. --#: ../yum/__init__.py:1126 -+#: ../yum/__init__.py:1229 +-#: ../yum/__init__.py:1293 ++#: ../yum/__init__.py:1390 #, python-format msgid "Existing lock %s: another copy is running as pid %s." - msgstr "Bloqueig existent %s: una altra còpia s'està executant amb pid %s." +-msgstr "" +-"Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s." ++msgstr "Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s." --#: ../yum/__init__.py:1196 -+#: ../yum/__init__.py:1306 + #. Whoa. What the heck happened? +-#: ../yum/__init__.py:1328 ++#: ../yum/__init__.py:1425 + #, python-format + msgid "Could not create lock at %s: %s " + msgstr "No se ha podido crear el bloqueo en %s: %s" + +-#: ../yum/__init__.py:1373 ++#: ../yum/__init__.py:1470 msgid "Package does not match intended download" - msgstr "El paquet no coincideix amb la descàrrega intentada" + msgstr "El paquete no se corresponde con la descarga pretendida" --#: ../yum/__init__.py:1211 -+#: ../yum/__init__.py:1321 +-#: ../yum/__init__.py:1388 ++#: ../yum/__init__.py:1485 msgid "Could not perform checksum" - msgstr "No s'ha pogut realitzar la suma de verificació" + msgstr "No se pudo realizar una suma de verificación" --#: ../yum/__init__.py:1214 -+#: ../yum/__init__.py:1324 +-#: ../yum/__init__.py:1391 ++#: ../yum/__init__.py:1488 msgid "Package does not match checksum" - msgstr "No coincideix la suma de verificació del paquet" + msgstr "El paquete no se corresponde con la suma de verificación" --#: ../yum/__init__.py:1257 -+#: ../yum/__init__.py:1366 +-#: ../yum/__init__.py:1433 ++#: ../yum/__init__.py:1530 #, python-format msgid "package fails checksum but caching is enabled for %s" --msgstr "la suma de verificació del paquet falla però l'ús de memòria cau està habilitat per a %s" -+msgstr "" -+"la suma de verificació del paquet falla però l'ús de memòria cau està " -+"habilitat per a %s" +-msgstr "" +-"el paquete no ha superado la suma de verificación, pero el caché se " +-"encuentra habilitado para %s" ++msgstr "el paquete no ha superado la suma de verificación, pero el caché se encuentra habilitado para %s" --#: ../yum/__init__.py:1260 --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1369 ../yum/__init__.py:1398 +-#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 ++#: ../yum/__init__.py:1533 ++#: ../yum/__init__.py:1562 #, python-format msgid "using local copy of %s" - msgstr "s'està utilitzant la còpia local de %s" + msgstr "utilizando una copia local de %s" --#: ../yum/__init__.py:1301 -+#: ../yum/__init__.py:1410 +-#: ../yum/__init__.py:1477 ++#: ../yum/__init__.py:1574 #, python-format msgid "" "Insufficient space in download directory %s\n" -@@ -1840,441 +1921,462 @@ msgstr "" - " * lliure %s\n" - " * necessari %s" +@@ -2082,416 +2261,433 @@ msgstr "" + " * libre %s\n" + " * necesario %s" --#: ../yum/__init__.py:1348 -+#: ../yum/__init__.py:1459 +-#: ../yum/__init__.py:1526 ++#: ../yum/__init__.py:1623 msgid "Header is not complete." - msgstr "La capçalera no està completa." + msgstr "El encabezado no está completo." --#: ../yum/__init__.py:1385 -+#: ../yum/__init__.py:1496 +-#: ../yum/__init__.py:1563 ++#: ../yum/__init__.py:1660 #, python-format --msgid "Header not in local cache and caching-only mode enabled. Cannot download %s" --msgstr "La capçalera no es troba en la memòria cau local i està habilitat el mode de només memòria cau. No es pot descarregar %s" -+msgid "" -+"Header not in local cache and caching-only mode enabled. Cannot download %s" -+msgstr "" -+"La capçalera no es troba en la memòria cau local i està habilitat el mode de " -+"només memòria cau. No es pot baixar %s" +-msgid "" +-"Header not in local cache and caching-only mode enabled. Cannot download %s" +-msgstr "" +-"El encabezado no se encuentra en el caché local, y está habilitado el modo " +-"de solo cacheo. No es posible descargar %s" ++msgid "Header not in local cache and caching-only mode enabled. Cannot download %s" ++msgstr "El encabezado no se encuentra en el caché local, y está habilitado el modo de solo cacheo. No es posible descargar %s" --#: ../yum/__init__.py:1440 -+#: ../yum/__init__.py:1551 +-#: ../yum/__init__.py:1618 ++#: ../yum/__init__.py:1715 #, python-format msgid "Public key for %s is not installed" - msgstr "La clau pública per a %s no està instal·lada" + msgstr "No se ha instalado la llave pública de %s " --#: ../yum/__init__.py:1444 -+#: ../yum/__init__.py:1555 +-#: ../yum/__init__.py:1622 ++#: ../yum/__init__.py:1719 #, python-format msgid "Problem opening package %s" - msgstr "Hi ha hagut un problema obrint el paquet %s" + msgstr "Problemas abriendo el paquete %s" --#: ../yum/__init__.py:1452 -+#: ../yum/__init__.py:1563 +-#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1727 #, python-format msgid "Public key for %s is not trusted" - msgstr "La clau pública per a %s no és de confiança" + msgstr "La llave pública de %s no es confiable" --#: ../yum/__init__.py:1456 -+#: ../yum/__init__.py:1567 +-#: ../yum/__init__.py:1634 ++#: ../yum/__init__.py:1731 #, python-format msgid "Package %s is not signed" - msgstr "El paquet %s no està signat" + msgstr "El paquete %s no está firmado" --#: ../yum/__init__.py:1494 -+#: ../yum/__init__.py:1605 +-#: ../yum/__init__.py:1672 ++#: ../yum/__init__.py:1769 #, python-format msgid "Cannot remove %s" --msgstr "No es pot esborrar %s" -+msgstr "No es pot suprimir %s" + msgstr "No es posible eliminar %s" --#: ../yum/__init__.py:1498 -+#: ../yum/__init__.py:1609 +-#: ../yum/__init__.py:1676 ++#: ../yum/__init__.py:1773 #, python-format msgid "%s removed" --msgstr "S'ha esborrat %s" -+msgstr "S'ha suprimit %s" + msgstr "%s eliminado" --#: ../yum/__init__.py:1534 -+#: ../yum/__init__.py:1645 +-#: ../yum/__init__.py:1712 ++#: ../yum/__init__.py:1819 #, python-format msgid "Cannot remove %s file %s" --msgstr "No es pot esborrar %s fitxer %s" -+msgstr "No es pot suprimir %s fitxer %s" + msgstr "No es posible eliminar %s archivo %s" --#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1649 +-#: ../yum/__init__.py:1716 ++#: ../yum/__init__.py:1823 #, python-format msgid "%s file %s removed" --msgstr "%s fitxer %s esborrat" -+msgstr "%s fitxer %s suprimit" + msgstr "%s archivo %s eliminado" --#: ../yum/__init__.py:1540 -+#: ../yum/__init__.py:1651 +-#: ../yum/__init__.py:1718 ++#: ../yum/__init__.py:1825 #, python-format msgid "%d %s files removed" --msgstr "%d %s fitxers esborrats" -+msgstr "%d %s fitxers suprimits" + msgstr "%d %s archivos eliminados" --#: ../yum/__init__.py:1609 -+#: ../yum/__init__.py:1720 +-#: ../yum/__init__.py:1787 ++#: ../yum/__init__.py:1894 #, python-format msgid "More than one identical match in sack for %s" - msgstr "Hi ha més d'una coincidència idèntica en el sac per a %s" + msgstr "Más de una correspondencia exacta en el saco para %s" --#: ../yum/__init__.py:1615 -+#: ../yum/__init__.py:1726 +-#: ../yum/__init__.py:1793 ++#: ../yum/__init__.py:1900 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "No hi ha coincidències %s.%s-%s:%s-%s de l'actualització" + msgstr "Nada se corresponde con %s.%s %s:%s-%s desde la actualización" --#: ../yum/__init__.py:1833 --msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n" --msgstr "searchPackages() desapareixerà en una futura versió de Yum. Useu searchGenerator(). \n" -+#: ../yum/__init__.py:1959 -+msgid "" -+"searchPackages() will go away in a future version of " -+"Yum. Use searchGenerator() instead. \n" -+msgstr "" -+"searchPackages() desapareixerà en una futura versió de " -+"Yum. Useu searchGenerator(). \n" +-#: ../yum/__init__.py:2026 +-msgid "" +-"searchPackages() will go away in a future version of " +-"Yum. Use searchGenerator() instead. \n" +-msgstr "" +-"searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar " +-"utilice searchGenerator(). \n" ++#: ../yum/__init__.py:2179 ++msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n" ++msgstr "searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar utilice searchGenerator(). \n" --#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2001 +-#: ../yum/__init__.py:2065 ++#: ../yum/__init__.py:2218 #, python-format msgid "Searching %d packages" - msgstr "S'estan buscant %d paquets" + msgstr "Buscando %d paquetes" --#: ../yum/__init__.py:1879 -+#: ../yum/__init__.py:2005 +-#: ../yum/__init__.py:2069 ++#: ../yum/__init__.py:2222 #, python-format msgid "searching package %s" - msgstr "s'està buscant el paquet %s" + msgstr "buscando paquete %s" --#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2017 +-#: ../yum/__init__.py:2081 ++#: ../yum/__init__.py:2234 msgid "searching in file entries" - msgstr "s'està buscant en les entrades de fitxers" + msgstr "buscando en las entradas de archivo" --#: ../yum/__init__.py:1898 -+#: ../yum/__init__.py:2024 +-#: ../yum/__init__.py:2088 ++#: ../yum/__init__.py:2241 msgid "searching in provides entries" - msgstr "s'està buscant en les entrades proporcionades" + msgstr "buscando en las entradas \"provee\"" --#: ../yum/__init__.py:1931 -+#: ../yum/__init__.py:2057 +-#: ../yum/__init__.py:2121 ++#: ../yum/__init__.py:2274 #, python-format msgid "Provides-match: %s" - msgstr "Proporciona-coincideix: %s" + msgstr "Lo que se ha indicado combina con: %s" --#: ../yum/__init__.py:1980 -+#: ../yum/__init__.py:2106 +-#: ../yum/__init__.py:2170 ++#: ../yum/__init__.py:2323 msgid "No group data available for configured repositories" - msgstr "No hi ha dades de grup disponibles en cap dels repositoris configurats" + msgstr "No existen datos de grupo disponibles en los repositorios configurados" --#: ../yum/__init__.py:2011 --#: ../yum/__init__.py:2030 --#: ../yum/__init__.py:2061 --#: ../yum/__init__.py:2067 --#: ../yum/__init__.py:2146 --#: ../yum/__init__.py:2150 --#: ../yum/__init__.py:2447 -+#: ../yum/__init__.py:2137 ../yum/__init__.py:2156 ../yum/__init__.py:2187 -+#: ../yum/__init__.py:2193 ../yum/__init__.py:2272 ../yum/__init__.py:2276 -+#: ../yum/__init__.py:2586 +-#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 +-#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 +-#: ../yum/__init__.py:2655 ++#: ../yum/__init__.py:2354 ++#: ../yum/__init__.py:2373 ++#: ../yum/__init__.py:2404 ++#: ../yum/__init__.py:2410 ++#: ../yum/__init__.py:2492 ++#: ../yum/__init__.py:2496 ++#: ../yum/__init__.py:2813 #, python-format msgid "No Group named %s exists" - msgstr "No existeix cap grup anomenat %s" + msgstr "No existe un grupo denominado %s" --#: ../yum/__init__.py:2042 --#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2168 ../yum/__init__.py:2289 +-#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 ++#: ../yum/__init__.py:2385 ++#: ../yum/__init__.py:2512 #, python-format msgid "package %s was not marked in group %s" - msgstr "el paquet %s no estava marcat en el grup %s" + msgstr "el paquete %s no fue marcado en el grupo %s" --#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2215 +-#: ../yum/__init__.py:2279 ++#: ../yum/__init__.py:2432 #, python-format msgid "Adding package %s from group %s" - msgstr "S'està afegint el paquet %s del grup %s" + msgstr "Agregando paquete %s del grupo %s" --#: ../yum/__init__.py:2093 -+#: ../yum/__init__.py:2219 +-#: ../yum/__init__.py:2283 ++#: ../yum/__init__.py:2436 #, python-format msgid "No package named %s available to be installed" - msgstr "No hi ha cap paquet anomenat %s disponible per a ser instal·lat" + msgstr "No existe un paquete denominado %s disponible para ser instalado" --#: ../yum/__init__.py:2190 -+#: ../yum/__init__.py:2316 +-#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2538 #, python-format msgid "Package tuple %s could not be found in packagesack" - msgstr "No s'ha pogut trobar la tupla de paquets %s al sac de paquets" + msgstr "La tupla %s de paquetes no pudo ser encontrada en el saco de paquetes" --#: ../yum/__init__.py:2205 --msgid "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n" --msgstr "getInstalledPackageObject() desapareixarà, useu self.rpmdb.searchPkgTuple().\n" -+#: ../yum/__init__.py:2330 -+msgid "" -+"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n" -+msgstr "" -+"getInstalledPackageObject() desapareixarà, useu self.rpmdb.searchPkgTuple" -+"().\n" +-#: ../yum/__init__.py:2399 ++#: ../yum/__init__.py:2557 + #, python-format + msgid "Package tuple %s could not be found in rpmdb" + msgstr "La tupla %s de paquetes no pudo ser encontrada en la base de datos" --#: ../yum/__init__.py:2261 --#: ../yum/__init__.py:2305 -+#: ../yum/__init__.py:2386 ../yum/__init__.py:2436 +-#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 ++#: ../yum/__init__.py:2613 ++#: ../yum/__init__.py:2663 msgid "Invalid version flag" - msgstr "Marcador de versió invàlid" + msgstr "Marca de versión no válida" --#: ../yum/__init__.py:2276 --#: ../yum/__init__.py:2280 -+#: ../yum/__init__.py:2406 ../yum/__init__.py:2411 +-#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 ++#: ../yum/__init__.py:2633 ++#: ../yum/__init__.py:2638 #, python-format msgid "No Package found for %s" - msgstr "No s'ha trobat cap paquet per a %s" + msgstr "No se ha encontrado ningún paquete para %s" --#: ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2627 +-#: ../yum/__init__.py:2696 ++#: ../yum/__init__.py:2854 msgid "Package Object was not a package object instance" - msgstr "L'objecte paquet no era una instància d'objecte paquet" + msgstr "El objeto de paquete no era una instancia de objeto de paquete" --#: ../yum/__init__.py:2484 -+#: ../yum/__init__.py:2631 +-#: ../yum/__init__.py:2700 ++#: ../yum/__init__.py:2858 msgid "Nothing specified to install" - msgstr "No hi ha res especificat per a instal·lar" + msgstr "No se ha indicado nada para instalar" --#: ../yum/__init__.py:2500 --#: ../yum/__init__.py:3127 -+#: ../yum/__init__.py:2647 ../yum/__init__.py:3411 +-#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 ++#: ../yum/__init__.py:2874 ++#: ../yum/__init__.py:3651 #, python-format msgid "Checking for virtual provide or file-provide for %s" --msgstr "S'està verificant si hi ha un proveïdor virtual o un fitxer proveïdor per a %s" -+msgstr "" -+"S'està verificant si hi ha un proveïdor virtual o un fitxer proveïdor per a %" -+"s" + msgstr "Verificando la provision virtual o provision de archivo de %s" --#: ../yum/__init__.py:2506 --#: ../yum/__init__.py:2783 --#: ../yum/__init__.py:2943 --#: ../yum/__init__.py:3133 -+#: ../yum/__init__.py:2653 ../yum/__init__.py:2960 ../yum/__init__.py:3127 -+#: ../yum/__init__.py:3417 +-#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 +-#: ../yum/__init__.py:3495 ++#: ../yum/__init__.py:2880 ++#: ../yum/__init__.py:3196 ++#: ../yum/__init__.py:3364 ++#: ../yum/__init__.py:3657 #, python-format msgid "No Match for argument: %s" - msgstr "No hi ha cap coincidència per a l'argument: %s" + msgstr "No hay nada concordante con el argumento: %s" --#: ../yum/__init__.py:2580 -+#: ../yum/__init__.py:2729 +-#: ../yum/__init__.py:2798 ++#: ../yum/__init__.py:2956 #, python-format msgid "Package %s installed and not available" - msgstr "El paquet %s es troba instal·lat però no és disponible" + msgstr "El paquete %s está instalado y no se encuentra disponible" --#: ../yum/__init__.py:2583 -+#: ../yum/__init__.py:2732 +-#: ../yum/__init__.py:2801 ++#: ../yum/__init__.py:2959 msgid "No package(s) available to install" - msgstr "No hi ha cap paquet disponible per a instal·lar" + msgstr "No existe(n) paquete(s) disponible(s) para instalar" --#: ../yum/__init__.py:2595 -+#: ../yum/__init__.py:2744 +-#: ../yum/__init__.py:2813 ++#: ../yum/__init__.py:2971 #, python-format msgid "Package: %s - already in transaction set" - msgstr "El paquet: %s - ja està en la transacció" + msgstr "Paquete: %s - ya se encuentra en un conjunto de transacción" --#: ../yum/__init__.py:2610 -+#: ../yum/__init__.py:2770 -+#, python-format -+msgid "Package %s is obsoleted by %s which is already installed" -+msgstr "El paquet %s és obsolet degut a %s, que ja està instal·lat" -+ -+#: ../yum/__init__.py:2773 +-#: ../yum/__init__.py:2839 ++#: ../yum/__init__.py:2997 + #, python-format + msgid "Package %s is obsoleted by %s which is already installed" + msgstr "El paquete %s se hace obsoleto con %s, que ya se encuentra instalado" + +-#: ../yum/__init__.py:2842 ++#: ../yum/__init__.py:3000 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" --msgstr "El paquet %s és obsolet degut a %s, es provarà d'instal·lar %s" -+msgstr "El paquet %s és obsolet degut a %s, es provarà d'instal·lar %s en el seu lloc" +-msgstr "" +-"El paquete %s se hace obsoleto con %s, en su lugar se está intentando " +-"instalar %s" ++msgstr "El paquete %s se hace obsoleto con %s, en su lugar se está intentando instalar %s" --#: ../yum/__init__.py:2618 -+#: ../yum/__init__.py:2781 +-#: ../yum/__init__.py:2850 ++#: ../yum/__init__.py:3008 #, python-format msgid "Package %s already installed and latest version" - msgstr "El paquet %s ja es troba instal·lat i en l'última versió." + msgstr "El paquete %s ya se encuentra instalado con su versión más reciente" --#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2795 +-#: ../yum/__init__.py:2864 ++#: ../yum/__init__.py:3022 #, python-format msgid "Package matching %s already installed. Checking for update." --msgstr "El paquet coincident %s ja es troba instal·lat. S'està buscant una actualització." -+msgstr "" -+"El paquet coincident %s ja es troba instal·lat. S'està buscant una " -+"actualització." +-msgstr "" +-"El paquete concordante con %s ya se encuentra instalado. Verificando si " +-"puede actualizarse." ++msgstr "El paquete concordante con %s ya se encuentra instalado. Verificando si puede actualizarse." #. update everything (the easy case) --#: ../yum/__init__.py:2718 -+#: ../yum/__init__.py:2889 +-#: ../yum/__init__.py:2966 ++#: ../yum/__init__.py:3125 msgid "Updating Everything" - msgstr "S'està actualitzant tot" + msgstr "Actualizando todo" --#: ../yum/__init__.py:2736 --#: ../yum/__init__.py:2845 --#: ../yum/__init__.py:2866 --#: ../yum/__init__.py:2892 -+#: ../yum/__init__.py:2910 ../yum/__init__.py:3025 ../yum/__init__.py:3054 -+#: ../yum/__init__.py:3081 +-#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 +-#: ../yum/__init__.py:3155 ++#: ../yum/__init__.py:3146 ++#: ../yum/__init__.py:3261 ++#: ../yum/__init__.py:3288 ++#: ../yum/__init__.py:3314 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "No s'actualitzarà el paquet obsolet: %s.%s %s:%s-%s" + msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s.%s %s:%s-%s" --#: ../yum/__init__.py:2771 --#: ../yum/__init__.py:2940 -+#: ../yum/__init__.py:2945 ../yum/__init__.py:3124 +-#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 ++#: ../yum/__init__.py:3181 ++#: ../yum/__init__.py:3361 #, python-format msgid "%s" msgstr "%s" --#: ../yum/__init__.py:2836 -+#: ../yum/__init__.py:3016 +-#: ../yum/__init__.py:3093 ++#: ../yum/__init__.py:3252 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "El paquet és obsolet: %s.%s %s:%s-%s" + msgstr "El paquete ya es obsoleto: %s.%s %s:%s-%s" --#: ../yum/__init__.py:2869 --#: ../yum/__init__.py:2895 -+#: ../yum/__init__.py:3049 -+#, python-format -+msgid "Not Updating Package that is obsoleted: %s" -+msgstr "No s'actualitzarà el paquet obsolet: %s" -+ -+#: ../yum/__init__.py:3058 ../yum/__init__.py:3085 +-#: ../yum/__init__.py:3124 ++#: ../yum/__init__.py:3283 + #, python-format + msgid "Not Updating Package that is obsoleted: %s" + msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s" + +-#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 ++#: ../yum/__init__.py:3292 ++#: ../yum/__init__.py:3318 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "No s'actualitzarà el paquet actualitzat: %s.%s %s:%s-%s" +-msgstr "" +-"Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s %s:%" +-"s-%s" ++msgstr "Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s %s:%s-%s" --#: ../yum/__init__.py:2956 -+#: ../yum/__init__.py:3140 +-#: ../yum/__init__.py:3218 ++#: ../yum/__init__.py:3377 msgid "No package matched to remove" --msgstr "No hi ha cap paquet coincident per a esborrar" -+msgstr "No hi ha cap paquet coincident per a suprimir" + msgstr "No hay paquete correspondiente para ser eliminado" --#: ../yum/__init__.py:2990 -+#: ../yum/__init__.py:3173 ../yum/__init__.py:3277 ../yum/__init__.py:3366 +-#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 ++#: ../yum/__init__.py:3411 #, python-format - msgid "Cannot open file: %s. Skipping." - msgstr "No es pot obrir el fitxer %s. S'ometrà." +-msgid "Cannot open file: %s. Skipping." +-msgstr "No es posible abrir el archivo: %s. Ignorando." ++msgid "Cannot open: %s. Skipping." ++msgstr "No es posible abrir: %s. Ignorando." --#: ../yum/__init__.py:2993 -+#: ../yum/__init__.py:3176 ../yum/__init__.py:3280 ../yum/__init__.py:3369 +-#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 ++#: ../yum/__init__.py:3414 ++#: ../yum/__init__.py:3513 ++#: ../yum/__init__.py:3597 #, python-format msgid "Examining %s: %s" - msgstr "S'està examinant %s: %s" + msgstr "Examinando %s: %s" --#: ../yum/__init__.py:3001 -+#: ../yum/__init__.py:3184 ../yum/__init__.py:3283 ../yum/__init__.py:3372 +-#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 ++#: ../yum/__init__.py:3422 ++#: ../yum/__init__.py:3516 ++#: ../yum/__init__.py:3600 #, python-format msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" --msgstr "No s'ha pogut afegir el paquet %s a la transacció. No és una arquitectura compatible: %s" -+msgstr "" -+"No s'ha pogut afegir el paquet %s a la transacció. No és una arquitectura " -+"compatible: %s" +-msgstr "" +-"No es posible añadir el paquete %s a la transacción. La arquitectura no es " +-"compatible: %s" ++msgstr "No es posible añadir el paquete %s a la transacción. La arquitectura no es compatible: %s" --#: ../yum/__init__.py:3009 -+#: ../yum/__init__.py:3192 +-#: ../yum/__init__.py:3270 ++#: ../yum/__init__.py:3430 #, python-format --msgid "Package %s not installed, cannot update it. Run yum install to install it instead." --msgstr "El paquet %s no està instal·lat; no es pot actualitzar. Executeu «yum install» per a instal·lar-lo." -+msgid "" -+"Package %s not installed, cannot update it. Run yum install to install it " -+"instead." -+msgstr "" -+"El paquet %s no està instal·lat; no es pot actualitzar. Executeu «yum " -+"install» per a instal·lar-lo." +-msgid "" +-"Package %s not installed, cannot update it. Run yum install to install it " +-"instead." +-msgstr "" +-"El paquete %s no está instalado, no puede actualizarse. En su lugar, para " +-"instalarlo, ejecute el comando yum install." ++msgid "Package %s not installed, cannot update it. Run yum install to install it instead." ++msgstr "El paquete %s no está instalado, no puede actualizarse. En su lugar, para instalarlo, ejecute el comando yum install." --#: ../yum/__init__.py:3044 -+#: ../yum/__init__.py:3227 ../yum/__init__.py:3294 ../yum/__init__.py:3383 +-#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 ++#: ../yum/__init__.py:3459 ++#: ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3605 #, python-format msgid "Excluding %s" - msgstr "S'està excloent %s" - --#: ../yum/__init__.py:3049 -+#: ../yum/__init__.py:3232 - #, python-format - msgid "Marking %s to be installed" - msgstr "S'està marcant %s per a ser instal·lat" - --#: ../yum/__init__.py:3055 -+#: ../yum/__init__.py:3238 - #, python-format - msgid "Marking %s as an update to %s" - msgstr "S'està marcant %s com a actualització de %s" - --#: ../yum/__init__.py:3062 -+#: ../yum/__init__.py:3245 - #, python-format - msgid "%s: does not update installed package." - msgstr "%s no actualitza el paquet instal·lat." - --#: ../yum/__init__.py:3077 -+#: ../yum/__init__.py:3313 - msgid "Problem in reinstall: no package matched to remove" --msgstr "Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a esborrar" -+msgstr "" -+"Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a suprimir" - --#: ../yum/__init__.py:3089 --#: ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3326 ../yum/__init__.py:3444 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "El paquet %s permet múltiples instal·lacions, s'està ometent" - --#: ../yum/__init__.py:3098 --msgid "Problem in reinstall: no package matched to install" --msgstr "Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a instal·lar" -+#: ../yum/__init__.py:3347 -+#, python-format -+msgid "Problem in reinstall: no package %s matched to install" -+msgstr "" -+"Hi ha un problema en reinstal·lar: no hi ha cap paquet %s marcat per a " -+"instal·lar" - --#: ../yum/__init__.py:3152 -+#: ../yum/__init__.py:3436 - msgid "No package(s) available to downgrade" - msgstr "No hi ha cap paquet disponible per a desactualitzar" - --#: ../yum/__init__.py:3183 -+#: ../yum/__init__.py:3480 - #, python-format - msgid "No Match for available package: %s" - msgstr "No hi ha cap paquet disponible que coincideixi: %s" - --#: ../yum/__init__.py:3189 -+#: ../yum/__init__.py:3486 - #, python-format - msgid "Only Upgrade available on package: %s" - msgstr "Només hi ha una actualització disponible per al paquet: %s" - --#: ../yum/__init__.py:3241 -+#: ../yum/__init__.py:3545 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "S'està recuperant la clau GPG des de %s" - --#: ../yum/__init__.py:3261 -+#: ../yum/__init__.py:3565 - msgid "GPG key retrieval failed: " - msgstr "La recuperació de la clau GPG ha fallat: " - --#: ../yum/__init__.py:3272 -+#: ../yum/__init__.py:3576 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "L'ànalisi de la clau GPG ha fallat: la clau no té el valor %s" + msgstr "Excluyendo %s" -#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3608 ++#: ../yum/__init__.py:3464 #, python-format - msgid "GPG key at %s (0x%s) is already installed" - msgstr "La clau GPG de %s (0x%s) ja està instal·lada" + msgid "Marking %s to be installed" + msgstr "Marcando %s para ser instalado" - #. Try installing/updating GPG key --#: ../yum/__init__.py:3309 --#: ../yum/__init__.py:3371 -+#: ../yum/__init__.py:3613 ../yum/__init__.py:3675 +-#: ../yum/__init__.py:3310 ++#: ../yum/__init__.py:3470 #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "S'està important la clau GPG 0x%s \"%s\" des de %s" + msgid "Marking %s as an update to %s" + msgstr "Marcando %s como una actualización de %s" --#: ../yum/__init__.py:3326 -+#: ../yum/__init__.py:3630 - msgid "Not installing key" - msgstr "No s'està instal·lant la clau" - --#: ../yum/__init__.py:3332 -+#: ../yum/__init__.py:3636 +-#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3477 #, python-format - msgid "Key import failed (code %d)" - msgstr "La importació de la clau ha fallat (codi %d)" + msgid "%s: does not update installed package." + msgstr "%s: no actualiza el paquete instalado." --#: ../yum/__init__.py:3333 --#: ../yum/__init__.py:3392 -+#: ../yum/__init__.py:3637 ../yum/__init__.py:3696 - msgid "Key imported successfully" - msgstr "La clau s'ha importat amb èxit" - --#: ../yum/__init__.py:3338 --#: ../yum/__init__.py:3397 -+#: ../yum/__init__.py:3642 ../yum/__init__.py:3701 - #, python-format - msgid "" --"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -+"The GPG keys listed for the \"%s\" repository are already installed but they " -+"are not correct for this package.\n" - "Check that the correct key URLs are configured for this repository." - msgstr "" --"Les claus GPG llistades per al repositori \"%s\" ja estan instal·lades però no són correctes per a aquest paquet.\n" --"Comproveu que les URL de claus correctes estan configurades per a aquest repositori." -+"Les claus GPG llistades per al repositori \"%s\" ja estan instal·lades però " -+"no són correctes per a aquest paquet.\n" -+"Comproveu que les URL de claus correctes estan configurades per a aquest " -+"repositori." - --#: ../yum/__init__.py:3347 -+#: ../yum/__init__.py:3651 - msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "La importació de claus no ha ajudat, eren claus incorrectes?" - --#: ../yum/__init__.py:3366 -+#: ../yum/__init__.py:3670 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "La clau GPG a %s (0x%s) ja ha estat importada" - --#: ../yum/__init__.py:3386 -+#: ../yum/__init__.py:3690 - #, python-format - msgid "Not installing key for repo %s" - msgstr "No s'està instal·lant la clau per al repositori %s" - --#: ../yum/__init__.py:3391 -+#: ../yum/__init__.py:3695 - msgid "Key import failed" - msgstr "Ha fallat la importació de la clau" - --#: ../yum/__init__.py:3482 -+#: ../yum/__init__.py:3816 - msgid "Unable to find a suitable mirror." - msgstr "No s'ha pogut trobar un servidor rèplica vàlid." - --#: ../yum/__init__.py:3484 -+#: ../yum/__init__.py:3818 - msgid "Errors were encountered while downloading packages." --msgstr "S'han trobat errors descarregant paquets." -+msgstr "S'han trobat errors baixant paquets." - --#: ../yum/__init__.py:3525 -+#: ../yum/__init__.py:3868 - #, python-format - msgid "Please report this error at %s" - msgstr "Siusplau, informeu d'aquest error al %s" - --#: ../yum/__init__.py:3549 -+#: ../yum/__init__.py:3892 - msgid "Test Transaction Errors: " - msgstr "Errors en la transacció de prova: " - - #. Mostly copied from YumOutput._outKeyValFill() --#: ../yum/plugins.py:204 -+#: ../yum/plugins.py:202 - msgid "Loaded plugins: " - msgstr "Connectors carregats: " - --#: ../yum/plugins.py:218 --#: ../yum/plugins.py:224 -+#: ../yum/plugins.py:216 ../yum/plugins.py:222 - #, python-format - msgid "No plugin match for: %s" - msgstr "No hi ha cap connector que coincideixi amb: %s" - --#: ../yum/plugins.py:254 -+#: ../yum/plugins.py:252 - #, python-format - msgid "Not loading \"%s\" plugin, as it is disabled" - msgstr "No s'està carregant el connector \"%s\", ja que està deshabilitat" - - #. Give full backtrace: --#: ../yum/plugins.py:266 -+#: ../yum/plugins.py:264 - #, python-format - msgid "Plugin \"%s\" can't be imported" - msgstr "No s'ha pogut importar el connector \"%s\"" - --#: ../yum/plugins.py:273 -+#: ../yum/plugins.py:271 - #, python-format - msgid "Plugin \"%s\" doesn't specify required API version" - msgstr "El connector \"%s\" no especifica la versió de l'API requerida." - --#: ../yum/plugins.py:278 -+#: ../yum/plugins.py:276 - #, python-format - msgid "Plugin \"%s\" requires API %s. Supported API is %s." - msgstr "El connector \"%s\" requereix l'API %s. L'API disponible és %s" - --#: ../yum/plugins.py:311 -+#: ../yum/plugins.py:309 - #, python-format - msgid "Loading \"%s\" plugin" - msgstr "S'està carregant el connector \"%s\"" - --#: ../yum/plugins.py:318 -+#: ../yum/plugins.py:316 - #, python-format --msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" --msgstr "Existeixen dos o més connectors amb el mateix nom \"%s\" en el camí de cerca de connectors" -+msgid "" -+"Two or more plugins with the name \"%s\" exist in the plugin search path" -+msgstr "" -+"Existeixen dos o més connectors amb el mateix nom \"%s\" en el camí de cerca " -+"de connectors" - --#: ../yum/plugins.py:338 -+#: ../yum/plugins.py:336 - #, python-format - msgid "Configuration file %s not found" - msgstr "No s'ha trobat el fitxer de configuració %s" - - #. for - #. Configuration files for the plugin not found --#: ../yum/plugins.py:341 -+#: ../yum/plugins.py:339 - #, python-format - msgid "Unable to find configuration file for plugin %s" - msgstr "No s'ha pogut trobar un fitxer de configuració per al connector %s" - --#: ../yum/plugins.py:495 -+#: ../yum/plugins.py:497 - msgid "registration of commands not supported" - msgstr "l'enregistrament d'ordres no està suportat" - -@@ -2282,44 +2384,87 @@ msgstr "l'enregistrament d'ordres no està suportat" - msgid "Repackaging" - msgstr "Reempaquetant" - --#: ../rpmUtils/oldUtils.py:31 -+#: ../rpmUtils/oldUtils.py:33 - #, python-format - msgid "Header cannot be opened or does not match %s, %s." - msgstr "La capçalera no es pot obrir o no coincideix amb %s, %s" - --#: ../rpmUtils/oldUtils.py:51 -+#: ../rpmUtils/oldUtils.py:53 - #, python-format - msgid "RPM %s fails md5 check" - msgstr "Falla la comprobació md5 per al RPM %s" - --#: ../rpmUtils/oldUtils.py:149 -+#: ../rpmUtils/oldUtils.py:151 - msgid "Could not open RPM database for reading. Perhaps it is already in use?" --msgstr "No s'ha pogut obrir la base de dades RPM per a llegir-la. Potser ja està en ús?" -+msgstr "" -+"No s'ha pogut obrir la base de dades RPM per a llegir-la. Potser ja està en " -+"ús?" - --#: ../rpmUtils/oldUtils.py:181 -+#: ../rpmUtils/oldUtils.py:183 - msgid "Got an empty Header, something has gone wrong" - msgstr "S'ha obtingut una capçalera buida, alguna cosa ha anat malament" - --#: ../rpmUtils/oldUtils.py:251 --#: ../rpmUtils/oldUtils.py:258 --#: ../rpmUtils/oldUtils.py:261 --#: ../rpmUtils/oldUtils.py:264 -+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260 -+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266 - #, python-format - msgid "Damaged Header %s" - msgstr "Capçalera malmesa %s" - --#: ../rpmUtils/oldUtils.py:279 -+#: ../rpmUtils/oldUtils.py:281 - #, python-format - msgid "Error opening rpm %s - error %s" --msgstr "S'ha produïut un error en obrir rpm %s - error %s" -+msgstr "S'ha produït un error en obrir l'rpm %s - error %s" -+ -+#~ msgid "Matching packages for package list to user args" -+#~ msgstr "" -+#~ "S'està comparant els paquets per a la llista de paquets amb els arguments " -+#~ "de l'usuari" -+ -+#~ msgid "" -+#~ "\n" -+#~ "Transaction Summary\n" -+#~ "%s\n" -+#~ "Install %5.5s Package(s) \n" -+#~ "Update %5.5s Package(s) \n" -+#~ "Remove %5.5s Package(s) \n" -+#~ msgstr "" -+#~ "\n" -+#~ "Resum de transaccions\n" -+#~ "%s\n" -+#~ "Instal·la %5.5s paquets \n" -+#~ "Actualitza %5.5s paquets \n" -+#~ "Esborra %5.5s paquets \n" -+ -+#~ msgid "excluding for cost: %s from %s" -+#~ msgstr "s'està excloent per cost: %s de %s" -+ -+#~ msgid "Excluding Packages in global exclude list" -+#~ msgstr "S'estan excloent paquets en la llista global d'exclusió" -+ -+#~ msgid "Excluding Packages from %s" -+#~ msgstr "S'estan excloent paquets de %s" -+ -+#~ msgid "Reducing %s to included packages only" -+#~ msgstr "S'està reduint %s únicament a paquets inclosos." -+ -+#~ msgid "Keeping included package %s" -+#~ msgstr "S'està mantenint el paquet inclòs %s" -+ -+#~ msgid "Removing unmatched package %s" -+#~ msgstr "S'està esborrant el paquet sense coincidències %s" -+ -+#~ msgid "Finished" -+#~ msgstr "Finalitzat" - - #~ msgid "Entering rpm code" - #~ msgstr "S'està entrant en codi rpm" -+ - #~ msgid "Leaving rpm code" - #~ msgstr "Deixant codi rpm" -+ - #~ msgid "Parsing package install arguments" - #~ msgstr "S'estan analitzant els arguments del paquet a instal·lar" -+ - #~ msgid "Invalid versioned dependency string, try quoting it." - #~ msgstr "" - #~ "La cadena de versió de dependència és invàlida, proveu-ho entre cometes." -- -diff --git a/po/cs.po b/po/cs.po -new file mode 100644 -index 0000000..18305e3 ---- /dev/null -+++ b/po/cs.po -@@ -0,0 +1,2518 @@ -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# -+# Adam Pribyl , 2009. -+msgid "" -+msgstr "" -+"Project-Id-Version: \n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2009-09-29 09:25+0000\n" -+"PO-Revision-Date: 2009-09-29 17:44+0200\n" -+"Last-Translator: Adam Pribyl \n" -+"Language-Team: Czech \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: Lokalize 1.0\n" -+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -+ -+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+msgid "Updating" -+msgstr "Aktualizuje se" -+ -+#: ../callback.py:49 ../yum/rpmtrans.py:72 -+msgid "Erasing" -+msgstr "Maže se" -+ -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 -+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+msgid "Installing" -+msgstr "Instaluje se" -+ -+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+msgid "Obsoleted" -+msgstr "Zastaralé" -+ -+#: ../callback.py:54 ../output.py:1063 ../output.py:1401 -+msgid "Updated" -+msgstr "Aktualizováno" -+ -+#: ../callback.py:55 ../output.py:1397 -+msgid "Erased" -+msgstr "Smazáno" -+ -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 -+#: ../output.py:1393 -+msgid "Installed" -+msgstr "Nainstalováno" -+ -+#: ../callback.py:130 -+msgid "No header - huh?" -+msgstr "Bez hlavičky???" -+ -+#: ../callback.py:168 -+msgid "Repackage" -+msgstr "Přebalit" -+ -+#: ../callback.py:189 -+#, python-format -+msgid "Error: invalid output state: %s for %s" -+msgstr "Chyba: neplatný výstupní stav: %s pro %s" -+ -+#: ../callback.py:212 -+#, python-format -+msgid "Erased: %s" -+msgstr "Smazáno: %s" -+ -+#: ../callback.py:217 ../output.py:941 -+msgid "Removing" -+msgstr "Odstraňuje se" -+ -+#: ../callback.py:219 ../yum/rpmtrans.py:77 -+msgid "Cleanup" -+msgstr "Čiští se" -+ -+#: ../cli.py:108 -+#, python-format -+msgid "Command \"%s\" already defined" -+msgstr "Přikaz \"%s\" již definován" -+ -+#: ../cli.py:120 -+msgid "Setting up repositories" -+msgstr "Nastavují se repozitáře" -+ -+#: ../cli.py:131 -+msgid "Reading repository metadata in from local files" -+msgstr "Načítají se metadata repozitářů z lokálních souborů" -+ -+#: ../cli.py:194 ../utils.py:102 -+#, python-format -+msgid "Config Error: %s" -+msgstr "Chyba konfigurace: %s" -+ -+#: ../cli.py:197 ../cli.py:1253 ../utils.py:105 -+#, python-format -+msgid "Options Error: %s" -+msgstr "Chybná volba: %s" -+ -+#: ../cli.py:225 -+#, python-format -+msgid " Installed: %s-%s at %s" -+msgstr " Nainstalováno: %s-%s na %s" -+ -+#: ../cli.py:227 -+#, python-format -+msgid " Built : %s at %s" -+msgstr " Sestaveno : %s na %s" -+ -+#: ../cli.py:229 -+#, python-format -+msgid " Committed: %s at %s" -+msgstr " Odesláno : %s na %s" -+ -+#: ../cli.py:268 -+msgid "You need to give some command" -+msgstr "Musíte zadat nějaký příkaz" -+ -+#: ../cli.py:311 -+msgid "Disk Requirements:\n" -+msgstr "Diskové požadavky:\n" -+ -+#: ../cli.py:313 -+#, python-format -+msgid " At least %dMB needed on the %s filesystem.\n" -+msgstr " Je potřeba alespoň %dMB na souborovém systému %s.\n" -+ -+#. TODO: simplify the dependency errors? -+#. Fixup the summary -+#: ../cli.py:318 -+msgid "" -+"Error Summary\n" -+"-------------\n" -+msgstr "" -+"Přehled chyb\n" -+"------------\n" -+ -+#: ../cli.py:361 -+msgid "Trying to run the transaction but nothing to do. Exiting." -+msgstr "Pokus o spuštění transakce, ale není co dělat. Ukončeno." -+ -+#: ../cli.py:397 -+msgid "Exiting on user Command" -+msgstr "Ukončeno na přikaz uživatele" -+ -+#: ../cli.py:401 -+msgid "Downloading Packages:" -+msgstr "Stahují se balíčky:" -+ -+#: ../cli.py:406 -+msgid "Error Downloading Packages:\n" -+msgstr "Chyba stahování balíčků:\n" -+ -+#: ../cli.py:420 ../yum/__init__.py:3995 -+msgid "Running rpm_check_debug" -+msgstr "Spuští se rpm_check_debug" -+ -+#: ../cli.py:429 ../yum/__init__.py:4004 -+msgid "ERROR You need to update rpm to handle:" -+msgstr "CHYBA Je potřeba aktualizovat rpm k provedení:" -+ -+#: ../cli.py:431 ../yum/__init__.py:4007 -+msgid "ERROR with rpm_check_debug vs depsolve:" -+msgstr "CHYBA v rpm_check_debug vs depsolve:" -+ -+#: ../cli.py:437 -+msgid "RPM needs to be updated" -+msgstr "Je potřeba aktualizovat RPM" -+ -+#: ../cli.py:438 -+#, python-format -+msgid "Please report this error in %s" -+msgstr "Prosím nahlašte tuto chybu v %s" -+ -+#: ../cli.py:444 -+msgid "Running Transaction Test" -+msgstr "Spouští se test transakcí" -+ -+#: ../cli.py:460 -+msgid "Finished Transaction Test" -+msgstr "Test transakcí dokončen" -+ -+#: ../cli.py:462 -+msgid "Transaction Check Error:\n" -+msgstr "Chyba při kontrole transakcí:\n" -+ -+#: ../cli.py:469 -+msgid "Transaction Test Succeeded" -+msgstr "Test transakcí uspěl" -+ -+#: ../cli.py:491 -+msgid "Running Transaction" -+msgstr "Spouští se transakce" -+ -+#: ../cli.py:521 -+msgid "" -+"Refusing to automatically import keys when running unattended.\n" -+"Use \"-y\" to override." -+msgstr "" -+"Nelze automaticky importovat klíče při spuštění bez obsluhy.\n" -+"Použite \"-y\" k potlačení." -+ -+#: ../cli.py:540 ../cli.py:574 -+msgid " * Maybe you meant: " -+msgstr " * Možná jste myslel: " -+ -+#: ../cli.py:557 ../cli.py:565 -+#, python-format -+msgid "Package(s) %s%s%s available, but not installed." -+msgstr "Balíček(y) %s%s%s dostupné, ale nenainstalované." -+ -+#: ../cli.py:571 ../cli.py:602 ../cli.py:680 -+#, python-format -+msgid "No package %s%s%s available." -+msgstr "Žádné dostupné balíčky %s%s%s." -+ -+#: ../cli.py:607 ../cli.py:740 -+msgid "Package(s) to install" -+msgstr "Balíček(y) k instalaci" -+ -+#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741 -+#: ../yumcommands.py:159 -+msgid "Nothing to do" -+msgstr "Není co dělat" -+ -+#: ../cli.py:641 -+#, python-format -+msgid "%d packages marked for Update" -+msgstr "%d balíčků označeno k aktualizaci" -+ -+#: ../cli.py:644 -+msgid "No Packages marked for Update" -+msgstr "Žádné balíčky označené k aktualizaci" -+ -+#: ../cli.py:658 -+#, python-format -+msgid "%d packages marked for removal" -+msgstr "%d balíčků označeno ke smazání" -+ -+#: ../cli.py:661 -+msgid "No Packages marked for removal" -+msgstr "Žádné balíčky označené k odstranění" -+ -+#: ../cli.py:685 -+msgid "Package(s) to downgrade" -+msgstr "Balíček(y) ke snížení verze" -+ -+#: ../cli.py:709 -+#, python-format -+msgid " (from %s)" -+msgstr " (z %s)" -+ -+#: ../cli.py:711 -+#, python-format -+msgid "Installed package %s%s%s%s not available." -+msgstr "Instalované balíčky %s%s%s%s nejsou dostupné" -+ -+#: ../cli.py:718 -+msgid "Package(s) to reinstall" -+msgstr "Balíček(y) k reinstalaci" -+ -+#: ../cli.py:731 -+msgid "No Packages Provided" -+msgstr "Žádný balíček neposkytuje" -+ -+#: ../cli.py:815 -+#, python-format -+msgid "Warning: No matches found for: %s" -+msgstr "Varování: Žádný balíček odpovídající: %s" -+ -+#: ../cli.py:818 -+msgid "No Matches found" -+msgstr "Nebyla nalezena shoda" -+ -+#: ../cli.py:857 -+#, python-format -+msgid "" -+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n" -+" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" -+msgstr "" -+"Varování: 3.0.x verze yumu by chybně hledala shodu se jménem souboru.\n" -+" Můžete použít \"%s*/%s%s\" a/nebo \"%s*bin/%s%s\" k dosažení tohoto chování" -+ -+#: ../cli.py:873 -+#, python-format -+msgid "No Package Found for %s" -+msgstr "Nebyly nalezeny balíčky pro %s" -+ -+#: ../cli.py:885 -+msgid "Cleaning up Everything" -+msgstr "Čistí se vše" -+ -+#: ../cli.py:899 -+msgid "Cleaning up Headers" -+msgstr "Čistí se hlavičky" -+ -+#: ../cli.py:902 -+msgid "Cleaning up Packages" -+msgstr "Čistí se balíčky" -+ -+#: ../cli.py:905 -+msgid "Cleaning up xml metadata" -+msgstr "Čistí se XML metadata" -+ -+#: ../cli.py:908 -+msgid "Cleaning up database cache" -+msgstr "Čistí se skladiště databáze" -+ -+#: ../cli.py:911 -+msgid "Cleaning up expire-cache metadata" -+msgstr "Čistí se vypršelá metadata ze skladiště" -+ -+#: ../cli.py:914 -+msgid "Cleaning up plugins" -+msgstr "Čistí se zásuvné moduly" -+ -+#: ../cli.py:939 -+msgid "Installed Groups:" -+msgstr "Naintalované skupiny:" -+ -+#: ../cli.py:951 -+msgid "Available Groups:" -+msgstr "Dostupné skupiny:" -+ -+#: ../cli.py:961 -+msgid "Done" -+msgstr "Dokončeno" -+ -+#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2621 -+#, python-format -+msgid "Warning: Group %s does not exist." -+msgstr "Varování: skupina %s neexistuje." -+ -+#: ../cli.py:1000 -+msgid "No packages in any requested group available to install or update" -+msgstr "" -+"V žádné s požadovaných skupin nejsou balíčky k instalaci nebo aktualizaci" -+ -+#: ../cli.py:1002 -+#, python-format -+msgid "%d Package(s) to Install" -+msgstr "%d balíček(ů) k instalaci" -+ -+#: ../cli.py:1012 ../yum/__init__.py:2633 -+#, python-format -+msgid "No group named %s exists" -+msgstr "Neexistuje skupina se jménem %s" -+ -+#: ../cli.py:1018 -+msgid "No packages to remove from groups" -+msgstr "Žádné balíčky k odstranění ve skupině" -+ -+#: ../cli.py:1020 -+#, python-format -+msgid "%d Package(s) to remove" -+msgstr "%d balíček(ů) k odstranění" -+ -+#: ../cli.py:1062 -+#, python-format -+msgid "Package %s is already installed, skipping" -+msgstr "Balíček %s je již nainstalován, přeskakuji." -+ -+#: ../cli.py:1073 -+#, python-format -+msgid "Discarding non-comparable pkg %s.%s" -+msgstr "Skartuje se neporovnatelný balíček %s.%s" -+ -+#. we've not got any installed that match n or n+a -+#: ../cli.py:1099 -+#, python-format -+msgid "No other %s installed, adding to list for potential install" -+msgstr "Žádný jiný %s nainstalován, přidán do seznamu k potenciální instalaci" -+ -+#: ../cli.py:1119 -+msgid "Plugin Options" -+msgstr "Možnosti zásuvného modulu" -+ -+#: ../cli.py:1127 -+#, python-format -+msgid "Command line error: %s" -+msgstr "Chyba příkazové řádky: %s" -+ -+#: ../cli.py:1140 -+#, python-format -+msgid "" -+"\n" -+"\n" -+"%s: %s option requires an argument" -+msgstr "" -+"\n" -+"\n" -+"%s: %s volba vyžaduje argument" -+ -+#: ../cli.py:1193 -+msgid "--color takes one of: auto, always, never" -+msgstr "--color přijímá jeden z: auto, always, never" -+ -+#: ../cli.py:1300 -+msgid "show this help message and exit" -+msgstr "ukázat tuto nápovedu a skončit" -+ -+#: ../cli.py:1304 -+msgid "be tolerant of errors" -+msgstr "tolerovat chyby" -+ -+#: ../cli.py:1306 -+msgid "run entirely from cache, don't update cache" -+msgstr "spustit vše z neaktualizovaného skladiště" -+ -+#: ../cli.py:1308 -+msgid "config file location" -+msgstr "umístění konfiguračního souboru" -+ -+#: ../cli.py:1310 -+msgid "maximum command wait time" -+msgstr "maximální čas čekání na příkaz" -+ -+#: ../cli.py:1312 -+msgid "debugging output level" -+msgstr "úroveň výstupních ladících informací" -+ -+#: ../cli.py:1316 -+msgid "show duplicates, in repos, in list/search commands" -+msgstr "ukázat duplikáty v repozitářích, v list/search příkazech" -+ -+#: ../cli.py:1318 -+msgid "error output level" -+msgstr "úroveň výstupu chyb" -+ -+#: ../cli.py:1321 -+msgid "quiet operation" -+msgstr "tichý chod" -+ -+#: ../cli.py:1323 -+msgid "verbose operation" -+msgstr "užvaněný chod" -+ -+#: ../cli.py:1325 -+msgid "answer yes for all questions" -+msgstr "odpovědět ano na všechny otázky" -+ -+#: ../cli.py:1327 -+msgid "show Yum version and exit" -+msgstr "ukázat verzi yumu a skončit" -+ -+#: ../cli.py:1328 -+msgid "set install root" -+msgstr "nastavit kořen instalace " -+ -+#: ../cli.py:1332 -+msgid "enable one or more repositories (wildcards allowed)" -+msgstr "povolit jeden nebo více repozitářů (zástupné znaky povoleny)" -+ -+#: ../cli.py:1336 -+msgid "disable one or more repositories (wildcards allowed)" -+msgstr "zakázat jeden nebo více repozitářů (zástupné znaky povoleny)" -+ -+#: ../cli.py:1339 -+msgid "exclude package(s) by name or glob" -+msgstr "vyřadit balíček(y) podle jména nebo globálně" -+ -+#: ../cli.py:1341 -+msgid "disable exclude from main, for a repo or for everything" -+msgstr "zakázat vyřazení z hlavní části pro repozitář nebo pro vše" -+ -+#: ../cli.py:1344 -+msgid "enable obsoletes processing during updates" -+msgstr "povolit zpracování zastaralých během aktualizací" -+ -+#: ../cli.py:1346 -+msgid "disable Yum plugins" -+msgstr "zakázat zásuvné moduly yumu" -+ -+#: ../cli.py:1348 -+msgid "disable gpg signature checking" -+msgstr "zakázat kontrolu GPG podpisů" -+ -+#: ../cli.py:1350 -+msgid "disable plugins by name" -+msgstr "zakázat zásuvné moduly podle jména" -+ -+#: ../cli.py:1353 -+msgid "enable plugins by name" -+msgstr "povolit zásuvné moduly podle jména" -+ -+#: ../cli.py:1356 -+msgid "skip packages with depsolving problems" -+msgstr "přeskočit balíčky s problémy v závislostech" -+ -+#: ../cli.py:1358 -+msgid "control whether color is used" -+msgstr "kontrola zda jsou použity barvy" -+ -+#: ../output.py:305 -+msgid "Jan" -+msgstr "Led" -+ -+#: ../output.py:305 -+msgid "Feb" -+msgstr "Úno" -+ -+#: ../output.py:305 -+msgid "Mar" -+msgstr "Bře" -+ -+#: ../output.py:305 -+msgid "Apr" -+msgstr "Dub" -+ -+#: ../output.py:305 -+msgid "May" -+msgstr "Kvě" -+ -+#: ../output.py:305 -+msgid "Jun" -+msgstr "Čer" -+ -+#: ../output.py:306 -+msgid "Jul" -+msgstr "Čec" -+ -+#: ../output.py:306 -+msgid "Aug" -+msgstr "Srp" -+ -+#: ../output.py:306 -+msgid "Sep" -+msgstr "Zář" -+ -+#: ../output.py:306 -+msgid "Oct" -+msgstr "Řij" -+ -+#: ../output.py:306 -+msgid "Nov" -+msgstr "Lis" -+ -+#: ../output.py:306 -+msgid "Dec" -+msgstr "Pro" -+ -+#: ../output.py:316 -+msgid "Trying other mirror." -+msgstr "Zkouší se jiné zrcadlo" -+ -+#: ../output.py:538 -+#, python-format -+msgid "Name : %s%s%s" -+msgstr "Jméno : %s%s%s" -+ -+#: ../output.py:539 -+#, python-format -+msgid "Arch : %s" -+msgstr "Arch : %s" -+ -+#: ../output.py:541 -+#, python-format -+msgid "Epoch : %s" -+msgstr "Epocha : %s" -+ -+#: ../output.py:542 -+#, python-format -+msgid "Version : %s" -+msgstr "Verze : %s" -+ -+#: ../output.py:543 -+#, python-format -+msgid "Release : %s" -+msgstr "Vydání : %s" -+ -+#: ../output.py:544 -+#, python-format -+msgid "Size : %s" -+msgstr "Velikost : %s" -+ -+#: ../output.py:545 -+#, python-format -+msgid "Repo : %s" -+msgstr "Repo : %s" -+ -+#: ../output.py:547 -+#, python-format -+msgid "From repo : %s" -+msgstr "Z repa : %s" -+ -+#: ../output.py:549 -+#, python-format -+msgid "Committer : %s" -+msgstr "Potvrzeno : %s" -+ -+#: ../output.py:550 -+#, python-format -+msgid "Committime : %s" -+msgstr "Čas povrzení : %s" -+ -+#: ../output.py:551 -+#, python-format -+msgid "Buildtime : %s" -+msgstr "Čas sestavení : %s" -+ -+#: ../output.py:553 -+#, python-format -+msgid "Installtime: %s" -+msgstr "Čas instalace : %s" -+ -+#: ../output.py:554 -+msgid "Summary : " -+msgstr "Souhrn : " -+ -+#: ../output.py:556 -+#, python-format -+msgid "URL : %s" -+msgstr "URL : %s" -+ -+#: ../output.py:557 -+#, python-format -+msgid "License : %s" -+msgstr "Licence : %s" -+ -+#: ../output.py:558 -+msgid "Description: " -+msgstr "Popis :" -+ -+#: ../output.py:626 -+msgid "y" -+msgstr "a" -+ -+#: ../output.py:626 -+msgid "yes" -+msgstr "ano" -+ -+#: ../output.py:627 -+msgid "n" -+msgstr "n" -+ -+#: ../output.py:627 -+msgid "no" -+msgstr "ne" -+ -+#: ../output.py:631 -+msgid "Is this ok [y/N]: " -+msgstr "V pořádku [a/N]: " -+ -+#: ../output.py:722 -+#, python-format -+msgid "" -+"\n" -+"Group: %s" -+msgstr "" -+"\n" -+"Skupina: %s" -+ -+#: ../output.py:726 -+#, python-format -+msgid " Group-Id: %s" -+msgstr " ID skupiny: %s" -+ -+#: ../output.py:731 -+#, python-format -+msgid " Description: %s" -+msgstr " Popis: %s" -+ -+#: ../output.py:733 -+msgid " Mandatory Packages:" -+msgstr " Povinné balíčky:" -+ -+#: ../output.py:734 -+msgid " Default Packages:" -+msgstr " Výchozí balíčky:" -+ -+#: ../output.py:735 -+msgid " Optional Packages:" -+msgstr " Volitelné balíčky:" -+ -+#: ../output.py:736 -+msgid " Conditional Packages:" -+msgstr " Podmínečné balíčky:" -+ -+#: ../output.py:756 -+#, python-format -+msgid "package: %s" -+msgstr "balíčky: %s" -+ -+#: ../output.py:758 -+msgid " No dependencies for this package" -+msgstr " Pro tento balíček nejsou žádné závislosti" -+ -+#: ../output.py:763 -+#, python-format -+msgid " dependency: %s" -+msgstr " závislosti: %s" -+ -+#: ../output.py:765 -+msgid " Unsatisfied dependency" -+msgstr " Neuspokojené závislosti" -+ -+#: ../output.py:837 -+#, python-format -+msgid "Repo : %s" -+msgstr "Repo : %s" -+ -+#: ../output.py:838 -+msgid "Matched from:" -+msgstr "Shoda s:" -+ -+#: ../output.py:847 -+msgid "Description : " -+msgstr "Popis : " -+ -+#: ../output.py:850 -+#, python-format -+msgid "URL : %s" -+msgstr "URL : %s" -+ -+#: ../output.py:853 -+#, python-format -+msgid "License : %s" -+msgstr "Licence : %s" -+ -+#: ../output.py:856 -+#, python-format -+msgid "Filename : %s" -+msgstr "Soubor : %s" -+ -+#: ../output.py:860 -+msgid "Other : " -+msgstr "Další : " -+ -+#: ../output.py:893 -+msgid "There was an error calculating total download size" -+msgstr "Pří výpočtu celkové velikosti stahování nastala chyba" -+ -+#: ../output.py:898 -+#, python-format -+msgid "Total size: %s" -+msgstr "Celková velikost: %s" -+ -+#: ../output.py:901 -+#, python-format -+msgid "Total download size: %s" -+msgstr "Celková velikost stahování: %s" -+ -+#: ../output.py:942 -+msgid "Reinstalling" -+msgstr "Reinstaluje se" -+ -+#: ../output.py:943 -+msgid "Downgrading" -+msgstr "Snižuje se verze" -+ -+#: ../output.py:944 -+msgid "Installing for dependencies" -+msgstr "Instaluje se kvůli závislostem" -+ -+#: ../output.py:945 -+msgid "Updating for dependencies" -+msgstr "Aktualizuje se kvůli závislostem" -+ -+#: ../output.py:946 -+msgid "Removing for dependencies" -+msgstr "Odstraňuje se kvůli závislostem" -+ -+#: ../output.py:953 ../output.py:1065 -+msgid "Skipped (dependency problems)" -+msgstr "Přeskočeno (problémy se závislostmi)" -+ -+#: ../output.py:976 -+msgid "Package" -+msgstr "Balíček" -+ -+#: ../output.py:976 -+msgid "Arch" -+msgstr "Arch" -+ -+#: ../output.py:977 -+msgid "Version" -+msgstr "Verze" -+ -+#: ../output.py:977 -+msgid "Repository" -+msgstr "Repozitář" -+ -+#: ../output.py:978 -+msgid "Size" -+msgstr "Velikost" -+ -+#: ../output.py:990 -+#, python-format -+msgid "" -+" replacing %s%s%s.%s %s\n" -+"\n" -+msgstr "" -+" nahrazuje se %s%s%s.%s %s\n" -+"\n" -+ -+#: ../output.py:999 -+#, python-format -+msgid "" -+"\n" -+"Transaction Summary\n" -+"%s\n" -+msgstr "" -+"\n" -+"Shrnutí transakce\n" -+"%s\n" -+ -+#: ../output.py:1006 -+#, python-format -+msgid "" -+"Install %5.5s Package(s)\n" -+"Upgrade %5.5s Package(s)\n" -+msgstr "" -+"Instalace %5.5s balíčku/ů\n" -+"Aktualizace %5.5s balíčku/ů\n" -+ -+#: ../output.py:1015 -+#, python-format -+msgid "" -+"Remove %5.5s Package(s)\n" -+"Reinstall %5.5s Package(s)\n" -+"Downgrade %5.5s Package(s)\n" -+msgstr "" -+"Odstraňení %5.5s balíčku/ů\n" -+"Reinstalace %5.5s balíčku/ů\n" -+"Snížení verze %5.5s balíčku/ů\n" -+ -+#: ../output.py:1059 -+msgid "Removed" -+msgstr "Odstraněno" -+ -+#: ../output.py:1060 -+msgid "Dependency Removed" -+msgstr "Odstraněné závislosti" -+ -+#: ../output.py:1062 -+msgid "Dependency Installed" -+msgstr "Nainstalované závislosti" -+ -+#: ../output.py:1064 -+msgid "Dependency Updated" -+msgstr "Aktualizované závislosti" -+ -+#: ../output.py:1066 -+msgid "Replaced" -+msgstr "Nahrazeno" -+ -+#: ../output.py:1067 -+msgid "Failed" -+msgstr "Selhalo" -+ -+#. Delta between C-c's so we treat as exit -+#: ../output.py:1133 -+msgid "two" -+msgstr "dvě" -+ -+#. For translators: This is output like: -+#. Current download cancelled, interrupt (ctrl-c) again within two seconds -+#. to exit. -+#. Where "interupt (ctrl-c) again" and "two" are highlighted. -+#: ../output.py:1144 -+#, python-format -+msgid "" -+"\n" -+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " -+"seconds\n" -+"to exit.\n" -+msgstr "" -+"\n" -+" Aktuální stahování přerušeno, %spřerušte (ctrl-c) znovu%s během %s%s%s " -+"sekund\n" -+"pro ukončení.\n" -+ -+#: ../output.py:1155 -+msgid "user interrupt" -+msgstr "Přerušeno uživatelem" -+ -+#: ../output.py:1173 -+msgid "Total" -+msgstr "Celkem" -+ -+#: ../output.py:1201 -+msgid "" -+msgstr "" -+ -+#: ../output.py:1202 -+msgid "System" -+msgstr "Systém" -+ -+#: ../output.py:1238 -+msgid "Bad transaction IDs, or package(s), given" -+msgstr "Zadáné špatné ID transakce nebo balíčku/ů" -+ -+#: ../output.py:1282 ../yumcommands.py:1148 ../yum/__init__.py:1060 -+msgid "Warning: RPMDB has been altered since the last yum transaction." -+msgstr "Varování: RPMDB byla od poslední yum transakce změněna" -+ -+#: ../output.py:1287 -+msgid "No transaction ID given" -+msgstr "Nezadáno ID transakce" -+ -+#: ../output.py:1295 -+msgid "Bad transaction ID given" -+msgstr "Špatné ID transakce" -+ -+#: ../output.py:1300 -+msgid "Not found given transaction ID" -+msgstr "Zadané ID transakce nenalezeno" -+ -+#: ../output.py:1308 -+msgid "Found more than one transaction ID!" -+msgstr "Nalezeno více než jedno ID transakce!" -+ -+#: ../output.py:1329 -+msgid "No transaction ID, or package, given" -+msgstr "Nebylo zadáno ID transakce nebo balíčku/ů" -+ -+#: ../output.py:1355 -+msgid "Transaction ID :" -+msgstr "ID transakce:" -+ -+#: ../output.py:1357 -+msgid "Begin time :" -+msgstr "Čas startu :" -+ -+#: ../output.py:1360 ../output.py:1362 -+msgid "Begin rpmdb :" -+msgstr "Začátek rpmdb :" -+ -+#: ../output.py:1376, python-format -+msgid "(%s seconds)" -+msgstr "(%s sekund)" -+ -+#: ../output.py:1377 -+msgid "End time :" -+msgstr "Konečný čas :" -+ -+#: ../output.py:1380 ../output.py:1382 -+msgid "End rpmdb :" -+msgstr "Konec rpmdb :" -+ -+#: ../output.py:1383 -+msgid "User :" -+msgstr "Uživatel :" -+ -+#: ../output.py:1385 ../output.py:1387 ../output.py:1389 -+msgid "Return-Code :" -+msgstr "Vrácený kód :" -+ -+#: ../output.py:1385 -+msgid "Aborted" -+msgstr "Přerušeno" -+ -+#: ../output.py:1387 -+msgid "Failure:" -+msgstr "Selhalo:" -+ -+#: ../output.py:1389 -+msgid "Success" -+msgstr "Úspěch" -+ -+#: ../output.py:1390 -+msgid "Transaction performed with :" -+msgstr "Transakce proběhla s :" -+ -+#: ../output.py:1403 -+msgid "Downgraded" -+msgstr "Snížena verze" -+ -+#. multiple versions installed, both older and newer -+#: ../output.py:1405 -+msgid "Weird" -+msgstr "Divné" -+ -+#: ../output.py:1407 -+msgid "Packages Altered:" -+msgstr "Pozměněné balíčky:" -+ -+#: ../output.py:1475 -+msgid "Last day" -+msgstr "Poslední den" -+ -+#: ../output.py:1476 -+msgid "Last week" -+msgstr "Poslední týden" -+ -+#: ../output.py:1477 -+msgid "Last 2 weeks" -+msgstr "Poslední 2 týdny" -+ -+#. US default :p -+#: ../output.py:1478 -+msgid "Last 3 months" -+msgstr "Poslední 3 měsíce" -+ -+#: ../output.py:1479 -+msgid "Last 6 months" -+msgstr "Posledních 6 měsíců" -+ -+#: ../output.py:1480 -+msgid "Last year" -+msgstr "Poslední rok" -+ -+#: ../output.py:1481 -+msgid "Over a year ago" -+msgstr "Více než rok" -+ -+#: ../output.py:1510 -+msgid "installed" -+msgstr "nainstalováno" -+ -+#: ../output.py:1511 -+msgid "updated" -+msgstr "aktualizováno" -+ -+#: ../output.py:1512 -+msgid "obsoleted" -+msgstr "zastaralo" -+ -+#: ../output.py:1513 -+msgid "erased" -+msgstr "vymazáno" -+ -+#: ../output.py:1517 -+#, python-format -+msgid "---> Package %s.%s %s:%s-%s set to be %s" -+msgstr "---> Balíček %s.%s %s:%s-%s nastaven k/ke %s" -+ -+#: ../output.py:1524 -+msgid "--> Running transaction check" -+msgstr "--> Spouští se kontrola transakce" -+ -+#: ../output.py:1529 -+msgid "--> Restarting Dependency Resolution with new changes." -+msgstr "--> Restartuje se řešení závislostí s novými změnami." -+ -+#: ../output.py:1534 -+msgid "--> Finished Dependency Resolution" -+msgstr "--> Řešení závislostí dokončeno" -+ -+#: ../output.py:1539 ../output.py:1544 -+#, python-format -+msgid "--> Processing Dependency: %s for package: %s" -+msgstr "--> Zpracování závislosti: %s pro balíček: %s" -+ -+#: ../output.py:1548 -+#, python-format -+msgid "--> Unresolved Dependency: %s" -+msgstr "--> Nevyřešená závislost: %s" -+ -+#: ../output.py:1554 ../output.py:1559 -+#, python-format -+msgid "--> Processing Conflict: %s conflicts %s" -+msgstr "--> Zpracování konfliktu: %s je v konfliktu s %s" -+ -+#: ../output.py:1563 -+msgid "--> Populating transaction set with selected packages. Please wait." -+msgstr "--> Přidávají se do transakce vybrané balíčky. Prosím čekejte." -+ -+#: ../output.py:1567 -+#, python-format -+msgid "---> Downloading header for %s to pack into transaction set." -+msgstr "---> Stahují se hlavičky %s pro přidání do transakce." -+ -+#: ../utils.py:132 ../yummain.py:42 -+msgid "" -+"\n" -+"\n" -+"Exiting on user cancel" -+msgstr "" -+"\n" -+"\n" -+"Ukončeno na základě pokynu uživatele" -+ -+#: ../utils.py:138 ../yummain.py:48 -+msgid "" -+"\n" -+"\n" -+"Exiting on Broken Pipe" -+msgstr "" -+"\n" -+"\n" -+"Ukončeno kvůli nefunkční rouře" -+ -+#: ../utils.py:140 ../yummain.py:50, python-format -+msgid "" -+"\n" -+"\n" -+"%s" -+msgstr "" -+"\n" -+"\n" -+"%s" -+ -+#: ../utils.py:179 ../yummain.py:273 -+msgid "Complete!" -+msgstr "Hotovo!" -+ -+#: ../yumcommands.py:42 -+msgid "You need to be root to perform this command." -+msgstr "Pro spuštění tohoto příkazu potřebujete být root." -+ -+#: ../yumcommands.py:49 -+msgid "" -+"\n" -+"You have enabled checking of packages via GPG keys. This is a good thing. \n" -+"However, you do not have any GPG public keys installed. You need to " -+"download\n" -+"the keys for packages you wish to install and install them.\n" -+"You can do that by running the command:\n" -+" rpm --import public.gpg.key\n" -+"\n" -+"\n" -+"Alternatively you can specify the url to the key you would like to use\n" -+"for a repository in the 'gpgkey' option in a repository section and yum \n" -+"will install it for you.\n" -+"\n" -+"For more information contact your distribution or package provider.\n" -+msgstr "" -+"\n" -+"Povolili jste kontrolu balíčků pomocí GPG klíčů, což je dobrá věc.\n" -+"Bohužel nemáte ale nainstalován žádný veřejný GPG klíč. Musíte stáhnout " -+"klíč\n" -+"pro blíček, který si přejete nainstalovat a přidat jej příkazem.\n" -+" rpm --import public.gpg.key\n" -+"\n" -+"\n" -+"Jako druhou možnost můžete uvést URL ke klíči, který chcete použít\n" -+"pro repozitář ve volbě 'gpgkey' v nastavení repozitáře a yum\n" -+"jej nainstaluje.\n" -+"\n" -+"Pro více informací kontaktujte vašeho distributora nebo správce balíčku.\n" -+ -+#: ../yumcommands.py:69 -+#, python-format -+msgid "Error: Need to pass a list of pkgs to %s" -+msgstr "Chyba: Je potřeba předat seznam balíčků do %s" -+ -+#: ../yumcommands.py:75 -+msgid "Error: Need an item to match" -+msgstr "Chyba: K nalezení shody je potřeba předmět" -+ -+#: ../yumcommands.py:81 -+msgid "Error: Need a group or list of groups" -+msgstr "Chyba: Je potřeba skupina nebo seznam skupin" -+ -+#: ../yumcommands.py:90 -+#, python-format -+msgid "Error: clean requires an option: %s" -+msgstr "Chyba: clean vyžaduje volbu: %s" -+ -+#: ../yumcommands.py:95 -+#, python-format -+msgid "Error: invalid clean argument: %r" -+msgstr "Chyba: Neplatný argument pro clean: %r" -+ -+#: ../yumcommands.py:108 -+msgid "No argument to shell" -+msgstr "Shell nemá žádný argument" -+ -+#: ../yumcommands.py:110 -+#, python-format -+msgid "Filename passed to shell: %s" -+msgstr "Jméno souboru předané shelu: %s" -+ -+#: ../yumcommands.py:114 -+#, python-format -+msgid "File %s given as argument to shell does not exist." -+msgstr "Soubor %s předaný jako argument shellu neexistuje." -+ -+#: ../yumcommands.py:120 -+msgid "Error: more than one file given as argument to shell." -+msgstr "Chyba: Více než jeden soubor předán shellu jako argument." -+ -+#: ../yumcommands.py:169 -+msgid "PACKAGE..." -+msgstr "Balíček..." -+ -+#: ../yumcommands.py:172 -+msgid "Install a package or packages on your system" -+msgstr "Nainstalujte balíček nebo balíčky do vašeho systému" -+ -+#: ../yumcommands.py:180 -+msgid "Setting up Install Process" -+msgstr "Uspořádává se instalační průběh" -+ -+#: ../yumcommands.py:191 -+msgid "[PACKAGE...]" -+msgstr "[Balíček...]" -+ -+#: ../yumcommands.py:194 -+msgid "Update a package or packages on your system" -+msgstr "Aktualizujte balíček nebo balíčky na vašem systému" -+ -+#: ../yumcommands.py:201 -+msgid "Setting up Update Process" -+msgstr "Uspořádává se průběh aktualizace" -+ -+#: ../yumcommands.py:246 -+msgid "Display details about a package or group of packages" -+msgstr "Zobrazit detaily o balíčku nebo skupině balíčků" -+ -+#: ../yumcommands.py:295 -+msgid "Installed Packages" -+msgstr "Instalované balíčky" -+ -+#: ../yumcommands.py:303 -+msgid "Available Packages" -+msgstr "Dostupné balíčky" -+ -+#: ../yumcommands.py:307 -+msgid "Extra Packages" -+msgstr "Dodatečné balíčky" -+ -+#: ../yumcommands.py:311 -+msgid "Updated Packages" -+msgstr "Aktualizované balíčky" -+ -+#. This only happens in verbose mode -+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:602 -+msgid "Obsoleting Packages" -+msgstr "Zastaralé balíčky" -+ -+#: ../yumcommands.py:328 -+msgid "Recently Added Packages" -+msgstr "Nově přidané balíčky" -+ -+#: ../yumcommands.py:335 -+msgid "No matching Packages to list" -+msgstr "Nenalezeny shodné balíčky" -+ -+#: ../yumcommands.py:349 -+msgid "List a package or groups of packages" -+msgstr "Vypsat balíček nebo skupiny balíčků" -+ -+#: ../yumcommands.py:361 -+msgid "Remove a package or packages from your system" -+msgstr "Odstranit balíček nebo balíčky ze systému" -+ -+#: ../yumcommands.py:368 -+msgid "Setting up Remove Process" -+msgstr "Uspořádává se průběh odstranění" -+ -+#: ../yumcommands.py:382 -+msgid "Setting up Group Process" -+msgstr "Uspořádává se zpracování skupiny" -+ -+#: ../yumcommands.py:388 -+msgid "No Groups on which to run command" -+msgstr "Nenalezeny skupiny, na které by šlo příkaz aplikovat" -+ -+#: ../yumcommands.py:401 -+msgid "List available package groups" -+msgstr "Vypsat dostupné skupiny balíčků" -+ -+#: ../yumcommands.py:418 -+msgid "Install the packages in a group on your system" -+msgstr "Instalovat balíčky ze skupiny do systému" -+ -+#: ../yumcommands.py:440 -+msgid "Remove the packages in a group from your system" -+msgstr "Odstranit balíčky ze skupiny ze systému" -+ -+#: ../yumcommands.py:467 -+msgid "Display details about a package group" -+msgstr "Zobrazit detaily o skupině balíčků" -+ -+#: ../yumcommands.py:491 -+msgid "Generate the metadata cache" -+msgstr "Vygenerovat skladiště metadat" -+ -+#: ../yumcommands.py:497 -+msgid "Making cache files for all metadata files." -+msgstr "Vytváří se skladišťové soubory pro všechna metadata " -+ -+#: ../yumcommands.py:498 -+msgid "This may take a while depending on the speed of this computer" -+msgstr "Může to chvíli trvat v závislosti na rychosti tohoto počítače" -+ -+#: ../yumcommands.py:519 -+msgid "Metadata Cache Created" -+msgstr "Skladiště metadat vytvořeno" -+ -+#: ../yumcommands.py:533 -+msgid "Remove cached data" -+msgstr "Odstranit data ze skladiště" -+ -+#: ../yumcommands.py:553 -+msgid "Find what package provides the given value" -+msgstr "Nalézt balíček, který poskytuje danou hodnotu" -+ -+#: ../yumcommands.py:573 -+msgid "Check for available package updates" -+msgstr "Zkontrolovat dostupné aktualizace balíčku" -+ -+#: ../yumcommands.py:622 -+msgid "Search package details for the given string" -+msgstr "Nalézt detaily balíčku pro daný řetězec" -+ -+#: ../yumcommands.py:628 -+msgid "Searching Packages: " -+msgstr "Prohledávají se balíčky: " -+ -+#: ../yumcommands.py:645 -+msgid "Update packages taking obsoletes into account" -+msgstr "Aktualizovat balíčky a brát v úvahu zastaralé" -+ -+#: ../yumcommands.py:653 -+msgid "Setting up Upgrade Process" -+msgstr "Upořádává se průběh aktualizace" -+ -+#: ../yumcommands.py:667 -+msgid "Install a local RPM" -+msgstr "Instalovat lokální RPM" -+ -+#: ../yumcommands.py:675 -+msgid "Setting up Local Package Process" -+msgstr "Uspořádává se zpracování lokálního balíčku" -+ -+#: ../yumcommands.py:694 -+msgid "Determine which package provides the given dependency" -+msgstr "Určit který balíček poskytuje danou závislost" -+ -+#: ../yumcommands.py:697 -+msgid "Searching Packages for Dependency:" -+msgstr "Prohledávají se balíčky kvůli závislostem:" -+ -+#: ../yumcommands.py:711 -+msgid "Run an interactive yum shell" -+msgstr "Spustit interaktivní shell yum" -+ -+#: ../yumcommands.py:717 -+msgid "Setting up Yum Shell" -+msgstr "Nastavuje se yum shell" -+ -+#: ../yumcommands.py:735 -+msgid "List a package's dependencies" -+msgstr "Zobrazit závislosti balíčku" -+ -+#: ../yumcommands.py:741 -+msgid "Finding dependencies: " -+msgstr "Hledají se závíslosti: " -+ -+#: ../yumcommands.py:757 -+msgid "Display the configured software repositories" -+msgstr "Zobrazit nastavené softwarová repozitáře" -+ -+#: ../yumcommands.py:809 ../yumcommands.py:810 -+msgid "enabled" -+msgstr "povoleno" -+ -+#: ../yumcommands.py:818 ../yumcommands.py:819 -+msgid "disabled" -+msgstr "zakázáno" -+ -+#: ../yumcommands.py:833 -+msgid "Repo-id : " -+msgstr "Repo-id : " -+ -+#: ../yumcommands.py:834 -+msgid "Repo-name : " -+msgstr "Repo-jméno : " -+ -+#: ../yumcommands.py:835 -+msgid "Repo-status : " -+msgstr "Repo-status : " -+ -+#: ../yumcommands.py:837 -+msgid "Repo-revision: " -+msgstr "Repo-revize : " -+ -+#: ../yumcommands.py:841 -+msgid "Repo-tags : " -+msgstr "Repo-tagy : " -+ -+#: ../yumcommands.py:847 -+msgid "Repo-distro-tags: " -+msgstr "Repo-distro-tagy: " -+ -+#: ../yumcommands.py:852 -+msgid "Repo-updated : " -+msgstr "Repo-aktuální: " -+ -+#: ../yumcommands.py:854 -+msgid "Repo-pkgs : " -+msgstr "Repo-bal. : " -+ -+#: ../yumcommands.py:855 -+msgid "Repo-size : " -+msgstr "Repo-velikost: " -+ -+#: ../yumcommands.py:862 -+msgid "Repo-baseurl : " -+msgstr "Repo-baseurl : " -+ -+#: ../yumcommands.py:870 -+msgid "Repo-metalink: " -+msgstr "Repo-metalink: " -+ -+#: ../yumcommands.py:874 -+msgid " Updated : " -+msgstr " Aktualizováno: " -+ -+#: ../yumcommands.py:877 -+msgid "Repo-mirrors : " -+msgstr "Repo-zrcadla : " -+ -+#: ../yumcommands.py:881 ../yummain.py:133 -+msgid "Unknown" -+msgstr "Neznámý" -+ -+#: ../yumcommands.py:887 -+#, python-format -+msgid "Never (last: %s)" -+msgstr "Nikdy (poslední: %s)" -+ -+#: ../yumcommands.py:889 -+#, python-format -+msgid "Instant (last: %s)" -+msgstr "Okamžitě (naposledy: %s)" -+ -+#: ../yumcommands.py:892 -+#, python-format -+msgid "%s second(s) (last: %s)" -+msgstr "%s sekund (naposledy: %s)" -+ -+#: ../yumcommands.py:894 -+msgid "Repo-expire : " -+msgstr "Repo-vyprší : " -+ -+#: ../yumcommands.py:897 -+msgid "Repo-exclude : " -+msgstr "Repo-vyřazeno: " -+ -+#: ../yumcommands.py:901 -+msgid "Repo-include : " -+msgstr "Repo-zahrnuto: " -+ -+#. Work out the first (id) and last (enabled/disalbed/count), -+#. then chop the middle (name)... -+#: ../yumcommands.py:911 ../yumcommands.py:937 -+msgid "repo id" -+msgstr "repo id" -+ -+#: ../yumcommands.py:925 ../yumcommands.py:926 ../yumcommands.py:940 -+msgid "status" -+msgstr "status" -+ -+#: ../yumcommands.py:938 -+msgid "repo name" -+msgstr "jméno repa" -+ -+#: ../yumcommands.py:964 -+msgid "Display a helpful usage message" -+msgstr "Zobrazit užitečnou nápovědu" -+ -+#: ../yumcommands.py:998 -+#, python-format -+msgid "No help available for %s" -+msgstr "Není dostupná nápověda pro %s" -+ -+#: ../yumcommands.py:1003 -+msgid "" -+"\n" -+"\n" -+"aliases: " -+msgstr "" -+"\n" -+"\n" -+"aliasy: " -+ -+#: ../yumcommands.py:1005 -+msgid "" -+"\n" -+"\n" -+"alias: " -+msgstr "" -+"\n" -+"\n" -+"alias: " -+ -+#: ../yumcommands.py:1033 -+msgid "Setting up Reinstall Process" -+msgstr "Uspořádává se průběh reinstalace" -+ -+#: ../yumcommands.py:1041 -+msgid "reinstall a package" -+msgstr "reinstalace balíčku" -+ -+#: ../yumcommands.py:1059 -+msgid "Setting up Downgrade Process" -+msgstr "Uspořádává se průběh snížení verze" -+ -+#: ../yumcommands.py:1066 -+msgid "downgrade a package" -+msgstr "snížení verze balíčku" -+ -+#: ../yumcommands.py:1080 -+msgid "Display a version for the machine and/or available repos." -+msgstr "Zobrazit verzi pro tento počítač a/nebo dostupné repozitáře." -+ -+#: ../yumcommands.py:1110 -+msgid " Yum version groups:" -+msgstr " Verze yum skupin:" -+ -+#: ../yumcommands.py:1120 -+msgid " Group :" -+msgstr " Skupina :" -+ -+#: ../yumcommands.py:1121 -+msgid " Packages:" -+msgstr " Balíčky :" -+ -+#: ../yumcommands.py:1151 -+msgid "Installed:" -+msgstr "Nainstalováno:" -+ -+#: ../yumcommands.py:1156 -+msgid "Group-Installed:" -+msgstr "Nainstalované skupiny:" -+ -+#: ../yumcommands.py:1165 -+msgid "Available:" -+msgstr "Dostupné:" -+ -+#: ../yumcommands.py:1171 -+msgid "Group-Available:" -+msgstr "Dostupné skupiny:" -+ -+#: ../yumcommands.py:1210 -+msgid "Display, or use, the transaction history" -+msgstr "Zobrazit nebo používat transakční historii" -+ -+#: ../yumcommands.py:1238 -+#, python-format -+msgid "Invalid history sub-command, use: %s." -+msgstr "Neplatný pod-příkaz historie, použijte: %s." -+ -+#: ../yummain.py:128 -+msgid "Running" -+msgstr "Běží" -+ -+#: ../yummain.py:129 -+msgid "Sleeping" -+msgstr "Spí" -+ -+#: ../yummain.py:130 -+msgid "Uninteruptable" -+msgstr "Nepřerušitelné" -+ -+#: ../yummain.py:131 -+msgid "Zombie" -+msgstr "Zombie" -+ -+#: ../yummain.py:132 -+msgid "Traced/Stopped" -+msgstr "Trasován/Zastaven" -+ -+#: ../yummain.py:137 -+msgid " The other application is: PackageKit" -+msgstr " Další aplikace je: PackageKit" -+ -+#: ../yummain.py:139 -+#, python-format -+msgid " The other application is: %s" -+msgstr " Další aplikace je: %s" -+ -+#: ../yummain.py:142 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " Paměť : %5s RSS (%5sB VSZ)" -+ -+#: ../yummain.py:146 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " Spuštěn: %s - %s nazpět" -+ -+#: ../yummain.py:148 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " Stav : %s, pid: %d" -+ -+#: ../yummain.py:173 -+msgid "" -+"Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "Zámek yumu je obsazen jinou aplikací; čeká se na její ukončení..." -+ -+#: ../yummain.py:201 ../yummain.py:240 -+#, python-format -+msgid "Error: %s" -+msgstr "Chyba: %s" -+ -+#: ../yummain.py:211 ../yummain.py:253 -+#, python-format -+msgid "Unknown Error(s): Exit Code: %d:" -+msgstr "Neznámá chyba/y: Výstupní kód: %d:" -+ -+#. Depsolve stage -+#: ../yummain.py:218 -+msgid "Resolving Dependencies" -+msgstr "Řeší se závislosti" -+ -+#: ../yummain.py:242 -+msgid " You could try using --skip-broken to work around the problem" -+msgstr " Můžete zkusit volbu --skip-broken k překonání tohoto problému" -+ -+#: ../yummain.py:243 -+msgid "" -+" You could try running: package-cleanup --problems\n" -+" package-cleanup --dupes\n" -+" rpm -Va --nofiles --nodigest" -+msgstr "" -+" Můžete zkusit spustit: package-cleanup --problems\n" -+" package-cleanup --dupes\n" -+" rpm -Va --nofiles --nodigest" -+ -+#: ../yummain.py:259 -+msgid "" -+"\n" -+"Dependencies Resolved" -+msgstr "" -+"\n" -+"Závislosti vyřešeny" -+ -+#: ../yummain.py:326 -+msgid "" -+"\n" -+"\n" -+"Exiting on user cancel." -+msgstr "" -+"\n" -+"\n" -+"Ukončeno na pokyn uživatele." -+ -+#: ../yum/depsolve.py:83 -+msgid "doTsSetup() will go away in a future version of Yum.\n" -+msgstr "doTsSetup() bude v následujících verzích yumu odstraněno.\n" -+ -+#: ../yum/depsolve.py:98 -+msgid "Setting up TransactionSets before config class is up" -+msgstr "Uspořádává se TransactionSet před tím než bude připravena třída config" -+ -+#: ../yum/depsolve.py:149 -+#, python-format -+msgid "Invalid tsflag in config file: %s" -+msgstr "Neplatný tsflag v konfiguračním souboru: %s" -+ -+#: ../yum/depsolve.py:160 -+#, python-format -+msgid "Searching pkgSack for dep: %s" -+msgstr "Hledá se pkgSack pro závislost: %s" -+ -+#: ../yum/depsolve.py:176 -+#, python-format -+msgid "Potential match for %s from %s" -+msgstr "Potenciálně shodné pro %s z %s" -+ -+#: ../yum/depsolve.py:184 -+#, python-format -+msgid "Matched %s to require for %s" -+msgstr "Shoda %s vyžadovaná pro %s" -+ -+#: ../yum/depsolve.py:225 -+#, python-format -+msgid "Member: %s" -+msgstr "Prvek: %s" -+ -+#: ../yum/depsolve.py:239 ../yum/depsolve.py:749 -+#, python-format -+msgid "%s converted to install" -+msgstr "%s zkonvertován na instalaci" -+ -+#: ../yum/depsolve.py:246 -+#, python-format -+msgid "Adding Package %s in mode %s" -+msgstr "Přidává se balíček %s v módu %s" -+ -+#: ../yum/depsolve.py:256 -+#, python-format -+msgid "Removing Package %s" -+msgstr "Odstraňuje se balíček %s" -+ -+#: ../yum/depsolve.py:278 -+#, python-format -+msgid "%s requires: %s" -+msgstr "%s vyžaduje: %s" -+ -+#: ../yum/depsolve.py:336 -+msgid "Needed Require has already been looked up, cheating" -+msgstr "Závazné požadavky již byly prohledány, švindluje se" -+ -+#: ../yum/depsolve.py:346 -+#, python-format -+msgid "Needed Require is not a package name. Looking up: %s" -+msgstr "Závazný požadavek není jméno balíčku. Hledá se: %s" -+ -+#: ../yum/depsolve.py:353 -+#, python-format -+msgid "Potential Provider: %s" -+msgstr "Možný poskytovatel: %s" -+ -+#: ../yum/depsolve.py:376 -+#, python-format -+msgid "Mode is %s for provider of %s: %s" -+msgstr "Mód je %s pro poskytovatele %s: %s" -+ -+#: ../yum/depsolve.py:380 -+#, python-format -+msgid "Mode for pkg providing %s: %s" -+msgstr "Mód pro bal. poskytující %s: %s" -+ -+#: ../yum/depsolve.py:384 -+#, python-format -+msgid "TSINFO: %s package requiring %s marked as erase" -+msgstr "TSINFO: %s balíček požaduje %s označený ke smazání" -+ -+#: ../yum/depsolve.py:397 -+#, python-format -+msgid "TSINFO: Obsoleting %s with %s to resolve dep." -+msgstr "TSINFO: Zastarává se %s s %s k vyřešení závislostí." -+ -+#: ../yum/depsolve.py:400 -+#, python-format -+msgid "TSINFO: Updating %s to resolve dep." -+msgstr "TSINFO: Aktualizuji %s k vyřešení závislostí." -+ -+#: ../yum/depsolve.py:408 -+#, python-format -+msgid "Cannot find an update path for dep for: %s" -+msgstr "Nelze nalézt cestu aktualizací pro závislost pro: %s" -+ -+#: ../yum/depsolve.py:418 -+#, python-format -+msgid "Unresolvable requirement %s for %s" -+msgstr "Neřešitelný požadavek %s pro %s" -+ -+#: ../yum/depsolve.py:441 -+#, python-format -+msgid "Quick matched %s to require for %s" -+msgstr "Rychlá shoda %s vyžadovaného pro %s" -+ -+#. is it already installed? -+#: ../yum/depsolve.py:483 -+#, python-format -+msgid "%s is in providing packages but it is already installed, removing." -+msgstr "" -+"%s je v poskytujících balíčcích, ale je již nainstalován, odstraňuje se." -+ -+#: ../yum/depsolve.py:499 -+#, python-format -+msgid "Potential resolving package %s has newer instance in ts." -+msgstr "Balíček %s, který může být řešení má v ts novější verzi." -+ -+#: ../yum/depsolve.py:510 -+#, python-format -+msgid "Potential resolving package %s has newer instance installed." -+msgstr "Balíček %s, který může být řešení je nainstalován v novější verzi." -+ -+#: ../yum/depsolve.py:518 ../yum/depsolve.py:564 -+#, python-format -+msgid "Missing Dependency: %s is needed by package %s" -+msgstr "Chybí závislost: %s je vyžadován balíčkem %s" -+ -+#: ../yum/depsolve.py:531 -+#, python-format -+msgid "%s already in ts, skipping this one" -+msgstr "%s je již v ts, vynechává se" -+ -+#: ../yum/depsolve.py:574 -+#, python-format -+msgid "TSINFO: Marking %s as update for %s" -+msgstr "TSINFO: Označuji %s jako aktualizaci %s" -+ -+#: ../yum/depsolve.py:582 -+#, python-format -+msgid "TSINFO: Marking %s as install for %s" -+msgstr "TSINFO: Označuji %s jako instalaci %s" -+ -+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+msgid "Success - empty transaction" -+msgstr "Úspěch - prázdná transakce" -+ -+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+msgid "Restarting Loop" -+msgstr "Restartuje se smyčka" -+ -+#: ../yum/depsolve.py:755 -+msgid "Dependency Process ending" -+msgstr "Proces zpracování závislostí končí" -+ -+#: ../yum/depsolve.py:761 -+#, python-format -+msgid "%s from %s has depsolving problems" -+msgstr "%s z %s má problémy se závislostmi" -+ -+#: ../yum/depsolve.py:768 -+msgid "Success - deps resolved" -+msgstr "Úspěch - závislosti vyřešeny" -+ -+#: ../yum/depsolve.py:782 -+#, python-format -+msgid "Checking deps for %s" -+msgstr "Kontroluji závislosti pro %s" -+ -+#: ../yum/depsolve.py:865 -+#, python-format -+msgid "looking for %s as a requirement of %s" -+msgstr "hledá se %s jako požadavek od %s" -+ -+#: ../yum/depsolve.py:1007 -+#, python-format -+msgid "Running compare_providers() for %s" -+msgstr "Spouští se compare_providers() pro %s" -+ -+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#, python-format -+msgid "better arch in po %s" -+msgstr "lepší architektura v po %s" -+ -+#: ../yum/depsolve.py:1142 -+#, python-format -+msgid "%s obsoletes %s" -+msgstr "%s zastarává %s" -+ -+#: ../yum/depsolve.py:1154 -+#, python-format -+msgid "" -+"archdist compared %s to %s on %s\n" -+" Winner: %s" -+msgstr "" -+"archdist porovnán pro %s k %s na %s\n" -+" Vítěz: %s" -+ -+#: ../yum/depsolve.py:1161 -+#, python-format -+msgid "common sourcerpm %s and %s" -+msgstr "společné zdrojové rpm %s a %s" -+ -+#: ../yum/depsolve.py:1167 -+#, python-format -+msgid "common prefix of %s between %s and %s" -+msgstr "společný prefix %s mezi %s a %s" -+ -+#: ../yum/depsolve.py:1175 -+#, python-format -+msgid "Best Order: %s" -+msgstr "Nejlepší pořádek: %s" -+ -+#: ../yum/__init__.py:187 -+msgid "doConfigSetup() will go away in a future version of Yum.\n" -+msgstr "doConfigSetup() bude odstraněn v příští verzi Yumu.\n" -+ -+#: ../yum/__init__.py:412 -+#, python-format -+msgid "Repository %r is missing name in configuration, using id" -+msgstr "Repozitáři %r chybí jméno v konfiguraci, používá se id" -+ -+#: ../yum/__init__.py:450 -+msgid "plugins already initialised" -+msgstr "zásuvný modul již inicializován" -+ -+#: ../yum/__init__.py:457 -+msgid "doRpmDBSetup() will go away in a future version of Yum.\n" -+msgstr "doRpmDBSetup() bude odstraněn v příští verzi Yumu.\n" -+ -+#: ../yum/__init__.py:468 -+msgid "Reading Local RPMDB" -+msgstr "Načítá se lokální RPMDB" -+ -+#: ../yum/__init__.py:489 -+msgid "doRepoSetup() will go away in a future version of Yum.\n" -+msgstr "doRepoSetup() bude odstraněn v příští verzi Yumu.\n" -+ -+#: ../yum/__init__.py:509 -+msgid "doSackSetup() will go away in a future version of Yum.\n" -+msgstr "doSackSetup() bude odstraněn v příští verzi Yumu.\n" -+ -+#: ../yum/__init__.py:539 -+msgid "Setting up Package Sacks" -+msgstr "Připravuji pytle balíčků" -+ -+#: ../yum/__init__.py:584 -+#, python-format -+msgid "repo object for repo %s lacks a _resetSack method\n" -+msgstr "objekt repozitáře pro repo %s postrádá metodu _resetSack\n" -+ -+#: ../yum/__init__.py:585 -+msgid "therefore this repo cannot be reset.\n" -+msgstr "proto nemůže toto repo být resetován.\n" -+ -+#: ../yum/__init__.py:590 -+msgid "doUpdateSetup() will go away in a future version of Yum.\n" -+msgstr "doUpdateSetup() bude odstraněn v příští verzi Yumu.\n" -+ -+#: ../yum/__init__.py:602 -+msgid "Building updates object" -+msgstr "Sestavuje se objekt aktualizací" -+ -+#: ../yum/__init__.py:637 -+msgid "doGroupSetup() will go away in a future version of Yum.\n" -+msgstr "doGroupSetup() bude odstraněn v příští verzi Yumu.\n" -+ -+#: ../yum/__init__.py:662 -+msgid "Getting group metadata" -+msgstr "Získávají se metadata skupin" -+ -+#: ../yum/__init__.py:688 -+#, python-format -+msgid "Adding group file from repository: %s" -+msgstr "Přidávám skupinový soubor pro repozitář: %s" -+ -+#: ../yum/__init__.py:697 -+#, python-format -+msgid "Failed to add groups file for repository: %s - %s" -+msgstr "Selhalo přidání skupinového souboru pro repozitář: %s - %s" -+ -+#: ../yum/__init__.py:703 -+msgid "No Groups Available in any repository" -+msgstr "V žádném repozitáři nejsou dostupné skupiny" -+ -+#: ../yum/__init__.py:763 -+msgid "Importing additional filelist information" -+msgstr "Importuji informace z dodatečného seznamu souborů" -+ -+#: ../yum/__init__.py:777 -+#, python-format -+msgid "The program %s%s%s is found in the yum-utils package." -+msgstr "Program %s %s %s byl nalezen v balíčku yum-utils." -+ -+#: ../yum/__init__.py:785 -+msgid "" -+"There are unfinished transactions remaining. You might consider running yum-" -+"complete-transaction first to finish them." -+msgstr "" -+"Existují nedokončené transakce. Měli byste zvážit možnost nejdříve spustit " -+"yum-complete-transaction k jejich dokončení." -+ -+#: ../yum/__init__.py:853 -+#, python-format -+msgid "Skip-broken round %i" -+msgstr "Přeskočení rozpadlých - kolo %i" -+ -+#: ../yum/__init__.py:906 -+#, python-format -+msgid "Skip-broken took %i rounds " -+msgstr "Přeskočení rozpadlých trvalo %i kol " -+ -+#: ../yum/__init__.py:907 -+msgid "" -+"\n" -+"Packages skipped because of dependency problems:" -+msgstr "\n
Balíčky přeskočené kvůli problémům se závislostmi:" -+ -+#: ../yum/__init__.py:911 -+#, python-format -+msgid " %s from %s" -+msgstr " %s z %s" -+ -+#: ../yum/__init__.py:1076 -+msgid "" -+"Warning: scriptlet or other non-fatal errors occurred during transaction." -+msgstr "" -+"Varování: Během transakce došlo k chybě skripletu nebo jiné nefatální chybě." -+ -+#: ../yum/__init__.py:1093 -+#, python-format -+msgid "Failed to remove transaction file %s" -+msgstr "Selhalo odstranění transakčního souboru %s." -+ -+#. maybe a file log here, too -+#. but raising an exception is not going to do any good -+#: ../yum/__init__.py:1122 -+#, python-format -+msgid "%s was supposed to be installed but is not!" -+msgstr "%s mělo být nainstalováno ale neni!" -+ -+#. maybe a file log here, too -+#. but raising an exception is not going to do any good -+#: ../yum/__init__.py:1161 -+#, python-format -+msgid "%s was supposed to be removed but is not!" -+msgstr "%s mělo být odstraněno ale není!" -+ -+#. Whoa. What the heck happened? -+#: ../yum/__init__.py:1281 -+#, python-format -+msgid "Unable to check if PID %s is active" -+msgstr "Nedá se zkontrolovat zda je PID %s aktivní." -+ -+#. Another copy seems to be running. -+#: ../yum/__init__.py:1285 -+#, python-format -+msgid "Existing lock %s: another copy is running as pid %s." -+msgstr "Existující zámek %s: jiná kopie běží s pid %s." -+ -+#. Whoa. What the heck happened? -+#: ../yum/__init__.py:1320 -+#, python-format -+msgid "Could not create lock at %s: %s " -+msgstr "Nelze vytvořit zámek na %s: %s " -+ -+#: ../yum/__init__.py:1365 -+msgid "Package does not match intended download" -+msgstr "Balíček se neshoduje se zamýšleným stahováním" -+ -+#: ../yum/__init__.py:1380 -+msgid "Could not perform checksum" -+msgstr "Nelze zkontrolovat kontrolní součet" -+ -+#: ../yum/__init__.py:1383 -+msgid "Package does not match checksum" -+msgstr "Balíček neodpovídá kontrolnímu součtu" -+ -+#: ../yum/__init__.py:1425 -+#, python-format -+msgid "package fails checksum but caching is enabled for %s" -+msgstr "balíček neprošel kontrolním součtem ale skladiště je povoleno pro %s" -+ -+#: ../yum/__init__.py:1428 ../yum/__init__.py:1457 -+#, python-format -+msgid "using local copy of %s" -+msgstr "používá se lokální kopie %s" -+ -+#: ../yum/__init__.py:1469 -+#, python-format -+msgid "" -+"Insufficient space in download directory %s\n" -+" * free %s\n" -+" * needed %s" -+msgstr "" -+"Nedostatek diskového prostoru ve stahovacím adresáři %s\n" -+" * volno %s\n" -+" * potřeba %s" -+ -+#: ../yum/__init__.py:1518 -+msgid "Header is not complete." -+msgstr "Hlavička není komplet." -+ -+#: ../yum/__init__.py:1555 -+#, python-format -+msgid "" -+"Header not in local cache and caching-only mode enabled. Cannot download %s" -+msgstr "" -+"Hlavička není v lokálním skladišti ale je povoleno používat pouze skladiště. " -+"Nemohu stáhnout %s" -+ -+#: ../yum/__init__.py:1610 -+#, python-format -+msgid "Public key for %s is not installed" -+msgstr "Veřejný klíč %s není nainstalován" -+ -+#: ../yum/__init__.py:1614 -+#, python-format -+msgid "Problem opening package %s" -+msgstr "Problém s otevřením balíčku %s" -+ -+#: ../yum/__init__.py:1622 -+#, python-format -+msgid "Public key for %s is not trusted" -+msgstr "Veřejný klíč %s není důvěryhodný" -+ -+#: ../yum/__init__.py:1626 -+#, python-format -+msgid "Package %s is not signed" -+msgstr "Balíček %s není podepsán" -+ -+#: ../yum/__init__.py:1664 -+#, python-format -+msgid "Cannot remove %s" -+msgstr "Nemohu odstranit %s" -+ -+#: ../yum/__init__.py:1668 -+#, python-format -+msgid "%s removed" -+msgstr "%s odstraňen" -+ -+#: ../yum/__init__.py:1704 -+#, python-format -+msgid "Cannot remove %s file %s" -+msgstr "Nemohu odstranit %s soubor %s" -+ -+#: ../yum/__init__.py:1708 -+#, python-format -+msgid "%s file %s removed" -+msgstr "%s soubor %s odstraněn" -+ -+#: ../yum/__init__.py:1710 -+#, python-format -+msgid "%d %s files removed" -+msgstr "%d %s soubor odstraněn" -+ -+#: ../yum/__init__.py:1779 -+#, python-format -+msgid "More than one identical match in sack for %s" -+msgstr "Více než jedna identická shoda v pytly pro %s" -+ -+#: ../yum/__init__.py:1785 -+#, python-format -+msgid "Nothing matches %s.%s %s:%s-%s from update" -+msgstr "Nic se neshoduje s %s.%s %s:%s-%s z aktualizace" -+ -+#: ../yum/__init__.py:2018 -+msgid "" -+"searchPackages() will go away in a future version of " -+"Yum. Use searchGenerator() instead. \n" -+msgstr "" -+"searchPackages() bude odstraněno v příští verzi Yumu. " -+"Používejte místo ní searchGenerator(). \n" -+ -+#: ../yum/__init__.py:2057 -+#, python-format -+msgid "Searching %d packages" -+msgstr "Prohledává se %d balíčků" -+ -+#: ../yum/__init__.py:2061 -+#, python-format -+msgid "searching package %s" -+msgstr "prohledává se balíček %s" -+ -+#: ../yum/__init__.py:2073 -+msgid "searching in file entries" -+msgstr "hledá se v souborových položkách" -+ -+#: ../yum/__init__.py:2080 -+msgid "searching in provides entries" -+msgstr "hledá se v položkách poskytovatelů" -+ -+#: ../yum/__init__.py:2113 -+#, python-format -+msgid "Provides-match: %s" -+msgstr "Poskytovatel-shoda: %s" -+ -+#: ../yum/__init__.py:2162 -+msgid "No group data available for configured repositories" -+msgstr "Pro nastavený repozitář nejsou žádná dostupná skupinová data" -+ -+#: ../yum/__init__.py:2193 ../yum/__init__.py:2212 ../yum/__init__.py:2243 -+#: ../yum/__init__.py:2249 ../yum/__init__.py:2328 ../yum/__init__.py:2332 -+#: ../yum/__init__.py:2647 -+#, python-format -+msgid "No Group named %s exists" -+msgstr "Neexistuje skupina pojmenovaná %s" -+ -+#: ../yum/__init__.py:2224 ../yum/__init__.py:2345 -+#, python-format -+msgid "package %s was not marked in group %s" -+msgstr "balíček %s nebyl označen ve skupině %s" -+ -+#: ../yum/__init__.py:2271 -+#, python-format -+msgid "Adding package %s from group %s" -+msgstr "Přidává se balíček %s pro skupinu %s" -+ -+#: ../yum/__init__.py:2275 -+#, python-format -+msgid "No package named %s available to be installed" -+msgstr "Neexistuje žádný balíček pojmenovaný %s dostupný k instalaci" -+ -+#: ../yum/__init__.py:2372 -+#, python-format -+msgid "Package tuple %s could not be found in packagesack" -+msgstr "Uspořádaný seznam balíčků %s nenalezen v pytly balíčků" -+ -+#: ../yum/__init__.py:2391, python-format -+msgid "Package tuple %s could not be found in rpmdb" -+msgstr "Uspořádaný seznam balíčků %s nenalezen v rpmdb" -+ -+#: ../yum/__init__.py:2447 ../yum/__init__.py:2497 -+msgid "Invalid version flag" -+msgstr "Chybý příznak verze" -+ -+#: ../yum/__init__.py:2467 ../yum/__init__.py:2472 -+#, python-format -+msgid "No Package found for %s" -+msgstr "Nebyl nalezen balíček pro %s" -+ -+#: ../yum/__init__.py:2688 -+msgid "Package Object was not a package object instance" -+msgstr "Objekt balíčku nebyl instancí balíčkového objektu" -+ -+#: ../yum/__init__.py:2692 -+msgid "Nothing specified to install" -+msgstr "Nebylo určeno nic k instalaci" -+ -+#: ../yum/__init__.py:2708 ../yum/__init__.py:3472 -+#, python-format -+msgid "Checking for virtual provide or file-provide for %s" -+msgstr "Hledá se virtuální poskytovatel nebo soubor poskytující %s" -+ -+#: ../yum/__init__.py:2714 ../yum/__init__.py:3021 ../yum/__init__.py:3188 -+#: ../yum/__init__.py:3478 -+#, python-format -+msgid "No Match for argument: %s" -+msgstr "Nenalezena shoda pro argument: %s" -+ -+#: ../yum/__init__.py:2790 -+#, python-format -+msgid "Package %s installed and not available" -+msgstr "Balíček %s nainstalován ale není dostupný" -+ -+#: ../yum/__init__.py:2793 -+msgid "No package(s) available to install" -+msgstr "Žádný balíček/ky dostupný pro instalaci" -+ -+#: ../yum/__init__.py:2805 -+#, python-format -+msgid "Package: %s - already in transaction set" -+msgstr "Balíček: %s - již je v transakci" -+ -+#: ../yum/__init__.py:2831 -+#, python-format -+msgid "Package %s is obsoleted by %s which is already installed" -+msgstr "Balíček %s je zastaralý balíčkem %s, který je již nainstalován" -+ -+#: ../yum/__init__.py:2834 -+#, python-format -+msgid "Package %s is obsoleted by %s, trying to install %s instead" -+msgstr "Balíček %s je zastaralý balíčkem %s, zkouší se místo něj instalovat %s" -+ -+#: ../yum/__init__.py:2842 -+#, python-format -+msgid "Package %s already installed and latest version" -+msgstr "Balíček %s již nainstalován a v poslední verzi" -+ -+#: ../yum/__init__.py:2856 -+#, python-format -+msgid "Package matching %s already installed. Checking for update." -+msgstr "Balíček odpovídající %s je již nainstalován. Hledají se aktualizace." -+ -+#. update everything (the easy case) -+#: ../yum/__init__.py:2950 -+msgid "Updating Everything" -+msgstr "Aktualizuje se vše" -+ -+#: ../yum/__init__.py:2971 ../yum/__init__.py:3086 ../yum/__init__.py:3115 -+#: ../yum/__init__.py:3142 -+#, python-format -+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" -+msgstr "Neaktualizuje se balíček, který je již zastaralý: %s.%s %s:%s-%s" -+ -+#: ../yum/__init__.py:3006 ../yum/__init__.py:3185 -+#, python-format -+msgid "%s" -+msgstr "%s" -+ -+#: ../yum/__init__.py:3077 -+#, python-format -+msgid "Package is already obsoleted: %s.%s %s:%s-%s" -+msgstr "Balíček je již zastaralý: %s.%s %s:%s-%s" -+ -+#: ../yum/__init__.py:3110 -+#, python-format -+msgid "Not Updating Package that is obsoleted: %s" -+msgstr "Neaktualizuje se balíček, který je zastaralý: %s" -+ -+#: ../yum/__init__.py:3119 ../yum/__init__.py:3146 -+#, python-format -+msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" -+msgstr "Neaktualizuje se balíček, který jej již aktuální: %s.%s %s:%s-%s" -+ -+#: ../yum/__init__.py:3201 -+msgid "No package matched to remove" -+msgstr "Nenalezen žádný shodný balíček pro odstranění" -+ -+#: ../yum/__init__.py:3234 ../yum/__init__.py:3338 ../yum/__init__.py:3427 +-#: ../yum/__init__.py:3379 ++#: ../yum/__init__.py:3510 ++#: ../yum/__init__.py:3594 +#, python-format +msgid "Cannot open file: %s. Skipping." -+msgstr "Nelze otevřít soubor: %s. Přeskakuje se." -+ -+#: ../yum/__init__.py:3237 ../yum/__init__.py:3341 ../yum/__init__.py:3430 -+#, python-format -+msgid "Examining %s: %s" -+msgstr "Zkoumá se %s: %s" -+ -+#: ../yum/__init__.py:3245 ../yum/__init__.py:3344 ../yum/__init__.py:3433 -+#, python-format -+msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" -+msgstr "Nelze přídat balíček %s do transakce. Nekompatibilní architektura: %s" -+ -+#: ../yum/__init__.py:3253 -+#, python-format -+msgid "" -+"Package %s not installed, cannot update it. Run yum install to install it " -+"instead." -+msgstr "" -+"Balíček %s není nainstalován, nelze jej aktualizovat. Spusťte místo toho yum " -+"install a nainstalujte jej." -+ -+#: ../yum/__init__.py:3288 ../yum/__init__.py:3355 ../yum/__init__.py:3444 -+#, python-format -+msgid "Excluding %s" -+msgstr "Vynechává se %s" -+ -+#: ../yum/__init__.py:3293 -+#, python-format -+msgid "Marking %s to be installed" -+msgstr "Označuje se %s k instalaci" -+ -+#: ../yum/__init__.py:3299 -+#, python-format -+msgid "Marking %s as an update to %s" -+msgstr "Označuje se %s jako aktualizace %s" -+ -+#: ../yum/__init__.py:3306 -+#, python-format -+msgid "%s: does not update installed package." -+msgstr "%s: není aktualizací instalovaného balíčku" -+ -+#: ../yum/__init__.py:3374 -+msgid "Problem in reinstall: no package matched to remove" -+msgstr "Problém při reinstalaci: žádný shodný balíček k odstranění" -+ -+#: ../yum/__init__.py:3387 ../yum/__init__.py:3506 -+#, python-format -+msgid "Package %s is allowed multiple installs, skipping" -+msgstr "Balíček %s má dovoleno vícero instalací, přeskakuje se" -+ -+#: ../yum/__init__.py:3408 -+#, python-format -+msgid "Problem in reinstall: no package %s matched to install" -+msgstr "Problém při reinstalaci: žádný shodný balíček %s k instalaci" -+ -+#: ../yum/__init__.py:3498 -+msgid "No package(s) available to downgrade" -+msgstr "Žádný balíček/ky dostupné ke snížení verze" -+ -+#: ../yum/__init__.py:3542 -+#, python-format -+msgid "No Match for available package: %s" -+msgstr "Neexistuje shoda pro dostupný balíček: %s" -+ -+#: ../yum/__init__.py:3548 -+#, python-format -+msgid "Only Upgrade available on package: %s" -+msgstr "Pouze aktualizace dostupná pro balíček: %s" -+ -+#: ../yum/__init__.py:3616 ../yum/__init__.py:3653, python-format -+msgid "Failed to downgrade: %s" -+msgstr "Nepodařilo se snížit verzi: %s" ++msgstr "No es posible abrir el archivo: %s. Ignorando." + ++#: ../yum/__init__.py:3540 + msgid "Problem in reinstall: no package matched to remove" +-msgstr "" +-"Problema al reinstalar: no existe ningún paquete concordante para eliminar" ++msgstr "Problema al reinstalar: no existe ningún paquete concordante para eliminar" + +-#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 ++#: ../yum/__init__.py:3553 +#: ../yum/__init__.py:3685 + #, python-format + msgid "Package %s is allowed multiple installs, skipping" + msgstr "El paquete %s permite múltiples instalaciones, ignorando" + +-#: ../yum/__init__.py:3413 ++#: ../yum/__init__.py:3574 + #, python-format + msgid "Problem in reinstall: no package %s matched to install" +-msgstr "" +-"Problema al reinstalar: no existe ningún paquete concordante con %s para " +-"instalar" ++msgstr "Problema al reinstalar: no existe ningún paquete concordante con %s para instalar" + +-#: ../yum/__init__.py:3515 ++#: ../yum/__init__.py:3677 + msgid "No package(s) available to downgrade" + msgstr "No existe(n) paquete(s) disponible(s) para desactualizar" + +-#: ../yum/__init__.py:3559 ++#: ../yum/__init__.py:3730 + #, python-format + msgid "No Match for available package: %s" + msgstr "Ninguna correspondencia disponible para el paquete: %s" + +-#: ../yum/__init__.py:3565 ++#: ../yum/__init__.py:3737 + #, python-format + msgid "Only Upgrade available on package: %s" + msgstr "Solo existe la posibilidad de actualizar el paquete: %s" + +-#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 ++#: ../yum/__init__.py:3807 ++#: ../yum/__init__.py:3844 + #, python-format + msgid "Failed to downgrade: %s" + msgstr "Falló al desactualizar: %s" + +-#: ../yum/__init__.py:3704 ++#: ../yum/__init__.py:3876 + #, python-format + msgid "Retrieving GPG key from %s" + msgstr "Obteniendo llave GPG desde %s" + +-#: ../yum/__init__.py:3724 ++#: ../yum/__init__.py:3896 + msgid "GPG key retrieval failed: " + msgstr "La obtención de la llave GPG ha fallado:" + +-#: ../yum/__init__.py:3735 ++#: ../yum/__init__.py:3902 +#, python-format -+msgid "Retrieving GPG key from %s" -+msgstr "Získává se GPG klíč pro %s" ++msgid "Invalid GPG Key from %s: %s" ++msgstr "Llave GPG no válida de %s: %s" + -+#: ../yum/__init__.py:3705 -+msgid "GPG key retrieval failed: " -+msgstr "Získání GPG klíč selhalo: " -+ -+#: ../yum/__init__.py:3716 ++#: ../yum/__init__.py:3911 + #, python-format + msgid "GPG key parsing failed: key does not have value %s" + msgstr "El análisis de la llave GPG ha fallado: la llave no posee valor %s" + +-#: ../yum/__init__.py:3767 ++#: ../yum/__init__.py:3943 + #, python-format + msgid "GPG key at %s (0x%s) is already installed" + msgstr "La llave GPG de %s (0x%s) ya se encuentra instalada" + + #. Try installing/updating GPG key +-#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 ++#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:4010 + #, python-format + msgid "Importing GPG key 0x%s \"%s\" from %s" + msgstr "Importando la llave GPG 0x%s \"%s\" desde %s" + +-#: ../yum/__init__.py:3789 ++#: ../yum/__init__.py:3965 + msgid "Not installing key" + msgstr "No se está instalando la llave" + +-#: ../yum/__init__.py:3795 ++#: ../yum/__init__.py:3971 + #, python-format + msgid "Key import failed (code %d)" + msgstr "La importación de la llave falló (código %d)" + +-#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 ++#: ../yum/__init__.py:3972 ++#: ../yum/__init__.py:4031 + msgid "Key imported successfully" + msgstr "La llave ha sido importada exitosamente" + +-#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 ++#: ../yum/__init__.py:3977 ++#: ../yum/__init__.py:4036 + #, python-format + msgid "" +-"The GPG keys listed for the \"%s\" repository are already installed but they " +-"are not correct for this package.\n" ++"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" + "Check that the correct key URLs are configured for this repository." + msgstr "" +-"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran " +-"instaladas, pero con este paquete no son correctas.\n" +-"Verifique que las URLs de la llave para este repositorio estén correctamente " +-"configuradas." ++"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero con este paquete no son correctas.\n" ++"Verifique que las URLs de la llave para este repositorio estén correctamente configuradas." + +-#: ../yum/__init__.py:3810 ++#: ../yum/__init__.py:3986 + msgid "Import of key(s) didn't help, wrong key(s)?" + msgstr "La importación de la(s) llave(s) no funcionó, ¿llave(s) equivocada(s)?" + +-#: ../yum/__init__.py:3829 ++#: ../yum/__init__.py:4005 + #, python-format + msgid "GPG key at %s (0x%s) is already imported" + msgstr "La llave GPG de %s (0x%s) ya ha sido importada" + +-#: ../yum/__init__.py:3849 ++#: ../yum/__init__.py:4025 + #, python-format + msgid "Not installing key for repo %s" + msgstr "No se está instalando la llave para el repositorio %s" + +-#: ../yum/__init__.py:3854 ++#: ../yum/__init__.py:4030 + msgid "Key import failed" + msgstr "Falló la importación de la llave" + +-#: ../yum/__init__.py:3976 ++#: ../yum/__init__.py:4156 + msgid "Unable to find a suitable mirror." + msgstr "No es posible encontrar un espejo que funcione." + +-#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4158 + msgid "Errors were encountered while downloading packages." + msgstr "Fueron encontrados errores mientras los paquetes eran descargados." + +-#: ../yum/__init__.py:4028 ++#: ../yum/__init__.py:4208 + #, python-format + msgid "Please report this error at %s" + msgstr "Por favor, informe este error en %s" + +-#: ../yum/__init__.py:4052 ++#: ../yum/__init__.py:4232 + msgid "Test Transaction Errors: " + msgstr "Errores de la prueba de transacción:" + ++#: ../yum/__init__.py:4333 +#, python-format -+msgid "GPG key parsing failed: key does not have value %s" -+msgstr "Zpracování GPG klíče selhalo: klíč nemá žádnou hodnotu %s" ++msgid "Could not set cachedir: %s" ++msgstr "No se ha podido definir un directorio de chaché: %s" + -+#: ../yum/__init__.py:3748 + #. Mostly copied from YumOutput._outKeyValFill() + #: ../yum/plugins.py:202 + msgid "Loaded plugins: " + msgstr "Complementos cargados:" + +-#: ../yum/plugins.py:216 ../yum/plugins.py:222 ++#: ../yum/plugins.py:216 ++#: ../yum/plugins.py:222 + #, python-format + msgid "No plugin match for: %s" + msgstr "No hay un complemento que se corresponda con: %s" +@@ -2499,8 +2695,7 @@ msgstr "No hay un complemento que se corresponda con: %s" + #: ../yum/plugins.py:252 + #, python-format + msgid "Not loading \"%s\" plugin, as it is disabled" +-msgstr "" +-"El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado" ++msgstr "El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado" + + #. Give full backtrace: + #: ../yum/plugins.py:264 +@@ -2525,11 +2720,8 @@ msgstr "Cargando el complemento \"%s\"" + + #: ../yum/plugins.py:316 + #, python-format +-msgid "" +-"Two or more plugins with the name \"%s\" exist in the plugin search path" +-msgstr "" +-"Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda " +-"de complementos " ++msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" ++msgstr "Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda de complementos " + + #: ../yum/plugins.py:336 + #, python-format +@@ -2541,14 +2733,26 @@ msgstr "No se encuentra el archivo de configuración %s" + #: ../yum/plugins.py:339 + #, python-format + msgid "Unable to find configuration file for plugin %s" +-msgstr "" +-"No es posible encontrar el archivo de configuración para el complemento %s" ++msgstr "No es posible encontrar el archivo de configuración para el complemento %s" + + #: ../yum/plugins.py:501 + msgid "registration of commands not supported" + msgstr "registro de comando no soportado" + +-#: ../yum/rpmtrans.py:78 ++#: ../yum/rpmsack.py:102 ++msgid "has missing requires of" ++msgstr "no se encuentran necesita de" ++ ++#: ../yum/rpmsack.py:105 ++msgid "has installed conflicts" ++msgstr "se ha instalado choca con" ++ ++#: ../yum/rpmsack.py:114 +#, python-format -+msgid "GPG key at %s (0x%s) is already installed" -+msgstr "GPG klíč %s (0x%s) je již nainstalován" -+ -+#. Try installing/updating GPG key -+#: ../yum/__init__.py:3753 ../yum/__init__.py:3815 -+#, python-format -+msgid "Importing GPG key 0x%s \"%s\" from %s" -+msgstr "Importuje se GPG klíč 0x%s \"%s\" z %s" -+ -+#: ../yum/__init__.py:3770 -+msgid "Not installing key" -+msgstr "Neinstaluji klíč" -+ -+#: ../yum/__init__.py:3776 -+#, python-format -+msgid "Key import failed (code %d)" -+msgstr "Import klíče selhal (kód %d)" -+ -+#: ../yum/__init__.py:3777 ../yum/__init__.py:3836 -+msgid "Key imported successfully" -+msgstr "Import klíče proběhl úspěšně" -+ -+#: ../yum/__init__.py:3782 ../yum/__init__.py:3841 -+#, python-format -+msgid "" -+"The GPG keys listed for the \"%s\" repository are already installed but they " -+"are not correct for this package.\n" -+"Check that the correct key URLs are configured for this repository." -+msgstr "" -+"GPG klíč určený pro repozitář %s je již nainstalován, ale není správný pro " -+"tento balíček.\n" -+"Zkontrolujte, že URL klíče jsou pro repozitář správně nastavena." -+ -+#: ../yum/__init__.py:3791 -+msgid "Import of key(s) didn't help, wrong key(s)?" -+msgstr "Import klíče/ů nepomohl, špatný klíč(e)?" -+ -+#: ../yum/__init__.py:3810 -+#, python-format -+msgid "GPG key at %s (0x%s) is already imported" -+msgstr "GPG klíč %s (0x%s) je již naimportován" -+ -+#: ../yum/__init__.py:3830 -+#, python-format -+msgid "Not installing key for repo %s" -+msgstr "Neinstaluji klíč pro repozitář %s" -+ -+#: ../yum/__init__.py:3835 -+msgid "Key import failed" -+msgstr "Import klíče selhal" -+ -+#: ../yum/__init__.py:3957 -+msgid "Unable to find a suitable mirror." -+msgstr "Nemohu nalézt vhodné zrcadlo" -+ -+#: ../yum/__init__.py:3959 -+msgid "Errors were encountered while downloading packages." -+msgstr "Při stahování balíčků došlo k chybě." -+ -+#: ../yum/__init__.py:4009 -+#, python-format -+msgid "Please report this error at %s" -+msgstr "Prosím ohlašte tuto chybu na %s" -+ -+#: ../yum/__init__.py:4033 -+msgid "Test Transaction Errors: " -+msgstr "Chyby testu transakce: " -+ -+#. Mostly copied from YumOutput._outKeyValFill() -+#: ../yum/plugins.py:202 -+msgid "Loaded plugins: " -+msgstr "Zavedeny zásuvné moduly:" -+ -+#: ../yum/plugins.py:216 ../yum/plugins.py:222 -+#, python-format -+msgid "No plugin match for: %s" -+msgstr "Neexistuje zásuvný modul pro: %s" -+ -+#: ../yum/plugins.py:252 -+#, python-format -+msgid "Not loading \"%s\" plugin, as it is disabled" -+msgstr "Nezavádí se \"%s\" modul, protože je zakázán" -+ -+#. Give full backtrace: -+#: ../yum/plugins.py:264 -+#, python-format -+msgid "Plugin \"%s\" can't be imported" -+msgstr "Modul \"%s\" nemůže být importován" -+ -+#: ../yum/plugins.py:271 -+#, python-format -+msgid "Plugin \"%s\" doesn't specify required API version" -+msgstr "Modul \"%s\" neuvádí požadovanou verzi API" -+ -+#: ../yum/plugins.py:276 -+#, python-format -+msgid "Plugin \"%s\" requires API %s. Supported API is %s." -+msgstr "Modul \"%s\" požaduje API %s. Podporované API je %s." -+ -+#: ../yum/plugins.py:309 -+#, python-format -+msgid "Loading \"%s\" plugin" -+msgstr "Zavádí se zásvuný modul \"%s\"" -+ -+#: ../yum/plugins.py:316 -+#, python-format -+msgid "" -+"Two or more plugins with the name \"%s\" exist in the plugin search path" -+msgstr "V prohledávaných cestách jsou dva nebo více modulů se jménem \"%s\"" -+ -+#: ../yum/plugins.py:336 -+#, python-format -+msgid "Configuration file %s not found" -+msgstr "Konfigurační soubor %s nenalezen" -+ -+#. for -+#. Configuration files for the plugin not found -+#: ../yum/plugins.py:339 -+#, python-format -+msgid "Unable to find configuration file for plugin %s" -+msgstr "Nelze nalézt konfigurační soubor pro modul %s" -+ -+#: ../yum/plugins.py:501 -+msgid "registration of commands not supported" -+msgstr "registrace příkazů není podporována" -+ -+#: ../yum/rpmtrans.py:78 -+msgid "Repackaging" -+msgstr "Přebaluje se" -+ -+#: ../rpmUtils/oldUtils.py:33 -+#, python-format -+msgid "Header cannot be opened or does not match %s, %s." -+msgstr "Hlavička nemůže být otevřena nebo neodpovídá %s, %s." -+ -+#: ../rpmUtils/oldUtils.py:53 -+#, python-format -+msgid "RPM %s fails md5 check" -+msgstr "Pro RPM %s selhala kontrola md5" -+ -+#: ../rpmUtils/oldUtils.py:151 -+msgid "Could not open RPM database for reading. Perhaps it is already in use?" -+msgstr "Nelze otevřít databázi RPM pro čtení. Možná je jíž používána?" -+ -+#: ../rpmUtils/oldUtils.py:183 -+msgid "Got an empty Header, something has gone wrong" -+msgstr "Vrátila se prázdná hlavička. Něco se stalo špatně." -+ -+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260 -+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266 -+#, python-format -+msgid "Damaged Header %s" -+msgstr "Poškozená hlavička %s" -+ -+#: ../rpmUtils/oldUtils.py:281 -+#, python-format -+msgid "Error opening rpm %s - error %s" -+msgstr "Chyba při otevření rpm %s - chyba %s" ++msgid "%s is a duplicate with %s" ++msgstr "%s es uin duplicado con %s" + ++#: ../yum/rpmtrans.py:79 + msgid "Repackaging" + msgstr "Reempaquetando" + +@@ -2564,16 +2768,16 @@ msgstr "El RPM %s ha fallado la verificación md5" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"No es posible abrir la base de datos de RPM para su lectura. ¿Tal vez se " +-"encuentre en uso?" ++msgstr "No es posible abrir la base de datos de RPM para su lectura. ¿Tal vez se encuentre en uso?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" + msgstr "Se obtuvo un encabezado vacío, algo ha salido mal" + +-#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260 +-#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266 ++#: ../rpmUtils/oldUtils.py:253 ++#: ../rpmUtils/oldUtils.py:260 ++#: ../rpmUtils/oldUtils.py:263 ++#: ../rpmUtils/oldUtils.py:266 + #, python-format + msgid "Damaged Header %s" + msgstr "Encabezado %s dañado" +@@ -2583,9 +2787,26 @@ msgstr "Encabezado %s dañado" + msgid "Error opening rpm %s - error %s" + msgstr "Error al abrir el rpm %s - error %s" + ++#~ msgid "Finished Transaction Test" ++#~ msgstr "Prueba de transacción finalizada" +#~ msgid "" -+#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" -+#~ "().\n" ++#~ " You could try running: package-cleanup --problems\n" ++#~ " package-cleanup --dupes\n" ++#~ " rpm -Va --nofiles --nodigest" +#~ msgstr "" -+#~ "getInstalledPackageObject() bude odstraněno, používejte self.rpmdb." -+#~ "searchPkgTuple().\n" -diff --git a/po/ja.po b/po/ja.po -index 6f86fc8..e7b7084 100644 ---- a/po/ja.po -+++ b/po/ja.po -@@ -6,17 +6,17 @@ - # ++#~ " Podría intentar ejecutar: package-cleanup --problems\n" ++#~ " package-cleanup --dupes\n" ++#~ " rpm -Va --nofiles --nodigest" ++#~ msgid "Unresolvable requirement %s for %s" ++#~ msgstr "Requerimiento %s irresoluble para %s" ++#~ msgid "Missing Dependency: %s is needed by package %s" ++#~ msgstr "" ++#~ "No se encuentra una dependencia: es necesario %s para poder instalar el " ++#~ "paquete %s" + #~ msgid "" + #~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" + #~ "().\n" + #~ msgstr "" + #~ "getInstalledPackageObject() desaparecerá en alguna versión próxima de " + #~ "Yum, utilice en su lugar self.rpmdb.searchPkgTuple().\n" ++ +diff --git a/po/fi.po b/po/fi.po +index 363f1de..4347eba 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -1,49 +1,48 @@ + # Finnish translation of yum. + # Copyright (C) 2009 yum's COPYRIGHT HOLDER + # This file is distributed under the same license as the yum package. +-# Ville-Pekka Vainio , 2009. ++# Ville-Pekka Vainio , 2009, 2010. msgid "" msgstr "" --"Project-Id-Version: yum master\n" -+"Project-Id-Version: yum (yum-3_2_X)\n" + "Project-Id-Version: yum\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-05-07 11:34+0900\n" --"PO-Revision-Date: 2009-05-20 03:23+0900\n" -+"POT-Creation-Date: 2009-09-21 03:07+0900\n" -+"PO-Revision-Date: 2009-09-21 04:52+0900\n" - "Last-Translator: Tadashi Jokagi \n" - "Language-Team: Japanese \n" +-"POT-Creation-Date: 2009-10-15 15:45+0200\n" +-"PO-Revision-Date: 2009-11-11 01:39+0200\n" ++"POT-Creation-Date: 2010-02-10 10:43-0500\n" ++"PO-Revision-Date: 2010-02-11 21:50+0200\n" + "Last-Translator: Ville-Pekka Vainio \n" + "Language-Team: Finnish \n" +-"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Virtaal 0.4.1\n" --#: callback.py:48 output.py:922 yum/rpmtrans.py:71 -+#: callback.py:48 output.py:938 yum/rpmtrans.py:71 +-#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 ++#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 msgid "Updating" - msgstr "更新" + msgstr "Päivitetään" -@@ -24,7 +24,7 @@ msgstr "更新" +-#: ../callback.py:49 ../yum/rpmtrans.py:72 ++#: ../callback.py:49 ../yum/rpmtrans.py:73 msgid "Erasing" - msgstr "削除中" + msgstr "Poistetaan" --#: callback.py:50 callback.py:51 callback.py:53 output.py:921 -+#: callback.py:50 callback.py:51 callback.py:53 output.py:937 - #: yum/rpmtrans.py:73 yum/rpmtrans.py:74 yum/rpmtrans.py:76 +-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 +-#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 ++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 ++#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 ++#: ../yum/rpmtrans.py:77 msgid "Installing" - msgstr "インストールしています" -@@ -33,7 +33,7 @@ msgstr "インストールしています" + msgstr "Asennetaan" + +-#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 ++#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 msgid "Obsoleted" - msgstr "不要でした" + msgstr "Vanhennettu" --#: callback.py:54 output.py:1029 -+#: callback.py:54 output.py:1061 +-#: ../callback.py:54 ../output.py:1063 ../output.py:1403 ++#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 msgid "Updated" - msgstr "更新しました" + msgstr "Päivitetty" -@@ -41,7 +41,7 @@ msgstr "更新しました" +-#: ../callback.py:55 ../output.py:1399 ++#: ../callback.py:55 ../output.py:1438 msgid "Erased" - msgstr "削除しました" + msgstr "Poistettu" --#: callback.py:56 callback.py:57 callback.py:59 output.py:1027 -+#: callback.py:56 callback.py:57 callback.py:59 output.py:1059 +-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 +-#: ../output.py:1395 ++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 ++#: ../output.py:1434 ../output.py:1646 msgid "Installed" - msgstr "インストールしました" + msgstr "Asennettu" -@@ -63,7 +63,7 @@ msgstr "エラー: 不正な出力状態: %s for %s" +@@ -65,69 +64,74 @@ msgstr "Virhe: virheellinen tulostetila: %s, paketti %s" msgid "Erased: %s" - msgstr "削除しました: %s" + msgstr "Poistettiin: %s" --#: callback.py:217 output.py:923 -+#: callback.py:217 output.py:939 +-#: ../callback.py:217 ../output.py:941 ++#: ../callback.py:217 ../output.py:948 ../output.py:1648 msgid "Removing" - msgstr "削除" + msgstr "Poistetaan" -@@ -71,58 +71,58 @@ msgstr "削除" +-#: ../callback.py:219 ../yum/rpmtrans.py:77 ++#: ../callback.py:219 ../yum/rpmtrans.py:78 msgid "Cleanup" - msgstr "整理中" + msgstr "Siivotaan" --#: cli.py:105 -+#: cli.py:107 +-#: ../cli.py:106 ++#: ../cli.py:107 #, python-format msgid "Command \"%s\" already defined" - msgstr "コマンド「%s」はすでに定義済みです" + msgstr "Komento ”%s” on jo määritelty" --#: cli.py:117 -+#: cli.py:119 +-#: ../cli.py:118 ++#: ../cli.py:119 msgid "Setting up repositories" - msgstr "リポジトリーの設定" + msgstr "Tehdään asennuslähdeasetuksia" --#: cli.py:128 -+#: cli.py:130 +-#: ../cli.py:129 ++#: ../cli.py:130 msgid "Reading repository metadata in from local files" - msgstr "ローカルファイルからリポジトリーのメタデータを読み込んでいます" + msgstr "Luetaan asennuslähteiden metadataa paikallisista tiedostoista" --#: cli.py:192 utils.py:79 -+#: cli.py:193 utils.py:102 +-#: ../cli.py:192 ../utils.py:107 ++#: ../cli.py:194 ../utils.py:193 #, python-format msgid "Config Error: %s" - msgstr "設定エラー: %s" + msgstr "Asetusvirhe: %s" --#: cli.py:195 cli.py:1190 utils.py:82 -+#: cli.py:196 cli.py:1253 utils.py:105 +-#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 ++#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 #, python-format msgid "Options Error: %s" - msgstr "オプションエラー: %s" + msgstr "Valitsinvirhe: %s" --#: cli.py:223 -+#: cli.py:225 +-#: ../cli.py:223 ++#: ../cli.py:227 #, python-format msgid " Installed: %s-%s at %s" - msgstr "" + msgstr " Asennettiin : %s-%s ajassa %s" --#: cli.py:225 -+#: cli.py:227 +-#: ../cli.py:225 ++#: ../cli.py:229 #, python-format msgid " Built : %s at %s" - msgstr "" + msgstr " Käännettiin : %s ajassa %s" --#: cli.py:227 -+#: cli.py:229 + # mitä on "commit" suomeksi? +-#: ../cli.py:227 ++#: ../cli.py:231 #, python-format msgid " Committed: %s at %s" - msgstr "" + msgstr " Suoritettiin: %s ajassa %s" --#: cli.py:266 -+#: cli.py:268 +-#: ../cli.py:266 ++#: ../cli.py:270 msgid "You need to give some command" - msgstr "いくつかのコマンドを指定する必要があります" + msgstr "Jokin komento on annettava" --#: cli.py:309 -+#: cli.py:311 +-#: ../cli.py:309 ++#: ../cli.py:284 ++#, python-format ++msgid "No such command: %s. Please use %s --help" ++msgstr "Komentoa %s ei ole olemassa. Käytä komentoa %s --help" ++ ++#: ../cli.py:314 msgid "Disk Requirements:\n" - msgstr "ディスク要求:\n" + msgstr "Vaadittu levytila:\n" --#: cli.py:311 -+#: cli.py:313 +-#: ../cli.py:311 ++#: ../cli.py:316 #, python-format - msgid " At least %dMB needed on the %s filesystem.\n" - msgstr " 少なくとも %d MB の空き容量がファイルシステム %s で必要です。\n" +-msgid " At least %dMB needed on the %s filesystem.\n" ++msgid " At least %dMB more space needed on the %s filesystem.\n" + msgstr " Vähintään %d Mt levytilaa tarvitaan tiedostojärjestelmällä %s.\n" --#: cli.py:316 -+#: cli.py:318 + #. TODO: simplify the dependency errors? + #. Fixup the summary +-#: ../cli.py:316 ++#: ../cli.py:321 msgid "" "Error Summary\n" "-------------\n" -@@ -130,220 +130,246 @@ msgstr "" - "エラーの要約\n" - "-------------\n" +@@ -135,65 +139,61 @@ msgstr "" + "Yhteenveto virheistä\n" + "--------------------\n" --#: cli.py:359 -+#: cli.py:361 +-#: ../cli.py:359 ++#: ../cli.py:364 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" - "トランザクションの実行を試みましたが、何もありませんでした。終了します。" + "Yritettiin suorittaa transaktio, mutta ei ole mitään tehtävää. Lopetetaan." --#: cli.py:395 -+#: cli.py:397 +-#: ../cli.py:395 ++#: ../cli.py:403 msgid "Exiting on user Command" - msgstr "ユーザーコマンドを終了しています" + msgstr "Lopetetaan, käyttäjä antoi lopetuskomennon" --#: cli.py:399 -+#: cli.py:401 +-#: ../cli.py:399 ++#: ../cli.py:407 msgid "Downloading Packages:" - msgstr "パッケージをダウンロードしています:" + msgstr "Ladataan paketteja:" --#: cli.py:404 -+#: cli.py:406 +-#: ../cli.py:404 ++#: ../cli.py:412 msgid "Error Downloading Packages:\n" - msgstr "パッケージのダウンロードでエラー:\n" + msgstr "Virhe pakettien latauksessa:\n" --#: cli.py:418 yum/__init__.py:3362 -+#: cli.py:420 yum/__init__.py:3873 +-#: ../cli.py:418 ../yum/__init__.py:4014 ++#: ../cli.py:426 ../yum/__init__.py:4194 msgid "Running rpm_check_debug" - msgstr "rpm_check_debug を実行しています" + msgstr "Suoritetaan rpm_check_debug" --#: cli.py:421 yum/__init__.py:3365 -+#: cli.py:429 yum/__init__.py:3882 -+msgid "ERROR You need to update rpm to handle:" -+msgstr "" -+ -+#: cli.py:431 yum/__init__.py:3885 +-#: ../cli.py:427 ../yum/__init__.py:4023 ++#: ../cli.py:435 ../yum/__init__.py:4203 + msgid "ERROR You need to update rpm to handle:" + msgstr "VIRHE RPM on päivitettävä, jotta se osaa käsitellä:" + +-#: ../cli.py:429 ../yum/__init__.py:4026 ++#: ../cli.py:437 ../yum/__init__.py:4206 msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "" + msgstr "VIRHE rpm_check_debugin ja riippuvuuksien tarkistuksen välillä:" --#: cli.py:425 -+#: cli.py:437 -+msgid "RPM needs to be updated" -+msgstr "" -+ -+#: cli.py:438 +-#: ../cli.py:435 ++#: ../cli.py:443 + msgid "RPM needs to be updated" + msgstr "RPM on päivitettävä" + +-#: ../cli.py:436 ++#: ../cli.py:444 #, python-format msgid "Please report this error in %s" - msgstr "%s にこのエラーを報告してください" + msgstr "Ilmoita tästä ongelmasta osoitteeseen %s" --#: cli.py:431 -+#: cli.py:444 +-#: ../cli.py:442 ++#: ../cli.py:450 msgid "Running Transaction Test" - msgstr "トランザクションのテストを実行しています" + msgstr "Suoritetaan transaktiotestiä" --#: cli.py:447 -+#: cli.py:460 - msgid "Finished Transaction Test" - msgstr "トランザクションのテストを終了しました" - --#: cli.py:449 -+#: cli.py:462 +-#: ../cli.py:458 +-msgid "Finished Transaction Test" +-msgstr "Transaktiotesti valmistui" +- +-#: ../cli.py:460 ++#: ../cli.py:466 msgid "Transaction Check Error:\n" - msgstr "トランザクションの確認エラー\n" + msgstr "Transaktiotarkistuksen virhe:\n" --#: cli.py:456 -+#: cli.py:469 +-#: ../cli.py:467 ++#: ../cli.py:473 msgid "Transaction Test Succeeded" - msgstr "トランザクションのテストを成功しました" + msgstr "Transaktiotesti onnistui" --#: cli.py:477 -+#: cli.py:491 +-#: ../cli.py:489 ++#: ../cli.py:495 msgid "Running Transaction" - msgstr "トランザクションを実行しています" + msgstr "Suoritetaan transaktiota" --#: cli.py:507 -+#: cli.py:521 +-#: ../cli.py:519 ++#: ../cli.py:525 + msgid "" + "Refusing to automatically import keys when running unattended.\n" + "Use \"-y\" to override." +@@ -201,80 +201,85 @@ msgstr "" + "Avaimia ei tuoda automaattisesti, kun yumia suoritetaan ilman valvontaa.\n" + "Käytä valitsinta ”-y” tämän muuttamiseksi." + +-#: ../cli.py:538 ../cli.py:572 ++#: ../cli.py:544 ../cli.py:578 + msgid " * Maybe you meant: " + msgstr " * Tarkoititko: " + +-#: ../cli.py:555 ../cli.py:563 ++#: ../cli.py:561 ../cli.py:569 + #, python-format + msgid "Package(s) %s%s%s available, but not installed." + msgstr "" + "Paketti tai paketit %s%s%s ovat saatavilla, mutta niitä ei ole asennettu." + +-#: ../cli.py:569 ../cli.py:600 ../cli.py:678 ++#: ../cli.py:575 ../cli.py:607 ../cli.py:687 + #, python-format + msgid "No package %s%s%s available." + msgstr "Pakettia %s%s%s ei ole saatavilla." + +-#: ../cli.py:605 ../cli.py:738 ++#: ../cli.py:612 ../cli.py:748 + msgid "Package(s) to install" + msgstr "Asennettavat paketit" + +-#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 +-#: ../yumcommands.py:159 ++#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 ++#: ../yumcommands.py:160 + msgid "Nothing to do" + msgstr "Ei mitään tehtävää" + +-#: ../cli.py:639 ++#: ../cli.py:647 + #, python-format + msgid "%d packages marked for Update" + msgstr "%d pakettia merkitty päivitettäväksi" + +-#: ../cli.py:642 ++#: ../cli.py:650 + msgid "No Packages marked for Update" + msgstr "Yhtään pakettia ei ole merkitty päivitettäväksi" + +-#: ../cli.py:656 ++#: ../cli.py:664 + #, python-format + msgid "%d packages marked for removal" + msgstr "%d pakettia merkitty poistettavaksi" + +-#: ../cli.py:659 ++#: ../cli.py:667 + msgid "No Packages marked for removal" + msgstr "Yhtään pakettia ei ole merkitty poistettavaksi" + +-#: ../cli.py:683 ++#: ../cli.py:692 + msgid "Package(s) to downgrade" + msgstr "Vanhennettavat paketit" + +-#: ../cli.py:707 ++#: ../cli.py:717 + #, python-format + msgid " (from %s)" + msgstr " (versiosta %s)" + +-#: ../cli.py:709 ++#: ../cli.py:719 + #, python-format + msgid "Installed package %s%s%s%s not available." + msgstr "Asennettua pakettia %s%s%s%s ei ole saatavilla." + +-#: ../cli.py:716 ++#: ../cli.py:726 + msgid "Package(s) to reinstall" + msgstr "Uudelleenasennettavat paketit" + +-#: ../cli.py:729 ++#: ../cli.py:739 + msgid "No Packages Provided" + msgstr "Yhtään pakettia ei annettu" + +-#: ../cli.py:813 ++#: ../cli.py:818 ++#, python-format ++msgid "Matched: %s" ++msgstr "Löytyi: %s" ++ ++#: ../cli.py:825 + #, python-format + msgid "Warning: No matches found for: %s" + msgstr "Varoitus: hakutuloksia ei löytynyt hakusanalle %s" + +-#: ../cli.py:816 ++#: ../cli.py:828 + msgid "No Matches found" + msgstr "Hakutuloksia ei löytynyt" + +-#: ../cli.py:855 ++#: ../cli.py:868 + #, python-format + msgid "" + "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" +@@ -285,109 +290,113 @@ msgstr "" + " Hakusanoilla ”%s*/%s%s” ja/tai ”%s*bin/%s%s” saadaan niitä vastaava " + "toiminta." + +-#: ../cli.py:871 ++#: ../cli.py:884 + #, python-format + msgid "No Package Found for %s" + msgstr "Hakusanalla %s ei löytynyt pakettia" + +-#: ../cli.py:883 ++#: ../cli.py:896 + msgid "Cleaning up Everything" + msgstr "Siivotaan kaikki" + +-#: ../cli.py:897 ++#: ../cli.py:912 + msgid "Cleaning up Headers" + msgstr "Siivotaan otsakkeet" + +-#: ../cli.py:900 ++#: ../cli.py:915 + msgid "Cleaning up Packages" + msgstr "Siivotaan paketit" + +-#: ../cli.py:903 ++#: ../cli.py:918 + msgid "Cleaning up xml metadata" + msgstr "Siivotaan XML-metadata" + +-#: ../cli.py:906 ++#: ../cli.py:921 + msgid "Cleaning up database cache" + msgstr "Siivotaan tiedokannan välimuisti" + +-#: ../cli.py:909 ++#: ../cli.py:924 + msgid "Cleaning up expire-cache metadata" + msgstr "Siivotaan välimuistin vanhentumiseen liittyvä metadata" + +-#: ../cli.py:912 ++#: ../cli.py:927 ++msgid "Cleaning up cached rpmdb data" ++msgstr "Siivotaan välimuistissa oleva rpm-tietokannan data" ++ ++#: ../cli.py:930 + msgid "Cleaning up plugins" + msgstr "Siivotaan liitännäiset" + +-#: ../cli.py:937 ++#: ../cli.py:955 + msgid "Installed Groups:" + msgstr "Asennetut ryhmät:" + +-#: ../cli.py:949 ++#: ../cli.py:967 + msgid "Available Groups:" + msgstr "Saatavilla olevat ryhmät:" + +-#: ../cli.py:959 ++#: ../cli.py:977 + msgid "Done" + msgstr "Valmis" + +-#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 ++#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2787 + #, python-format + msgid "Warning: Group %s does not exist." + msgstr "Varoitus: Ryhmää %s ei ole olemassa." + +-#: ../cli.py:998 ++#: ../cli.py:1016 + msgid "No packages in any requested group available to install or update" + msgstr "" + "Missään pyydetyssä ryhmässä ei ole yhtään asennettavaa tai päivitettävää " + "pakettia" + +-#: ../cli.py:1000 ++#: ../cli.py:1018 + #, python-format + msgid "%d Package(s) to Install" + msgstr "%d pakettia asennettavana" + +-#: ../cli.py:1010 ../yum/__init__.py:2641 ++#: ../cli.py:1028 ../yum/__init__.py:2799 + #, python-format + msgid "No group named %s exists" + msgstr "Ryhmää nimeltä %s ei ole olemassa" + +-#: ../cli.py:1016 ++#: ../cli.py:1034 + msgid "No packages to remove from groups" + msgstr "Ei yhtään poistettavaa pakettia ryhmien perusteella" + +-#: ../cli.py:1018 ++#: ../cli.py:1036 + #, python-format + msgid "%d Package(s) to remove" + msgstr "%d poistettavaa pakettia" + +-#: ../cli.py:1060 ++#: ../cli.py:1078 + #, python-format + msgid "Package %s is already installed, skipping" + msgstr "Paketti %s on jo asennettu, ohitetaan" + +-#: ../cli.py:1071 ++#: ../cli.py:1089 + #, python-format + msgid "Discarding non-comparable pkg %s.%s" + msgstr "Hylätään paketti %s.%s, jota ei voi verrata" + + #. we've not got any installed that match n or n+a +-#: ../cli.py:1097 ++#: ../cli.py:1115 + #, python-format + msgid "No other %s installed, adding to list for potential install" + msgstr "" + "Toista pakettia nimeltä %s ei ole asennettuna, lisätään mahdollisesti " + "asennettavien luetteloon" + +-#: ../cli.py:1117 ++#: ../cli.py:1135 + msgid "Plugin Options" + msgstr "Liitännäisten valitsimet" + +-#: ../cli.py:1125 ++#: ../cli.py:1143 + #, python-format + msgid "Command line error: %s" + msgstr "Komentorivivirhe: %s" + +-#: ../cli.py:1138 ++#: ../cli.py:1156 + #, python-format + msgid "" + "\n" +@@ -398,110 +407,120 @@ msgstr "" + "\n" + "%s: valitsin %s vaatii argumentin" + +-#: ../cli.py:1191 ++#: ../cli.py:1209 + msgid "--color takes one of: auto, always, never" + msgstr "--color vaatii yhden seuraavista argumenteista: auto, always, never" + +-#: ../cli.py:1298 ++#: ../cli.py:1319 + msgid "show this help message and exit" + msgstr "näytä tämä ohjeviesti ja lopeta" + +-#: ../cli.py:1302 ++#: ../cli.py:1323 + msgid "be tolerant of errors" + msgstr "hyväksy virheet" + +-#: ../cli.py:1304 +-msgid "run entirely from cache, don't update cache" ++#: ../cli.py:1326 ++msgid "run entirely from system cache, don't update cache" + msgstr "toimi kokonaan välimuistista, älä päivitä sitä" + +-#: ../cli.py:1306 ++#: ../cli.py:1329 + msgid "config file location" + msgstr "asetustiedoston sijainti" + +-#: ../cli.py:1308 ++#: ../cli.py:1332 + msgid "maximum command wait time" + msgstr "komennon suurin odotusaika" + +-#: ../cli.py:1310 ++#: ../cli.py:1334 + msgid "debugging output level" + msgstr "virheenjäljitystulosteiden taso" + +-#: ../cli.py:1314 ++#: ../cli.py:1338 + msgid "show duplicates, in repos, in list/search commands" + msgstr "näytä duplikaatit asennuslähteissä ja list/search-komennoissa" + +-#: ../cli.py:1316 ++#: ../cli.py:1340 + msgid "error output level" + msgstr "virhetulostustaso" + +-#: ../cli.py:1319 ++#: ../cli.py:1343 ++msgid "debugging output level for rpm" ++msgstr "rpm:n virheenjäljitystulosteiden taso" ++ ++#: ../cli.py:1346 + msgid "quiet operation" + msgstr "hiljainen toiminta" + +-#: ../cli.py:1321 ++#: ../cli.py:1348 + msgid "verbose operation" + msgstr "yksityiskohtaset tulosteet" + +-#: ../cli.py:1323 ++#: ../cli.py:1350 + msgid "answer yes for all questions" + msgstr "vastaa kyllä kaikkiin kysymyksiin" + +-#: ../cli.py:1325 ++#: ../cli.py:1352 + msgid "show Yum version and exit" + msgstr "näytä Yumin versio ja lopeta" + +-#: ../cli.py:1326 ++#: ../cli.py:1353 + msgid "set install root" + msgstr "aseta asennusjuuri" + +-#: ../cli.py:1330 ++#: ../cli.py:1357 + msgid "enable one or more repositories (wildcards allowed)" + msgstr "" + "ota käyttöön yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" + +-#: ../cli.py:1334 ++#: ../cli.py:1361 + msgid "disable one or more repositories (wildcards allowed)" + msgstr "" + "poista käytöstä yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" + +-#: ../cli.py:1337 ++#: ../cli.py:1364 + msgid "exclude package(s) by name or glob" + msgstr "jätä pois paketteja nimen tai jokerimerkkien perusteella" + +-#: ../cli.py:1339 ++#: ../cli.py:1366 + msgid "disable exclude from main, for a repo or for everything" + msgstr "" + "ota pakettien pois jättäminen pois käytöstä pääasetuksille, jollekin " + "asennuslähteelle tai kaikelle" + +-#: ../cli.py:1342 ++#: ../cli.py:1369 + msgid "enable obsoletes processing during updates" + msgstr "ota käyttöön vanhentuneiden pakettien käsittely päivitysten aikana" + +-#: ../cli.py:1344 ++#: ../cli.py:1371 + msgid "disable Yum plugins" + msgstr "poista Yumin liitännäiset käytöstä" + +-#: ../cli.py:1346 ++#: ../cli.py:1373 + msgid "disable gpg signature checking" + msgstr "poista GPG-allekirjoitusten tarkistus käytöstä" + +-#: ../cli.py:1348 ++#: ../cli.py:1375 + msgid "disable plugins by name" + msgstr "poista liitännäisiä käytöstä nimen perusteella" + +-#: ../cli.py:1351 ++#: ../cli.py:1378 + msgid "enable plugins by name" + msgstr "ota liitännäisiä käyttöön nimen perusteella" + +-#: ../cli.py:1354 ++#: ../cli.py:1381 + msgid "skip packages with depsolving problems" + msgstr "ohita paketit, joilla on riippuvuusongelmia" + +-#: ../cli.py:1356 ++#: ../cli.py:1383 + msgid "control whether color is used" + msgstr "käytetäänkö värejä" + ++#: ../cli.py:1385 ++msgid "set value of $releasever in yum config and repo files" ++msgstr "" ++"aseta $releasever-muuttujan arvo yumin asetuksissa ja " ++"asennuslähdetiedostoissa" ++ + #: ../output.py:305 + msgid "Jan" + msgstr "tammi" +@@ -554,105 +573,104 @@ msgstr "joulu" + msgid "Trying other mirror." + msgstr "Kokeillaan toista peilipalvelinta." + +-#: ../output.py:538 ++#: ../output.py:534 + #, python-format + msgid "Name : %s%s%s" + msgstr "Nimi : %s%s%s" + +-#: ../output.py:539 ++#: ../output.py:535 + #, python-format + msgid "Arch : %s" + msgstr "Arkkitehtuuri : %s" + +-#: ../output.py:541 ++#: ../output.py:537 + #, python-format + msgid "Epoch : %s" + msgstr "Epoch : %s" + +-#: ../output.py:542 ++#: ../output.py:538 + #, python-format + msgid "Version : %s" + msgstr "Versio : %s" + +-#: ../output.py:543 ++#: ../output.py:539 + #, python-format + msgid "Release : %s" + msgstr "Julkaisu : %s" + +-#: ../output.py:544 ++#: ../output.py:540 + #, python-format + msgid "Size : %s" + msgstr "Koko : %s" + +-#: ../output.py:545 ++#: ../output.py:541 + #, python-format + msgid "Repo : %s" + msgstr "Asennuslähde : %s" + +-#: ../output.py:547 ++#: ../output.py:543 + #, python-format + msgid "From repo : %s" + msgstr "Asennuslähteestä: %s" + +-#: ../output.py:549 ++#: ../output.py:545 + #, python-format + msgid "Committer : %s" + msgstr "Tekijä : %s" + +-#: ../output.py:550 ++#: ../output.py:546 + #, python-format + msgid "Committime : %s" + msgstr "Tekoaika : %s" + +-#: ../output.py:551 ++#: ../output.py:547 + #, python-format + msgid "Buildtime : %s" + msgstr "Käännösaika : %s" + +-#: ../output.py:553 ++#: ../output.py:549 + #, python-format + msgid "Installtime: %s" + msgstr "Asennusaika : %s" + +-#: ../output.py:554 ++#: ../output.py:550 + msgid "Summary : " + msgstr "Yhteenveto : " + +-#: ../output.py:556 ++#: ../output.py:552 + #, python-format + msgid "URL : %s" + msgstr "URL : %s" + +-#: ../output.py:557 +-#, python-format +-msgid "License : %s" +-msgstr "Lisenssi : %s" ++#: ../output.py:553 ++msgid "License : " ++msgstr "Lisenssi : " + +-#: ../output.py:558 ++#: ../output.py:554 + msgid "Description: " + msgstr "Kuvaus: " + +-#: ../output.py:626 ++#: ../output.py:622 + msgid "y" + msgstr "k" + +-#: ../output.py:626 ++#: ../output.py:622 + msgid "yes" + msgstr "kyllä" + +-#: ../output.py:627 ++#: ../output.py:623 + msgid "n" + msgstr "e" + +-#: ../output.py:627 ++#: ../output.py:623 + msgid "no" + msgstr "ei" + +-#: ../output.py:631 ++#: ../output.py:627 + msgid "Is this ok [y/N]: " + msgstr "Onko tämä ok [k/E]: " + +-#: ../output.py:722 ++#: ../output.py:715 + #, python-format + msgid "" + "\n" +@@ -661,150 +679,151 @@ msgstr "" + "\n" + "Ryhmä: %s" + +-#: ../output.py:726 ++#: ../output.py:719 + #, python-format + msgid " Group-Id: %s" + msgstr " Ryhmätunnus: %s" + +-#: ../output.py:731 ++#: ../output.py:724 + #, python-format + msgid " Description: %s" + msgstr " Kuvaus: %s" + +-#: ../output.py:733 ++#: ../output.py:726 + msgid " Mandatory Packages:" + msgstr " Pakolliset paketit:" + +-#: ../output.py:734 ++#: ../output.py:727 + msgid " Default Packages:" + msgstr " Oletuspaketit:" + +-#: ../output.py:735 ++#: ../output.py:728 + msgid " Optional Packages:" + msgstr " Valinnaiset paketit:" + +-#: ../output.py:736 ++#: ../output.py:729 + msgid " Conditional Packages:" + msgstr " Ehdolliset paketit:" + +-#: ../output.py:756 ++#: ../output.py:749 + #, python-format + msgid "package: %s" + msgstr "paketti: %s" + +-#: ../output.py:758 ++#: ../output.py:751 + msgid " No dependencies for this package" + msgstr " Tällä paketilla ei ole riippuvuuksia" + +-#: ../output.py:763 ++#: ../output.py:756 + #, python-format + msgid " dependency: %s" + msgstr " riippuvuus: %s" + +-#: ../output.py:765 ++#: ../output.py:758 + msgid " Unsatisfied dependency" + msgstr " Toteutumaton riippuvuus" + +-#: ../output.py:837 ++#: ../output.py:830 + #, python-format + msgid "Repo : %s" + msgstr "Asennuslähde: %s" + +-#: ../output.py:838 ++#: ../output.py:831 + msgid "Matched from:" + msgstr "Vastaavuus :" + +-#: ../output.py:847 ++#: ../output.py:840 + msgid "Description : " + msgstr "Kuvaus : " + +-#: ../output.py:850 ++#: ../output.py:843 + #, python-format + msgid "URL : %s" + msgstr "URL : %s" + +-#: ../output.py:853 ++#: ../output.py:846 + #, python-format + msgid "License : %s" + msgstr "Lisenssi : %s" + +-#: ../output.py:856 ++#: ../output.py:849 + #, python-format + msgid "Filename : %s" + msgstr "Tiedostonimi: %s" + +-#: ../output.py:860 ++#: ../output.py:853 + msgid "Other : " + msgstr "Muuta : " + +-#: ../output.py:893 ++#: ../output.py:896 + msgid "There was an error calculating total download size" + msgstr "Kokonaislatausmäärää laskettaessa tapahtui virhe" + +-#: ../output.py:898 ++#: ../output.py:901 + #, python-format + msgid "Total size: %s" + msgstr "Koko yhteensä: %s" + +-#: ../output.py:901 ++#: ../output.py:904 + #, python-format + msgid "Total download size: %s" + msgstr "Latausmäärä yhteensä: %s" + +-#: ../output.py:942 ++#: ../output.py:908 ++#, python-format ++msgid "Installed size: %s" ++msgstr "Koko asennettuna: %s" ++ ++#: ../output.py:949 + msgid "Reinstalling" + msgstr "Asennetaan uudelleen" + +-#: ../output.py:943 ++#: ../output.py:950 + msgid "Downgrading" + msgstr "Varhennetaan" + +-#: ../output.py:944 ++#: ../output.py:951 + msgid "Installing for dependencies" + msgstr "Asennetaan riippuvuuksien vuoksi" + +-#: ../output.py:945 ++#: ../output.py:952 + msgid "Updating for dependencies" + msgstr "Päivitetään riippuvuuksien vuoksi" + +-#: ../output.py:946 ++#: ../output.py:953 + msgid "Removing for dependencies" + msgstr "Poistetaan riippuvuuksien vuoksi" + +-#: ../output.py:953 ../output.py:1065 ++#: ../output.py:960 ../output.py:1072 + msgid "Skipped (dependency problems)" + msgstr "Ohitettiin (riippuvuusongelmia)" + +-#: ../output.py:976 ++#: ../output.py:983 + msgid "Package" + msgstr "Paketti" + +-#: ../output.py:976 ++#: ../output.py:983 + msgid "Arch" + msgstr "Arkkitehtuuri" + +-#: ../output.py:977 ++#: ../output.py:984 + msgid "Version" + msgstr "Versio" + +-#: ../output.py:977 ++#: ../output.py:984 + msgid "Repository" + msgstr "Asennuslähde" + +-#: ../output.py:978 ++#: ../output.py:985 + msgid "Size" + msgstr "Koko" + +-#: ../output.py:990 ++#: ../output.py:997 + #, python-format +-msgid "" +-" replacing %s%s%s.%s %s\n" +-"\n" +-msgstr "" +-" korvaa %s%s%s.%s %s\n" +-"\n" ++msgid " replacing %s%s%s.%s %s\n" ++msgstr " korvaa %s%s%s.%s %s\n" + +-#: ../output.py:999 ++#: ../output.py:1006 + #, python-format + msgid "" + "\n" +@@ -815,7 +834,7 @@ msgstr "" + "Transaktion yhteenveto\n" + "%s\n" + +-#: ../output.py:1006 ++#: ../output.py:1013 + #, python-format + msgid "" + "Install %5.5s Package(s)\n" +@@ -824,7 +843,7 @@ msgstr "" + "Asennetaan %5.5s paketti(a)\n" + "Päivitetään %5.5s paketti(a)\n" + +-#: ../output.py:1015 ++#: ../output.py:1022 + #, python-format + msgid "" + "Remove %5.5s Package(s)\n" +@@ -835,32 +854,32 @@ msgstr "" + "Asennetaan uudelleen %5.5s paketti(a)\n" + "Varhennetaan %5.5s paketti(a)\n" + +-#: ../output.py:1059 ++#: ../output.py:1066 + msgid "Removed" + msgstr "Poistettu" + +-#: ../output.py:1060 ++#: ../output.py:1067 + msgid "Dependency Removed" + msgstr "Poistettu riippuvuuksia" + +-#: ../output.py:1062 ++#: ../output.py:1069 + msgid "Dependency Installed" + msgstr "Asennettu riippuvuuksia" + +-#: ../output.py:1064 ++#: ../output.py:1071 + msgid "Dependency Updated" + msgstr "Päivitetty riippuvuuksia" + +-#: ../output.py:1066 ++#: ../output.py:1073 + msgid "Replaced" + msgstr "Korvattu" + +-#: ../output.py:1067 ++#: ../output.py:1074 + msgid "Failed" + msgstr "Epäonnistui" + + #. Delta between C-c's so we treat as exit +-#: ../output.py:1133 ++#: ../output.py:1140 + msgid "two" + msgstr "kahden" + +@@ -868,7 +887,7 @@ msgstr "kahden" + #. Current download cancelled, interrupt (ctrl-c) again within two seconds + #. to exit. + #. Where "interupt (ctrl-c) again" and "two" are highlighted. +-#: ../output.py:1144 ++#: ../output.py:1151 + #, python-format + msgid "" + "\n" +@@ -881,209 +900,365 @@ msgstr "" + "aikana\n" + "ohjelman lopettamiseksi.\n" + +-#: ../output.py:1155 ++#: ../output.py:1162 + msgid "user interrupt" + msgstr "käyttäjä keskeytti" + +-#: ../output.py:1173 ++#: ../output.py:1180 + msgid "Total" + msgstr "Yhteensä" + ++#: ../output.py:1202 ++msgid "I" ++msgstr "A" ++ + #: ../output.py:1203 ++msgid "O" ++msgstr "Vanh." ++ ++#: ../output.py:1204 ++msgid "E" ++msgstr "P" ++ ++#: ../output.py:1205 ++msgid "R" ++msgstr "U" ++ ++#: ../output.py:1206 ++msgid "D" ++msgstr "Varh." ++ ++#: ../output.py:1207 ++msgid "U" ++msgstr "P" ++ ++#: ../output.py:1217 + msgid "" + msgstr "" + +-#: ../output.py:1204 ++#: ../output.py:1218 + msgid "System" + msgstr "Järjestelmä" + +-#: ../output.py:1240 ++#: ../output.py:1254 + msgid "Bad transaction IDs, or package(s), given" + msgstr "Annettu virheellinen transaktiotunnus tai paketit" + +-#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 +-msgid "Warning: RPMDB has been altered since the last yum transaction." +-msgstr "" +-"Varoitus: RPM-tietokantaa on muutettu edellisen yum-transaktion jälkeen." ++#: ../output.py:1266 ++msgid "ID" ++msgstr "Tunniste" ++ ++#: ../output.py:1267 ../output.py:1520 ++msgid "Login user" ++msgstr "Kirjautunut käyttäjä" + +-#: ../output.py:1289 ++#: ../output.py:1268 ++msgid "Date and time" ++msgstr "Päivämäärä ja kellonaika" ++ ++#: ../output.py:1269 ../output.py:1522 ++msgid "Action(s)" ++msgstr "Toiminnot" ++ ++#: ../output.py:1270 ../output.py:1523 ++msgid "Altered" ++msgstr "Muutettu" ++ ++#: ../output.py:1310 + msgid "No transaction ID given" + msgstr "Transaktiotunnusta ei annettu" + +-#: ../output.py:1297 ++#: ../output.py:1336 + msgid "Bad transaction ID given" + msgstr "Annettiin virheellinen transaktiotunnus" + +-#: ../output.py:1302 ++#: ../output.py:1341 + msgid "Not found given transaction ID" + msgstr "Annettua transaktiotunnusta ei löytynyt" + +-#: ../output.py:1310 ++#: ../output.py:1349 + msgid "Found more than one transaction ID!" + msgstr "Löytyi useampi kuin yksi transaktiotunnus!" + +-#: ../output.py:1331 ++#: ../output.py:1370 + msgid "No transaction ID, or package, given" + msgstr "Transaktiotunnusta tai pakettia ei annettu" + +-#: ../output.py:1357 ++#: ../output.py:1396 + msgid "Transaction ID :" + msgstr "Transaktiotunnus :" + +-#: ../output.py:1359 ++#: ../output.py:1398 + msgid "Begin time :" + msgstr "Aloitusaika :" + +-#: ../output.py:1362 ../output.py:1364 ++#: ../output.py:1401 ../output.py:1403 + msgid "Begin rpmdb :" + msgstr "RPM-tietokanta alussa :" + +-#: ../output.py:1378 ++#: ../output.py:1417 + #, python-format + msgid "(%s seconds)" + msgstr "(%s sekuntia)" + +-#: ../output.py:1379 ++#: ../output.py:1418 + msgid "End time :" + msgstr "Lopetusaika :" + +-#: ../output.py:1382 ../output.py:1384 ++#: ../output.py:1421 ../output.py:1423 + msgid "End rpmdb :" + msgstr "RPM-tietokanta lopussa:" + +-#: ../output.py:1385 ++#: ../output.py:1424 + msgid "User :" + msgstr "Käyttäjä :" + +-#: ../output.py:1387 ../output.py:1389 ../output.py:1391 ++#: ../output.py:1426 ../output.py:1428 ../output.py:1430 + msgid "Return-Code :" + msgstr "Lopetuskoodi :" + +-#: ../output.py:1387 ++#: ../output.py:1426 + msgid "Aborted" + msgstr "Keskeytetty" + +-#: ../output.py:1389 ++#: ../output.py:1428 + msgid "Failure:" + msgstr "Epäonnistui:" + +-#: ../output.py:1391 ++#: ../output.py:1430 + msgid "Success" + msgstr "Onnistui" + +-#: ../output.py:1392 ++#: ../output.py:1431 + msgid "Transaction performed with:" + msgstr "Transaktio suoritettiin:" + +-#: ../output.py:1405 ++#: ../output.py:1444 ../output.py:1489 + msgid "Downgraded" + msgstr "Varhennettu" + + #. multiple versions installed, both older and newer +-#: ../output.py:1407 ++#: ../output.py:1446 + msgid "Weird" + msgstr "Omituinen" + +-#: ../output.py:1409 ++#: ../output.py:1448 + msgid "Packages Altered:" + msgstr "Muutetut paketit:" + +-#: ../output.py:1412 ++#: ../output.py:1451 + msgid "Scriptlet output:" + msgstr "Sovelman tuloste:" + +-#: ../output.py:1418 ++#: ../output.py:1457 + msgid "Errors:" + msgstr "Virheet:" + +-#: ../output.py:1489 ++#: ../output.py:1481 ../output.py:1482 ++msgid "Install" ++msgstr "Asennus" ++ ++#: ../output.py:1483 ++msgid "Dep-Install" ++msgstr "Riippuvuuden asennus" ++ ++#: ../output.py:1485 ++msgid "Obsoleting" ++msgstr "Vanhentava" ++ ++#: ../output.py:1486 ++msgid "Erase" ++msgstr "Poisto" ++ ++#: ../output.py:1487 ++msgid "Reinstall" ++msgstr "Uudelleenasennus" ++ ++#: ../output.py:1488 ++msgid "Downgrade" ++msgstr "Varhennus" ++ ++#: ../output.py:1490 ++msgid "Update" ++msgstr "Päivitys" ++ ++#: ../output.py:1521 ++msgid "Time" ++msgstr "Aika" ++ ++#: ../output.py:1547 + msgid "Last day" + msgstr "Eilen" + +-#: ../output.py:1490 ++#: ../output.py:1548 + msgid "Last week" + msgstr "Viime viikolla" + +-#: ../output.py:1491 ++#: ../output.py:1549 + msgid "Last 2 weeks" + msgstr "Viimeisen kahden viikon aikana" + + #. US default :p +-#: ../output.py:1492 ++#: ../output.py:1550 + msgid "Last 3 months" + msgstr "Viimeisen kolmen kuukauden aikana" + +-#: ../output.py:1493 ++#: ../output.py:1551 + msgid "Last 6 months" + msgstr "Viimeisen kuuden kuukauden aikana" + +-#: ../output.py:1494 ++#: ../output.py:1552 + msgid "Last year" + msgstr "Viime vuonna" + +-#: ../output.py:1495 ++#: ../output.py:1553 + msgid "Over a year ago" + msgstr "Yli vuosi sitten" + +-#: ../output.py:1524 ++#: ../output.py:1585 + msgid "installed" + msgstr "asennettavaksi" + +-#: ../output.py:1525 ++#: ../output.py:1586 + msgid "updated" + msgstr "päivitettäväksi" + +-#: ../output.py:1526 ++#: ../output.py:1587 + msgid "obsoleted" + msgstr "vanhennettavaksi" + +-#: ../output.py:1527 ++#: ../output.py:1588 + msgid "erased" + msgstr "poistettavaksi" + +-#: ../output.py:1531 ++#: ../output.py:1592 + #, python-format + msgid "---> Package %s.%s %s:%s-%s set to be %s" + msgstr "---> Paketti %s.%s %s:%s-%s asetettu %s" + +-#: ../output.py:1538 ++#: ../output.py:1599 + msgid "--> Running transaction check" + msgstr "--> Suoritetaan transaktiotarkistusta" + +-#: ../output.py:1543 ++#: ../output.py:1604 + msgid "--> Restarting Dependency Resolution with new changes." + msgstr "" + "--> Aloitetaan riippuvuuksien tarkistus uudelleen uusien muutosten kanssa." + +-#: ../output.py:1548 ++#: ../output.py:1609 + msgid "--> Finished Dependency Resolution" + msgstr "--> Riippuvuuksien tarkistus valmistui" + +-#: ../output.py:1553 ../output.py:1558 ++#: ../output.py:1614 ../output.py:1619 + #, python-format + msgid "--> Processing Dependency: %s for package: %s" + msgstr "--> Käsitellään riipuvuutta: %s paketille: %s" + +-#: ../output.py:1562 ++#: ../output.py:1623 + #, python-format + msgid "--> Unresolved Dependency: %s" + msgstr "--> Ratkaisematon riippuvuus: %s" + +-#: ../output.py:1568 ../output.py:1573 ++#: ../output.py:1634 ++#, python-format ++msgid "Package: %s" ++msgstr "Paketti: %s" ++ ++#: ../output.py:1636 ++#, python-format ++msgid "" ++"\n" ++" Requires: %s" ++msgstr "" ++"\n" ++" Vaatii: %s" ++ ++#: ../output.py:1649 ../output.py:1660 ++#, python-format ++msgid "" ++"\n" ++" %s: %s (%s)" ++msgstr "" ++"\n" ++" %s: %s (%s)" ++ ++#: ../output.py:1657 ++msgid "Available" ++msgstr "Saatavilla" ++ ++#: ../output.py:1665 ../output.py:1670 + #, python-format + msgid "--> Processing Conflict: %s conflicts %s" + msgstr "--> Käsitellään ristiriitaa: %s on ristiriidassa paketin %s kanssa" + +-#: ../output.py:1577 ++#: ../output.py:1674 + msgid "--> Populating transaction set with selected packages. Please wait." + msgstr "--> Täytetään transaktiojoukkoa valituilla paketeilla. Odota hetki." + +-#: ../output.py:1581 ++#: ../output.py:1678 + #, python-format + msgid "---> Downloading header for %s to pack into transaction set." + msgstr "---> Ladataan paketin %s otsaketta transaktiojoukkoon lisäämseksi." + +-#: ../utils.py:137 ../yummain.py:42 ++#: ../utils.py:93 ++msgid "Running" ++msgstr "Suoritetaan" ++ ++#: ../utils.py:94 ++msgid "Sleeping" ++msgstr "Unessa" ++ ++#: ../utils.py:95 ++msgid "Uninterruptible" ++msgstr "Ei voi keskeyttää" ++ ++#: ../utils.py:96 ++msgid "Zombie" ++msgstr "Zombi" ++ ++#: ../utils.py:97 ++msgid "Traced/Stopped" ++msgstr "Jäljitetään/Pysäytetty" ++ ++#: ../utils.py:98 ../yumcommands.py:917 ++msgid "Unknown" ++msgstr "Tuntematon" ++ ++#: ../utils.py:109 ++msgid " The other application is: PackageKit" ++msgstr " Toinen ohjelma on: PackageKit" ++ ++#: ../utils.py:111 ++#, python-format ++msgid " The other application is: %s" ++msgstr " Toinen ohjelma on: %s" ++ ++#: ../utils.py:114 ++#, python-format ++msgid " Memory : %5s RSS (%5sB VSZ)" ++msgstr " Muisti : %5s RSS (%5sB VSZ)" ++ ++#: ../utils.py:119 ++#, python-format ++msgid " Started: %s - %s ago" ++msgstr " Aloitettu : %s - %s sitten" ++ ++#: ../utils.py:121 ++#, python-format ++msgid " State : %s, pid: %d" ++msgstr " Tila : %s, pid: %d" ++ ++#: ../utils.py:199 ++#, python-format ++msgid "PluginExit Error: %s" ++msgstr "PluginExit-virhe: %s" ++ ++#: ../utils.py:202 ++#, python-format ++msgid "Yum Error: %s" ++msgstr "Yum-virhe: %s" ++ ++#: ../utils.py:235 ../yummain.py:42 + msgid "" + "\n" + "\n" +@@ -1093,7 +1268,7 @@ msgstr "" + "\n" + "Lopetetaan käyttäjän peruttua" + +-#: ../utils.py:143 ../yummain.py:48 ++#: ../utils.py:241 ../yummain.py:48 + msgid "" + "\n" + "\n" +@@ -1103,7 +1278,7 @@ msgstr "" + "\n" + "Lopetetaan putken katkettua" + +-#: ../utils.py:145 ../yummain.py:50 ++#: ../utils.py:243 ../yummain.py:50 + #, python-format + msgid "" + "\n" +@@ -1114,15 +1289,15 @@ msgstr "" + "\n" + "%s" + +-#: ../utils.py:184 ../yummain.py:273 ++#: ../utils.py:282 ../yummain.py:211 + msgid "Complete!" + msgstr "Valmis!" + +-#: ../yumcommands.py:42 ++#: ../yumcommands.py:43 + msgid "You need to be root to perform this command." + msgstr "Vain pääkäyttäjä voi suorittaa tämän komennon." + +-#: ../yumcommands.py:49 ++#: ../yumcommands.py:50 + msgid "" + "\n" + "You have enabled checking of packages via GPG keys. This is a good thing. \n" +@@ -1152,336 +1327,336 @@ msgstr "" + "\n" + "Lisätietoja saattaa olla jakelun tai pakettien tarjoajan ohjeissa.\n" + +-#: ../yumcommands.py:69 ++#: ../yumcommands.py:70 + #, python-format + msgid "Error: Need to pass a list of pkgs to %s" + msgstr "Virhe: komennolle %s on annettava luettelo paketeista" + +-#: ../yumcommands.py:75 ++#: ../yumcommands.py:76 + msgid "Error: Need an item to match" + msgstr "Virhe: Tarvitaan vastaava kohta" + +-#: ../yumcommands.py:81 ++#: ../yumcommands.py:82 + msgid "Error: Need a group or list of groups" + msgstr "Virhe: Tarvitaan ryhmä tai ryhmäluettelo" + +-#: ../yumcommands.py:90 ++#: ../yumcommands.py:91 + #, python-format + msgid "Error: clean requires an option: %s" + msgstr "Virhe: clean vaatii valitsimen: %s" + +-#: ../yumcommands.py:95 ++#: ../yumcommands.py:96 + #, python-format + msgid "Error: invalid clean argument: %r" + msgstr "Virhe: virheellinen clean-argumentti: %r" + +-#: ../yumcommands.py:108 ++#: ../yumcommands.py:109 + msgid "No argument to shell" + msgstr "shellille ei annettu argumenttia" + +-#: ../yumcommands.py:110 ++#: ../yumcommands.py:111 + #, python-format + msgid "Filename passed to shell: %s" + msgstr "Tiedostonimi välitettiin shellille: %s" + +-#: ../yumcommands.py:114 ++#: ../yumcommands.py:115 + #, python-format + msgid "File %s given as argument to shell does not exist." + msgstr "" + "Tiedosto %s annettiin argumenttina shellille, mutta sitä ei ole olemassa." + +-#: ../yumcommands.py:120 ++#: ../yumcommands.py:121 + msgid "Error: more than one file given as argument to shell." + msgstr "Virhe: useampi kuin yksi tiedosto annettiin argumenttina shellille." + +-#: ../yumcommands.py:169 ++#: ../yumcommands.py:170 + msgid "PACKAGE..." + msgstr "PAKETTI..." + +-#: ../yumcommands.py:172 ++#: ../yumcommands.py:173 + msgid "Install a package or packages on your system" + msgstr "Asenna paketti tai paketteja järjestelmään" + +-#: ../yumcommands.py:180 ++#: ../yumcommands.py:181 + msgid "Setting up Install Process" + msgstr "Aloitetaan asennusprosessi" + +-#: ../yumcommands.py:191 ++#: ../yumcommands.py:192 + msgid "[PACKAGE...]" + msgstr "[PAKETTI...]" + +-#: ../yumcommands.py:194 ++#: ../yumcommands.py:195 + msgid "Update a package or packages on your system" + msgstr "Päivitä paketti tai paketteja järjestelmään" + +-#: ../yumcommands.py:201 ++#: ../yumcommands.py:202 + msgid "Setting up Update Process" + msgstr "Aloitetaan päivitysprosessi" + +-#: ../yumcommands.py:246 ++#: ../yumcommands.py:244 + msgid "Display details about a package or group of packages" + msgstr "Näytä tietoja paketista tai pakettiryhmästä" + +-#: ../yumcommands.py:295 ++#: ../yumcommands.py:293 + msgid "Installed Packages" + msgstr "Asennetut paketit" + +-#: ../yumcommands.py:303 ++#: ../yumcommands.py:301 + msgid "Available Packages" + msgstr "Saatavilla olevat paketit" + +-#: ../yumcommands.py:307 ++#: ../yumcommands.py:305 + msgid "Extra Packages" + msgstr "Lisäpaketit" + +-#: ../yumcommands.py:311 ++#: ../yumcommands.py:309 + msgid "Updated Packages" + msgstr "Päivitetyt paketit" + + #. This only happens in verbose mode +-#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 ++#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 + msgid "Obsoleting Packages" + msgstr "Vanhentavat paketit" + +-#: ../yumcommands.py:328 ++#: ../yumcommands.py:326 + msgid "Recently Added Packages" + msgstr "Äskettäin lisätyt paketit" + +-#: ../yumcommands.py:335 ++#: ../yumcommands.py:333 + msgid "No matching Packages to list" + msgstr "Ei yhtään vastaavaa pakettia lueteltavaksi" + +-#: ../yumcommands.py:349 ++#: ../yumcommands.py:347 + msgid "List a package or groups of packages" + msgstr "Luettele paketti tai pakettiryhmä" + +-#: ../yumcommands.py:361 ++#: ../yumcommands.py:359 + msgid "Remove a package or packages from your system" + msgstr "Poista paketti tai paketteja järjestelmästä" + +-#: ../yumcommands.py:368 ++#: ../yumcommands.py:366 + msgid "Setting up Remove Process" + msgstr "Aloitetaan poistoprosessi" + +-#: ../yumcommands.py:382 ++#: ../yumcommands.py:380 + msgid "Setting up Group Process" + msgstr "Aloitetaan ryhmäprosessi" + +-#: ../yumcommands.py:388 ++#: ../yumcommands.py:386 + msgid "No Groups on which to run command" + msgstr "Ei ryhmiä joille suorittaa komentoa" + +-#: ../yumcommands.py:401 ++#: ../yumcommands.py:399 + msgid "List available package groups" + msgstr "Luettele saatavilla olevat pakettiryhmät" + +-#: ../yumcommands.py:418 ++#: ../yumcommands.py:416 + msgid "Install the packages in a group on your system" + msgstr "Asenna ryhmään kuuluvat paketit järjestelmään" + +-#: ../yumcommands.py:440 ++#: ../yumcommands.py:438 + msgid "Remove the packages in a group from your system" + msgstr "Poista ryhmään kuuluvat paketit järjestelmästä" + +-#: ../yumcommands.py:467 ++#: ../yumcommands.py:465 + msgid "Display details about a package group" + msgstr "Näytä tietoja pakettiryhmästä" + +-#: ../yumcommands.py:491 ++#: ../yumcommands.py:489 + msgid "Generate the metadata cache" + msgstr "Luo metadatavälimuisti" + +-#: ../yumcommands.py:497 ++#: ../yumcommands.py:495 + msgid "Making cache files for all metadata files." + msgstr "Luodaan välimuistitiedostoja kaikille metadatatiedostoille" + +-#: ../yumcommands.py:498 ++#: ../yumcommands.py:496 + msgid "This may take a while depending on the speed of this computer" + msgstr "Tämä voi kestää jonkin aikaa riippuen tietokoneen nopeudesta" + +-#: ../yumcommands.py:519 ++#: ../yumcommands.py:517 + msgid "Metadata Cache Created" + msgstr "Metadatavälimuisti on luotu" + +-#: ../yumcommands.py:533 ++#: ../yumcommands.py:531 + msgid "Remove cached data" + msgstr "Poista välimuistissa oleva data" + +-#: ../yumcommands.py:553 ++#: ../yumcommands.py:551 + msgid "Find what package provides the given value" + msgstr "Etsi annetun arvon tarjoava paketti" + +-#: ../yumcommands.py:573 ++#: ../yumcommands.py:571 + msgid "Check for available package updates" + msgstr "Etsi saatavilla olevia pakettipäivityksiä" + +-#: ../yumcommands.py:623 ++#: ../yumcommands.py:621 + msgid "Search package details for the given string" + msgstr "Etsi pakettitiedoista annettua merkkijonoa" + +-#: ../yumcommands.py:629 ++#: ../yumcommands.py:627 + msgid "Searching Packages: " + msgstr "Etsitään paketteja: " + +-#: ../yumcommands.py:646 ++#: ../yumcommands.py:644 + msgid "Update packages taking obsoletes into account" + msgstr "Päivitä paketit ottaen vanhennukset huomioon" + +-#: ../yumcommands.py:654 ++#: ../yumcommands.py:652 + msgid "Setting up Upgrade Process" + msgstr "Aloitetaan päivitysprosessi" + +-#: ../yumcommands.py:668 ++#: ../yumcommands.py:666 + msgid "Install a local RPM" + msgstr "Asenna paikallinen RPM-tiedosto" + +-#: ../yumcommands.py:676 ++#: ../yumcommands.py:674 + msgid "Setting up Local Package Process" + msgstr "Aloitetaan paikallinen pakettiprosessi" + +-#: ../yumcommands.py:695 ++#: ../yumcommands.py:693 + msgid "Determine which package provides the given dependency" + msgstr "Selvitä mikä paketti tarjoaa annetun riippuvuuden" + +-#: ../yumcommands.py:698 ++#: ../yumcommands.py:696 + msgid "Searching Packages for Dependency:" + msgstr "Etsitään riippuvuutta paketeista:" + +-#: ../yumcommands.py:712 ++#: ../yumcommands.py:710 + msgid "Run an interactive yum shell" + msgstr "Suorita interaktiivinen yum-komentorivi" + +-#: ../yumcommands.py:718 ++#: ../yumcommands.py:716 + msgid "Setting up Yum Shell" + msgstr "Asetetaan Yum-komentoriviä" + +-#: ../yumcommands.py:736 ++#: ../yumcommands.py:734 + msgid "List a package's dependencies" + msgstr "Luettele paketin riippuvuudet" + +-#: ../yumcommands.py:742 ++#: ../yumcommands.py:740 + msgid "Finding dependencies: " + msgstr "Etsitään riippuvuuksia: " + +-#: ../yumcommands.py:758 ++#: ../yumcommands.py:756 + msgid "Display the configured software repositories" + msgstr "Näytä asetetut asennuslähteet" + +-#: ../yumcommands.py:810 ../yumcommands.py:811 ++#: ../yumcommands.py:822 ../yumcommands.py:823 + msgid "enabled" + msgstr "käytössä" + +-#: ../yumcommands.py:819 ../yumcommands.py:820 ++#: ../yumcommands.py:849 ../yumcommands.py:850 + msgid "disabled" + msgstr "poissa käytöstä" + +-#: ../yumcommands.py:834 ++#: ../yumcommands.py:866 + msgid "Repo-id : " + msgstr "Lähdetunnus : " + +-#: ../yumcommands.py:835 ++#: ../yumcommands.py:867 + msgid "Repo-name : " + msgstr "Lähdenimi : " + +-#: ../yumcommands.py:836 ++#: ../yumcommands.py:870 + msgid "Repo-status : " + msgstr "Lähteen tila : " + +-#: ../yumcommands.py:838 ++#: ../yumcommands.py:873 + msgid "Repo-revision: " + msgstr "Lähderevisio : " + +-#: ../yumcommands.py:842 ++#: ../yumcommands.py:877 + msgid "Repo-tags : " + msgstr "Lähteen tagit : " + +-#: ../yumcommands.py:848 ++#: ../yumcommands.py:883 + msgid "Repo-distro-tags: " + msgstr "Lähteen jakelutagit: " + +-#: ../yumcommands.py:853 ++#: ../yumcommands.py:888 + msgid "Repo-updated : " + msgstr "Lähde päivitetty : " + +-#: ../yumcommands.py:855 ++#: ../yumcommands.py:890 + msgid "Repo-pkgs : " + msgstr "Lähteen paketit : " + +-#: ../yumcommands.py:856 ++#: ../yumcommands.py:891 + msgid "Repo-size : " + msgstr "Lähteen koko : " + +-#: ../yumcommands.py:863 ++#: ../yumcommands.py:898 + msgid "Repo-baseurl : " + msgstr "Lähteen baseurl : " + +-#: ../yumcommands.py:871 ++#: ../yumcommands.py:906 + msgid "Repo-metalink: " + msgstr "Lähteen metalink : " + +-#: ../yumcommands.py:875 ++#: ../yumcommands.py:910 + msgid " Updated : " + msgstr " Päivitetty : " + +-#: ../yumcommands.py:878 ++#: ../yumcommands.py:913 + msgid "Repo-mirrors : " + msgstr "Lähteen peilit : " + +-#: ../yumcommands.py:882 ../yummain.py:133 +-msgid "Unknown" +-msgstr "Tuntematon" +- +-#: ../yumcommands.py:888 ++#: ../yumcommands.py:923 + #, python-format + msgid "Never (last: %s)" + msgstr "Ei koskaan (viimeksi: %s)" + +-#: ../yumcommands.py:890 ++#: ../yumcommands.py:925 + #, python-format + msgid "Instant (last: %s)" + msgstr "Heti (viimeksi: %s)" + +-#: ../yumcommands.py:893 ++#: ../yumcommands.py:928 + #, python-format + msgid "%s second(s) (last: %s)" + msgstr "%s sekunti(a) (viimeksi: %s)" + +-#: ../yumcommands.py:895 ++#: ../yumcommands.py:930 + msgid "Repo-expire : " + msgstr "Lähde vanhentuu : " + +-#: ../yumcommands.py:898 ++#: ../yumcommands.py:933 + msgid "Repo-exclude : " + msgstr "Lähde ohittaa : " + +-#: ../yumcommands.py:902 ++#: ../yumcommands.py:937 + msgid "Repo-include : " + msgstr "Lähde sisältää : " + ++#: ../yumcommands.py:941 ++msgid "Repo-excluded: " ++msgstr "Lähde ohitettu : " ++ + #. Work out the first (id) and last (enabled/disalbed/count), + #. then chop the middle (name)... +-#: ../yumcommands.py:912 ../yumcommands.py:938 ++#: ../yumcommands.py:951 ../yumcommands.py:980 + msgid "repo id" + msgstr "lähdetunnus" + +-#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 ++#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 + msgid "status" + msgstr "tila" + +-#: ../yumcommands.py:939 ++#: ../yumcommands.py:981 + msgid "repo name" + msgstr "lähdenimi" + +-#: ../yumcommands.py:965 ++#: ../yumcommands.py:1018 + msgid "Display a helpful usage message" + msgstr "Näytä käyttöohjeviesti" + +-#: ../yumcommands.py:999 ++#: ../yumcommands.py:1052 + #, python-format + msgid "No help available for %s" + msgstr "Ei ohjeita komennolle %s" + +-#: ../yumcommands.py:1004 ++#: ../yumcommands.py:1057 + msgid "" + "\n" + "\n" +@@ -1491,7 +1666,7 @@ msgstr "" + "\n" + "muut nimet: " + +-#: ../yumcommands.py:1006 ++#: ../yumcommands.py:1059 + msgid "" + "\n" + "\n" +@@ -1501,145 +1676,100 @@ msgstr "" + "\n" + "toinen nimi: " + +-#: ../yumcommands.py:1034 ++#: ../yumcommands.py:1087 + msgid "Setting up Reinstall Process" + msgstr "Aloitetaan uudelleenasennusprosessi" + +-#: ../yumcommands.py:1042 ++#: ../yumcommands.py:1095 + msgid "reinstall a package" + msgstr "asenna paketti uudelleen" + +-#: ../yumcommands.py:1060 ++#: ../yumcommands.py:1113 + msgid "Setting up Downgrade Process" + msgstr "Aloitetaan varhennusprosessi" + +-#: ../yumcommands.py:1067 ++#: ../yumcommands.py:1120 + msgid "downgrade a package" + msgstr "varhenna paketti" + +-#: ../yumcommands.py:1081 ++#: ../yumcommands.py:1134 + msgid "Display a version for the machine and/or available repos." + msgstr "" + "Näytä koneella ja/tai käytettävissä olevissa asennuslähteissä oleva versio" + +-#: ../yumcommands.py:1111 ++#: ../yumcommands.py:1173 + msgid " Yum version groups:" + msgstr " Yum-versioryhmät:" + +-#: ../yumcommands.py:1121 ++#: ../yumcommands.py:1183 + msgid " Group :" + msgstr " Ryhmä:" + +-#: ../yumcommands.py:1122 ++#: ../yumcommands.py:1184 + msgid " Packages:" + msgstr " Paketit:" + +-#: ../yumcommands.py:1152 ++#: ../yumcommands.py:1213 + msgid "Installed:" + msgstr "Asennettu:" + +-#: ../yumcommands.py:1157 ++#: ../yumcommands.py:1218 + msgid "Group-Installed:" + msgstr "Asennettu ryhmässä:" + +-#: ../yumcommands.py:1166 ++#: ../yumcommands.py:1227 + msgid "Available:" + msgstr "Saatavilla:" + +-#: ../yumcommands.py:1172 ++#: ../yumcommands.py:1233 + msgid "Group-Available:" + msgstr "Saatavilla ryhmässä:" + +-#: ../yumcommands.py:1211 ++#: ../yumcommands.py:1272 + msgid "Display, or use, the transaction history" + msgstr "Näytä tai käytä transaktiohistoriaa" + +-#: ../yumcommands.py:1239 ++#: ../yumcommands.py:1300 + #, python-format + msgid "Invalid history sub-command, use: %s." + msgstr "Virheellinen historyn alikomento, käytä: %s." + +-#: ../yummain.py:128 +-msgid "Running" +-msgstr "Suoritetaan" ++#: ../yumcommands.py:1345 ++msgid "Check for problems in the rpmdb" ++msgstr "Etsi ongelmia rpm-tietokannasta" + +-#: ../yummain.py:129 +-msgid "Sleeping" +-msgstr "Unessa" +- +-#: ../yummain.py:130 +-msgid "Uninteruptable" +-msgstr "Ei voi keskeyttää" +- +-#: ../yummain.py:131 +-msgid "Zombie" +-msgstr "Zombi" +- +-#: ../yummain.py:132 +-msgid "Traced/Stopped" +-msgstr "Jäljitetään/Pysäytetty" +- +-#: ../yummain.py:137 +-msgid " The other application is: PackageKit" +-msgstr " Toinen ohjelma on: PackageKit" +- +-#: ../yummain.py:139 +-#, python-format +-msgid " The other application is: %s" +-msgstr " Toinen ohjelma on: %s" +- +-#: ../yummain.py:142 +-#, python-format +-msgid " Memory : %5s RSS (%5sB VSZ)" +-msgstr " Muisti : %5s RSS (%5sB VSZ)" +- +-#: ../yummain.py:146 +-#, python-format +-msgid " Started: %s - %s ago" +-msgstr " Aloitettu : %s - %s sitten" +- +-#: ../yummain.py:148 +-#, python-format +-msgid " State : %s, pid: %d" +-msgstr " Tila : %s, pid: %d" +- +-#: ../yummain.py:173 ++#: ../yummain.py:102 + msgid "" + "Another app is currently holding the yum lock; waiting for it to exit..." + msgstr "" + "Toinen ohjelma pitää tällä hetkellä yumin lukkoa, odotetaan että se " + "lopettaa..." + +-#: ../yummain.py:201 ../yummain.py:240 ++#: ../yummain.py:130 ../yummain.py:169 + #, python-format + msgid "Error: %s" + msgstr "Virhe: %s" + +-#: ../yummain.py:211 ../yummain.py:253 ++#: ../yummain.py:140 ../yummain.py:182 + #, python-format + msgid "Unknown Error(s): Exit Code: %d:" + msgstr "Tuntematon virhe: lopetuskoodi: %d:" + + #. Depsolve stage +-#: ../yummain.py:218 ++#: ../yummain.py:147 + msgid "Resolving Dependencies" + msgstr "Ratkaistaan riippuvuuksia" + +-#: ../yummain.py:242 ++#: ../yummain.py:173 + msgid " You could try using --skip-broken to work around the problem" + msgstr " Ongelman pystyy ehkä kiertämään valitsimella --skip-broken" + +-#: ../yummain.py:243 +-msgid "" +-" You could try running: package-cleanup --problems\n" +-" package-cleanup --dupes\n" +-" rpm -Va --nofiles --nodigest" ++#: ../yummain.py:175 ../yummain.py:208 ++msgid " You could try running: rpm -Va --nofiles --nodigest" + msgstr "" +-" Kokeile komentoja: package-cleanup --problems\n" +-" package-cleanup --dupes\n" +-" rpm -Va --nofiles --nodigest" ++" Kannattaa myös kokeilla komennon rpm -Va --nofiles --nodigest suorittamista" + +-#: ../yummain.py:259 ++#: ../yummain.py:188 + msgid "" + "\n" + "Dependencies Resolved" +@@ -1647,7 +1777,7 @@ msgstr "" + "\n" + "Riippuvuudet on ratkaistu" + +-#: ../yummain.py:326 ++#: ../yummain.py:265 + msgid "" + "\n" + "\n" +@@ -1685,171 +1815,166 @@ msgstr "Mahdollinen vastaavuus haulle %s paketissa %s" + msgid "Matched %s to require for %s" + msgstr "%s vastaa vaatimusta %s" + +-#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:225 + #, python-format + msgid "Member: %s" + msgstr "Jäsen: %s" + +-#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 ++#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 + #, python-format + msgid "%s converted to install" + msgstr "%s muutettu asennukseksi" + +-#: ../yum/depsolve.py:245 ++#: ../yum/depsolve.py:246 + #, python-format + msgid "Adding Package %s in mode %s" + msgstr "Lisätään paketti %s tilassa %s" + +-#: ../yum/depsolve.py:255 ++#: ../yum/depsolve.py:256 + #, python-format + msgid "Removing Package %s" + msgstr "Poistetaan paketti %s" + +-#: ../yum/depsolve.py:277 ++#: ../yum/depsolve.py:278 + #, python-format + msgid "%s requires: %s" + msgstr "%s vaatii: %s" + +-#: ../yum/depsolve.py:335 ++#: ../yum/depsolve.py:319 ++#, python-format ++msgid "%s requires %s" ++msgstr "%s vaatii %s" ++ ++#: ../yum/depsolve.py:346 + msgid "Needed Require has already been looked up, cheating" + msgstr "Tarvittava vaatimus on jo etsitty, huijataan" + +-#: ../yum/depsolve.py:345 ++#: ../yum/depsolve.py:356 + #, python-format + msgid "Needed Require is not a package name. Looking up: %s" + msgstr "Tarvittava vaatimus ei ole pakettinimi. Etsitään: %s" + +-#: ../yum/depsolve.py:352 ++#: ../yum/depsolve.py:363 + #, python-format + msgid "Potential Provider: %s" + msgstr "Mahdollinen tarjoaja: %s" + +-#: ../yum/depsolve.py:375 ++#: ../yum/depsolve.py:386 + #, python-format + msgid "Mode is %s for provider of %s: %s" + msgstr "Tila %s riippuvuuden %s: %s tarjoajalla" + +-#: ../yum/depsolve.py:379 ++#: ../yum/depsolve.py:390 + #, python-format + msgid "Mode for pkg providing %s: %s" + msgstr "Riippuvuuden %s: %s tarjoavan paketin tila" + +-#: ../yum/depsolve.py:383 ++#: ../yum/depsolve.py:394 + #, python-format + msgid "TSINFO: %s package requiring %s marked as erase" + msgstr "" + "TSINFO: paketti %s, joka vaatii riippuvuuden %s on merkitty poistettavaksi" + +-#: ../yum/depsolve.py:396 ++#: ../yum/depsolve.py:407 + #, python-format + msgid "TSINFO: Obsoleting %s with %s to resolve dep." + msgstr "" + "TSINFO: Vanhennetaan paketti %s paketilla %s riippuvuuden ratkaisemiseksi." + +-#: ../yum/depsolve.py:399 ++#: ../yum/depsolve.py:410 + #, python-format + msgid "TSINFO: Updating %s to resolve dep." + msgstr "TSINFO: Päivitetään paketti %s riippuvuuden ratkaisemiseksi." + +-#: ../yum/depsolve.py:407 ++#: ../yum/depsolve.py:418 + #, python-format + msgid "Cannot find an update path for dep for: %s" + msgstr "Päivityspolkua ei löydetty riippuvuudelle: %s" + +-#: ../yum/depsolve.py:417 +-#, python-format +-msgid "Unresolvable requirement %s for %s" +-msgstr "Ratkaisematon riippuvuus %s paketille %s" +- +-#: ../yum/depsolve.py:440 ++#: ../yum/depsolve.py:449 + #, python-format + msgid "Quick matched %s to require for %s" + msgstr "Pikavastaavuus %s vaatimukselle %s" + + #. is it already installed? +-#: ../yum/depsolve.py:482 ++#: ../yum/depsolve.py:491 + #, python-format + msgid "%s is in providing packages but it is already installed, removing." + msgstr "%s on tarjoavissa paketeissa, mutta se on jo asennettuna, poistetaan." + +-#: ../yum/depsolve.py:498 ++#: ../yum/depsolve.py:507 + #, python-format + msgid "Potential resolving package %s has newer instance in ts." + msgstr "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi ts:ssä." + +-#: ../yum/depsolve.py:509 ++#: ../yum/depsolve.py:518 + #, python-format + msgid "Potential resolving package %s has newer instance installed." + msgstr "" + "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi asennettuna." + +-#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 +-#, python-format +-msgid "Missing Dependency: %s is needed by package %s" +-msgstr "Puuttuva riippuvuus: %s tarvitaan paketille %s" +- +-#: ../yum/depsolve.py:530 ++#: ../yum/depsolve.py:536 + #, python-format + msgid "%s already in ts, skipping this one" + msgstr "paketti %s on jo ts:ssä, ohitetaan" + +-#: ../yum/depsolve.py:573 ++#: ../yum/depsolve.py:578 + #, python-format + msgid "TSINFO: Marking %s as update for %s" + msgstr "TSINFO: Merkitään paketti %s päivitykseksi paketille %s" + +-#: ../yum/depsolve.py:581 ++#: ../yum/depsolve.py:586 + #, python-format + msgid "TSINFO: Marking %s as install for %s" + msgstr "TSINFO: Merkitään %s asennukseksi paketille %s" + +-#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 ++#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 + msgid "Success - empty transaction" + msgstr "Onnistui - tyhjä transaktio" + +-#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 ++#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 + msgid "Restarting Loop" + msgstr "Käynnistetään silmukka uudelleen" + +-#: ../yum/depsolve.py:755 ++#: ../yum/depsolve.py:760 + msgid "Dependency Process ending" + msgstr "Riippuvuuksien käsittely päättyy" + +-#: ../yum/depsolve.py:761 ++#: ../yum/depsolve.py:774 + #, python-format + msgid "%s from %s has depsolving problems" + msgstr "paketilla %s asennuslähteestä %s on riippuvuusongelmia" + +-#: ../yum/depsolve.py:768 ++#: ../yum/depsolve.py:782 + msgid "Success - deps resolved" + msgstr "Onnistui – riippuvuudet on ratkaistu" + +-#: ../yum/depsolve.py:782 ++#: ../yum/depsolve.py:796 + #, python-format + msgid "Checking deps for %s" + msgstr "Tarkistetaan paketin %s riippuvuuksia" + +-#: ../yum/depsolve.py:865 ++#: ../yum/depsolve.py:874 + #, python-format + msgid "looking for %s as a requirement of %s" + msgstr "etsitään riippuvuutta %s paketille %s" + +-#: ../yum/depsolve.py:1007 ++#: ../yum/depsolve.py:1090 + #, python-format + msgid "Running compare_providers() for %s" + msgstr "Suoritetaan compare_providers() paketeille %s" + +-#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 ++#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 + #, python-format + msgid "better arch in po %s" + msgstr "po:ssa %s on parempi arkkitehtuuri" + +-#: ../yum/depsolve.py:1142 ++#: ../yum/depsolve.py:1218 + #, python-format + msgid "%s obsoletes %s" + msgstr "paketti %s vanhentaa paketin %s" + +-#: ../yum/depsolve.py:1154 ++#: ../yum/depsolve.py:1230 + #, python-format + msgid "" + "archdist compared %s to %s on %s\n" +@@ -1858,103 +1983,122 @@ msgstr "" + "archdist vertasi paketteja %s ja %s arkkitehtuurilla %s\n" + " Voittaja: %s" + +-#: ../yum/depsolve.py:1161 ++#: ../yum/depsolve.py:1237 + #, python-format + msgid "common sourcerpm %s and %s" + msgstr "paketeilla %s ja %s on yhteinen lähde-RPM" + +-#: ../yum/depsolve.py:1167 ++#: ../yum/depsolve.py:1241 ++#, python-format ++msgid "base package %s is installed for %s" ++msgstr "peruspaketti %s on asennettu paketille %s" ++ ++#: ../yum/depsolve.py:1247 + #, python-format + msgid "common prefix of %s between %s and %s" + msgstr "yhteinen %s merkin mittainen etuliite paketeilla %s ja %s" + +-#: ../yum/depsolve.py:1175 ++#: ../yum/depsolve.py:1256 + #, python-format + msgid "Best Order: %s" + msgstr "Paras järjestys %s" + +-#: ../yum/__init__.py:187 ++#: ../yum/__init__.py:192 + msgid "doConfigSetup() will go away in a future version of Yum.\n" + msgstr "doConfigSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" + +-#: ../yum/__init__.py:412 ++#: ../yum/__init__.py:424 + #, python-format + msgid "Repository %r is missing name in configuration, using id" + msgstr "Asennuslähteen %r asetuksista puuttuu nimi, käytetään tunnistetta" + +-#: ../yum/__init__.py:450 ++#: ../yum/__init__.py:462 + msgid "plugins already initialised" + msgstr "liitännäiset on jo alustettu" + +-#: ../yum/__init__.py:457 ++#: ../yum/__init__.py:469 + msgid "doRpmDBSetup() will go away in a future version of Yum.\n" + msgstr "doRpmSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" + +-#: ../yum/__init__.py:468 ++#: ../yum/__init__.py:480 + msgid "Reading Local RPMDB" + msgstr "Luetaan paikallista RPM-tietokantaa" + +-#: ../yum/__init__.py:489 ++#: ../yum/__init__.py:504 + msgid "doRepoSetup() will go away in a future version of Yum.\n" + msgstr "doRepoSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" + +-#: ../yum/__init__.py:509 ++#: ../yum/__init__.py:524 + msgid "doSackSetup() will go away in a future version of Yum.\n" + msgstr "doSackSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" + +-#: ../yum/__init__.py:539 ++#: ../yum/__init__.py:554 + msgid "Setting up Package Sacks" + msgstr "Asetetaan pakettisäkkejä" + +-#: ../yum/__init__.py:584 ++#: ../yum/__init__.py:599 + #, python-format + msgid "repo object for repo %s lacks a _resetSack method\n" + msgstr "asennuslähteen %s oliosta puuttuu _resetSack-metodi\n" + +-#: ../yum/__init__.py:585 ++#: ../yum/__init__.py:600 + msgid "therefore this repo cannot be reset.\n" + msgstr "siksi tätä asennuslähdettä ei voi palauttaa alkutilaan.\n" + +-#: ../yum/__init__.py:590 ++#: ../yum/__init__.py:605 + msgid "doUpdateSetup() will go away in a future version of Yum.\n" + msgstr "doUpdateSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" + +-#: ../yum/__init__.py:602 ++#: ../yum/__init__.py:617 + msgid "Building updates object" + msgstr "Rakennetaan päivitysoliota" + +-#: ../yum/__init__.py:637 ++#: ../yum/__init__.py:652 + msgid "doGroupSetup() will go away in a future version of Yum.\n" + msgstr "doGroupSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" + +-#: ../yum/__init__.py:662 ++#: ../yum/__init__.py:677 + msgid "Getting group metadata" + msgstr "Haetaan ryhmien metadataa" + +-#: ../yum/__init__.py:688 ++#: ../yum/__init__.py:703 + #, python-format + msgid "Adding group file from repository: %s" + msgstr "Lisätään ryhmätiedosto asennuslähteestä: %s" + +-#: ../yum/__init__.py:697 ++#: ../yum/__init__.py:712 + #, python-format + msgid "Failed to add groups file for repository: %s - %s" + msgstr "Ryhmätiedoston lisääminen asennuslähteelle epäonnistui: %s - %s" + +-#: ../yum/__init__.py:703 ++#: ../yum/__init__.py:718 + msgid "No Groups Available in any repository" + msgstr "Yhtään ryhmää ei ole saatavilla mistään asennuslähteestä" + +-#: ../yum/__init__.py:763 ++#: ../yum/__init__.py:730 ++msgid "Getting pkgtags metadata" ++msgstr "Haetaan pakettitagien metadataa" ++ ++#: ../yum/__init__.py:740 ++#, python-format ++msgid "Adding tags from repository: %s" ++msgstr "Lisätään tagit asennuslähteestä: %s" ++ ++#: ../yum/__init__.py:749 ++#, python-format ++msgid "Failed to add Pkg Tags for repository: %s - %s" ++msgstr "Pakettitagien lisääminen asennuslähteelle epäonnistui: %s - %s" ++ ++#: ../yum/__init__.py:827 + msgid "Importing additional filelist information" + msgstr "Tuodaan lisää tiedostoluettelotietoa" + +-#: ../yum/__init__.py:777 ++#: ../yum/__init__.py:841 + #, python-format + msgid "The program %s%s%s is found in the yum-utils package." + msgstr "Ohjelma %s%s%s on paketissa yum-utils." + +-#: ../yum/__init__.py:785 ++#: ../yum/__init__.py:849 + msgid "" + "There are unfinished transactions remaining. You might consider running yum-" + "complete-transaction first to finish them." +@@ -1962,17 +2106,18 @@ msgstr "" + "Keskeneräisiä transaktioita on jäljellä. Niiden päättämiseksi on suositeltua " + "suorittaa ensin yum-complete-transaction." + +-#: ../yum/__init__.py:853 ++#. Kind of hacky ++#: ../yum/__init__.py:922 + #, python-format + msgid "Skip-broken round %i" + msgstr "Skip-broken, kierros %i" + +-#: ../yum/__init__.py:906 ++#: ../yum/__init__.py:975 + #, python-format + msgid "Skip-broken took %i rounds " + msgstr "Skip-broken vaati %i kierrosta" + +-#: ../yum/__init__.py:907 ++#: ../yum/__init__.py:976 + msgid "" + "\n" + "Packages skipped because of dependency problems:" +@@ -1980,79 +2125,91 @@ msgstr "" + "\n" + "Riippuvuusongelmien vuoksi ohitetut paketit:" + +-#: ../yum/__init__.py:911 ++#: ../yum/__init__.py:980 + #, python-format + msgid " %s from %s" + msgstr " %s asennuslähteestä %s" + +-#: ../yum/__init__.py:1083 ++#: ../yum/__init__.py:1121 ++msgid "Warning: RPMDB altered outside of yum." ++msgstr "Varoitus: RPM-tietokantaa on muutettu yumin ulkopuolella." ++ ++#: ../yum/__init__.py:1126 ++msgid "missing requires" ++msgstr "puuttuvia riippuvuuksia" ++ ++#: ../yum/__init__.py:1127 ++msgid "installed conflict" ++msgstr "asennettu konflikti" ++ ++#: ../yum/__init__.py:1180 + msgid "" + "Warning: scriptlet or other non-fatal errors occurred during transaction." + msgstr "" + "Varoitus: sovelmien virheitä tai muita virheitä, jotka eivät ole vakavia, " + "tapahtui transaktion aikana." + +-#: ../yum/__init__.py:1101 ++#: ../yum/__init__.py:1198 + #, python-format + msgid "Failed to remove transaction file %s" + msgstr "Transaktiotiedoston %s poistaminen epäonnistui" + + #. maybe a file log here, too + #. but raising an exception is not going to do any good +-#: ../yum/__init__.py:1130 ++#: ../yum/__init__.py:1227 + #, python-format + msgid "%s was supposed to be installed but is not!" + msgstr "%s piti olla asennettuna, mutta se ei ole!" + + #. maybe a file log here, too + #. but raising an exception is not going to do any good +-#: ../yum/__init__.py:1169 ++#: ../yum/__init__.py:1266 + #, python-format + msgid "%s was supposed to be removed but is not!" + msgstr "%s piti olla poistettu, mutta se ei ole!" + + #. Whoa. What the heck happened? +-#: ../yum/__init__.py:1289 ++#: ../yum/__init__.py:1386 + #, python-format + msgid "Unable to check if PID %s is active" + msgstr "Ei voida tarkistaa onko PID %s aktiivinen" + + #. Another copy seems to be running. +-#: ../yum/__init__.py:1293 ++#: ../yum/__init__.py:1390 + #, python-format + msgid "Existing lock %s: another copy is running as pid %s." + msgstr "Lukko %s on olemassa: toinen kopio on suorituksessa pidillä %s." + + #. Whoa. What the heck happened? +-#: ../yum/__init__.py:1328 ++#: ../yum/__init__.py:1425 + #, python-format + msgid "Could not create lock at %s: %s " + msgstr "Ei voitu luoda lukkoa sijaintiin %s: %s" + +-#: ../yum/__init__.py:1373 ++#: ../yum/__init__.py:1470 + msgid "Package does not match intended download" + msgstr "Paketti ei vastaa aiottua latausta" + +-#: ../yum/__init__.py:1388 ++#: ../yum/__init__.py:1485 + msgid "Could not perform checksum" + msgstr "Ei voitu laskea tarkistussummaa" + +-#: ../yum/__init__.py:1391 ++#: ../yum/__init__.py:1488 + msgid "Package does not match checksum" + msgstr "Paketti ei vastaa tarkistussummaa" + +-#: ../yum/__init__.py:1433 ++#: ../yum/__init__.py:1530 + #, python-format + msgid "package fails checksum but caching is enabled for %s" + msgstr "" + "paketti ei vastaa tarkistussummaa, mutta välimuisti on käytössä kohteelle %s" + +-#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 ++#: ../yum/__init__.py:1533 ../yum/__init__.py:1562 + #, python-format + msgid "using local copy of %s" + msgstr "käytetään paikallista kopiota paketista %s" + +-#: ../yum/__init__.py:1477 ++#: ../yum/__init__.py:1574 + #, python-format + msgid "" + "Insufficient space in download directory %s\n" +@@ -2063,11 +2220,11 @@ msgstr "" + " * vapaana %s\n" + " * tarvitaan %s" + +-#: ../yum/__init__.py:1526 ++#: ../yum/__init__.py:1623 + msgid "Header is not complete." + msgstr "Otsake ei ole täydellinen." + +-#: ../yum/__init__.py:1563 ++#: ../yum/__init__.py:1660 + #, python-format + msgid "" + "Header not in local cache and caching-only mode enabled. Cannot download %s" +@@ -2075,62 +2232,62 @@ msgstr "" + "Otsake ei ole paikallisessa välimuistissa ja pelkästä välimuistista toimiva " + "tila on käytössä. Ei voida ladata otsaketta %s" + +-#: ../yum/__init__.py:1618 ++#: ../yum/__init__.py:1715 + #, python-format + msgid "Public key for %s is not installed" + msgstr "Julkista avainta pakettia %s varten ei ole asennettu" + +-#: ../yum/__init__.py:1622 ++#: ../yum/__init__.py:1719 + #, python-format + msgid "Problem opening package %s" + msgstr "Ongelma paketin %s avaamisessa" + +-#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1727 + #, python-format + msgid "Public key for %s is not trusted" + msgstr "Paketin %s julkiseen avaimeen ei luoteta" + +-#: ../yum/__init__.py:1634 ++#: ../yum/__init__.py:1731 + #, python-format + msgid "Package %s is not signed" + msgstr "Pakettia %s ei ole allekirjoitettu" + +-#: ../yum/__init__.py:1672 ++#: ../yum/__init__.py:1769 + #, python-format + msgid "Cannot remove %s" + msgstr "Ei voida poistaa tiedostoa %s" + +-#: ../yum/__init__.py:1676 ++#: ../yum/__init__.py:1773 + #, python-format + msgid "%s removed" + msgstr "tiedosto %s on poistettu" + +-#: ../yum/__init__.py:1712 ++#: ../yum/__init__.py:1819 + #, python-format + msgid "Cannot remove %s file %s" + msgstr "Ei voida poistaa %s-tyyppistä tiedostoa %s" + +-#: ../yum/__init__.py:1716 ++#: ../yum/__init__.py:1823 + #, python-format + msgid "%s file %s removed" + msgstr "%s-tyyppinen tiedosto %s on poistettu" + +-#: ../yum/__init__.py:1718 ++#: ../yum/__init__.py:1825 + #, python-format + msgid "%d %s files removed" + msgstr "%d %s-tyyppistä tiedostoa on poistettu" + +-#: ../yum/__init__.py:1787 ++#: ../yum/__init__.py:1894 + #, python-format + msgid "More than one identical match in sack for %s" + msgstr "Säkissä on useampi kuin yksi identtinen vastaavuus haulle %s" + +-#: ../yum/__init__.py:1793 ++#: ../yum/__init__.py:1900 + #, python-format + msgid "Nothing matches %s.%s %s:%s-%s from update" + msgstr "Mikään ei vastaa päivityksen pakettia %s.%s %s:%s-%s" + +-#: ../yum/__init__.py:2026 ++#: ../yum/__init__.py:2179 + msgid "" + "searchPackages() will go away in a future version of " + "Yum. Use searchGenerator() instead. \n" +@@ -2138,181 +2295,181 @@ msgstr "" + "searchPackages() poistetaan jossakin Yumin tulevassa versiossa. Käytä sen " + "sijaan searchGenerator()-metodia.\n" + +-#: ../yum/__init__.py:2065 ++#: ../yum/__init__.py:2218 + #, python-format + msgid "Searching %d packages" + msgstr "Etsitään %d pakettia" + +-#: ../yum/__init__.py:2069 ++#: ../yum/__init__.py:2222 + #, python-format + msgid "searching package %s" + msgstr "etsitään pakettia %s" + +-#: ../yum/__init__.py:2081 ++#: ../yum/__init__.py:2234 + msgid "searching in file entries" + msgstr "etsitään tiedostoista" + +-#: ../yum/__init__.py:2088 ++#: ../yum/__init__.py:2241 + msgid "searching in provides entries" + msgstr "etsitään tarjoajista" + +-#: ../yum/__init__.py:2121 ++#: ../yum/__init__.py:2274 + #, python-format + msgid "Provides-match: %s" + msgstr "Tarjoajavastaavuus: %s" + +-#: ../yum/__init__.py:2170 ++#: ../yum/__init__.py:2323 + msgid "No group data available for configured repositories" + msgstr "Asetetuille asennuslähteille ei ole saatavilla ryhmädataa" + +-#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 +-#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 +-#: ../yum/__init__.py:2655 ++#: ../yum/__init__.py:2354 ../yum/__init__.py:2373 ../yum/__init__.py:2404 ++#: ../yum/__init__.py:2410 ../yum/__init__.py:2492 ../yum/__init__.py:2496 ++#: ../yum/__init__.py:2813 + #, python-format + msgid "No Group named %s exists" + msgstr "Ryhmää nimeltä %s ei ole olemassa" + +-#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 ++#: ../yum/__init__.py:2385 ../yum/__init__.py:2512 + #, python-format + msgid "package %s was not marked in group %s" + msgstr "pakettia %s ei ollut merkitty kuuluvaksi ryhmään %s" + +-#: ../yum/__init__.py:2279 ++#: ../yum/__init__.py:2432 + #, python-format + msgid "Adding package %s from group %s" + msgstr "Lisätään paketti %s ryhmästä %s" + +-#: ../yum/__init__.py:2283 ++#: ../yum/__init__.py:2436 + #, python-format + msgid "No package named %s available to be installed" + msgstr "Pakettia nimeltä %s ei ole saatavilla asennusta varten" + +-#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2538 + #, python-format + msgid "Package tuple %s could not be found in packagesack" + msgstr "Paketti-tuplea %s ei löytynyt pakettisäkistä" + +-#: ../yum/__init__.py:2399 ++#: ../yum/__init__.py:2557 + #, python-format + msgid "Package tuple %s could not be found in rpmdb" + msgstr "Paketti-tuplea %s ei löytynyt RPM-tietokannasta" + +-#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 ++#: ../yum/__init__.py:2613 ../yum/__init__.py:2663 + msgid "Invalid version flag" + msgstr "Virheellinen versiolippu" + +-#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 ++#: ../yum/__init__.py:2633 ../yum/__init__.py:2638 + #, python-format + msgid "No Package found for %s" + msgstr "Riippuvuudelle %s ei löytynyt pakettia" + +-#: ../yum/__init__.py:2696 ++#: ../yum/__init__.py:2854 + msgid "Package Object was not a package object instance" + msgstr "Pakettiolio ei ollutkaan pakettiolioinstanssi" + +-#: ../yum/__init__.py:2700 ++#: ../yum/__init__.py:2858 + msgid "Nothing specified to install" + msgstr "Mitään ei määritelty asennettavaksi" + +-#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 ++#: ../yum/__init__.py:2874 ../yum/__init__.py:3651 + #, python-format + msgid "Checking for virtual provide or file-provide for %s" + msgstr "Etsitään virtuaalista tai tiedostotarjoajaa argumentille %s" + +-#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 +-#: ../yum/__init__.py:3495 ++#: ../yum/__init__.py:2880 ../yum/__init__.py:3196 ../yum/__init__.py:3364 ++#: ../yum/__init__.py:3657 + #, python-format + msgid "No Match for argument: %s" + msgstr "Mikään ei vastaa argumenttia: %s" + +-#: ../yum/__init__.py:2798 ++#: ../yum/__init__.py:2956 + #, python-format + msgid "Package %s installed and not available" + msgstr "Paketti %s on asennettu, mutta ei saatavilla" + +-#: ../yum/__init__.py:2801 ++#: ../yum/__init__.py:2959 + msgid "No package(s) available to install" + msgstr "Yhtään pakettia ei ole saatavilla asennettavaksi" + +-#: ../yum/__init__.py:2813 ++#: ../yum/__init__.py:2971 + #, python-format + msgid "Package: %s - already in transaction set" + msgstr "Paketti: %s – on jo transaktiojoukossa" + +-#: ../yum/__init__.py:2839 ++#: ../yum/__init__.py:2997 + #, python-format + msgid "Package %s is obsoleted by %s which is already installed" + msgstr "Paketin %s vanhentaa paketti %s, joka on jo asennettuna" + +-#: ../yum/__init__.py:2842 ++#: ../yum/__init__.py:3000 + #, python-format + msgid "Package %s is obsoleted by %s, trying to install %s instead" + msgstr "Paketin %s vanhentaa paketti %s, yritetään paketti %s sen sijaan" + +-#: ../yum/__init__.py:2850 ++#: ../yum/__init__.py:3008 + #, python-format + msgid "Package %s already installed and latest version" + msgstr "Paketti %s on jo asennettuna ja uusin versio" + +-#: ../yum/__init__.py:2864 ++#: ../yum/__init__.py:3022 + #, python-format + msgid "Package matching %s already installed. Checking for update." + msgstr "" + "Pakettia %s vastaava paketti on jo asennettuna. Tarkistetaan päivitykset." + + #. update everything (the easy case) +-#: ../yum/__init__.py:2966 ++#: ../yum/__init__.py:3125 + msgid "Updating Everything" + msgstr "Päivitetään kaikki" + +-#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 +-#: ../yum/__init__.py:3155 ++#: ../yum/__init__.py:3146 ../yum/__init__.py:3261 ../yum/__init__.py:3288 ++#: ../yum/__init__.py:3314 + #, python-format + msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" + msgstr "Vanhennettua pakettia ei päivitetä: %s.%s %s:%s-%s" + +-#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 ++#: ../yum/__init__.py:3181 ../yum/__init__.py:3361 + #, python-format + msgid "%s" + msgstr "%s" + +-#: ../yum/__init__.py:3093 ++#: ../yum/__init__.py:3252 + #, python-format + msgid "Package is already obsoleted: %s.%s %s:%s-%s" + msgstr "Paketti on jo vanhennettu: %s.%s %s:%s-%s" + +-#: ../yum/__init__.py:3124 ++#: ../yum/__init__.py:3283 + #, python-format + msgid "Not Updating Package that is obsoleted: %s" + msgstr "Ei päivitetä vanhennettua pakettia: %s" + +-#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 ++#: ../yum/__init__.py:3292 ../yum/__init__.py:3318 + #, python-format + msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" + msgstr "Jo päivitettyä pakettia ei enää päivitetä: %s.%s %s:%s-%s" + +-#: ../yum/__init__.py:3218 ++#: ../yum/__init__.py:3377 + msgid "No package matched to remove" + msgstr "Yhtään poistopyyntöä vastaavaa pakettia ei ole" + +-#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 ++#: ../yum/__init__.py:3411 + #, python-format +-msgid "Cannot open file: %s. Skipping." +-msgstr "Ei voida avata tiedostoa: %s. Ohitetaan." ++msgid "Cannot open: %s. Skipping." ++msgstr "Ei voida avata pakettia: %s. Ohitetaan." + +-#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 ++#: ../yum/__init__.py:3414 ../yum/__init__.py:3513 ../yum/__init__.py:3597 + #, python-format + msgid "Examining %s: %s" + msgstr "Tutkitaan %s: %s" + +-#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 ++#: ../yum/__init__.py:3422 ../yum/__init__.py:3516 ../yum/__init__.py:3600 + #, python-format + msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" + msgstr "" + "Pakettia %s ei voida lisätä transaktioon. Arkkitehtuuri ei ole yhteensopiva: " + "%s" + +-#: ../yum/__init__.py:3270 ++#: ../yum/__init__.py:3430 + #, python-format + msgid "" + "Package %s not installed, cannot update it. Run yum install to install it " +@@ -2321,99 +2478,109 @@ msgstr "" + "Pakettia %s ei ole asennettu, sitä ei voida päivittää. Suorita yum install -" + "komento paketin asentamiseksi." + +-#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3521 ../yum/__init__.py:3605 + #, python-format + msgid "Excluding %s" + msgstr "Ohitetaan paketti %s" + +-#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3464 + #, python-format + msgid "Marking %s to be installed" + msgstr "Merkitään paketti %s asennettavaksi" + +-#: ../yum/__init__.py:3310 ++#: ../yum/__init__.py:3470 + #, python-format + msgid "Marking %s as an update to %s" + msgstr "Merkitään paketti %s päivitykseksi paketille %s" + +-#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3477 + #, python-format + msgid "%s: does not update installed package." + msgstr "%s: ei päivitä asennettua pakettia" + +-#: ../yum/__init__.py:3379 ++#: ../yum/__init__.py:3510 ../yum/__init__.py:3594 ++#, python-format ++msgid "Cannot open file: %s. Skipping." ++msgstr "Ei voida avata tiedostoa: %s. Ohitetaan." ++ ++#: ../yum/__init__.py:3540 + msgid "Problem in reinstall: no package matched to remove" + msgstr "Ongelma uudelleenasennuksessa: poistopyyntöä vastaavaa pakettia ei ole" + +-#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 ++#: ../yum/__init__.py:3553 ../yum/__init__.py:3685 + #, python-format + msgid "Package %s is allowed multiple installs, skipping" + msgstr "Paketille %s sallitaan useita asennuksia, ohitetaan." + +-#: ../yum/__init__.py:3413 ++#: ../yum/__init__.py:3574 + #, python-format + msgid "Problem in reinstall: no package %s matched to install" + msgstr "" + "Ongelma uudelleenasennuksessa: asennuspyyntöä vastaavaa pakettia %s ei ole" + +-#: ../yum/__init__.py:3515 ++#: ../yum/__init__.py:3677 + msgid "No package(s) available to downgrade" + msgstr "Yhtään pakettia ei ole saatavilla varhennettavaksi" + +-#: ../yum/__init__.py:3559 ++#: ../yum/__init__.py:3730 + #, python-format + msgid "No Match for available package: %s" + msgstr "Ei vastaavuutta saatavilla olevalle paketille: %s" + +-#: ../yum/__init__.py:3565 ++#: ../yum/__init__.py:3737 + #, python-format + msgid "Only Upgrade available on package: %s" + msgstr "Vain päivitys saatavilla paketille: %s" + +-#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 ++#: ../yum/__init__.py:3807 ../yum/__init__.py:3844 + #, python-format + msgid "Failed to downgrade: %s" + msgstr "Varhentaminen epäonnistui: %s" + +-#: ../yum/__init__.py:3704 ++#: ../yum/__init__.py:3876 + #, python-format + msgid "Retrieving GPG key from %s" + msgstr "Noudetaan GPG-avain osoitteesta %s" + +-#: ../yum/__init__.py:3724 ++#: ../yum/__init__.py:3896 + msgid "GPG key retrieval failed: " + msgstr "GPG-avaimen nouto epäonnistui: " + +-#: ../yum/__init__.py:3735 ++#: ../yum/__init__.py:3902 ++#, python-format ++msgid "Invalid GPG Key from %s: %s" ++msgstr "Virheellinen GPG-avain osoitteesta %s: %s" ++ ++#: ../yum/__init__.py:3911 + #, python-format + msgid "GPG key parsing failed: key does not have value %s" + msgstr "GPG-avaimen jäsentäminen epäonnistui: avaimessa ei ole arvoa %s" + +-#: ../yum/__init__.py:3767 ++#: ../yum/__init__.py:3943 + #, python-format + msgid "GPG key at %s (0x%s) is already installed" + msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo asennetuna" + + #. Try installing/updating GPG key +-#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 ++#: ../yum/__init__.py:3948 ../yum/__init__.py:4010 + #, python-format + msgid "Importing GPG key 0x%s \"%s\" from %s" + msgstr "Tuodaan GPG-avain 0x%s ”%s” osoitteesta %s" + +-#: ../yum/__init__.py:3789 ++#: ../yum/__init__.py:3965 + msgid "Not installing key" + msgstr "Avainta ei asenneta" + +-#: ../yum/__init__.py:3795 ++#: ../yum/__init__.py:3971 + #, python-format + msgid "Key import failed (code %d)" + msgstr "Avaimen tuonti epäonnistui (koodi %d)" + +-#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 ++#: ../yum/__init__.py:3972 ../yum/__init__.py:4031 + msgid "Key imported successfully" + msgstr "Avaimen tuonti onnistui" + +-#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 ++#: ../yum/__init__.py:3977 ../yum/__init__.py:4036 + #, python-format + msgid "" + "The GPG keys listed for the \"%s\" repository are already installed but they " +@@ -2424,41 +2591,46 @@ msgstr "" + "vastaa tätä pakettia.\n" + "Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." + +-#: ../yum/__init__.py:3810 ++#: ../yum/__init__.py:3986 + msgid "Import of key(s) didn't help, wrong key(s)?" + msgstr "Avainten tuonti ei auttanut, ovatko avaimet vääriä?" + +-#: ../yum/__init__.py:3829 ++#: ../yum/__init__.py:4005 + #, python-format + msgid "GPG key at %s (0x%s) is already imported" + msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo tuotu" + +-#: ../yum/__init__.py:3849 ++#: ../yum/__init__.py:4025 + #, python-format + msgid "Not installing key for repo %s" + msgstr "Ei asenneta avainta asennuslähteelle %s" + +-#: ../yum/__init__.py:3854 ++#: ../yum/__init__.py:4030 + msgid "Key import failed" + msgstr "Avaimen tuonti epäonnistui" + +-#: ../yum/__init__.py:3976 ++#: ../yum/__init__.py:4156 + msgid "Unable to find a suitable mirror." + msgstr "Sopivaa peilipalvelinta ei löytynyt." + +-#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4158 + msgid "Errors were encountered while downloading packages." + msgstr "Paketteja ladatessa tapahtui virheitä." + +-#: ../yum/__init__.py:4028 ++#: ../yum/__init__.py:4208 + #, python-format + msgid "Please report this error at %s" + msgstr "Ilmoita tästä ongelmasta: %s" + +-#: ../yum/__init__.py:4052 ++#: ../yum/__init__.py:4232 + msgid "Test Transaction Errors: " + msgstr "Testitransaktion virheitä: " + ++#: ../yum/__init__.py:4333 ++#, python-format ++msgid "Could not set cachedir: %s" ++msgstr "Välimuistihakemiston asettaminen epäonnistui %s" ++ + #. Mostly copied from YumOutput._outKeyValFill() + #: ../yum/plugins.py:202 + msgid "Loaded plugins: " +@@ -2517,7 +2689,20 @@ msgstr "Liitännäisen %s asetustiedostoa ei löytynyt" + msgid "registration of commands not supported" + msgstr "komentojen rekisteröintiä ei tueta" + +-#: ../yum/rpmtrans.py:78 ++#: ../yum/rpmsack.py:102 ++msgid "has missing requires of" ++msgstr "on puuttuvia riippuvuuksia" ++ ++#: ../yum/rpmsack.py:105 ++msgid "has installed conflicts" ++msgstr "on asennettuja konflikteja" ++ ++#: ../yum/rpmsack.py:114 ++#, python-format ++msgid "%s is a duplicate with %s" ++msgstr "paketti %s on paketin %s duplikaatti" ++ ++#: ../yum/rpmtrans.py:79 + msgid "Repackaging" + msgstr "Paketoidaan uudelleen" + +@@ -2550,6 +2735,24 @@ msgstr "Vioittunut otsake %s" + msgid "Error opening rpm %s - error %s" + msgstr "Virhe avattaessa RPM:ää %s – virhe %s" + ++#~ msgid "Finished Transaction Test" ++#~ msgstr "Transaktiotesti valmistui" ++ ++#~ msgid "" ++#~ " You could try running: package-cleanup --problems\n" ++#~ " package-cleanup --dupes\n" ++#~ " rpm -Va --nofiles --nodigest" ++#~ msgstr "" ++#~ " Kokeile komentoja: package-cleanup --problems\n" ++#~ " package-cleanup --dupes\n" ++#~ " rpm -Va --nofiles --nodigest" ++ ++#~ msgid "Unresolvable requirement %s for %s" ++#~ msgstr "Ratkaisematon riippuvuus %s paketille %s" ++ ++#~ msgid "Missing Dependency: %s is needed by package %s" ++#~ msgstr "Puuttuva riippuvuus: %s tarvitaan paketille %s" ++ + #~ msgid "" + #~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" + #~ "().\n" +diff --git a/po/it.po b/po/it.po +index a6c8f13..0adee83 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -2,8 +2,8 @@ + # Italian translation of yum. + # Copyright (C) 2008 Red Hat, Inc. + # This file is distributed under the same license as the yum package. +-# +-# ++# ++# + # Silvio Pierro , 2008. + # Gianluca Busiello , 2008. + # mario_santagiuliana , 2009. +@@ -12,43 +12,44 @@ msgid "" + msgstr "" + "Project-Id-Version: yum-it 3.2.8\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-10-15 15:45+0200\n" ++"POT-Creation-Date: 2010-02-11 10:54-0500\n" + "PO-Revision-Date: 2009-03-06 11:41+0100\n" + "Last-Translator: mario_santagiuliana \n" + "Language-Team: Italian \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: Lokalize 0.3\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Lokalize 0.3\n" + +-#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 ++#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 + msgid "Updating" + msgstr "Aggiornamento" + +-#: ../callback.py:49 ../yum/rpmtrans.py:72 ++#: ../callback.py:49 ../yum/rpmtrans.py:73 + msgid "Erasing" + msgstr "Cancellazione" + +-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 +-#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 ++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 ++#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 ++#: ../yum/rpmtrans.py:77 + msgid "Installing" + msgstr "Installazione" + +-#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 ++#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 + msgid "Obsoleted" + msgstr "Reso obsoleto" + +-#: ../callback.py:54 ../output.py:1063 ../output.py:1403 ++#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 + msgid "Updated" + msgstr "Aggiornato" + +-#: ../callback.py:55 ../output.py:1399 ++#: ../callback.py:55 ../output.py:1438 + msgid "Erased" + msgstr "Cancellato" + +-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 +-#: ../output.py:1395 ++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 ++#: ../output.py:1434 ../output.py:1646 + msgid "Installed" + msgstr "Installato" + +@@ -70,68 +71,73 @@ msgstr "Errore: stato di output non valido: %s per %s" + msgid "Erased: %s" + msgstr "Cancellato: %s" + +-#: ../callback.py:217 ../output.py:941 ++#: ../callback.py:217 ../output.py:948 ../output.py:1648 + msgid "Removing" + msgstr "Rimozione in corso" + +-#: ../callback.py:219 ../yum/rpmtrans.py:77 ++#: ../callback.py:219 ../yum/rpmtrans.py:78 + msgid "Cleanup" + msgstr "Pulizia" + +-#: ../cli.py:106 ++#: ../cli.py:107 + #, python-format + msgid "Command \"%s\" already defined" + msgstr "Comando \"%s\" già definito" + +-#: ../cli.py:118 ++#: ../cli.py:119 + msgid "Setting up repositories" + msgstr "Settaggio repository" + +-#: ../cli.py:129 ++#: ../cli.py:130 + msgid "Reading repository metadata in from local files" + msgstr "Lettura dei metadati dei repository dai file locali" + +-#: ../cli.py:192 ../utils.py:107 ++#: ../cli.py:194 ../utils.py:193 + #, python-format + msgid "Config Error: %s" + msgstr "Errore di configurazione: %s" + +-#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 ++#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 + #, python-format + msgid "Options Error: %s" + msgstr "Errore opzioni: %s" + +-#: ../cli.py:223 ++#: ../cli.py:227 + #, python-format + msgid " Installed: %s-%s at %s" + msgstr " Installato: %s-%s da %s" + +-#: ../cli.py:225 ++#: ../cli.py:229 + #, python-format + msgid " Built : %s at %s" + msgstr " Costruito : %s da %s" + +-#: ../cli.py:227 ++#: ../cli.py:231 + #, python-format + msgid " Committed: %s at %s" + msgstr " Committed: %s da %s" + +-#: ../cli.py:266 ++#: ../cli.py:270 + msgid "You need to give some command" + msgstr "È necessario dare qualche comando" + +-#: ../cli.py:309 ++#: ../cli.py:284 ++#, python-format ++msgid "No such command: %s. Please use %s --help" ++msgstr "" ++ ++#: ../cli.py:314 + msgid "Disk Requirements:\n" + msgstr "Requisiti su disco:\n" + +-#: ../cli.py:311 +-#, python-format +-msgid " At least %dMB needed on the %s filesystem.\n" ++#: ../cli.py:316 ++#, fuzzy, python-format ++msgid " At least %dMB more space needed on the %s filesystem.\n" + msgstr " Almeno %dMB necessari sul filesystem %s.\n" + + #. TODO: simplify the dependency errors? + #. Fixup the summary +-#: ../cli.py:316 ++#: ../cli.py:321 + msgid "" + "Error Summary\n" + "-------------\n" +@@ -139,258 +145,259 @@ msgstr "" + "Riepilogo errori\n" + "-------------\n" + +-#: ../cli.py:359 ++#: ../cli.py:364 + msgid "Trying to run the transaction but nothing to do. Exiting." + msgstr "La transazione non contiene alcuna operazione da eseguire." + +-#: ../cli.py:395 ++#: ../cli.py:403 + msgid "Exiting on user Command" + msgstr "Uscita richiesta dall'utente" + +-#: ../cli.py:399 ++#: ../cli.py:407 + msgid "Downloading Packages:" + msgstr "Download dei pacchetti:" + +-#: ../cli.py:404 ++#: ../cli.py:412 + msgid "Error Downloading Packages:\n" + msgstr "Errore nel download dei pacchetti:\n" + +-#: ../cli.py:418 ../yum/__init__.py:4014 ++#: ../cli.py:426 ../yum/__init__.py:4195 + msgid "Running rpm_check_debug" + msgstr "Esecuzione rpm_check_debug" + +-#: ../cli.py:427 ../yum/__init__.py:4023 ++#: ../cli.py:435 ../yum/__init__.py:4204 + msgid "ERROR You need to update rpm to handle:" +-msgstr "" ++msgstr "ERRORE Occorre aggiornare rpm per gestire:" + +-#: ../cli.py:429 ../yum/__init__.py:4026 ++#: ../cli.py:437 ../yum/__init__.py:4207 + msgid "ERROR with rpm_check_debug vs depsolve:" +-msgstr "ERRORE con rpm_check_debug su depsolve:" ++msgstr "ERRORE tra rpm_check_debug e depsolve:" + +-#: ../cli.py:435 ++#: ../cli.py:443 + msgid "RPM needs to be updated" +-msgstr "" ++msgstr "RPM deve essere aggiornato" + +-#: ../cli.py:436 ++#: ../cli.py:444 + #, python-format + msgid "Please report this error in %s" + msgstr "Riportare questo errore in %s" + +-#: ../cli.py:442 ++#: ../cli.py:450 + msgid "Running Transaction Test" + msgstr "Test di transazione in corso" + +-#: ../cli.py:458 +-msgid "Finished Transaction Test" +-msgstr "Test di transazione terminato" +- +-#: ../cli.py:460 ++#: ../cli.py:466 + msgid "Transaction Check Error:\n" + msgstr "Errore nel controllo transazione:\n" + +-#: ../cli.py:467 ++#: ../cli.py:473 + msgid "Transaction Test Succeeded" + msgstr "Test di transazione eseguito con successo" + +-#: ../cli.py:489 ++#: ../cli.py:495 + msgid "Running Transaction" + msgstr "Transazione in corso" + +-#: ../cli.py:519 ++#: ../cli.py:525 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" +-"L'importazione automatica delle chiavi è disabilitata in modalità non " +-"interattiva.\n" ++"L'importazione automatica delle chiavi è disabilitata in modalità non interattiva.\n" + "Usare \"-y\" per abilitarla." --#: cli.py:526 cli.py:560 -+#: cli.py:540 cli.py:574 +-#: ../cli.py:538 ../cli.py:572 ++#: ../cli.py:544 ../cli.py:578 msgid " * Maybe you meant: " - msgstr "" + msgstr " * Forse si intendeva: " --#: cli.py:543 cli.py:551 -+#: cli.py:557 cli.py:565 +-#: ../cli.py:555 ../cli.py:563 ++#: ../cli.py:561 ../cli.py:569 #, python-format msgid "Package(s) %s%s%s available, but not installed." - msgstr "パッケージ %s%s%s は利用できますが、インストールしませんでした。" + msgstr "Pacchetto(i) %s%s%s disponibili ma non installati." --#: cli.py:557 cli.py:590 -+#: cli.py:571 cli.py:602 cli.py:680 +-#: ../cli.py:569 ../cli.py:600 ../cli.py:678 ++#: ../cli.py:575 ../cli.py:607 ../cli.py:687 #, python-format msgid "No package %s%s%s available." - msgstr "パッケージ %s%s%s は利用できません。" + msgstr "Nessun pacchetto %s%s%s disponibile." --#: cli.py:595 cli.py:670 yumcommands.py:1010 -+#: cli.py:607 cli.py:740 +-#: ../cli.py:605 ../cli.py:738 ++#: ../cli.py:612 ../cli.py:748 msgid "Package(s) to install" - msgstr "インストールするパッケージ" + msgstr "Pacchetto(i) da installare" --#: cli.py:596 cli.py:671 yumcommands.py:159 yumcommands.py:1011 -+#: cli.py:608 cli.py:686 cli.py:719 cli.py:741 yumcommands.py:157 +-#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 +-#: ../yumcommands.py:159 ++#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 ++#: ../yumcommands.py:160 msgid "Nothing to do" - msgstr "何もしません" + msgstr "Niente da fare" --#: cli.py:629 -+#: cli.py:641 +-#: ../cli.py:639 ++#: ../cli.py:647 #, python-format msgid "%d packages marked for Update" - msgstr "%d 個のパッケージが更新の設定しました" + msgstr "%d pacchetti marcati per l'aggiornamento" --#: cli.py:632 -+#: cli.py:644 +-#: ../cli.py:642 ++#: ../cli.py:650 msgid "No Packages marked for Update" - msgstr "更新と設定されたパッケージがありません" + msgstr "Nessun pacchetto marcato per l'aggiornamento" --#: cli.py:646 -+#: cli.py:658 +-#: ../cli.py:656 ++#: ../cli.py:664 #, python-format msgid "%d packages marked for removal" - msgstr "%d 個のパッケージが削除の設定しました" + msgstr "%d pacchetti marcati per la rimozione" --#: cli.py:649 -+#: cli.py:661 +-#: ../cli.py:659 ++#: ../cli.py:667 msgid "No Packages marked for removal" - msgstr "削除と設定されたパッケージがありません" + msgstr "Nessun pacchetto marcato per la rimozione" --#: cli.py:661 -+#: cli.py:685 -+msgid "Package(s) to downgrade" -+msgstr "ダウングレードするパッケージ" -+ -+#: cli.py:709 -+#, python-format -+msgid " (from %s)" -+msgstr "" -+ -+#: cli.py:711 -+#, python-format -+msgid "Installed package %s%s%s%s not available." -+msgstr "インストール済みパッケージ %s%s%s%s は利用できません。" -+ -+#: cli.py:718 -+msgid "Package(s) to reinstall" -+msgstr "再インストールするパッケージ" -+ -+#: cli.py:731 +-#: ../cli.py:683 ++#: ../cli.py:692 + #, fuzzy + msgid "Package(s) to downgrade" + msgstr "Pacchetto(i) da installare" + +-#: ../cli.py:707 ++#: ../cli.py:717 + #, fuzzy, python-format + msgid " (from %s)" + msgstr " %s da %s" + +-#: ../cli.py:709 ++#: ../cli.py:719 + #, fuzzy, python-format + msgid "Installed package %s%s%s%s not available." + msgstr "Nessun pacchetto %s%s%s disponibile." + +-#: ../cli.py:716 ++#: ../cli.py:726 + #, fuzzy + msgid "Package(s) to reinstall" + msgstr "Pacchetto(i) da installare" + +-#: ../cli.py:729 ++#: ../cli.py:739 msgid "No Packages Provided" - msgstr "パッケージが提供されていません" + msgstr "Nessun pacchetto fornito" --#: cli.py:716 --msgid "Matching packages for package list to user args" --msgstr "ユーザーの引数にパッケージ一覧のパッケージを一致させています" -- --#: cli.py:765 -+#: cli.py:815 +-#: ../cli.py:813 ++#: ../cli.py:818 ++#, fuzzy, python-format ++msgid "Matched: %s" ++msgstr "Cancellato: %s" ++ ++#: ../cli.py:825 #, python-format msgid "Warning: No matches found for: %s" - msgstr "警告: 一致するものが見つかりません: %s" + msgstr "Attenzione: Nessun pacchetto trovato per %s" --#: cli.py:768 -+#: cli.py:818 +-#: ../cli.py:816 ++#: ../cli.py:828 msgid "No Matches found" - msgstr "見つかりませんでした" + msgstr "Nessuna corrispondenza trovata" --#: cli.py:807 -+#: cli.py:857 +-#: ../cli.py:855 ++#: ../cli.py:868 #, python-format msgid "" "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" msgstr "" +-"Attenzione: la versione 3.0.x di yum non fa match correttamente sui " +-"filenames.\n" ++"Attenzione: la versione 3.0.x di yum non fa match correttamente sui filenames.\n" + " Si può usare \"%s*/%s%s\" e/o \"%s*bin/%s%s\" per avere questo comportamento" --#: cli.py:823 -+#: cli.py:873 +-#: ../cli.py:871 ++#: ../cli.py:884 #, python-format msgid "No Package Found for %s" - msgstr "%s のパッケージが見つかりません" + msgstr "Nessun pacchetto trovato per %s" --#: cli.py:835 -+#: cli.py:885 +-#: ../cli.py:883 ++#: ../cli.py:896 msgid "Cleaning up Everything" - msgstr "すべて掃除しています" + msgstr "Pulizia completa" --#: cli.py:849 -+#: cli.py:899 +-#: ../cli.py:897 ++#: ../cli.py:912 msgid "Cleaning up Headers" - msgstr "ヘッダーを掃除しています" + msgstr "Pulizia headers" --#: cli.py:852 -+#: cli.py:902 +-#: ../cli.py:900 ++#: ../cli.py:915 msgid "Cleaning up Packages" - msgstr "パッケージを掃除しています" + msgstr "Pulizia pacchetti" --#: cli.py:855 -+#: cli.py:905 +-#: ../cli.py:903 ++#: ../cli.py:918 msgid "Cleaning up xml metadata" - msgstr "XML メタデータを掃除しています" + msgstr "Pulizia metadati xml" --#: cli.py:858 -+#: cli.py:908 +-#: ../cli.py:906 ++#: ../cli.py:921 msgid "Cleaning up database cache" - msgstr "データベースキャッシュを掃除しています" + msgstr "Pulizia database cache" --#: cli.py:861 -+#: cli.py:911 +-#: ../cli.py:909 ++#: ../cli.py:924 msgid "Cleaning up expire-cache metadata" - msgstr "期限切れのメタデータキャッシュを掃除しています" + msgstr "Pulizia metadati expire-cache" --#: cli.py:864 -+#: cli.py:914 +-#: ../cli.py:912 ++#: ../cli.py:927 ++#, fuzzy ++msgid "Cleaning up cached rpmdb data" ++msgstr "Pulizia metadati expire-cache" ++ ++#: ../cli.py:930 msgid "Cleaning up plugins" - msgstr "プラグインを掃除しています" + msgstr "Pulizia plugins" --#: cli.py:889 -+#: cli.py:939 +-#: ../cli.py:937 ++#: ../cli.py:955 msgid "Installed Groups:" - msgstr "インストール済みグループ:" + msgstr "Gruppi installati:" --#: cli.py:896 -+#: cli.py:951 +-#: ../cli.py:949 ++#: ../cli.py:967 msgid "Available Groups:" - msgstr "利用可能なグループ" + msgstr "Gruppi disponibili:" --#: cli.py:902 -+#: cli.py:961 +-#: ../cli.py:959 ++#: ../cli.py:977 msgid "Done" - msgstr "完了" + msgstr "Fatto" --#: cli.py:913 cli.py:931 cli.py:937 yum/__init__.py:2410 -+#: cli.py:972 cli.py:990 cli.py:996 yum/__init__.py:2579 +-#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 ++#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 #, python-format msgid "Warning: Group %s does not exist." - msgstr "警告: グループ %s が存在しません。" + msgstr "Attenzione: Il gruppo %s non esiste." --#: cli.py:941 -+#: cli.py:1000 +-#: ../cli.py:998 ++#: ../cli.py:1016 msgid "No packages in any requested group available to install or update" - msgstr "" +-msgstr "" +-"Nessun pacchetto in alcun gruppo richiesto è disponibile per l'installazione " +-"o l'aggiornamento" ++msgstr "Nessun pacchetto in alcun gruppo richiesto è disponibile per l'installazione o l'aggiornamento" --#: cli.py:943 -+#: cli.py:1002 +-#: ../cli.py:1000 ++#: ../cli.py:1018 #, python-format msgid "%d Package(s) to Install" - msgstr "%d 個のパッケージをインストールします" + msgstr "%d pacchetto(i) da installare" --#: cli.py:953 yum/__init__.py:2422 -+#: cli.py:1012 yum/__init__.py:2591 +-#: ../cli.py:1010 ../yum/__init__.py:2641 ++#: ../cli.py:1028 ../yum/__init__.py:2800 #, python-format msgid "No group named %s exists" - msgstr "グループ名 %s が存在しません" + msgstr "Non esiste nessun gruppo di nome %s" --#: cli.py:959 -+#: cli.py:1018 +-#: ../cli.py:1016 ++#: ../cli.py:1034 msgid "No packages to remove from groups" - msgstr "グループから削除するパッケージがありません" + msgstr "Nessun pacchetto da rimuovere dai gruppi" --#: cli.py:961 -+#: cli.py:1020 +-#: ../cli.py:1018 ++#: ../cli.py:1036 #, python-format msgid "%d Package(s) to remove" - msgstr "%d 個のパッケージを削除します" + msgstr "%d pacchetto(i) da rimuovere" --#: cli.py:1003 -+#: cli.py:1062 +-#: ../cli.py:1060 ++#: ../cli.py:1078 #, python-format msgid "Package %s is already installed, skipping" - msgstr "パッケージ %s は既にインストールされているので飛ばします" + msgstr "Il pacchetto %s è già installato, lo salto" --#: cli.py:1014 -+#: cli.py:1073 +-#: ../cli.py:1071 ++#: ../cli.py:1089 #, python-format msgid "Discarding non-comparable pkg %s.%s" - msgstr "非互換のパッケージ %s.%s を破棄しています" + msgstr "Escludendo il pacchetto non comparabile %s.%s" --#: cli.py:1040 -+#: cli.py:1099 + #. we've not got any installed that match n or n+a +-#: ../cli.py:1097 ++#: ../cli.py:1115 #, python-format msgid "No other %s installed, adding to list for potential install" +-msgstr "" +-"Nessun altro %s installato, inserimento in lista per potenziale installazione" ++msgstr "Nessun altro %s installato, inserimento in lista per potenziale installazione" + +-#: ../cli.py:1117 ++#: ../cli.py:1135 + msgid "Plugin Options" msgstr "" --#: cli.py:1059 -+#: cli.py:1119 -+msgid "Plugin Options" -+msgstr "" -+ -+#: cli.py:1127 +-#: ../cli.py:1125 ++#: ../cli.py:1143 #, python-format msgid "Command line error: %s" - msgstr "コマンドラインエラー: %s" + msgstr "Errore di linea di comando: %s" --#: cli.py:1072 -+#: cli.py:1140 +-#: ../cli.py:1138 ++#: ../cli.py:1156 #, python-format msgid "" "\n" -@@ -354,253 +380,258 @@ msgstr "" +@@ -401,106 +408,116 @@ msgstr "" "\n" - "%s: オプション %sは引数が必要です " + "%s: l'opzione %s richiede un argomento" --#: cli.py:1130 -+#: cli.py:1193 +-#: ../cli.py:1191 ++#: ../cli.py:1209 msgid "--color takes one of: auto, always, never" - msgstr "--color がとることができる値な次のうちひとつです: auto、always、never" + msgstr "--color deve specificare uno tra: auto, always, never" --#: cli.py:1232 -+#: cli.py:1300 +-#: ../cli.py:1298 ++#: ../cli.py:1319 msgid "show this help message and exit" - msgstr "このヘルプメッセージを表示して終了する" + msgstr "mostra questo messaggio di aiuto ed esce" --#: cli.py:1236 -+#: cli.py:1304 +-#: ../cli.py:1302 ++#: ../cli.py:1323 msgid "be tolerant of errors" - msgstr "" + msgstr "tollera gli errori" --#: cli.py:1238 -+#: cli.py:1306 - msgid "run entirely from cache, don't update cache" - msgstr "キャッシュから完全に実行します。キャッシュを更新しません" +-#: ../cli.py:1304 +-msgid "run entirely from cache, don't update cache" ++#: ../cli.py:1326 ++#, fuzzy ++msgid "run entirely from system cache, don't update cache" + msgstr "esecuzione esclusivamente in cache, senza aggiornarla" --#: cli.py:1240 -+#: cli.py:1308 +-#: ../cli.py:1306 ++#: ../cli.py:1329 msgid "config file location" - msgstr "構成ファイルの場所" + msgstr "configurazione locazione dei file" --#: cli.py:1242 -+#: cli.py:1310 +-#: ../cli.py:1308 ++#: ../cli.py:1332 msgid "maximum command wait time" - msgstr "コマンドの最大待ち時間" + msgstr "tempo di attesa comando massima" --#: cli.py:1244 -+#: cli.py:1312 +-#: ../cli.py:1310 ++#: ../cli.py:1334 msgid "debugging output level" - msgstr "デバッグ情報の出力レベル" + msgstr "livello output di debug" --#: cli.py:1248 -+#: cli.py:1316 +-#: ../cli.py:1314 ++#: ../cli.py:1338 msgid "show duplicates, in repos, in list/search commands" - msgstr "一覧/検索コマンドのリポジトリーの重複の表示" + msgstr "Mostra comandi duplicati, nei repo, in lista/cerca" --#: cli.py:1250 -+#: cli.py:1318 +-#: ../cli.py:1316 ++#: ../cli.py:1340 msgid "error output level" - msgstr "エラー出力レベル" + msgstr "livello output per gli errori" --#: cli.py:1253 -+#: cli.py:1321 +-#: ../cli.py:1319 ++#: ../cli.py:1343 ++#, fuzzy ++msgid "debugging output level for rpm" ++msgstr "livello output di debug" ++ ++#: ../cli.py:1346 msgid "quiet operation" - msgstr "静かに処理をする" + msgstr "modalità silenziosa" --#: cli.py:1255 -+#: cli.py:1323 +-#: ../cli.py:1321 ++#: ../cli.py:1348 msgid "verbose operation" - msgstr "冗長に処理をする" + msgstr "mostra più messaggi di log" --#: cli.py:1257 -+#: cli.py:1325 +-#: ../cli.py:1323 ++#: ../cli.py:1350 msgid "answer yes for all questions" - msgstr "すべての問い合わせに「yes」で答える" + msgstr "risponde si a tutte le domande" --#: cli.py:1259 -+#: cli.py:1327 +-#: ../cli.py:1325 ++#: ../cli.py:1352 msgid "show Yum version and exit" - msgstr "Yum のバージョンを表示して終了する" + msgstr "mostra la versione di Yum e esce" --#: cli.py:1260 -+#: cli.py:1328 +-#: ../cli.py:1326 ++#: ../cli.py:1353 msgid "set install root" - msgstr "インストールのベースディレクトリを設定する" + msgstr "imposta il percorso d'installazione" --#: cli.py:1264 -+#: cli.py:1332 +-#: ../cli.py:1330 ++#: ../cli.py:1357 msgid "enable one or more repositories (wildcards allowed)" - msgstr "ひとつ以上のリポジトリーを有効にする (ワイルドカード許可)" + msgstr "abilita uno o più repository (wildcard consentite)" --#: cli.py:1268 -+#: cli.py:1336 +-#: ../cli.py:1334 ++#: ../cli.py:1361 msgid "disable one or more repositories (wildcards allowed)" - msgstr "ひとつ以上のリポジトリーを無効にする (ワイルドカード許可)" + msgstr "disabilita uno o più repository (wildcard·consentite)" --#: cli.py:1271 -+#: cli.py:1339 +-#: ../cli.py:1337 ++#: ../cli.py:1364 msgid "exclude package(s) by name or glob" - msgstr "名前かワイルドカードでパッケージを除外する" + msgstr "esclude pacchetto(i) per nome o glob" --#: cli.py:1273 -+#: cli.py:1341 +-#: ../cli.py:1339 ++#: ../cli.py:1366 msgid "disable exclude from main, for a repo or for everything" - msgstr "" + msgstr "disabilita l'esclusione dal main, per un repo o per tutto" --#: cli.py:1276 -+#: cli.py:1344 +-#: ../cli.py:1342 ++#: ../cli.py:1369 msgid "enable obsoletes processing during updates" - msgstr "更新中に不要な処理を有効にします" + msgstr "abilita l'elaborazione degli obsoleti durante l'aggiornamento" --#: cli.py:1278 -+#: cli.py:1346 +-#: ../cli.py:1344 ++#: ../cli.py:1371 msgid "disable Yum plugins" - msgstr "Yum プラグインを無効にする" + msgstr "disabilita i plugin di Yum" --#: cli.py:1280 -+#: cli.py:1348 +-#: ../cli.py:1346 ++#: ../cli.py:1373 msgid "disable gpg signature checking" - msgstr "GPG 署名の確認を無効にする" + msgstr "disabilita il controllo della firma gpg" --#: cli.py:1282 -+#: cli.py:1350 +-#: ../cli.py:1348 ++#: ../cli.py:1375 msgid "disable plugins by name" - msgstr "名前でプラグインを無効にする" + msgstr "disabilita i plugin per nome" --#: cli.py:1285 -+#: cli.py:1353 +-#: ../cli.py:1351 ++#: ../cli.py:1378 msgid "enable plugins by name" - msgstr "名前でプラグインを有効にする" + msgstr "abilita i plugin per nome" --#: cli.py:1288 -+#: cli.py:1356 +-#: ../cli.py:1354 ++#: ../cli.py:1381 msgid "skip packages with depsolving problems" - msgstr "依存性に問題があるパッケージを飛ばす" + msgstr "Salto pacchetti con problemi di risoluzione dipendenze" --#: cli.py:1290 -+#: cli.py:1358 +-#: ../cli.py:1356 ++#: ../cli.py:1383 msgid "control whether color is used" - msgstr "" + msgstr "controlla se il colore è usato" --#: output.py:298 -+#: output.py:303 - msgid "Jan" - msgstr "1 月" - --#: output.py:298 -+#: output.py:303 - msgid "Feb" - msgstr "2 月" - --#: output.py:298 -+#: output.py:303 - msgid "Mar" - msgstr "3 月" - --#: output.py:298 -+#: output.py:303 - msgid "Apr" - msgstr "4 月" - --#: output.py:298 -+#: output.py:303 - msgid "May" - msgstr "5 月" - --#: output.py:298 -+#: output.py:303 - msgid "Jun" - msgstr "6 月" - --#: output.py:299 -+#: output.py:304 - msgid "Jul" - msgstr "7 月" - --#: output.py:299 -+#: output.py:304 - msgid "Aug" - msgstr "8 月" - --#: output.py:299 -+#: output.py:304 - msgid "Sep" - msgstr "9 月" - --#: output.py:299 -+#: output.py:304 - msgid "Oct" - msgstr "10 月" - --#: output.py:299 -+#: output.py:304 - msgid "Nov" - msgstr "11 月" - --#: output.py:299 -+#: output.py:304 - msgid "Dec" - msgstr "12 月" - --#: output.py:309 -+#: output.py:314 - msgid "Trying other mirror." - msgstr "他のミラーを試します。" - --#: output.py:525 -+#: output.py:536 - #, python-format - msgid "Name : %s%s%s" - msgstr "名前 : %s%s%s" - --#: output.py:526 -+#: output.py:537 - #, python-format - msgid "Arch : %s" - msgstr "アーキテクチャ: %s" - --#: output.py:528 -+#: output.py:539 - #, python-format - msgid "Epoch : %s" - msgstr "エポック : %s" - --#: output.py:529 -+#: output.py:540 - #, python-format - msgid "Version : %s" - msgstr "バージョン : %s" - --#: output.py:530 -+#: output.py:541 - #, python-format - msgid "Release : %s" - msgstr "リリース : %s" - --#: output.py:531 -+#: output.py:542 - #, python-format - msgid "Size : %s" - msgstr "容量 : %s" - --#: output.py:532 -+#: output.py:543 - #, python-format - msgid "Repo : %s" - msgstr "リポジトリー : %s" - --#: output.py:534 -+#: output.py:545 -+#, python-format -+msgid "From repo : %s" ++#: ../cli.py:1385 ++msgid "set value of $releasever in yum config and repo files" +msgstr "" + -+#: output.py:547 + #: ../output.py:305 + msgid "Jan" + msgstr "Gen" +@@ -553,106 +570,105 @@ msgstr "Dic" + msgid "Trying other mirror." + msgstr "Connessione ad un altro mirror in corso." + +-#: ../output.py:538 ++#: ../output.py:534 + #, python-format + msgid "Name : %s%s%s" + msgstr "Nome : %s%s%s" + +-#: ../output.py:539 ++#: ../output.py:535 + #, python-format + msgid "Arch : %s" + msgstr "Arch : %s" + +-#: ../output.py:541 ++#: ../output.py:537 + #, python-format + msgid "Epoch : %s" + msgstr "Periodo : %s" + +-#: ../output.py:542 ++#: ../output.py:538 + #, python-format + msgid "Version : %s" + msgstr "Versione : %s" + +-#: ../output.py:543 ++#: ../output.py:539 + #, python-format + msgid "Release : %s" + msgstr "Release : %s" + +-#: ../output.py:544 ++#: ../output.py:540 + #, python-format + msgid "Size : %s" + msgstr "Dimensione : %s" + +-#: ../output.py:545 ++#: ../output.py:541 + #, python-format + msgid "Repo : %s" + msgstr "Repo : %s" + +-#: ../output.py:547 ++#: ../output.py:543 + #, fuzzy, python-format + msgid "From repo : %s" + msgstr "Versione : %s" + +-#: ../output.py:549 ++#: ../output.py:545 #, python-format msgid "Committer : %s" - msgstr "コミット者 : %s" + msgstr "Committer : %s" --#: output.py:535 -+#: output.py:548 +-#: ../output.py:550 ++#: ../output.py:546 #, python-format msgid "Committime : %s" - msgstr "コミット日時 : %s" + msgstr "Data commit: %s" --#: output.py:536 -+#: output.py:549 +-#: ../output.py:551 ++#: ../output.py:547 #, python-format msgid "Buildtime : %s" - msgstr "ビルド日時 : %s" + msgstr "Data build : %s" --#: output.py:538 -+#: output.py:551 +-#: ../output.py:553 ++#: ../output.py:549 #, python-format msgid "Installtime: %s" - msgstr "インストール日時 : %s " + msgstr "Data inst. : %s" --#: output.py:539 -+#: output.py:552 +-#: ../output.py:554 ++#: ../output.py:550 msgid "Summary : " - msgstr "要約 : " + msgstr "Sommario : " --#: output.py:541 -+#: output.py:554 +-#: ../output.py:556 ++#: ../output.py:552 #, python-format msgid "URL : %s" - msgstr "URL : %s" + msgstr "URL : %s" --#: output.py:542 -+#: output.py:555 - #, python-format - msgid "License : %s" - msgstr "ライセンス : %s" +-#: ../output.py:557 +-#, python-format +-msgid "License : %s" ++#: ../output.py:553 ++#, fuzzy ++msgid "License : " + msgstr "Licenza : %s" --#: output.py:543 -+#: output.py:556 +-#: ../output.py:558 ++#: ../output.py:554 msgid "Description: " - msgstr "説明 : " + msgstr "Descrizione: " --#: output.py:611 -+#: output.py:624 +-#: ../output.py:626 ++#: ../output.py:622 msgid "y" - msgstr "y" + msgstr "s" --#: output.py:611 -+#: output.py:624 +-#: ../output.py:626 ++#: ../output.py:622 msgid "yes" - msgstr "はい" + msgstr "si" --#: output.py:612 -+#: output.py:625 +-#: ../output.py:627 ++#: ../output.py:623 msgid "n" msgstr "n" --#: output.py:612 -+#: output.py:625 +-#: ../output.py:627 ++#: ../output.py:623 msgid "no" - msgstr "いいえ" + msgstr "no" - # REMEMBER to Translate [Y/N] to the current locale --#: output.py:616 -+#: output.py:629 +-# +-#: ../output.py:631 ++#: ../output.py:627 msgid "Is this ok [y/N]: " - msgstr "これでいいですか? [y/N]" + msgstr "È corretto [s/N]: " --#: output.py:704 -+#: output.py:720 +-#: ../output.py:722 ++#: ../output.py:715 #, python-format msgid "" "\n" -@@ -609,264 +640,313 @@ msgstr "" +@@ -661,152 +677,154 @@ msgstr "" "\n" - "グループ: %s" + "Gruppo: %s" --#: output.py:708 -+#: output.py:724 +-#: ../output.py:726 ++#: ../output.py:719 #, python-format msgid " Group-Id: %s" - msgstr " グループ ID: %s" + msgstr " Id-Gruppo: %s" --#: output.py:713 -+#: output.py:729 +-#: ../output.py:731 ++#: ../output.py:724 #, python-format msgid " Description: %s" - msgstr " 説明: %s" + msgstr " Descrizione: %s" --#: output.py:715 -+#: output.py:731 +-#: ../output.py:733 ++#: ../output.py:726 msgid " Mandatory Packages:" - msgstr " 強制的なパッケージ:" + msgstr " Pacchetti necessari:" --#: output.py:716 -+#: output.py:732 +-#: ../output.py:734 ++#: ../output.py:727 msgid " Default Packages:" - msgstr " 標準パッケージ:" + msgstr " Pacchetti di default:" --#: output.py:717 -+#: output.py:733 +-#: ../output.py:735 ++#: ../output.py:728 msgid " Optional Packages:" - msgstr " オプションパッケージ:" + msgstr "Pacchetti opzionali:" --#: output.py:718 -+#: output.py:734 +-#: ../output.py:736 ++#: ../output.py:729 msgid " Conditional Packages:" - msgstr " 条件付パッケージ:" + msgstr " Pacchetti condizionali:" --#: output.py:738 -+#: output.py:754 +-#: ../output.py:756 ++#: ../output.py:749 #, python-format msgid "package: %s" - msgstr "パッケージ : %s" + msgstr "pacchetto: %s" --#: output.py:740 -+#: output.py:756 +-#: ../output.py:758 ++#: ../output.py:751 msgid " No dependencies for this package" - msgstr " このパッケージの依存はありません" + msgstr " Nessuna dipendenza per questo pacchetto" --#: output.py:745 -+#: output.py:761 +-#: ../output.py:763 ++#: ../output.py:756 #, python-format msgid " dependency: %s" - msgstr " 依存性 : %s" + msgstr " dipendenze: %s" --#: output.py:747 -+#: output.py:763 +-#: ../output.py:765 ++#: ../output.py:758 msgid " Unsatisfied dependency" - msgstr " 満たされていない依存性" + msgstr " Dipendenza non soddisfatte" --#: output.py:819 -+#: output.py:835 +-#: ../output.py:837 ++#: ../output.py:830 #, python-format msgid "Repo : %s" - msgstr "リポジトリー : %s" + msgstr "Repo : %s" --#: output.py:820 -+#: output.py:836 +-#: ../output.py:838 ++#: ../output.py:831 msgid "Matched from:" - msgstr "" + msgstr "Corrispondenza trovata in:" --#: output.py:828 -+#: output.py:845 +-#: ../output.py:847 ++#: ../output.py:840 msgid "Description : " - msgstr "説明 : " + msgstr "Descrizione: " --#: output.py:831 -+#: output.py:848 +-#: ../output.py:850 ++#: ../output.py:843 #, python-format msgid "URL : %s" - msgstr "URL : %s" + msgstr "URL : %s" --#: output.py:834 -+#: output.py:851 +-#: ../output.py:853 ++#: ../output.py:846 #, python-format msgid "License : %s" - msgstr "ライセンス : %s" + msgstr "Licenza : %s" --#: output.py:837 -+#: output.py:854 +-#: ../output.py:856 ++#: ../output.py:849 #, python-format msgid "Filename : %s" - msgstr "リリース : %s" + msgstr "Nome file : %s" --#: output.py:841 -+#: output.py:858 +-#: ../output.py:860 ++#: ../output.py:853 msgid "Other : " - msgstr "その他 : " + msgstr "Altro : " --#: output.py:874 -+#: output.py:891 +-#: ../output.py:893 ++#: ../output.py:896 msgid "There was an error calculating total download size" - msgstr "総ダウンロード容量の計算中にエラーです" +-msgstr "" +-"Si è verificato un errore nel calcolo della dimensione totale di download" ++msgstr "Si è verificato un errore nel calcolo della dimensione totale di download" --#: output.py:879 -+#: output.py:896 +-#: ../output.py:898 ++#: ../output.py:901 #, python-format msgid "Total size: %s" - msgstr "合計容量: %s" + msgstr "Dimensione totale: %s" --#: output.py:882 -+#: output.py:899 +-#: ../output.py:901 ++#: ../output.py:904 #, python-format msgid "Total download size: %s" - msgstr "総ダウンロード容量: %s" + msgstr "Dimensione totale del download: %s" --#: output.py:924 -+#: output.py:940 -+msgid "Reinstalling" -+msgstr "再インストールをしています" +-#: ../output.py:942 ++#: ../output.py:908 ++#, fuzzy, python-format ++msgid "Installed size: %s" ++msgstr "Data inst. : %s" + -+#: output.py:941 -+msgid "Downgrading" -+msgstr "ダウングレードをしています" -+ -+#: output.py:942 ++#: ../output.py:949 + #, fuzzy + msgid "Reinstalling" + msgstr "Installazione" + +-#: ../output.py:943 ++#: ../output.py:950 + msgid "Downgrading" + msgstr "" + +-#: ../output.py:944 ++#: ../output.py:951 msgid "Installing for dependencies" --msgstr "依存性関連でのインストールをします" -+msgstr "依存性関連でのインストールをしています" + msgstr "Installazioni per dipendenze" --#: output.py:925 -+#: output.py:943 +-#: ../output.py:945 ++#: ../output.py:952 msgid "Updating for dependencies" --msgstr "依存性関連での更新をします" -+msgstr "依存性関連での更新をしています" + msgstr "Aggiornamenti per dipendenze" --#: output.py:926 -+#: output.py:944 +-#: ../output.py:946 ++#: ../output.py:953 msgid "Removing for dependencies" - msgstr "依存性関連での削除をします" + msgstr "Rimozioni per dipendenze" --#: output.py:933 output.py:1031 -+#: output.py:951 output.py:1063 +-#: ../output.py:953 ../output.py:1065 ++#: ../output.py:960 ../output.py:1072 msgid "Skipped (dependency problems)" - msgstr "飛ばしました (依存性の問題)" + msgstr "Saltato (problemi di dipendenze):" --#: output.py:954 -+#: output.py:974 +-#: ../output.py:976 ++#: ../output.py:983 msgid "Package" - msgstr "" + msgstr "Pacchetto" --#: output.py:954 -+#: output.py:974 +-#: ../output.py:976 ++#: ../output.py:983 msgid "Arch" - msgstr "" + msgstr "Arch" --#: output.py:955 -+#: output.py:975 +-#: ../output.py:977 ++#: ../output.py:984 msgid "Version" - msgstr "" + msgstr "Versione" --#: output.py:955 -+#: output.py:975 +-#: ../output.py:977 ++#: ../output.py:984 msgid "Repository" - msgstr "" + msgstr "Repository" --#: output.py:956 -+#: output.py:976 +-#: ../output.py:978 ++#: ../output.py:985 msgid "Size" - msgstr "" + msgstr "Dim." --#: output.py:968 -+#: output.py:988 - #, python-format - msgid "" - " replacing %s%s%s.%s %s\n" - "\n" --msgstr " 置き換えています %s%s%s.%s %s\n\n" -+msgstr "" -+" 置き換えています %s%s%s.%s %s\n" -+"\n" - --#: output.py:977 -+#: output.py:997 - #, python-format - msgid "" - "\n" - "Transaction Summary\n" - "%s\n" --"Install %5.5s Package(s) \n" --"Update %5.5s Package(s) \n" --"Remove %5.5s Package(s) \n" - msgstr "" +-#: ../output.py:990 +-#, python-format +-msgid "" +-" replacing %s%s%s.%s %s\n" -"\n" --"トランザクションの要約\n" --"%s\n" --"インストール %5.5s パッケージ \n" --"更新 %5.5s パッケージ \n" --"削除 %5.5s パッケージ \n" - --#: output.py:1025 -+#: output.py:1004 -+#, python-format -+msgid "" -+"Install %5.5s Package(s)\n" -+"Upgrade %5.5s Package(s)\n" -+msgstr "" -+ -+#: output.py:1013 -+#, python-format -+msgid "" -+"Remove %5.5s Package(s)\n" -+"Reinstall %5.5s Package(s)\n" -+"Downgrade %5.5s Package(s)\n" -+msgstr "" -+ -+#: output.py:1057 - msgid "Removed" - msgstr "削除しました" - --#: output.py:1026 -+#: output.py:1058 - msgid "Dependency Removed" - msgstr "依存性の削除をしました" - --#: output.py:1028 -+#: output.py:1060 - msgid "Dependency Installed" - msgstr "依存性関連をインストールしました" - --#: output.py:1030 -+#: output.py:1062 - msgid "Dependency Updated" - msgstr "依存性を更新しました" - --#: output.py:1032 -+#: output.py:1064 - msgid "Replaced" - msgstr "置換しました" - --#: output.py:1033 -+#: output.py:1065 - msgid "Failed" - msgstr "失敗しました" - --#: output.py:1099 -+#: output.py:1131 - msgid "two" ++#: ../output.py:997 ++#, fuzzy, python-format ++msgid " replacing %s%s%s.%s %s\n" msgstr "" + " in sostituzione di %s%s%s.%s %s\n" + "\n" --#: output.py:1106 -+#: output.py:1142 +-#: ../output.py:999 ++#: ../output.py:1006 #, python-format msgid "" "\n" - " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " --"seconds to exit.\n" -+"seconds\n" -+"to exit.\n" +@@ -814,14 +832,14 @@ msgid "" + "%s\n" msgstr "" --#: output.py:1116 -+#: output.py:1153 +-#: ../output.py:1006 ++#: ../output.py:1013 + #, python-format + msgid "" + "Install %5.5s Package(s)\n" + "Upgrade %5.5s Package(s)\n" + msgstr "" + +-#: ../output.py:1015 ++#: ../output.py:1022 + #, python-format + msgid "" + "Remove %5.5s Package(s)\n" +@@ -829,32 +847,32 @@ msgid "" + "Downgrade %5.5s Package(s)\n" + msgstr "" + +-#: ../output.py:1059 ++#: ../output.py:1066 + msgid "Removed" + msgstr "Rimosso" + +-#: ../output.py:1060 ++#: ../output.py:1067 + msgid "Dependency Removed" + msgstr "Dipendenza rimossa" + +-#: ../output.py:1062 ++#: ../output.py:1069 + msgid "Dependency Installed" + msgstr "Dipendenza installata" + +-#: ../output.py:1064 ++#: ../output.py:1071 + msgid "Dependency Updated" + msgstr "Dipendenza aggiornata" + +-#: ../output.py:1066 ++#: ../output.py:1073 + msgid "Replaced" + msgstr "Sostituito" + +-#: ../output.py:1067 ++#: ../output.py:1074 + msgid "Failed" + msgstr "Fallito" + + #. Delta between C-c's so we treat as exit +-#: ../output.py:1133 ++#: ../output.py:1140 + msgid "two" + msgstr "due" + +@@ -862,233 +880,391 @@ msgstr "due" + #. Current download cancelled, interrupt (ctrl-c) again within two seconds + #. to exit. + #. Where "interupt (ctrl-c) again" and "two" are highlighted. +-#: ../output.py:1144 ++#: ../output.py:1151 + #, fuzzy, python-format + msgid "" + "\n" +-" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " +-"seconds\n" ++" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" + msgstr "" + "\n" +-" Download in corso interrotto, %spremi (ctrl-c) nuovamente%s entro %s%s%s " +-"secondi per uscire\n" ++" Download in corso interrotto, %spremi (ctrl-c) nuovamente%s entro %s%s%s secondi per uscire\n" + +-#: ../output.py:1155 ++#: ../output.py:1162 msgid "user interrupt" - msgstr "ユーザーの割り込み" + msgstr "interruzione utente" --#: output.py:1132 -+#: output.py:1171 +-#: ../output.py:1173 ++#: ../output.py:1180 msgid "Total" - msgstr "合計" + msgstr "Totale" --#: output.py:1146 -+#: output.py:1186 ++#: ../output.py:1202 ++msgid "I" ++msgstr "" ++ + #: ../output.py:1203 +-msgid "" ++msgid "O" + msgstr "" + + #: ../output.py:1204 ++msgid "E" ++msgstr "" ++ ++#: ../output.py:1205 ++msgid "R" ++msgstr "" ++ ++#: ../output.py:1206 ++msgid "D" ++msgstr "" ++ ++#: ../output.py:1207 ++msgid "U" ++msgstr "" ++ ++#: ../output.py:1217 ++msgid "" ++msgstr "" ++ ++#: ../output.py:1218 + msgid "System" + msgstr "" + +-#: ../output.py:1240 ++#: ../output.py:1254 + msgid "Bad transaction IDs, or package(s), given" + msgstr "" + +-#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 +-msgid "Warning: RPMDB has been altered since the last yum transaction." ++#: ../output.py:1266 ++msgid "ID" + msgstr "" + +-#: ../output.py:1289 ++#: ../output.py:1267 ../output.py:1520 ++msgid "Login user" ++msgstr "" ++ ++#: ../output.py:1268 ++msgid "Date and time" ++msgstr "" ++ ++#: ../output.py:1269 ../output.py:1522 ++msgid "Action(s)" ++msgstr "" ++ ++#: ../output.py:1270 ../output.py:1523 ++#, fuzzy ++msgid "Altered" ++msgstr "cancellato" ++ ++#: ../output.py:1310 + msgid "No transaction ID given" + msgstr "" + +-#: ../output.py:1297 ++#: ../output.py:1336 + msgid "Bad transaction ID given" + msgstr "" + +-#: ../output.py:1302 ++#: ../output.py:1341 + #, fuzzy + msgid "Not found given transaction ID" + msgstr "Transazione in corso" + +-#: ../output.py:1310 ++#: ../output.py:1349 + msgid "Found more than one transaction ID!" + msgstr "" + +-#: ../output.py:1331 ++#: ../output.py:1370 + msgid "No transaction ID, or package, given" + msgstr "" + +-#: ../output.py:1357 ++#: ../output.py:1396 + #, fuzzy + msgid "Transaction ID :" + msgstr "Errore nel controllo transazione:\n" + +-#: ../output.py:1359 ++#: ../output.py:1398 + msgid "Begin time :" + msgstr "" + +-#: ../output.py:1362 ../output.py:1364 ++#: ../output.py:1401 ../output.py:1403 + msgid "Begin rpmdb :" + msgstr "" + +-#: ../output.py:1378 ++#: ../output.py:1417 + #, python-format + msgid "(%s seconds)" + msgstr "" + +-#: ../output.py:1379 ++#: ../output.py:1418 + #, fuzzy + msgid "End time :" + msgstr "Altro : " + +-#: ../output.py:1382 ../output.py:1384 ++#: ../output.py:1421 ../output.py:1423 + msgid "End rpmdb :" + msgstr "" + +-#: ../output.py:1385 ++#: ../output.py:1424 + #, fuzzy + msgid "User :" + msgstr "URL : %s" + +-#: ../output.py:1387 ../output.py:1389 ../output.py:1391 ++#: ../output.py:1426 ../output.py:1428 ../output.py:1430 + #, fuzzy + msgid "Return-Code :" + msgstr "Id-Repo : " + +-#: ../output.py:1387 ++#: ../output.py:1426 + #, fuzzy + msgid "Aborted" + msgstr "Reso obsoleto" + +-#: ../output.py:1389 ++#: ../output.py:1428 + #, fuzzy + msgid "Failure:" + msgstr "Fallito" + +-#: ../output.py:1391 ++#: ../output.py:1430 + msgid "Success" + msgstr "" + +-#: ../output.py:1392 ++#: ../output.py:1431 + #, fuzzy + msgid "Transaction performed with:" + msgstr "Errore nel controllo transazione:\n" + +-#: ../output.py:1405 ++#: ../output.py:1444 ../output.py:1489 + msgid "Downgraded" + msgstr "" + + #. multiple versions installed, both older and newer +-#: ../output.py:1407 ++#: ../output.py:1446 + msgid "Weird" + msgstr "" + +-#: ../output.py:1409 ++#: ../output.py:1448 + #, fuzzy + msgid "Packages Altered:" + msgstr "Nessun pacchetto fornito" + +-#: ../output.py:1412 ++#: ../output.py:1451 + msgid "Scriptlet output:" + msgstr "" + +-#: ../output.py:1418 ++#: ../output.py:1457 + #, fuzzy + msgid "Errors:" + msgstr "Errore: %s" + +-#: ../output.py:1489 ++#: ../output.py:1481 ../output.py:1482 ++#, fuzzy ++msgid "Install" ++msgstr "Installato" ++ ++#: ../output.py:1483 ++#, fuzzy ++msgid "Dep-Install" ++msgstr "Installato" ++ ++#: ../output.py:1485 ++#, fuzzy ++msgid "Obsoleting" ++msgstr "Reso obsoleto" ++ ++#: ../output.py:1486 ++#, fuzzy ++msgid "Erase" ++msgstr "Cancellato" ++ ++#: ../output.py:1487 ++#, fuzzy ++msgid "Reinstall" ++msgstr "Installazione" ++ ++#: ../output.py:1488 ++#, fuzzy ++msgid "Downgrade" ++msgstr "Fatto" ++ ++#: ../output.py:1490 ++#, fuzzy ++msgid "Update" ++msgstr "Aggiornato" ++ ++#: ../output.py:1521 ++msgid "Time" ++msgstr "" ++ ++#: ../output.py:1547 + msgid "Last day" + msgstr "" + +-#: ../output.py:1490 ++#: ../output.py:1548 + msgid "Last week" + msgstr "" + +-#: ../output.py:1491 ++#: ../output.py:1549 + msgid "Last 2 weeks" + msgstr "" + + #. US default :p +-#: ../output.py:1492 ++#: ../output.py:1550 + msgid "Last 3 months" + msgstr "" + +-#: ../output.py:1493 ++#: ../output.py:1551 + msgid "Last 6 months" + msgstr "" + +-#: ../output.py:1494 ++#: ../output.py:1552 + msgid "Last year" + msgstr "" + +-#: ../output.py:1495 ++#: ../output.py:1553 + msgid "Over a year ago" + msgstr "" + +-#: ../output.py:1524 ++#: ../output.py:1585 msgid "installed" - msgstr "インストール" + msgstr "installato" --#: output.py:1147 -+#: output.py:1187 +-#: ../output.py:1525 ++#: ../output.py:1586 msgid "updated" - msgstr "更新" + msgstr "aggiornato" --#: output.py:1148 -+#: output.py:1188 +-#: ../output.py:1526 ++#: ../output.py:1587 msgid "obsoleted" - msgstr "不要" + msgstr "reso obsoleto" --#: output.py:1149 -+#: output.py:1189 +-#: ../output.py:1527 ++#: ../output.py:1588 msgid "erased" - msgstr "削除" + msgstr "cancellato" --#: output.py:1153 -+#: output.py:1193 +-#: ../output.py:1531 ++#: ../output.py:1592 #, python-format msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> パッケージ %s.%s %s:%s-%s を%sに設定しました" + msgstr "---> Pacchetto %s.%s %s:%s-%s settato per essere %s" --#: output.py:1160 -+#: output.py:1200 +-#: ../output.py:1538 ++#: ../output.py:1599 msgid "--> Running transaction check" - msgstr "--> トランザクションの確認を実行しています" + msgstr "--> Esecuzione del controllo di transazione" --#: output.py:1165 -+#: output.py:1205 +-#: ../output.py:1543 ++#: ../output.py:1604 msgid "--> Restarting Dependency Resolution with new changes." - msgstr "--> 新しい変更と依存性の解決を再開しています。" +-msgstr "" +-"--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti." ++msgstr "--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti." --#: output.py:1170 -+#: output.py:1210 +-#: ../output.py:1548 ++#: ../output.py:1609 msgid "--> Finished Dependency Resolution" - msgstr "--> 依存性解決を終了しました" + msgstr "--> Risoluzione delle dipendenze terminata" --#: output.py:1175 -+#: output.py:1215 output.py:1220 +-#: ../output.py:1553 ../output.py:1558 ++#: ../output.py:1614 ../output.py:1619 #, python-format msgid "--> Processing Dependency: %s for package: %s" - msgstr "--> 依存性の処理をしています: %s のパッケージ: %s" + msgstr "--> Esame delle dipendenze: %s per il pacchetto: %s" --#: output.py:1180 -+#: output.py:1224 +-#: ../output.py:1562 ++#: ../output.py:1623 #, python-format msgid "--> Unresolved Dependency: %s" - msgstr "--> 未解決の依存性: %s" + msgstr "--> Dipendenze non risolte: %s" --#: output.py:1186 -+#: output.py:1230 output.py:1235 +-#: ../output.py:1568 ../output.py:1573 ++#: ../output.py:1634 ++#, fuzzy, python-format ++msgid "Package: %s" ++msgstr "pacchetto: %s" ++ ++#: ../output.py:1636 ++#, fuzzy, python-format ++msgid "" ++"\n" ++" Requires: %s" ++msgstr "%s richiede: %s" ++ ++#: ../output.py:1649 ../output.py:1660 ++#, fuzzy, python-format ++msgid "" ++"\n" ++" %s: %s (%s)" ++msgstr " %s da %s" ++ ++#: ../output.py:1657 ++#, fuzzy ++msgid "Available" ++msgstr "Gruppi disponibili:" ++ ++#: ../output.py:1665 ../output.py:1670 #, python-format msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> 衝突を処理しています: %s は %s と衝突しています" + msgstr "--> Controllo conflitto: %s va in conflitto con %s" --#: output.py:1189 -+#: output.py:1239 +-#: ../output.py:1577 ++#: ../output.py:1674 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" +-msgstr "" +-"--> Inizializzazione della transazione con i pacchetti selezionati. " +-"Attendere prego." ++msgstr "--> Inizializzazione della transazione con i pacchetti selezionati. Attendere prego." --#: output.py:1193 -+#: output.py:1243 +-#: ../output.py:1581 ++#: ../output.py:1678 #, python-format msgid "---> Downloading header for %s to pack into transaction set." - msgstr "" - "---> トランザクションセットに束ねるために %s のヘッダーをダウンロードしていま" - "す" +-msgstr "" +-"---> Download degli header per %s per impacchettarli nel set di transazione." ++msgstr "---> Download degli header per %s per impacchettarli nel set di transazione." ++ ++#: ../utils.py:93 ++msgid "Running" ++msgstr "In esecuzione" ++ ++#: ../utils.py:94 ++#, fuzzy ++msgid "Sleeping" ++msgstr "Addormentato" ++ ++#: ../utils.py:95 ++#, fuzzy ++msgid "Uninterruptible" ++msgstr "Non interrompibile" --#: yumcommands.py:41 -+#: utils.py:132 yummain.py:42 -+msgid "" -+"\n" -+"\n" -+"Exiting on user cancel" -+msgstr "" -+"\n" -+"\n" -+"ユーザーの取り消しで終了しています" +-#: ../utils.py:137 ../yummain.py:42 ++#: ../utils.py:96 ++msgid "Zombie" ++msgstr "Zombie" + -+#: utils.py:138 yummain.py:48 -+msgid "" -+"\n" -+"\n" -+"Exiting on Broken Pipe" -+msgstr "" -+"\n" -+"\n" -+"パイプが壊れたため終了しています" ++#: ../utils.py:97 ++msgid "Traced/Stopped" ++msgstr "Tracciato/Fermato" + -+#: utils.py:140 yummain.py:50 ++#: ../utils.py:98 ../yumcommands.py:917 ++msgid "Unknown" ++msgstr "Sconosciuto" ++ ++#: ../utils.py:109 ++msgid " The other application is: PackageKit" ++msgstr " L'altra applicazione è: PackageKit" ++ ++#: ../utils.py:111 +#, python-format -+msgid "" -+"\n" -+"\n" -+"%s" -+msgstr "\n\n%s" ++msgid " The other application is: %s" ++msgstr " L'altra applicazione è: %s" + -+#: utils.py:179 yummain.py:273 -+msgid "Complete!" -+msgstr "完了しました!" ++#: ../utils.py:114 ++#, python-format ++msgid " Memory : %5s RSS (%5sB VSZ)" ++msgstr " Memoria : %5s RSS (%5sB VSZ)" + -+#: yumcommands.py:40 - msgid "You need to be root to perform this command." - msgstr "このコマンドを実行するには root である必要があります。" ++#: ../utils.py:119 ++#, python-format ++msgid " Started: %s - %s ago" ++msgstr " Partito: %s - %s fa" ++ ++#: ../utils.py:121 ++#, python-format ++msgid " State : %s, pid: %d" ++msgstr " Stato : %s, pid: %d" ++ ++#: ../utils.py:199 ++#, fuzzy, python-format ++msgid "PluginExit Error: %s" ++msgstr "Errore di configurazione: %s" ++ ++#: ../utils.py:202 ++#, fuzzy, python-format ++msgid "Yum Error: %s" ++msgstr "Errore: %s" ++ ++#: ../utils.py:235 ../yummain.py:42 + msgid "" + "\n" + "\n" +@@ -1098,7 +1274,7 @@ msgstr "" + "\n" + "Uscita forzata da utente" --#: yumcommands.py:48 -+#: yumcommands.py:47 +-#: ../utils.py:143 ../yummain.py:48 ++#: ../utils.py:241 ../yummain.py:48 + msgid "" + "\n" + "\n" +@@ -1108,7 +1284,7 @@ msgstr "" + "\n" + "Uscita per broken pipe" + +-#: ../utils.py:145 ../yummain.py:50 ++#: ../utils.py:243 ../yummain.py:50 + #, fuzzy, python-format + msgid "" + "\n" +@@ -1116,20 +1292,19 @@ msgid "" + "%s" + msgstr "%s" + +-#: ../utils.py:184 ../yummain.py:273 ++#: ../utils.py:282 ../yummain.py:211 + msgid "Complete!" + msgstr "Completo!" + +-#: ../yumcommands.py:42 ++#: ../yumcommands.py:43 + msgid "You need to be root to perform this command." + msgstr "Occorre avere i privilegi di root per eseguire questo comando" + +-#: ../yumcommands.py:49 ++#: ../yumcommands.py:50 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -884,156 +964,156 @@ msgid "" +-"However, you do not have any GPG public keys installed. You need to " +-"download\n" ++"However, you do not have any GPG public keys installed. You need to download\n" + "the keys for packages you wish to install and install them.\n" + "You can do that by running the command:\n" + " rpm --import public.gpg.key\n" +@@ -1142,365 +1317,359 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" + "\n" +-"Il controllo dei pacchetti tramite chiavi GPG è abilitato. Questa è una " +-"buona cosa. \n" +-"Comunque, non ci sono chiavi pubbliche GPG installate: è necessario " +-"scaricare le chiavi dei repository che si desidera utilizzare ed " +-"installarle.\n" ++"Il controllo dei pacchetti tramite chiavi GPG è abilitato. Questa è una buona cosa. \n" ++"Comunque, non ci sono chiavi pubbliche GPG installate: è necessario scaricare le chiavi dei repository che si desidera utilizzare ed installarle.\n" + "Per importare una chiave pubblica GPG eseguire il comando:\n" + " rpm --import public.gpg.key\n" + "\n" + "\n" +-"In alternativa è possibile specificare gli indirizzi delle chiavi dei " +-"repository nell'opzione 'gpgkey' dei relativi file di configurazione; yum la " +-"installerà automaticamente.\n" ++"In alternativa è possibile specificare gli indirizzi delle chiavi dei repository nell'opzione 'gpgkey' dei relativi file di configurazione; yum la installerà automaticamente.\n" + "\n" +-"Per maggiori informazioni contattare il provider della distribuzione o del " +-"pacchetto.\n" ++"Per maggiori informazioni contattare il provider della distribuzione o del pacchetto.\n" --#: yumcommands.py:68 -+#: yumcommands.py:67 +-#: ../yumcommands.py:69 ++#: ../yumcommands.py:70 #, python-format msgid "Error: Need to pass a list of pkgs to %s" - msgstr "エラー: パッケージの一覧を %s に渡す必要があります" + msgstr "Errore: Bisogna passare una lista di pkg a %s" --#: yumcommands.py:74 -+#: yumcommands.py:73 +-#: ../yumcommands.py:75 ++#: ../yumcommands.py:76 msgid "Error: Need an item to match" - msgstr "エラー: 一致する項目が必要です" + msgstr "Errore: richiesto un elemento di corrispondenza" --#: yumcommands.py:80 -+#: yumcommands.py:79 +-#: ../yumcommands.py:81 ++#: ../yumcommands.py:82 msgid "Error: Need a group or list of groups" - msgstr "エラー: グループ化グループの一覧が必要です" + msgstr "Errore: Necessario un gruppo o una lista di gruppi" --#: yumcommands.py:89 -+#: yumcommands.py:88 +-#: ../yumcommands.py:90 ++#: ../yumcommands.py:91 #, python-format msgid "Error: clean requires an option: %s" - msgstr "エラー: clean は引数をひとつ要求します: %s" + msgstr "Errore: il comando clean richiede l'opzione: %s" --#: yumcommands.py:94 -+#: yumcommands.py:93 +-#: ../yumcommands.py:95 ++#: ../yumcommands.py:96 #, python-format msgid "Error: invalid clean argument: %r" - msgstr "エラー: 不正な clean の引数です: %r" + msgstr "Errore: argomento per il comando clean non valido: %r" --#: yumcommands.py:107 -+#: yumcommands.py:106 +-#: ../yumcommands.py:108 ++#: ../yumcommands.py:109 msgid "No argument to shell" - msgstr "シェルへの引数がありません" + msgstr "Nessun argomento per la shell" --#: yumcommands.py:110 -+#: yumcommands.py:108 +-#: ../yumcommands.py:110 ++#: ../yumcommands.py:111 #, python-format msgid "Filename passed to shell: %s" - msgstr "シェルに渡すファイル名: %s" + msgstr "Nome file passato alla shell: %s" --#: yumcommands.py:114 -+#: yumcommands.py:112 +-#: ../yumcommands.py:114 ++#: ../yumcommands.py:115 #, python-format msgid "File %s given as argument to shell does not exist." - msgstr "シェルへの引数として渡したファイル %s は存在しません。" + msgstr "Il file %s dato come argomento per la shell non esiste." --#: yumcommands.py:120 -+#: yumcommands.py:118 +-#: ../yumcommands.py:120 ++#: ../yumcommands.py:121 msgid "Error: more than one file given as argument to shell." - msgstr "エラー: シェルへの引数としてひとつ以上のファイルを渡しました。" + msgstr "Errore: più di un file passato come argomento alla shell." --#: yumcommands.py:169 -+#: yumcommands.py:167 +-#: ../yumcommands.py:169 ++#: ../yumcommands.py:170 msgid "PACKAGE..." - msgstr "パッケージ..." + msgstr "PACCHETTO..." --#: yumcommands.py:172 -+#: yumcommands.py:170 +-#: ../yumcommands.py:172 ++#: ../yumcommands.py:173 msgid "Install a package or packages on your system" - msgstr "システムにパッケージをインストールする" + msgstr "Installa uno o più pacchetti nel sistema" --#: yumcommands.py:180 -+#: yumcommands.py:178 +-#: ../yumcommands.py:180 ++#: ../yumcommands.py:181 msgid "Setting up Install Process" - msgstr "インストール処理の設定をしています" + msgstr "Impostazione Processo di Installazione" --#: yumcommands.py:191 -+#: yumcommands.py:189 +-#: ../yumcommands.py:191 ++#: ../yumcommands.py:192 msgid "[PACKAGE...]" - msgstr "[パッケージ...]" + msgstr "[PACCHETTO...]" --#: yumcommands.py:194 -+#: yumcommands.py:192 +-#: ../yumcommands.py:194 ++#: ../yumcommands.py:195 msgid "Update a package or packages on your system" - msgstr "システムのパッケージを更新する" + msgstr "Aggiorna uno o più pacchetti nel sistema" --#: yumcommands.py:201 -+#: yumcommands.py:199 +-#: ../yumcommands.py:201 ++#: ../yumcommands.py:202 msgid "Setting up Update Process" - msgstr "更新処理の設定をしています" + msgstr "Impostazione Processo di Aggiornamento" --#: yumcommands.py:243 -+#: yumcommands.py:244 +-#: ../yumcommands.py:246 ++#: ../yumcommands.py:244 msgid "Display details about a package or group of packages" - msgstr "パッケージもしくはパッケージのグループについての詳細を表示する" + msgstr "Visualizza dettagli su un pacchetto o gruppi di pacchetti" --#: yumcommands.py:292 -+#: yumcommands.py:293 +-#: ../yumcommands.py:295 ++#: ../yumcommands.py:293 msgid "Installed Packages" - msgstr "インストール済みパッケージ" + msgstr "Pacchetti installati" --#: yumcommands.py:300 -+#: yumcommands.py:301 +-#: ../yumcommands.py:303 ++#: ../yumcommands.py:301 msgid "Available Packages" - msgstr "利用可能なパッケージ" + msgstr "Pacchetti disponibili" --#: yumcommands.py:304 -+#: yumcommands.py:305 +-#: ../yumcommands.py:307 ++#: ../yumcommands.py:305 msgid "Extra Packages" - msgstr "外部パッケージ" + msgstr "Pacchetti extra" --#: yumcommands.py:308 -+#: yumcommands.py:309 +-#: ../yumcommands.py:311 ++#: ../yumcommands.py:309 msgid "Updated Packages" - msgstr "更新したパッケージ" + msgstr "Pacchetti aggiornati" --#: yumcommands.py:316 yumcommands.py:323 yumcommands.py:600 -+#: yumcommands.py:317 yumcommands.py:324 yumcommands.py:600 + #. This only happens in verbose mode +-#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 ++#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 msgid "Obsoleting Packages" - msgstr "パッケージを不要にしています" + msgstr "Pacchetti resi obsoleti" --#: yumcommands.py:325 -+#: yumcommands.py:326 +-#: ../yumcommands.py:328 ++#: ../yumcommands.py:326 msgid "Recently Added Packages" - msgstr "最近追加したパッケージ" + msgstr "Pacchetti aggiunti di recente" --#: yumcommands.py:332 -+#: yumcommands.py:333 +-#: ../yumcommands.py:335 ++#: ../yumcommands.py:333 msgid "No matching Packages to list" - msgstr "表示するパッケージはありません" + msgstr "Nessun pacchetto presente in lista" --#: yumcommands.py:346 -+#: yumcommands.py:347 +-#: ../yumcommands.py:349 ++#: ../yumcommands.py:347 msgid "List a package or groups of packages" - msgstr "パッケージグループの一覧を表示する" + msgstr "Elenca un pacchetto o un gruppo di pacchetti" --#: yumcommands.py:358 -+#: yumcommands.py:359 +-#: ../yumcommands.py:361 ++#: ../yumcommands.py:359 msgid "Remove a package or packages from your system" - msgstr "システムから削除するパッケージ" + msgstr "Rimuove uno o più pacchetti dal sistema" --#: yumcommands.py:365 -+#: yumcommands.py:366 +-#: ../yumcommands.py:368 ++#: ../yumcommands.py:366 msgid "Setting up Remove Process" - msgstr "削除処理の設定をしています" + msgstr "Impostazione Processo di Rimozione" --#: yumcommands.py:379 -+#: yumcommands.py:380 +-#: ../yumcommands.py:382 ++#: ../yumcommands.py:380 msgid "Setting up Group Process" - msgstr "グループ処理の設定をしています" + msgstr "Settaggio dei processi di gruppo" --#: yumcommands.py:385 -+#: yumcommands.py:386 +-#: ../yumcommands.py:388 ++#: ../yumcommands.py:386 msgid "No Groups on which to run command" - msgstr "" + msgstr "Nessun gruppo sul quale eseguire il comando" --#: yumcommands.py:398 -+#: yumcommands.py:399 +-#: ../yumcommands.py:401 ++#: ../yumcommands.py:399 msgid "List available package groups" - msgstr "利用できるパッケージグループの一覧" + msgstr "Elenca i gruppi di pacchetti disponibili" --#: yumcommands.py:415 -+#: yumcommands.py:416 +-#: ../yumcommands.py:418 ++#: ../yumcommands.py:416 msgid "Install the packages in a group on your system" - msgstr "システムのグループのパッケージをインストールする" + msgstr "Installa i pacchetti di un gruppo nel sistema" --#: yumcommands.py:437 -+#: yumcommands.py:438 +-#: ../yumcommands.py:440 ++#: ../yumcommands.py:438 msgid "Remove the packages in a group from your system" - msgstr "システムからグループのパッケージを削除する" + msgstr "Rimuove i pacchetti di un gruppo dal sistema" --#: yumcommands.py:464 -+#: yumcommands.py:465 +-#: ../yumcommands.py:467 ++#: ../yumcommands.py:465 msgid "Display details about a package group" - msgstr "パッケージグループについての詳細を表示する" + msgstr "Visualizza i dettagli di un gruppo di pacchetti" --#: yumcommands.py:488 -+#: yumcommands.py:489 +-#: ../yumcommands.py:491 ++#: ../yumcommands.py:489 msgid "Generate the metadata cache" - msgstr "メタデータキャッシュを生成する" + msgstr "Genera la cache dei metadati" --#: yumcommands.py:494 -+#: yumcommands.py:495 +-#: ../yumcommands.py:497 ++#: ../yumcommands.py:495 msgid "Making cache files for all metadata files." - msgstr "すべて飲めたデータファイルのキャッシュを作成します。" + msgstr "Creazione dei file di cache per i metadati." --#: yumcommands.py:495 -+#: yumcommands.py:496 +-#: ../yumcommands.py:498 ++#: ../yumcommands.py:496 msgid "This may take a while depending on the speed of this computer" - msgstr "" +-msgstr "" +-"L'operazione impiegherà del tempo che dipende dalla velocità del computer" ++msgstr "L'operazione impiegherà del tempo che dipende dalla velocità del computer" --#: yumcommands.py:516 -+#: yumcommands.py:517 +-#: ../yumcommands.py:519 ++#: ../yumcommands.py:517 msgid "Metadata Cache Created" - msgstr "メタデータのキャッシュを作成しました" + msgstr "Cache dei metadata creata" --#: yumcommands.py:530 -+#: yumcommands.py:531 +-#: ../yumcommands.py:533 ++#: ../yumcommands.py:531 msgid "Remove cached data" - msgstr "キャッシュデータを削除する" + msgstr "Rimuovere i dati nella cache" -@@ -1106,15 +1186,15 @@ msgid "disabled" - msgstr "無効" +-#: ../yumcommands.py:553 ++#: ../yumcommands.py:551 + msgid "Find what package provides the given value" + msgstr "Cerca quale pacchetto fornisce il valore dato" - #: yumcommands.py:827 --msgid "Repo-id : " --msgstr "リポジトリーID : " -+msgid "Repo-id : " -+msgstr "リポジトリーID : " +-#: ../yumcommands.py:573 ++#: ../yumcommands.py:571 + msgid "Check for available package updates" + msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti" - #: yumcommands.py:828 --msgid "Repo-name : " --msgstr "リポジトリー名 : " -+msgid "Repo-name : " -+msgstr "リポジトリー名 : " +-#: ../yumcommands.py:623 ++#: ../yumcommands.py:621 + msgid "Search package details for the given string" + msgstr "Cerca il termine passato nei dettagli dei pacchetti" - #: yumcommands.py:829 --msgid "Repo-status : " -+msgid "Repo-status : " - msgstr "リポジトリーの状態: " +-#: ../yumcommands.py:629 ++#: ../yumcommands.py:627 + msgid "Searching Packages: " + msgstr "Ricerca dei pacchetti: " - #: yumcommands.py:831 -@@ -1122,67 +1202,94 @@ msgid "Repo-revision: " - msgstr "リポジトリーのリビジョン: " +-#: ../yumcommands.py:646 ++#: ../yumcommands.py:644 + msgid "Update packages taking obsoletes into account" + msgstr "Aggiornamento pacchetti tenendo conto degli obsoleti" - #: yumcommands.py:835 --msgid "Repo-tags : " --msgstr "リポジトリータグ : " -+msgid "Repo-tags : " -+msgstr "リポジトリータグ : " +-#: ../yumcommands.py:654 ++#: ../yumcommands.py:652 + msgid "Setting up Upgrade Process" + msgstr "Impostazione Processo di Aggiornamento del sistema" - #: yumcommands.py:841 +-#: ../yumcommands.py:668 ++#: ../yumcommands.py:666 + msgid "Install a local RPM" + msgstr "Installa un RPM locale" + +-#: ../yumcommands.py:676 ++#: ../yumcommands.py:674 + msgid "Setting up Local Package Process" + msgstr "Settaggio processamento pacchetti locali" + +-#: ../yumcommands.py:695 ++#: ../yumcommands.py:693 + msgid "Determine which package provides the given dependency" + msgstr "Determina quale pacchetto soddisfa la dipendenza" + +-#: ../yumcommands.py:698 ++#: ../yumcommands.py:696 + msgid "Searching Packages for Dependency:" + msgstr "Ricerca dei pacchetti per dipendenze:" + +-#: ../yumcommands.py:712 ++#: ../yumcommands.py:710 + msgid "Run an interactive yum shell" + msgstr "Esegui una shell di yum interattiva" + +-#: ../yumcommands.py:718 ++#: ../yumcommands.py:716 + msgid "Setting up Yum Shell" + msgstr "Impostazione della shell di yum" + +-#: ../yumcommands.py:736 ++#: ../yumcommands.py:734 + msgid "List a package's dependencies" + msgstr "Elenca le dipendenze del pacchetto" + +-#: ../yumcommands.py:742 ++#: ../yumcommands.py:740 + msgid "Finding dependencies: " + msgstr "Ricerca delle dipendenze: " + +-#: ../yumcommands.py:758 ++#: ../yumcommands.py:756 + msgid "Display the configured software repositories" + msgstr "Mostra i repository di software configurati" + +-#: ../yumcommands.py:810 ../yumcommands.py:811 ++#: ../yumcommands.py:822 ../yumcommands.py:823 + msgid "enabled" + msgstr "abilitato" + +-#: ../yumcommands.py:819 ../yumcommands.py:820 ++#: ../yumcommands.py:849 ../yumcommands.py:850 + msgid "disabled" + msgstr "disabilitato" + +-#: ../yumcommands.py:834 ++#: ../yumcommands.py:866 + #, fuzzy + msgid "Repo-id : " + msgstr "Id-Repo : " + +-#: ../yumcommands.py:835 ++#: ../yumcommands.py:867 + #, fuzzy + msgid "Repo-name : " + msgstr "Nome-Repo : " + +-#: ../yumcommands.py:836 ++#: ../yumcommands.py:870 + #, fuzzy + msgid "Repo-status : " + msgstr "Stato-Repo : " + +-#: ../yumcommands.py:838 ++#: ../yumcommands.py:873 + msgid "Repo-revision: " + msgstr "Revisione-Repo: " + +-#: ../yumcommands.py:842 ++#: ../yumcommands.py:877 + #, fuzzy + msgid "Repo-tags : " + msgstr "Repo-tags : " + +-#: ../yumcommands.py:848 ++#: ../yumcommands.py:883 msgid "Repo-distro-tags: " - msgstr "" + msgstr "Repo-distro-tags: " - #: yumcommands.py:846 --msgid "Repo-updated: " -+msgid "Repo-updated : " - msgstr "" +-#: ../yumcommands.py:853 ++#: ../yumcommands.py:888 + #, fuzzy + msgid "Repo-updated : " + msgstr "Repo-aggiornato: " - #: yumcommands.py:848 --msgid "Repo-pkgs : " -+msgid "Repo-pkgs : " - msgstr "" +-#: ../yumcommands.py:855 ++#: ../yumcommands.py:890 + #, fuzzy + msgid "Repo-pkgs : " + msgstr "Repo-pkgs : " - #: yumcommands.py:849 --msgid "Repo-size : " --msgstr "リポジトリー容量 : %s" -+msgid "Repo-size : " -+msgstr "リポジトリー容量 : " +-#: ../yumcommands.py:856 ++#: ../yumcommands.py:891 + #, fuzzy + msgid "Repo-size : " + msgstr "Dim.-Repo : " - #: yumcommands.py:856 --msgid "Repo-baseurl: " --msgstr "" -+msgid "Repo-baseurl : " -+msgstr "リポジトリー基点 URL: " +-#: ../yumcommands.py:863 ++#: ../yumcommands.py:898 + #, fuzzy + msgid "Repo-baseurl : " + msgstr "Repo-baseurl: " --#: yumcommands.py:860 -+#: yumcommands.py:864 +-#: ../yumcommands.py:871 ++#: ../yumcommands.py:906 msgid "Repo-metalink: " --msgstr "" + msgstr "Repo-metalink: " + +-#: ../yumcommands.py:875 ++#: ../yumcommands.py:910 + #, fuzzy + msgid " Updated : " + msgstr "Aggiornato" + +-#: ../yumcommands.py:878 ++#: ../yumcommands.py:913 + #, fuzzy + msgid "Repo-mirrors : " + msgstr "Repo-mirrors: " + +-#: ../yumcommands.py:882 ../yummain.py:133 +-msgid "Unknown" +-msgstr "Sconosciuto" - --#: yumcommands.py:863 --msgid "Repo-mirrors: " --msgstr "" -+msgstr "リポジトリー メタリンク: " - --#: yumcommands.py:867 --msgid "Repo-exclude: " --msgstr "" -+#: yumcommands.py:868 -+msgid " Updated : " -+msgstr "更新しました : " - - #: yumcommands.py:871 --msgid "Repo-include: " -+msgid "Repo-mirrors : " -+msgstr "リポジトリー ミラー: " -+ -+#: yumcommands.py:875 yummain.py:133 -+msgid "Unknown" -+msgstr "不明" -+ -+#: yumcommands.py:881 -+#, python-format -+msgid "Never (last: %s)" +-#: ../yumcommands.py:888 ++#: ../yumcommands.py:923 + #, python-format + msgid "Never (last: %s)" msgstr "" --#: yumcommands.py:881 yumcommands.py:907 -+#: yumcommands.py:883 -+#, python-format -+msgid "Instant (last: %s)" -+msgstr "インスタント (最終: %s)" +-#: ../yumcommands.py:890 ++#: ../yumcommands.py:925 + #, fuzzy, python-format + msgid "Instant (last: %s)" + msgstr "Data inst. : %s" + +-#: ../yumcommands.py:893 ++#: ../yumcommands.py:928 + #, fuzzy, python-format + msgid "%s second(s) (last: %s)" + msgstr "Conflitti di %s: %s" + +-#: ../yumcommands.py:895 ++#: ../yumcommands.py:930 + #, fuzzy + msgid "Repo-expire : " + msgstr "Dim.-Repo : " + +-#: ../yumcommands.py:898 ++#: ../yumcommands.py:933 + #, fuzzy + msgid "Repo-exclude : " + msgstr "Repo-exclude: " + +-#: ../yumcommands.py:902 ++#: ../yumcommands.py:937 + #, fuzzy + msgid "Repo-include : " + msgstr "Repo-include:" + ++#: ../yumcommands.py:941 ++#, fuzzy ++msgid "Repo-excluded: " ++msgstr "Repo-exclude: " + -+#: yumcommands.py:886 -+#, python-format -+msgid "%s second(s) (last: %s)" -+msgstr "%s 秒 (最終: %s)" -+ -+#: yumcommands.py:888 -+msgid "Repo-expire : " -+msgstr "リポジトリー期限 : " -+ -+#: yumcommands.py:891 -+msgid "Repo-exclude : " -+msgstr "リポジトリー除外 : " -+ -+#: yumcommands.py:895 -+msgid "Repo-include : " -+msgstr "リポジトリー内包 : " -+ -+#: yumcommands.py:905 yumcommands.py:931 + #. Work out the first (id) and last (enabled/disalbed/count), + #. then chop the middle (name)... +-#: ../yumcommands.py:912 ../yumcommands.py:938 ++#: ../yumcommands.py:951 ../yumcommands.py:980 msgid "repo id" --msgstr "" -+msgstr "リポジトリー ID" + msgstr "repo id" --#: yumcommands.py:895 yumcommands.py:896 yumcommands.py:910 -+#: yumcommands.py:919 yumcommands.py:920 yumcommands.py:934 +-#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 ++#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 msgid "status" --msgstr "" -+msgstr "状態" + msgstr "stato" --#: yumcommands.py:908 -+#: yumcommands.py:932 +-#: ../yumcommands.py:939 ++#: ../yumcommands.py:981 msgid "repo name" --msgstr "" -+msgstr "リポジトリー名" + msgstr "nome repo" --#: yumcommands.py:934 -+#: yumcommands.py:958 +-#: ../yumcommands.py:965 ++#: ../yumcommands.py:1018 msgid "Display a helpful usage message" - msgstr "役立つ使い方のメッセージを表示する" + msgstr "Mostra un messaggio utile per l'uso" --#: yumcommands.py:968 -+#: yumcommands.py:992 +-#: ../yumcommands.py:999 ++#: ../yumcommands.py:1052 #, python-format msgid "No help available for %s" - msgstr "%s のヘルプは利用できません" + msgstr "Nessun aiuto disponibile per %s" --#: yumcommands.py:973 -+#: yumcommands.py:997 +-#: ../yumcommands.py:1004 ++#: ../yumcommands.py:1057 msgid "" "\n" "\n" -@@ -1192,7 +1299,7 @@ msgstr "" +@@ -1510,7 +1679,7 @@ msgstr "" "\n" - "別名: " + "alias: " --#: yumcommands.py:975 -+#: yumcommands.py:999 +-#: ../yumcommands.py:1006 ++#: ../yumcommands.py:1059 msgid "" "\n" "\n" -@@ -1202,108 +1309,104 @@ msgstr "" +@@ -1520,153 +1689,103 @@ msgstr "" "\n" - "別名: " + "alias: " --#: yumcommands.py:1003 -+#: yumcommands.py:1027 +-#: ../yumcommands.py:1034 ++#: ../yumcommands.py:1087 msgid "Setting up Reinstall Process" - msgstr "再インストール処理の設定をしています" + msgstr "Impostazione Processo di Reinstallazione" --#: yumcommands.py:1017 -+#: yumcommands.py:1035 +-#: ../yumcommands.py:1042 ++#: ../yumcommands.py:1095 msgid "reinstall a package" - msgstr "パッケージの再インストール" + msgstr "reinstalla un pacchetto" --#: yummain.py:42 --msgid "" --"\n" --"\n" --"Exiting on user cancel" --msgstr "" --"\n" --"\n" --"ユーザーの取り消しで終了しています" -+#: yumcommands.py:1053 -+msgid "Setting up Downgrade Process" -+msgstr "ダウングレード処理の設定をしています" +-#: ../yumcommands.py:1060 ++#: ../yumcommands.py:1113 + #, fuzzy + msgid "Setting up Downgrade Process" + msgstr "Impostazione Processo di Aggiornamento del sistema" --#: yummain.py:48 --msgid "" --"\n" --"\n" --"Exiting on Broken Pipe" -+#: yumcommands.py:1060 -+msgid "downgrade a package" -+msgstr "パッケージのダウングレード" -+ -+#: yumcommands.py:1074 -+msgid "Display a version for the machine and/or available repos." - msgstr "" --"\n" --"\n" --"パイプが壊れたため終了しています" +-#: ../yumcommands.py:1067 ++#: ../yumcommands.py:1120 + #, fuzzy + msgid "downgrade a package" + msgstr "reinstalla un pacchetto" --#: yummain.py:126 -+#: yumcommands.py:1101 -+msgid "Installed:" -+msgstr "インストール済み:" -+ -+#: yumcommands.py:1110 -+msgid "Available:" -+msgstr "利用可能:" -+ -+#: yummain.py:128 - msgid "Running" - msgstr "実行中" - --#: yummain.py:127 -+#: yummain.py:129 - msgid "Sleeping" - msgstr "スリープ中" - --#: yummain.py:128 -+#: yummain.py:130 - msgid "Uninteruptable" --msgstr "" -+msgstr "割り込み不可" - --#: yummain.py:129 -+#: yummain.py:131 - msgid "Zombie" - msgstr "ゾンビ" - --#: yummain.py:130 -+#: yummain.py:132 - msgid "Traced/Stopped" +-#: ../yumcommands.py:1081 ++#: ../yumcommands.py:1134 + msgid "Display a version for the machine and/or available repos." msgstr "" --#: yummain.py:131 --msgid "Unknown" --msgstr "不明" +-#: ../yumcommands.py:1111 ++#: ../yumcommands.py:1173 + msgid " Yum version groups:" + msgstr "" + +-#: ../yumcommands.py:1121 ++#: ../yumcommands.py:1183 + #, fuzzy + msgid " Group :" + msgstr " Id-Gruppo: %s" + +-#: ../yumcommands.py:1122 ++#: ../yumcommands.py:1184 + #, fuzzy + msgid " Packages:" + msgstr "Pacchetto" + +-#: ../yumcommands.py:1152 ++#: ../yumcommands.py:1213 + #, fuzzy + msgid "Installed:" + msgstr "Installato" + +-#: ../yumcommands.py:1157 ++#: ../yumcommands.py:1218 + #, fuzzy + msgid "Group-Installed:" + msgstr "Installato" + +-#: ../yumcommands.py:1166 ++#: ../yumcommands.py:1227 + #, fuzzy + msgid "Available:" + msgstr "Gruppi disponibili:" + +-#: ../yumcommands.py:1172 ++#: ../yumcommands.py:1233 + #, fuzzy + msgid "Group-Available:" + msgstr "Gruppi disponibili:" + +-#: ../yumcommands.py:1211 ++#: ../yumcommands.py:1272 + msgid "Display, or use, the transaction history" + msgstr "" + +-#: ../yumcommands.py:1239 ++#: ../yumcommands.py:1300 + #, python-format + msgid "Invalid history sub-command, use: %s." + msgstr "" + +-#: ../yummain.py:128 +-msgid "Running" +-msgstr "In esecuzione" - --#: yummain.py:135 -+#: yummain.py:137 - msgid " The other application is: PackageKit" - msgstr " 他のアプリケーション: PackageKit" - --#: yummain.py:137 -+#: yummain.py:139 - #, python-format - msgid " The other application is: %s" - msgstr " 他のアプリケーション: %s" - --#: yummain.py:140 -+#: yummain.py:142 - #, python-format - msgid " Memory : %5s RSS (%5sB VSZ)" - msgstr " メモリー: %5s RSS (%5sB VSZ)" - --#: yummain.py:144 -+#: yummain.py:146 - #, python-format - msgid " Started: %s - %s ago" - msgstr " 開始 : %s - %s 秒経過" - --#: yummain.py:146 -+#: yummain.py:148 - #, python-format - msgid " State : %s, pid: %d" - msgstr " 状態 : %s、PID: %d" - --#: yummain.py:171 -+#: yummain.py:173 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." +-#: ../yummain.py:129 +-#, fuzzy +-msgid "Sleeping" +-msgstr "Addormentato" +- +-#: ../yummain.py:130 +-msgid "Uninteruptable" +-msgstr "Non interrompibile" +- +-#: ../yummain.py:131 +-msgid "Zombie" +-msgstr "Zombie" +- +-#: ../yummain.py:132 +-msgid "Traced/Stopped" +-msgstr "Tracciato/Fermato" +- +-#: ../yummain.py:137 +-msgid " The other application is: PackageKit" +-msgstr " L'altra applicazione è: PackageKit" +- +-#: ../yummain.py:139 +-#, python-format +-msgid " The other application is: %s" +-msgstr " L'altra applicazione è: %s" +- +-#: ../yummain.py:142 +-#, python-format +-msgid " Memory : %5s RSS (%5sB VSZ)" +-msgstr " Memoria : %5s RSS (%5sB VSZ)" +- +-#: ../yummain.py:146 +-#, python-format +-msgid " Started: %s - %s ago" +-msgstr " Partito: %s - %s fa" +- +-#: ../yummain.py:148 +-#, python-format +-msgid " State : %s, pid: %d" +-msgstr " Stato : %s, pid: %d" +- +-#: ../yummain.py:173 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." ++#: ../yumcommands.py:1345 ++msgid "Check for problems in the rpmdb" msgstr "" - "別のアプリケーションが現在 yum のロックを持っています。終了するまで待っていま" - "す..." +-"Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che " +-"esca..." --#: yummain.py:199 yummain.py:238 -+#: yummain.py:201 yummain.py:240 +-#: ../yummain.py:201 ../yummain.py:240 ++#: ../yummain.py:102 ++msgid "Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che esca..." ++ ++#: ../yummain.py:130 ../yummain.py:169 #, python-format msgid "Error: %s" - msgstr "エラー: %s" + msgstr "Errore: %s" --#: yummain.py:209 yummain.py:250 -+#: yummain.py:211 yummain.py:253 +-#: ../yummain.py:211 ../yummain.py:253 ++#: ../yummain.py:140 ../yummain.py:182 #, python-format msgid "Unknown Error(s): Exit Code: %d:" - msgstr "不明なエラー: 終了コード: %d:" + msgstr "Errore(i) sconosciuto: Codice di uscita: %d:" --#: yummain.py:216 -+#: yummain.py:218 + #. Depsolve stage +-#: ../yummain.py:218 ++#: ../yummain.py:147 msgid "Resolving Dependencies" - msgstr "依存性の解決をしています" + msgstr "Risoluzione dipendenze" --#: yummain.py:240 -+#: yummain.py:242 +-#: ../yummain.py:242 ++#: ../yummain.py:173 msgid " You could try using --skip-broken to work around the problem" - msgstr " 問題を回避するために --skip-broken を用いることができません" + msgstr " Si può provare ad usare --skip-broken per aggirare il problema" --#: yummain.py:241 -+#: yummain.py:243 - msgid "" - " You could try running: package-cleanup --problems\n" - " package-cleanup --dupes\n" -@@ -1313,7 +1416,7 @@ msgstr "" - " package-cleanup --dupes\n" - " rpm -Va --nofiles --nodigest" +-#: ../yummain.py:243 +-#, fuzzy +-msgid "" +-" You could try running: package-cleanup --problems\n" +-" package-cleanup --dupes\n" +-" rpm -Va --nofiles --nodigest" ++#: ../yummain.py:175 ../yummain.py:208 ++msgid " You could try running: rpm -Va --nofiles --nodigest" + msgstr "" +-" Provare a lanciare: package-cleanup --problems\n" +-" package-cleanup --dupes" --#: yummain.py:256 -+#: yummain.py:259 +-#: ../yummain.py:259 ++#: ../yummain.py:188 msgid "" "\n" "Dependencies Resolved" -@@ -1321,321 +1424,328 @@ msgstr "" +@@ -1674,7 +1793,7 @@ msgstr "" "\n" - "依存性を解決しました" + "Dipendenze risolte" --#: yummain.py:270 --msgid "Complete!" --msgstr "完了しました!" -- --#: yummain.py:325 -+#: yummain.py:326 +-#: ../yummain.py:326 ++#: ../yummain.py:265 msgid "" "\n" "\n" - "Exiting on user cancel." --msgstr "\n\n\nユーザーによる取り消しで終了しています。" -+msgstr "" -+"\n" -+"\n" -+"\n" -+"ユーザーによる取り消しで終了しています。" - --#: yum/depsolve.py:84 -+#: yum/depsolve.py:83 - msgid "doTsSetup() will go away in a future version of Yum.\n" - msgstr "doTsSetup() は Yum の将来のバージョンでなくなります。\n" - --#: yum/depsolve.py:99 -+#: yum/depsolve.py:98 - msgid "Setting up TransactionSets before config class is up" - msgstr "構成クラスが終わる前にトランザクションセットを設定しています" - --#: yum/depsolve.py:150 -+#: yum/depsolve.py:149 - #, python-format - msgid "Invalid tsflag in config file: %s" - msgstr "構成ファイルの tsflag が不正です: %s" - --#: yum/depsolve.py:161 -+#: yum/depsolve.py:160 - #, python-format - msgid "Searching pkgSack for dep: %s" - msgstr "依存性の pkgSack を検索しています: %s" - --#: yum/depsolve.py:184 -+#: yum/depsolve.py:183 - #, python-format - msgid "Potential match for %s from %s" - msgstr "" - --#: yum/depsolve.py:192 -+#: yum/depsolve.py:191 - #, python-format +@@ -1712,174 +1831,163 @@ msgstr "Corrispondenza potenziale per %s da %s" msgid "Matched %s to require for %s" --msgstr "" -+msgstr "%s は %s の要求に一致しました" + msgstr "Individuato %s come requisito per %s" --#: yum/depsolve.py:233 -+#: yum/depsolve.py:232 +-#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:225 #, python-format msgid "Member: %s" - msgstr "メンバー: %s" + msgstr "Membro: %s" --#: yum/depsolve.py:247 yum/depsolve.py:738 -+#: yum/depsolve.py:246 yum/depsolve.py:756 +-#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 ++#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 #, python-format msgid "%s converted to install" - msgstr "%s をインストールに変更しました" + msgstr "%s convertito in installa" --#: yum/depsolve.py:254 -+#: yum/depsolve.py:253 +-#: ../yum/depsolve.py:245 ++#: ../yum/depsolve.py:246 #, python-format msgid "Adding Package %s in mode %s" - msgstr "モード %s にパッケージ %s を追加しています" + msgstr "Aggiunto il pacchetto %s in modo %s" --#: yum/depsolve.py:264 -+#: yum/depsolve.py:263 +-#: ../yum/depsolve.py:255 ++#: ../yum/depsolve.py:256 #, python-format msgid "Removing Package %s" - msgstr "パッケージ %s の削除をしています" + msgstr "Rimozione pacchetto %s" --#: yum/depsolve.py:275 -+#: yum/depsolve.py:285 +-#: ../yum/depsolve.py:277 ++#: ../yum/depsolve.py:278 #, python-format msgid "%s requires: %s" - msgstr "%s の要求: %s" + msgstr "%s richiede: %s" --#: yum/depsolve.py:333 -+#: yum/depsolve.py:343 +-#: ../yum/depsolve.py:335 ++#: ../yum/depsolve.py:319 ++#, fuzzy, python-format ++msgid "%s requires %s" ++msgstr "%s richiede: %s" ++ ++#: ../yum/depsolve.py:346 msgid "Needed Require has already been looked up, cheating" - msgstr "必要な要求は既に調べましたが不正をしています" + msgstr "Il requisito necessario è già stato controllato, imbroglio" --#: yum/depsolve.py:343 -+#: yum/depsolve.py:353 +-#: ../yum/depsolve.py:345 ++#: ../yum/depsolve.py:356 #, python-format msgid "Needed Require is not a package name. Looking up: %s" - msgstr "必要な要求はパッケージ名ではありません。調べています: %s" + msgstr "Il requisito necessario non è il nome di un pacchetto. Guardando: %s" --#: yum/depsolve.py:350 -+#: yum/depsolve.py:360 +-#: ../yum/depsolve.py:352 ++#: ../yum/depsolve.py:363 #, python-format msgid "Potential Provider: %s" - msgstr "" + msgstr "Provider potenziale: %s" --#: yum/depsolve.py:373 -+#: yum/depsolve.py:383 +-#: ../yum/depsolve.py:375 ++#: ../yum/depsolve.py:386 #, python-format msgid "Mode is %s for provider of %s: %s" --msgstr "" -+msgstr "%s のモードは %s が提供しています: %s" + msgstr "La modalità è %s per il provider di %s: %s" --#: yum/depsolve.py:377 -+#: yum/depsolve.py:387 +-#: ../yum/depsolve.py:379 ++#: ../yum/depsolve.py:390 #, python-format msgid "Mode for pkg providing %s: %s" --msgstr "" -+msgstr "%s の提供しているパッケージのモード: %s" + msgstr "Modalità per la fornitura del pacchetto %s: %s" --#: yum/depsolve.py:381 -+#: yum/depsolve.py:391 +-#: ../yum/depsolve.py:383 ++#: ../yum/depsolve.py:394 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "" + msgstr "TSINFO: il pacchetto %s richiede che %s sia marcato per la rimozione" --#: yum/depsolve.py:394 -+#: yum/depsolve.py:404 +-#: ../yum/depsolve.py:396 ++#: ../yum/depsolve.py:407 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" +-msgstr "" +-"TSINFO: Verrà reso obsoleto %s, sostituendolo con %s per risolvere una " +-"dipendenza." ++msgstr "TSINFO: Verrà reso obsoleto %s, sostituendolo con %s per risolvere una dipendenza." --#: yum/depsolve.py:397 -+#: yum/depsolve.py:407 +-#: ../yum/depsolve.py:399 ++#: ../yum/depsolve.py:410 #, python-format msgid "TSINFO: Updating %s to resolve dep." - msgstr "" + msgstr "TSINFO: Aggiornamento di %s per risolvere dip." --#: yum/depsolve.py:405 -+#: yum/depsolve.py:415 +-#: ../yum/depsolve.py:407 ++#: ../yum/depsolve.py:418 #, python-format msgid "Cannot find an update path for dep for: %s" -msgstr "" -+msgstr "依存する更新パスを見つけられません: %s" +-"Impossibile trovare un percorso di aggiornamento per dipendenze per: %s" +- +-#: ../yum/depsolve.py:417 +-#, python-format +-msgid "Unresolvable requirement %s for %s" +-msgstr "Requisito %s non risolvibile per %s" ++msgstr "Impossibile trovare un percorso di aggiornamento per dipendenze per: %s" --#: yum/depsolve.py:415 -+#: yum/depsolve.py:425 - #, python-format - msgid "Unresolvable requirement %s for %s" - msgstr "要求された %s は %s で解決しませんでした" - --#: yum/depsolve.py:438 -+#: yum/depsolve.py:448 +-#: ../yum/depsolve.py:440 ++#: ../yum/depsolve.py:449 #, python-format msgid "Quick matched %s to require for %s" - msgstr "" + msgstr "Individuato %s come requisito per %s" --#: yum/depsolve.py:480 -+#: yum/depsolve.py:490 + #. is it already installed? +-#: ../yum/depsolve.py:482 ++#: ../yum/depsolve.py:491 #, python-format msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s を提供するパッケージはすでにインストールされています。削除しています。" + msgstr "%s è nei pacchetti forniti ma è già installato, Rimozione." --#: yum/depsolve.py:496 -+#: yum/depsolve.py:506 +-#: ../yum/depsolve.py:498 ++#: ../yum/depsolve.py:507 #, python-format msgid "Potential resolving package %s has newer instance in ts." - msgstr "" +-msgstr "" +-"Potenziale risoluzione del pacchetto %s ha una instanza piu nuova in ts." ++msgstr "Potenziale risoluzione del pacchetto %s ha una instanza piu nuova in ts." --#: yum/depsolve.py:507 -+#: yum/depsolve.py:517 +-#: ../yum/depsolve.py:509 ++#: ../yum/depsolve.py:518 #, python-format msgid "Potential resolving package %s has newer instance installed." - msgstr "" +-msgstr "" +-"Potenziale risoluzione del pacchetto %s ha una istanza piu aggiornata " +-"installata." ++msgstr "Potenziale risoluzione del pacchetto %s ha una istanza piu aggiornata installata." --#: yum/depsolve.py:515 yum/depsolve.py:564 -+#: yum/depsolve.py:525 yum/depsolve.py:571 - #, python-format - msgid "Missing Dependency: %s is needed by package %s" - msgstr "依存性の欠落: %s はパッケージ %s が必要としています" - --#: yum/depsolve.py:528 -+#: yum/depsolve.py:538 +-#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 +-#, python-format +-msgid "Missing Dependency: %s is needed by package %s" +-msgstr "Dipendenza mancante: %s è necessario per il pacchetto %s" +- +-#: ../yum/depsolve.py:530 ++#: ../yum/depsolve.py:536 #, python-format msgid "%s already in ts, skipping this one" --msgstr "" -+msgstr "%s はすでに ts にあります。これを飛ばします" + msgstr "%s è gia nel set delle transazioni (ts), verrà saltato" --#: yum/depsolve.py:574 -+#: yum/depsolve.py:581 +-#: ../yum/depsolve.py:573 ++#: ../yum/depsolve.py:578 #, python-format msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: %s を更新として %s で設定しています" + msgstr "TSINFO: %s marcato come update per %s" --#: yum/depsolve.py:582 -+#: yum/depsolve.py:589 +-#: ../yum/depsolve.py:581 ++#: ../yum/depsolve.py:586 #, python-format msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: %s をインストールとして %s で設定しています" + msgstr "TSINFO: %s marcato come installa per %s" --#: yum/depsolve.py:675 yum/depsolve.py:756 -+#: yum/depsolve.py:692 yum/depsolve.py:774 +-#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 ++#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 msgid "Success - empty transaction" - msgstr "成功 - 空のトランザクション" + msgstr "Successo - transazione vuota" --#: yum/depsolve.py:713 yum/depsolve.py:728 -+#: yum/depsolve.py:731 yum/depsolve.py:746 +-#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 ++#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 msgid "Restarting Loop" - msgstr "ループを再開しています" + msgstr "Riavvio del ciclo" --#: yum/depsolve.py:744 -+#: yum/depsolve.py:762 +-#: ../yum/depsolve.py:755 ++#: ../yum/depsolve.py:760 msgid "Dependency Process ending" - msgstr "依存性の処理を終了しています" + msgstr "Processo delle dipendenze terminato" --#: yum/depsolve.py:750 -+#: yum/depsolve.py:768 +-#: ../yum/depsolve.py:761 ++#: ../yum/depsolve.py:774 #, python-format msgid "%s from %s has depsolving problems" - msgstr "%s(%s) は依存性に問題があります" + msgstr "%s appartenente a %s ha problemi di dipendenze" --#: yum/depsolve.py:757 -+#: yum/depsolve.py:775 +-#: ../yum/depsolve.py:768 ++#: ../yum/depsolve.py:782 msgid "Success - deps resolved" - msgstr "成功 - 依存性を解決しました" + msgstr "Successo - dipendenze risolte" --#: yum/depsolve.py:771 -+#: yum/depsolve.py:789 +-#: ../yum/depsolve.py:782 ++#: ../yum/depsolve.py:796 #, python-format msgid "Checking deps for %s" - msgstr "%s の依存性を確認しています" + msgstr "Controllo delle dipendenze per %s" --#: yum/depsolve.py:854 -+#: yum/depsolve.py:872 +-#: ../yum/depsolve.py:865 ++#: ../yum/depsolve.py:874 #, python-format msgid "looking for %s as a requirement of %s" --msgstr "" -+msgstr "%s の要求として %s を検索しています" + msgstr "ricerca di %s come un requisito di %s" --#: yum/depsolve.py:996 -+#: yum/depsolve.py:1014 +-#: ../yum/depsolve.py:1007 ++#: ../yum/depsolve.py:1090 #, python-format msgid "Running compare_providers() for %s" - msgstr "%s の compare_providers() を実行しています" + msgstr "Esecuzione di compare_providers() per %s" --#: yum/depsolve.py:1024 yum/depsolve.py:1030 -+#: yum/depsolve.py:1048 yum/depsolve.py:1054 +-#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 ++#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 #, python-format msgid "better arch in po %s" - msgstr "" + msgstr "migliore architettura in po %s" --#: yum/depsolve.py:1091 -+#: yum/depsolve.py:1149 +-#: ../yum/depsolve.py:1142 ++#: ../yum/depsolve.py:1218 #, python-format msgid "%s obsoletes %s" - msgstr "" + msgstr "%s rende obsoleto %s" --#: yum/depsolve.py:1107 -+#: yum/depsolve.py:1161 +-#: ../yum/depsolve.py:1154 ++#: ../yum/depsolve.py:1230 #, python-format msgid "" "archdist compared %s to %s on %s\n" - " Winner: %s" - msgstr "" +@@ -1888,122 +1996,138 @@ msgstr "" + "archdist ha comparato %s a %s su %s\n" + " Vincitore: %s" --#: yum/depsolve.py:1114 -+#: yum/depsolve.py:1168 +-#: ../yum/depsolve.py:1161 ++#: ../yum/depsolve.py:1237 #, python-format msgid "common sourcerpm %s and %s" - msgstr "%s と %s の共通ソース RPM(SRPM)" + msgstr "sourcerpm comune %s e %s" --#: yum/depsolve.py:1120 -+#: yum/depsolve.py:1174 +-#: ../yum/depsolve.py:1167 ++#: ../yum/depsolve.py:1241 ++#, fuzzy, python-format ++msgid "base package %s is installed for %s" ++msgstr "TSINFO: %s marcato come installa per %s" ++ ++#: ../yum/depsolve.py:1247 #, python-format msgid "common prefix of %s between %s and %s" - msgstr "%s から %s と %s の共通接頭辞" + msgstr "prefisso comune di %s tra %s e %s" --#: yum/depsolve.py:1128 -+#: yum/depsolve.py:1182 +-#: ../yum/depsolve.py:1175 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Best Order: %s" - msgstr "最適の順序: %s" + msgstr "Ordine migliore: %s" --#: yum/__init__.py:176 -+#: yum/__init__.py:180 +-#: ../yum/__init__.py:187 ++#: ../yum/__init__.py:192 msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "doConfigSetup() は Yum の将来のバージョンでなくなります。\n" + msgstr "doConfigSetup() verrà eliminato in una futura versione di yum.\n" --#: yum/__init__.py:386 -+#: yum/__init__.py:401 +-#: ../yum/__init__.py:412 ++#: ../yum/__init__.py:424 #, python-format msgid "Repository %r is missing name in configuration, using id" - msgstr "リポジトリー %r は構成中に名前がありませんので ID を使います" + msgstr "Non è presente il nome nel repository %r, utilizzo l'id" --#: yum/__init__.py:424 -+#: yum/__init__.py:439 +-#: ../yum/__init__.py:450 ++#: ../yum/__init__.py:462 msgid "plugins already initialised" - msgstr "プラグインは既に初期化されています" + msgstr "plugin già inizializzato" --#: yum/__init__.py:431 -+#: yum/__init__.py:446 +-#: ../yum/__init__.py:457 ++#: ../yum/__init__.py:469 msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "dbRpmDBSetup() は Yum の将来のバージョンでなくなります。\n" + msgstr "doRpmDBSetup() verrà eliminato in una futura versione di yum.\n" --#: yum/__init__.py:441 -+#: yum/__init__.py:457 +-#: ../yum/__init__.py:468 ++#: ../yum/__init__.py:480 msgid "Reading Local RPMDB" - msgstr "ローカルの RPMDB を読み込んでいます" + msgstr "Lettura del RPMDB locale" --#: yum/__init__.py:459 -+#: yum/__init__.py:478 +-#: ../yum/__init__.py:489 ++#: ../yum/__init__.py:504 msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() は Yum の将来のバージョンでなくなります。\n" + msgstr "doRepoSetup() verrà eliminato in una futura versione di yum.\n" --#: yum/__init__.py:479 -+#: yum/__init__.py:498 +-#: ../yum/__init__.py:509 ++#: ../yum/__init__.py:524 msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() は Yum の将来のバージョンでなくなります。\n" + msgstr "doSackSetup() verrà eliminato in una futura versione di yum.\n" --#: yum/__init__.py:496 -+#: yum/__init__.py:528 +-#: ../yum/__init__.py:539 ++#: ../yum/__init__.py:554 msgid "Setting up Package Sacks" - msgstr "" + msgstr "Settaggio pacchetti sack" --#: yum/__init__.py:539 -+#: yum/__init__.py:573 +-#: ../yum/__init__.py:584 ++#: ../yum/__init__.py:599 #, python-format msgid "repo object for repo %s lacks a _resetSack method\n" - msgstr "" - --#: yum/__init__.py:540 -+#: yum/__init__.py:574 - msgid "therefore this repo cannot be reset.\n" -msgstr "" -+msgstr "したがって、このリポジトリーはリセットできません。\n" +-"l'oggetto repository per il repository %s manca del metodo _resetSack\n" ++msgstr "l'oggetto repository per il repository %s manca del metodo _resetSack\n" --#: yum/__init__.py:545 -+#: yum/__init__.py:579 +-#: ../yum/__init__.py:585 ++#: ../yum/__init__.py:600 + msgid "therefore this repo cannot be reset.\n" + msgstr "quindi questo repository non può essere resettato.\n" + +-#: ../yum/__init__.py:590 ++#: ../yum/__init__.py:605 msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "doUpdateSetup() は Yum の将来のバージョンでなくなります。\n" + msgstr "doUpdateSetup() verrà eliminato in una futura versione di yum.\n" --#: yum/__init__.py:557 -+#: yum/__init__.py:591 +-#: ../yum/__init__.py:602 ++#: ../yum/__init__.py:617 msgid "Building updates object" - msgstr "オブジェクトの更新を構築しています" + msgstr "Costruzione oggetto aggiornamenti" --#: yum/__init__.py:588 -+#: yum/__init__.py:626 +-#: ../yum/__init__.py:637 ++#: ../yum/__init__.py:652 msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() は Yum の将来のバージョンでなくなります。\n" + msgstr "doGroupSetup() verrà eliminato in una futura versione di Yum.\n" --#: yum/__init__.py:612 -+#: yum/__init__.py:651 +-#: ../yum/__init__.py:662 ++#: ../yum/__init__.py:677 msgid "Getting group metadata" - msgstr "グループメタデータを取得しています" + msgstr "Scaricamento metadati del gruppo" --#: yum/__init__.py:637 -+#: yum/__init__.py:677 +-#: ../yum/__init__.py:688 ++#: ../yum/__init__.py:703 #, python-format msgid "Adding group file from repository: %s" - msgstr "リポジトリーからグループファイルを追加しています: %s" + msgstr "Aggiunta file di gruppo dal repository: %s" --#: yum/__init__.py:642 -+#: yum/__init__.py:686 +-#: ../yum/__init__.py:697 ++#: ../yum/__init__.py:712 #, python-format msgid "Failed to add groups file for repository: %s - %s" - msgstr "リポジトリーのグループファイルに追加できませんでした: %s - %s" + msgstr "Fallita l'aggiunta di file di gruppi per repository: %s - %s" --#: yum/__init__.py:648 -+#: yum/__init__.py:692 +-#: ../yum/__init__.py:703 ++#: ../yum/__init__.py:718 msgid "No Groups Available in any repository" - msgstr "いずれかのリポジトリーに利用できるグループはありません" + msgstr "Nessun gruppo disponibile in alcun repository" --#: yum/__init__.py:698 -+#: yum/__init__.py:742 - msgid "Importing additional filelist information" - msgstr "追加ファイル一覧情報にインポートしています" - --#: yum/__init__.py:706 -+#: yum/__init__.py:756 -+#, python-format -+msgid "The program %s%s%s is found in the yum-utils package." -+msgstr "プログラム %s%s%s を yum-utils パッケージ内で発見しました。" +-#: ../yum/__init__.py:763 ++#: ../yum/__init__.py:730 ++#, fuzzy ++msgid "Getting pkgtags metadata" ++msgstr "Scaricamento metadati del gruppo" + -+#: yum/__init__.py:764 - msgid "" - "There are unfinished transactions remaining. You might consider running yum-" - "complete-transaction first to finish them." --msgstr "終了していない残作業があります。それらを終了するためにはじめに yum-complete-transaction の実行を検討するかもしれません。" -+msgstr "" -+"終了していない残作業があります。それらを終了するためにはじめに yum-complete-" -+"transaction の実行を検討するかもしれません。" ++#: ../yum/__init__.py:740 ++#, fuzzy, python-format ++msgid "Adding tags from repository: %s" ++msgstr "Aggiunta file di gruppo dal repository: %s" ++ ++#: ../yum/__init__.py:749 ++#, fuzzy, python-format ++msgid "Failed to add Pkg Tags for repository: %s - %s" ++msgstr "Fallita l'aggiunta di file di gruppi per repository: %s - %s" ++ ++#: ../yum/__init__.py:827 + msgid "Importing additional filelist information" + msgstr "Import di informazioni addizionali sulla lista di file" --#: yum/__init__.py:772 -+#: yum/__init__.py:832 +-#: ../yum/__init__.py:777 ++#: ../yum/__init__.py:841 + #, python-format + msgid "The program %s%s%s is found in the yum-utils package." + msgstr "" + +-#: ../yum/__init__.py:785 +-msgid "" +-"There are unfinished transactions remaining. You might consider running yum-" +-"complete-transaction first to finish them." +-msgstr "" +-"Ci sono transazioni non completate. Considerare di lanciare prima yum-" +-"complete-transaction per portarle a termine." ++#: ../yum/__init__.py:849 ++msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them." ++msgstr "Ci sono transazioni non completate. Considerare di lanciare prima yum-complete-transaction per portarle a termine." + +-#: ../yum/__init__.py:853 ++#. Kind of hacky ++#: ../yum/__init__.py:922 #, python-format msgid "Skip-broken round %i" - msgstr "" + msgstr "Ciclo skip-broken %i" --#: yum/__init__.py:824 -+#: yum/__init__.py:885 +-#: ../yum/__init__.py:906 ++#: ../yum/__init__.py:975 #, python-format msgid "Skip-broken took %i rounds " - msgstr "" + msgstr "Raggiunti %i cicli skip-broken" --#: yum/__init__.py:825 -+#: yum/__init__.py:886 +-#: ../yum/__init__.py:907 ++#: ../yum/__init__.py:976 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -1643,87 +1753,73 @@ msgstr "" +@@ -2011,78 +2135,90 @@ msgstr "" "\n" - "パッケージは依存関係に問題があるため、飛ばします:" + "Pacchetti saltati a causa di problemi di dipendenza:" --#: yum/__init__.py:829 -+#: yum/__init__.py:890 +-#: ../yum/__init__.py:911 ++#: ../yum/__init__.py:980 #, python-format msgid " %s from %s" - msgstr "" + msgstr " %s da %s" --#: yum/__init__.py:968 -+#: yum/__init__.py:1043 - msgid "" - "Warning: scriptlet or other non-fatal errors occurred during transaction." --msgstr "警告: スクリプト、もしくはその他で処理の間に致命的ではないエラーが発生しました。" -- --#: yum/__init__.py:983 --#, python-format --msgid "Failed to remove transaction file %s" --msgstr "トランザクションファイル %s の削除に失敗しました" -- --#: yum/__init__.py:1025 --#, python-format --msgid "excluding for cost: %s from %s" +-#: ../yum/__init__.py:1083 +-msgid "" +-"Warning: scriptlet or other non-fatal errors occurred during transaction." ++#: ../yum/__init__.py:1121 ++msgid "Warning: RPMDB altered outside of yum." msgstr "" -- --#: yum/__init__.py:1056 --msgid "Excluding Packages in global exclude list" --msgstr "全体の除外一覧でパッケージを除外します" -+"警告: スクリプト、もしくはその他で処理の間に致命的ではないエラーが発生しまし" -+"た。" +-"Attenzione: errori in scriptlet o altri errori non fatali sono avvenuti " +-"durante la transazione." - #: yum/__init__.py:1058 +-#: ../yum/__init__.py:1101 ++#: ../yum/__init__.py:1126 ++#, fuzzy ++msgid "missing requires" ++msgstr "%s richiede: %s" ++ ++#: ../yum/__init__.py:1127 ++#, fuzzy ++msgid "installed conflict" ++msgstr "installato" ++ ++#: ../yum/__init__.py:1180 ++msgid "Warning: scriptlet or other non-fatal errors occurred during transaction." ++msgstr "Attenzione: errori in scriptlet o altri errori non fatali sono avvenuti durante la transazione." ++ ++#: ../yum/__init__.py:1198 #, python-format --msgid "Excluding Packages from %s" --msgstr "%s からパッケージを除外しています" -- --#: yum/__init__.py:1085 --#, python-format --msgid "Reducing %s to included packages only" --msgstr "" -+msgid "Failed to remove transaction file %s" -+msgstr "トランザクションファイル %s の削除に失敗しました" + msgid "Failed to remove transaction file %s" + msgstr "Rimozione del file di transazione %s fallita" --#: yum/__init__.py:1091 -+#: yum/__init__.py:1087 + #. maybe a file log here, too + #. but raising an exception is not going to do any good +-#: ../yum/__init__.py:1130 ++#: ../yum/__init__.py:1227 #, python-format --msgid "Keeping included package %s" -+msgid "%s was supposed to be installed but is not!" + msgid "%s was supposed to be installed but is not!" msgstr "" --#: yum/__init__.py:1097 -+#: yum/__init__.py:1126 + #. maybe a file log here, too + #. but raising an exception is not going to do any good +-#: ../yum/__init__.py:1169 ++#: ../yum/__init__.py:1266 #, python-format --msgid "Removing unmatched package %s" -+msgid "%s was supposed to be removed but is not!" + msgid "%s was supposed to be removed but is not!" msgstr "" --#: yum/__init__.py:1100 --msgid "Finished" --msgstr "完了しました" -- --#: yum/__init__.py:1130 -+#: yum/__init__.py:1241 + #. Whoa. What the heck happened? +-#: ../yum/__init__.py:1289 ++#: ../yum/__init__.py:1386 #, python-format msgid "Unable to check if PID %s is active" --msgstr "" -+msgstr "PID %s がアクティブかどうかの確認に失敗しました" + msgstr "Non è possibile controllare se il PID %s è attivo" --#: yum/__init__.py:1134 -+#: yum/__init__.py:1245 + #. Another copy seems to be running. +-#: ../yum/__init__.py:1293 ++#: ../yum/__init__.py:1390 #, python-format msgid "Existing lock %s: another copy is running as pid %s." - msgstr "ロックファイル %s が存在します: PID %s として別に実行されています。" + msgstr "Lock %s attivo: altro processo in esecuzione con pid %s." --#: yum/__init__.py:1204 -+#: yum/__init__.py:1280 -+#, python-format -+msgid "Could not create lock at %s: %s " -+msgstr "%s でロックを作成できません: %s" -+ -+#: yum/__init__.py:1325 - msgid "Package does not match intended download" - msgstr "パッケージは意図したダウンロードと一致しません" + #. Whoa. What the heck happened? +-#: ../yum/__init__.py:1328 ++#: ../yum/__init__.py:1425 + #, fuzzy, python-format + msgid "Could not create lock at %s: %s " + msgstr "Impossibile trovare una corrispondenza per l'aggiornamento di %s" --#: yum/__init__.py:1219 -+#: yum/__init__.py:1340 +-#: ../yum/__init__.py:1373 +-msgid "Package does not match intended download" ++#: ../yum/__init__.py:1470 ++#, fuzzy ++msgid "Package does not match intended download. Suggestion: run yum clean metadata" + msgstr "Il pacchetto non corrisponde al download desiderato" + +-#: ../yum/__init__.py:1388 ++#: ../yum/__init__.py:1486 msgid "Could not perform checksum" - msgstr "チェックサムの実行ができません" + msgstr "Non è possibile calcolare il checksum" --#: yum/__init__.py:1222 -+#: yum/__init__.py:1343 +-#: ../yum/__init__.py:1391 ++#: ../yum/__init__.py:1489 msgid "Package does not match checksum" - msgstr "パッケージのチェックサムが一致しません" + msgstr "Il pacchetto non corrisponde al checksum" --#: yum/__init__.py:1265 -+#: yum/__init__.py:1385 +-#: ../yum/__init__.py:1433 ++#: ../yum/__init__.py:1531 #, python-format msgid "package fails checksum but caching is enabled for %s" --msgstr "%s のためにキャッシュを有効にしていますが、パッケージのチェックサム演算に失敗します。" -+msgstr "" -+"%s のためにキャッシュを有効にしていますが、パッケージのチェックサム演算に失敗" -+"します。" + msgstr "il pacchetto ha fallito il checksum ma la cache è abilitata per %s" --#: yum/__init__.py:1268 yum/__init__.py:1297 -+#: yum/__init__.py:1388 yum/__init__.py:1417 +-#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 ++#: ../yum/__init__.py:1534 ../yum/__init__.py:1563 #, python-format msgid "using local copy of %s" - msgstr "%s のローカルコピーを使う" + msgstr "utilizzo di una copia locale di %s" --#: yum/__init__.py:1309 -+#: yum/__init__.py:1429 +-#: ../yum/__init__.py:1477 ++#: ../yum/__init__.py:1575 #, python-format msgid "" "Insufficient space in download directory %s\n" -@@ -1734,72 +1830,74 @@ msgstr "" - " * 空き容量 %s\n" - " * 必要容量 %s" +@@ -2093,410 +2229,401 @@ msgstr "" + " * libero %s\n" + " * necessario %s" --#: yum/__init__.py:1356 -+#: yum/__init__.py:1478 +-#: ../yum/__init__.py:1526 ++#: ../yum/__init__.py:1624 msgid "Header is not complete." - msgstr "ヘッダーが完了していません。" + msgstr "L'header non è completo." --#: yum/__init__.py:1393 -+#: yum/__init__.py:1515 +-#: ../yum/__init__.py:1563 ++#: ../yum/__init__.py:1661 #, python-format - msgid "" - "Header not in local cache and caching-only mode enabled. Cannot download %s" --msgstr "ヘッダーはキャッシュのみのモードが有効で、ローカルにありません。%s のダウンロードができません" -+msgstr "" -+"ヘッダーはキャッシュのみのモードが有効で、ローカルにありません。%s のダウン" -+"ロードができません" +-msgid "" +-"Header not in local cache and caching-only mode enabled. Cannot download %s" +-msgstr "" +-"Header non presente in cache locale e modalita solo-cache abilitata. " +-"Impossibile scaricare %s" ++msgid "Header not in local cache and caching-only mode enabled. Cannot download %s" ++msgstr "Header non presente in cache locale e modalita solo-cache abilitata. Impossibile scaricare %s" --#: yum/__init__.py:1448 -+#: yum/__init__.py:1570 +-#: ../yum/__init__.py:1618 ++#: ../yum/__init__.py:1716 #, python-format msgid "Public key for %s is not installed" - msgstr "%s の公開鍵がインストールされていません" + msgstr "La chiave pubblica per %s non è installata" --#: yum/__init__.py:1452 -+#: yum/__init__.py:1574 +-#: ../yum/__init__.py:1622 ++#: ../yum/__init__.py:1720 #, python-format msgid "Problem opening package %s" - msgstr "パッケージ %s を開いている最中に問題です" + msgstr "Problemi nell'apertura di %s" --#: yum/__init__.py:1460 -+#: yum/__init__.py:1582 +-#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1728 #, python-format msgid "Public key for %s is not trusted" - msgstr "%s の公開鍵が信頼されません" + msgstr "La chiave pubblica per %s non è sicura" --#: yum/__init__.py:1464 -+#: yum/__init__.py:1586 +-#: ../yum/__init__.py:1634 ++#: ../yum/__init__.py:1732 #, python-format msgid "Package %s is not signed" - msgstr "パッケージ %s は署名されていません" + msgstr "Il pacchetto %s non è firmato" --#: yum/__init__.py:1502 -+#: yum/__init__.py:1624 +-#: ../yum/__init__.py:1672 ++#: ../yum/__init__.py:1770 #, python-format msgid "Cannot remove %s" - msgstr "%s を削除できません" + msgstr "Non posso rimuovere %s" --#: yum/__init__.py:1505 -+#: yum/__init__.py:1628 +-#: ../yum/__init__.py:1676 ++#: ../yum/__init__.py:1774 #, python-format msgid "%s removed" - msgstr "%s を削除しました" + msgstr "%s rimosso" --#: yum/__init__.py:1541 -+#: yum/__init__.py:1664 +-#: ../yum/__init__.py:1712 ++#: ../yum/__init__.py:1820 #, python-format msgid "Cannot remove %s file %s" - msgstr "%s のファイル %s を削除できませんでした" + msgstr "Impossibile rimuovere %s file %s" --#: yum/__init__.py:1544 -+#: yum/__init__.py:1668 +-#: ../yum/__init__.py:1716 ++#: ../yum/__init__.py:1824 #, python-format msgid "%s file %s removed" - msgstr "%s のファイル %s を削除しました" + msgstr "%s file %s rimosso" --#: yum/__init__.py:1546 -+#: yum/__init__.py:1670 +-#: ../yum/__init__.py:1718 ++#: ../yum/__init__.py:1826 #, python-format msgid "%d %s files removed" - msgstr "%d %sファイルを削除しました" + msgstr "%d %s file rimossi" --#: yum/__init__.py:1614 -+#: yum/__init__.py:1739 +-#: ../yum/__init__.py:1787 ++#: ../yum/__init__.py:1895 #, python-format msgid "More than one identical match in sack for %s" - msgstr "" + msgstr "Piu di una corrispondenza ugualein sack per %s" --#: yum/__init__.py:1619 -+#: yum/__init__.py:1745 +-#: ../yum/__init__.py:1793 ++#: ../yum/__init__.py:1901 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "更新から %s.%s %s:%s-%s に一致しません" + msgstr "Nessuna corrispondenza %s.%s %s:%s-%s dall'aggiornamento" --#: yum/__init__.py:1838 -+#: yum/__init__.py:1978 - msgid "" - "searchPackages() will go away in a future version of " - "Yum. Use searchGenerator() instead. \n" -@@ -1807,172 +1905,185 @@ msgstr "" - "searchPackages() は Yum の将来のバージョンでなくなりま" - "す。 代わりに searchGenerator() を使います。\n" +-#: ../yum/__init__.py:2026 +-msgid "" +-"searchPackages() will go away in a future version of " +-"Yum. Use searchGenerator() instead. \n" +-msgstr "" +-"searchPackages() verrà eliminato in una futura versione di yum.In " +-"sostituzione usare searchGenerator(). \n" ++#: ../yum/__init__.py:2180 ++msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n" ++msgstr "searchPackages() verrà eliminato in una futura versione di yum.In sostituzione usare searchGenerator(). \n" --#: yum/__init__.py:1876 -+#: yum/__init__.py:2020 +-#: ../yum/__init__.py:2065 ++#: ../yum/__init__.py:2219 #, python-format msgid "Searching %d packages" - msgstr "%d 個のパッケージを検索しています" + msgstr "Ricerca dei pacchetti %d" --#: yum/__init__.py:1879 -+#: yum/__init__.py:2024 +-#: ../yum/__init__.py:2069 ++#: ../yum/__init__.py:2223 #, python-format msgid "searching package %s" - msgstr "パッケージ %s を検索しています" + msgstr "Ricerca del pacchetto %s" --#: yum/__init__.py:1890 -+#: yum/__init__.py:2036 +-#: ../yum/__init__.py:2081 ++#: ../yum/__init__.py:2235 msgid "searching in file entries" - msgstr "ファイルのエントリーから検索しています" + msgstr "ricerca nelle voci dei file" --#: yum/__init__.py:1896 -+#: yum/__init__.py:2043 +-#: ../yum/__init__.py:2088 ++#: ../yum/__init__.py:2242 msgid "searching in provides entries" - msgstr "提供されたエントリーを検索しています" + msgstr "ricerca nelle voci fornite" --#: yum/__init__.py:1929 -+#: yum/__init__.py:2076 +-#: ../yum/__init__.py:2121 ++#: ../yum/__init__.py:2275 #, python-format msgid "Provides-match: %s" - msgstr "" + msgstr "Corrispondenza tra i forniti: %s" --#: yum/__init__.py:1978 -+#: yum/__init__.py:2125 +-#: ../yum/__init__.py:2170 ++#: ../yum/__init__.py:2324 msgid "No group data available for configured repositories" - msgstr "構成されたリポジトリーに利用できるグループはありません" + msgstr "Nessun gruppo disponibile in alcun repository" --#: yum/__init__.py:2009 yum/__init__.py:2028 yum/__init__.py:2058 --#: yum/__init__.py:2064 yum/__init__.py:2143 yum/__init__.py:2147 -+#: yum/__init__.py:2156 yum/__init__.py:2175 yum/__init__.py:2206 -+#: yum/__init__.py:2212 yum/__init__.py:2291 yum/__init__.py:2295 -+#: yum/__init__.py:2605 +-#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 +-#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 +-#: ../yum/__init__.py:2655 ++#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405 ++#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497 ++#: ../yum/__init__.py:2814 #, python-format msgid "No Group named %s exists" - msgstr "グループ名 %s が存在しません" + msgstr "Il gruppo %s non esiste" --#: yum/__init__.py:2039 yum/__init__.py:2159 -+#: yum/__init__.py:2187 yum/__init__.py:2308 +-#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 ++#: ../yum/__init__.py:2386 ../yum/__init__.py:2513 #, python-format msgid "package %s was not marked in group %s" - msgstr "パッケージ%s はグループ %s で設定されていません" + msgstr "Il pacchetto %s non è marcato nel gruppo %s" --#: yum/__init__.py:2085 -+#: yum/__init__.py:2234 +-#: ../yum/__init__.py:2279 ++#: ../yum/__init__.py:2433 #, python-format msgid "Adding package %s from group %s" - msgstr "パッケージ %s をグループ %s から追加しています" + msgstr "Aggiunta del pacchetto %s dal gruppo %s" --#: yum/__init__.py:2090 -+#: yum/__init__.py:2238 +-#: ../yum/__init__.py:2283 ++#: ../yum/__init__.py:2437 #, python-format msgid "No package named %s available to be installed" - msgstr "" + msgstr "Nessun pacchetto di nome %s disponibile per l'installazione" --#: yum/__init__.py:2186 -+#: yum/__init__.py:2335 +-#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2539 #, python-format msgid "Package tuple %s could not be found in packagesack" - msgstr "" + msgstr "La tupla del pacchetto %s non può essere trovata nel pacchetto sack" --#: yum/__init__.py:2201 -+#: yum/__init__.py:2349 - msgid "" - "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n" - msgstr "" +-#: ../yum/__init__.py:2399 ++#: ../yum/__init__.py:2558 + #, fuzzy, python-format + msgid "Package tuple %s could not be found in rpmdb" + msgstr "La tupla del pacchetto %s non può essere trovata nel pacchetto sack" --#: yum/__init__.py:2253 yum/__init__.py:2294 -+#: yum/__init__.py:2405 yum/__init__.py:2455 +-#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 ++#: ../yum/__init__.py:2614 ../yum/__init__.py:2664 msgid "Invalid version flag" - msgstr "不正なバージョンフラグ" + msgstr "Flag di versione non valido" --#: yum/__init__.py:2268 yum/__init__.py:2272 -+#: yum/__init__.py:2425 yum/__init__.py:2430 +-#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 ++#: ../yum/__init__.py:2634 ../yum/__init__.py:2639 #, python-format msgid "No Package found for %s" - msgstr "%s のパッケージが見つかりません" + msgstr "Nessun pacchetto trovato per %s" --#: yum/__init__.py:2449 -+#: yum/__init__.py:2646 +-#: ../yum/__init__.py:2696 ++#: ../yum/__init__.py:2855 msgid "Package Object was not a package object instance" - msgstr "" -+"パッケージ オブジェクトはパッケージ オブジェクト インスタンスではありません" + msgstr "L'oggetto pacchetto non era un'istanza dell'oggetto pacchetto" --#: yum/__init__.py:2453 -+#: yum/__init__.py:2650 +-#: ../yum/__init__.py:2700 ++#: ../yum/__init__.py:2859 msgid "Nothing specified to install" - msgstr "インストールへの指定がありません" + msgstr "Non è specificato niente da installare" --#: yum/__init__.py:2469 -+#: yum/__init__.py:2666 yum/__init__.py:3430 +-#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 ++#: ../yum/__init__.py:2875 ../yum/__init__.py:3652 #, python-format msgid "Checking for virtual provide or file-provide for %s" - msgstr "" + msgstr "Controllo per provide virtuale o file-provide per %s" --#: yum/__init__.py:2475 yum/__init__.py:2740 yum/__init__.py:2900 -+#: yum/__init__.py:2672 yum/__init__.py:2979 yum/__init__.py:3146 -+#: yum/__init__.py:3436 +-#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 +-#: ../yum/__init__.py:3495 ++#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365 ++#: ../yum/__init__.py:3658 #, python-format msgid "No Match for argument: %s" - msgstr "引数に一致しません: %s" + msgstr "Nessuna corrispondenza per l'argomento: %s" --#: yum/__init__.py:2548 -+#: yum/__init__.py:2748 +-#: ../yum/__init__.py:2798 ++#: ../yum/__init__.py:2957 #, python-format msgid "Package %s installed and not available" - msgstr "パッケージ %s はインストール済みか利用できません" + msgstr "Il pacchetto %s è installato e non disponibile." --#: yum/__init__.py:2551 -+#: yum/__init__.py:2751 +-#: ../yum/__init__.py:2801 ++#: ../yum/__init__.py:2960 msgid "No package(s) available to install" - msgstr "インストールに利用できるパッケージはありません" + msgstr "Nessun pacchetto disponibile per l'installazione" --#: yum/__init__.py:2564 -+#: yum/__init__.py:2763 +-#: ../yum/__init__.py:2813 ++#: ../yum/__init__.py:2972 #, python-format msgid "Package: %s - already in transaction set" - msgstr "パッケージ: %s - すでにトランザクション設定をしています" + msgstr "Pacchetto: %s - già nel set di transizione" --#: yum/__init__.py:2580 -+#: yum/__init__.py:2789 -+#, python-format -+msgid "Package %s is obsoleted by %s which is already installed" -+msgstr "パッケージ %s は既にインストールされている %s で古くなっています" -+ -+#: yum/__init__.py:2792 +-#: ../yum/__init__.py:2839 ++#: ../yum/__init__.py:2998 + #, fuzzy, python-format + msgid "Package %s is obsoleted by %s which is already installed" +-msgstr "" +-"Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo " +-"posto" ++msgstr "Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo posto" + +-#: ../yum/__init__.py:2842 ++#: ../yum/__init__.py:3001 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "パッケージ %s は %s に不要です。代わりに %s のインストールを試みています" +-msgstr "" +-"Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo " +-"posto" ++msgstr "Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo posto" --#: yum/__init__.py:2588 -+#: yum/__init__.py:2800 +-#: ../yum/__init__.py:2850 ++#: ../yum/__init__.py:3009 #, python-format msgid "Package %s already installed and latest version" - msgstr "パッケージ %s はインストール済みか最新バージョンです" + msgstr "Il pacchetto %s è già aggiornato all'ultima versione" --#: yum/__init__.py:2595 -+#: yum/__init__.py:2814 +-#: ../yum/__init__.py:2864 ++#: ../yum/__init__.py:3023 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" - "一致したパッケージ %s はすでにインストールされています。更新を確認していま" - "す。" +-msgstr "" +-"Corrispondenza del pacchetto %s già installato. Controllo aggiornamenti." ++msgstr "Corrispondenza del pacchetto %s già installato. Controllo aggiornamenti." --#: yum/__init__.py:2675 -+#: yum/__init__.py:2908 + #. update everything (the easy case) +-#: ../yum/__init__.py:2966 ++#: ../yum/__init__.py:3126 msgid "Updating Everything" - msgstr "すべて更新しています" + msgstr "Aggiornamento Sistema" --#: yum/__init__.py:2693 yum/__init__.py:2802 yum/__init__.py:2823 --#: yum/__init__.py:2849 -+#: yum/__init__.py:2929 yum/__init__.py:3044 yum/__init__.py:3073 -+#: yum/__init__.py:3100 +-#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 +-#: ../yum/__init__.py:3155 ++#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289 ++#: ../yum/__init__.py:3315 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "既に不要なパッケージの更新はありません: %s.%s %s:%s-%s" + msgstr "I pacchetti già resi obsoleti non verranno aggiornati: %s.%s %s:%s-%s" --#: yum/__init__.py:2728 yum/__init__.py:2897 -+#: yum/__init__.py:2964 yum/__init__.py:3143 +-#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 ++#: ../yum/__init__.py:3182 ../yum/__init__.py:3362 #, python-format msgid "%s" msgstr "%s" --#: yum/__init__.py:2793 -+#: yum/__init__.py:3035 +-#: ../yum/__init__.py:3093 ++#: ../yum/__init__.py:3253 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "パッケージは既に不要です: %s.%s %s:%s-%s" + msgstr "Il pacchetto è gia obsoleto: %s.%s %s:%s-%s" --#: yum/__init__.py:2826 yum/__init__.py:2852 -+#: yum/__init__.py:3068 -+#, python-format -+msgid "Not Updating Package that is obsoleted: %s" -+msgstr "既に不要なパッケージの更新はありません: %s" -+ -+#: yum/__init__.py:3077 yum/__init__.py:3104 +-#: ../yum/__init__.py:3124 ++#: ../yum/__init__.py:3284 + #, fuzzy, python-format + msgid "Not Updating Package that is obsoleted: %s" + msgstr "I pacchetti già resi obsoleti non verranno aggiornati: %s.%s %s:%s-%s" + +-#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 ++#: ../yum/__init__.py:3293 ../yum/__init__.py:3319 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "" - "既にアップデートされているのでパッケージをアップデートしません: %s.%s %s:%s-%" - "s" +-msgstr "" +-"Aggiornamento non necessario per il pacchetto già aggiornato: %s.%s %s:%s-%s" ++msgstr "Aggiornamento non necessario per il pacchetto già aggiornato: %s.%s %s:%s-%s" --#: yum/__init__.py:2913 -+#: yum/__init__.py:3159 +-#: ../yum/__init__.py:3218 ++#: ../yum/__init__.py:3378 msgid "No package matched to remove" - msgstr "削除に一致するパッケージはありません" + msgstr "Nessun pacchetto corrispondente per la rimozione" --#: yum/__init__.py:2947 -+#: yum/__init__.py:3192 yum/__init__.py:3296 yum/__init__.py:3385 - #, python-format - msgid "Cannot open file: %s. Skipping." - msgstr "ファイル %s が開けません。飛ばします。" +-#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 +-#, python-format +-msgid "Cannot open file: %s. Skipping." ++#: ../yum/__init__.py:3412 ++#, fuzzy, python-format ++msgid "Cannot open: %s. Skipping." + msgstr "Non posso aprire il file %s. Lo salto." --#: yum/__init__.py:2949 -+#: yum/__init__.py:3195 yum/__init__.py:3299 yum/__init__.py:3388 +-#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 ++#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598 #, python-format msgid "Examining %s: %s" - msgstr "%s を調べています: %s" + msgstr "Esame di %s: %s" --#: yum/__init__.py:2957 -+#: yum/__init__.py:3203 yum/__init__.py:3302 yum/__init__.py:3391 +-#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 ++#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601 #, python-format msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - "トランザクションにパッケージ %s を追加できません。アーキテクチャに互換性があ" - "りません: %s" +-msgstr "" +-"Impossibile aggiungere il pacchetto %s alla transazione. Architettura non " +-"compatibile: %s" ++msgstr "Impossibile aggiungere il pacchetto %s alla transazione. Architettura non compatibile: %s" --#: yum/__init__.py:2965 -+#: yum/__init__.py:3211 +-#: ../yum/__init__.py:3270 ++#: ../yum/__init__.py:3431 #, python-format - msgid "" - "Package %s not installed, cannot update it. Run yum install to install it " -@@ -1981,77 +2092,92 @@ msgstr "" - "パッケージ %s はインストールされていないので更新できません。代わりに「yum " - "install」を実行してインストールしてください。" +-msgid "" +-"Package %s not installed, cannot update it. Run yum install to install it " +-"instead." +-msgstr "" +-"Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire " +-"yum install per installarlo." ++msgid "Package %s not installed, cannot update it. Run yum install to install it instead." ++msgstr "Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire yum install per installarlo." --#: yum/__init__.py:2998 -+#: yum/__init__.py:3246 yum/__init__.py:3313 yum/__init__.py:3402 +-#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 ++#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606 #, python-format msgid "Excluding %s" - msgstr "%s の除外中" + msgstr "Esclusione di %s" --#: yum/__init__.py:3002 -+#: yum/__init__.py:3251 +-#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3465 #, python-format msgid "Marking %s to be installed" - msgstr "%s をインストール済みとして設定しています" + msgstr "Marco %s per l'installazione" --#: yum/__init__.py:3007 -+#: yum/__init__.py:3257 +-#: ../yum/__init__.py:3310 ++#: ../yum/__init__.py:3471 #, python-format msgid "Marking %s as an update to %s" - msgstr "次のリポジトリーへの更新として %s を設定します: %s" + msgstr "%s marcato come aggiornamento di %s" --#: yum/__init__.py:3012 -+#: yum/__init__.py:3264 +-#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3478 #, python-format msgid "%s: does not update installed package." - msgstr "%s: インストールされたパッケージを更新しません。" + msgstr "%s: non aggiornare il pacchetto installato" --#: yum/__init__.py:3029 -+#: yum/__init__.py:3332 +-#: ../yum/__init__.py:3379 ++#: ../yum/__init__.py:3511 ../yum/__init__.py:3595 ++#, python-format ++msgid "Cannot open file: %s. Skipping." ++msgstr "Non posso aprire il file %s. Lo salto." ++ ++#: ../yum/__init__.py:3541 msgid "Problem in reinstall: no package matched to remove" - msgstr "再インストール中に問題: 削除するパッケージがありません" +-msgstr "" +-"Problema nella reinstallazione: nessun pacchetto marcato per la rimozione" ++msgstr "Problema nella reinstallazione: nessun pacchetto marcato per la rimozione" --#: yum/__init__.py:3040 -+#: yum/__init__.py:3345 yum/__init__.py:3463 +-#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 ++#: ../yum/__init__.py:3554 ../yum/__init__.py:3686 #, python-format msgid "Package %s is allowed multiple installs, skipping" - msgstr "パッケージ %s は複数インストールが許可されています。飛ばします" + msgstr "Il pacchetto %s permette installazioni multiple, lo salto" --#: yum/__init__.py:3050 --msgid "Problem in reinstall: no package matched to install" --msgstr "再インストール中に問題: インストールするパッケージがありません" -+#: yum/__init__.py:3366 -+#, python-format -+msgid "Problem in reinstall: no package %s matched to install" -+msgstr "再インストール中に問題: %s に一致したインストール用パッケージがありません" -+ -+#: yum/__init__.py:3455 -+msgid "No package(s) available to downgrade" -+msgstr "ダウングレードに利用できるパッケージはありません" +-#: ../yum/__init__.py:3413 ++#: ../yum/__init__.py:3575 + #, fuzzy, python-format + msgid "Problem in reinstall: no package %s matched to install" +-msgstr "" +-"Problema nella reinstallazione: nessun pacchetto marcato per l'installazione" ++msgstr "Problema nella reinstallazione: nessun pacchetto marcato per l'installazione" --#: yum/__init__.py:3085 -+#: yum/__init__.py:3499 -+#, python-format -+msgid "No Match for available package: %s" -+msgstr "利用可能なパッケージが一致しません: %s" -+ -+#: yum/__init__.py:3505 -+#, python-format -+msgid "Only Upgrade available on package: %s" -+msgstr "アップグレードでのみ利用できるパッケージ: %s" -+ -+#: yum/__init__.py:3564 +-#: ../yum/__init__.py:3515 ++#: ../yum/__init__.py:3678 + #, fuzzy + msgid "No package(s) available to downgrade" + msgstr "Nessun pacchetto disponibile per l'installazione" + +-#: ../yum/__init__.py:3559 ++#: ../yum/__init__.py:3731 + #, fuzzy, python-format + msgid "No Match for available package: %s" + msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti" + +-#: ../yum/__init__.py:3565 ++#: ../yum/__init__.py:3738 + #, fuzzy, python-format + msgid "Only Upgrade available on package: %s" + msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti" + +-#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 ++#: ../yum/__init__.py:3808 ../yum/__init__.py:3845 + #, fuzzy, python-format + msgid "Failed to downgrade: %s" + msgstr "Dimensione totale del download: %s" + +-#: ../yum/__init__.py:3704 ++#: ../yum/__init__.py:3877 #, python-format msgid "Retrieving GPG key from %s" - msgstr "%s から GPG 鍵を取得しています" + msgstr "Recupero chiavi GPG da %s" --#: yum/__init__.py:3105 -+#: yum/__init__.py:3584 +-#: ../yum/__init__.py:3724 ++#: ../yum/__init__.py:3897 msgid "GPG key retrieval failed: " - msgstr "GPG 鍵の取得に失敗しました: " + msgstr "Recupero chiavi GPG fallito: " --#: yum/__init__.py:3116 -+#: yum/__init__.py:3595 +-#: ../yum/__init__.py:3735 ++#: ../yum/__init__.py:3903 ++#, fuzzy, python-format ++msgid "Invalid GPG Key from %s: %s" ++msgstr "Recupero chiavi GPG da %s" ++ ++#: ../yum/__init__.py:3912 #, python-format msgid "GPG key parsing failed: key does not have value %s" - msgstr "GPG 鍵の解析に失敗しました: 鍵は値 %s を持っていません" + msgstr "Analisi chiave GPG fallita: la chiave non ha valore %s" --#: yum/__init__.py:3148 -+#: yum/__init__.py:3627 +-#: ../yum/__init__.py:3767 ++#: ../yum/__init__.py:3944 #, python-format msgid "GPG key at %s (0x%s) is already installed" - msgstr "GPG 鍵 %s (0x%s) はすでにインストールしています" + msgstr "Chiave GPG in %s (0x%s) è già installata" --#: yum/__init__.py:3153 yum/__init__.py:3214 -+#: yum/__init__.py:3632 yum/__init__.py:3694 + #. Try installing/updating GPG key +-#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 ++#: ../yum/__init__.py:3949 ../yum/__init__.py:4011 #, python-format msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "GPG 公開鍵 0x%s 「%s」を %s からインポートしています" + msgstr "Importazione chiave GPG 0x%s \"%s\" da %s" --#: yum/__init__.py:3169 -+#: yum/__init__.py:3649 +-#: ../yum/__init__.py:3789 ++#: ../yum/__init__.py:3966 msgid "Not installing key" - msgstr "インストールする鍵がありません" + msgstr "Non installo le chiavi" --#: yum/__init__.py:3175 -+#: yum/__init__.py:3655 +-#: ../yum/__init__.py:3795 ++#: ../yum/__init__.py:3972 #, python-format msgid "Key import failed (code %d)" - msgstr "鍵のインポートに失敗しました (コード: %d)" + msgstr "Importazione chiave fallita (codice %d)" --#: yum/__init__.py:3176 yum/__init__.py:3236 -+#: yum/__init__.py:3656 yum/__init__.py:3715 +-#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 ++#: ../yum/__init__.py:3973 ../yum/__init__.py:4032 msgid "Key imported successfully" - msgstr "鍵のインポートに成功しました" + msgstr "Chiave importata correttamente" --#: yum/__init__.py:3181 yum/__init__.py:3241 -+#: yum/__init__.py:3661 yum/__init__.py:3720 +-#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 ++#: ../yum/__init__.py:3978 ../yum/__init__.py:4037 #, python-format msgid "" - "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2059,93 +2185,93 @@ msgid "" +-"The GPG keys listed for the \"%s\" repository are already installed but they " +-"are not correct for this package.\n" ++"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" "Check that the correct key URLs are configured for this repository." msgstr "" +-"Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate " +-"ma non sono corrette per il pacchetto.\n" +-"Controllare che le URL delle chiavi di questo repository siano configurate " +-"correttamente." ++"Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette per il pacchetto.\n" ++"Controllare che le URL delle chiavi di questo repository siano configurate correttamente." --#: yum/__init__.py:3190 -+#: yum/__init__.py:3670 +-#: ../yum/__init__.py:3810 ++#: ../yum/__init__.py:3987 msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "" + msgstr "Importazione della chiave(i) non utile, chiave(i) sbagliata?" --#: yum/__init__.py:3209 -+#: yum/__init__.py:3689 +-#: ../yum/__init__.py:3829 ++#: ../yum/__init__.py:4006 #, python-format msgid "GPG key at %s (0x%s) is already imported" - msgstr "GPG 鍵 %s (0x%s) はすでにインポートしています" + msgstr "Chiave GPG in %s (0x%s) è già stata importata" --#: yum/__init__.py:3228 -+#: yum/__init__.py:3709 +-#: ../yum/__init__.py:3849 ++#: ../yum/__init__.py:4026 #, python-format msgid "Not installing key for repo %s" - msgstr "リポジトリー %s の鍵がインストールされていません" + msgstr "La chiave per il repo %s non verrà installata" --#: yum/__init__.py:3235 -+#: yum/__init__.py:3714 +-#: ../yum/__init__.py:3854 ++#: ../yum/__init__.py:4031 msgid "Key import failed" - msgstr "鍵のインポートに失敗しました" + msgstr "Importazione chiave fallita" --#: yum/__init__.py:3325 -+#: yum/__init__.py:3835 +-#: ../yum/__init__.py:3976 ++#: ../yum/__init__.py:4157 msgid "Unable to find a suitable mirror." - msgstr "適当なミラーを見つけることができませんでした。" + msgstr "Impossibile trovare un mirror adatto." --#: yum/__init__.py:3327 -+#: yum/__init__.py:3837 +-#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4159 msgid "Errors were encountered while downloading packages." - msgstr "パッケージのダウンロード中にエラーに遭遇しました。" + msgstr "Sono stati riscontrati degli errori durante il download dei pacchetti." --#: yum/__init__.py:3367 -+#: yum/__init__.py:3887 +-#: ../yum/__init__.py:4028 ++#: ../yum/__init__.py:4209 #, python-format msgid "Please report this error at %s" - msgstr "%s にこのエラーを報告してください" + msgstr "Riportare questo errore in %s" --#: yum/__init__.py:3391 -+#: yum/__init__.py:3911 +-#: ../yum/__init__.py:4052 ++#: ../yum/__init__.py:4233 msgid "Test Transaction Errors: " - msgstr "テストトランザクションでエラー: " + msgstr "Errori nel test di transazione: " --#: yum/plugins.py:204 -+#: yum/plugins.py:202 ++#: ../yum/__init__.py:4334 ++#, fuzzy, python-format ++msgid "Could not set cachedir: %s" ++msgstr "Impossibile trovare una corrispondenza per l'aggiornamento di %s" ++ + #. Mostly copied from YumOutput._outKeyValFill() + #: ../yum/plugins.py:202 msgid "Loaded plugins: " - msgstr "読み込んだプラグイン:" +@@ -2535,10 +2662,8 @@ msgstr "Caricamento del plugin \"%s\"" --#: yum/plugins.py:218 yum/plugins.py:224 -+#: yum/plugins.py:216 yum/plugins.py:222 + #: ../yum/plugins.py:316 #, python-format - msgid "No plugin match for: %s" - msgstr "プラグインが一致しません: %s" +-msgid "" +-"Two or more plugins with the name \"%s\" exist in the plugin search path" +-msgstr "" +-"Esistono due o più plugin con il nome \"%s\" nel percorso di ricerca plugin" ++msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" ++msgstr "Esistono due o più plugin con il nome \"%s\" nel percorso di ricerca plugin" --#: yum/plugins.py:254 -+#: yum/plugins.py:252 + #: ../yum/plugins.py:336 #, python-format - msgid "Not loading \"%s\" plugin, as it is disabled" - msgstr "無効になっているため、プラグイン「%s」は読み込みません" - --#: yum/plugins.py:266 -+#: yum/plugins.py:264 - #, python-format - msgid "Plugin \"%s\" can't be imported" - msgstr "プラグイン「%s」はインポートできませんでした" - --#: yum/plugins.py:273 -+#: yum/plugins.py:271 - #, python-format - msgid "Plugin \"%s\" doesn't specify required API version" - msgstr "プラグイン「%s」は要求された API バージョンを明記していません" - --#: yum/plugins.py:278 -+#: yum/plugins.py:276 - #, python-format - msgid "Plugin \"%s\" requires API %s. Supported API is %s." - msgstr "" - "プラグイン「%s」は API %s を要求しています。サポートした API は %s です。" - --#: yum/plugins.py:311 -+#: yum/plugins.py:309 - #, python-format - msgid "Loading \"%s\" plugin" - msgstr "プラグイン「%s」を読み込んでいます" - --#: yum/plugins.py:318 -+#: yum/plugins.py:316 - #, python-format - msgid "" - "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - --#: yum/plugins.py:338 -+#: yum/plugins.py:336 - #, python-format - msgid "Configuration file %s not found" - msgstr "構成ファイル %s が見つかりません" - --#: yum/plugins.py:341 -+#: yum/plugins.py:339 - #, python-format - msgid "Unable to find configuration file for plugin %s" - msgstr "プラグイン %s の構成ファイルの検索に失敗しました" - --#: yum/plugins.py:495 -+#: yum/plugins.py:497 +@@ -2556,7 +2681,21 @@ msgstr "Non posso trovare il file di configurazione per il plugin %s" msgid "registration of commands not supported" - msgstr "コマンドの登録をサポートしていません" + msgstr "registrazione dei comandi non supportata" -@@ -2153,39 +2279,69 @@ msgstr "コマンドの登録をサポートしていません" +-#: ../yum/rpmtrans.py:78 ++#: ../yum/rpmsack.py:102 ++msgid "has missing requires of" ++msgstr "" ++ ++#: ../yum/rpmsack.py:105 ++#, fuzzy ++msgid "has installed conflicts" ++msgstr "imposta il percorso d'installazione" ++ ++#: ../yum/rpmsack.py:114 ++#, fuzzy, python-format ++msgid "%s is a duplicate with %s" ++msgstr "%s è in conflitto con %s" ++ ++#: ../yum/rpmtrans.py:79 msgid "Repackaging" - msgstr "再パッケージをしています" + msgstr "Reimpacchetto" --#: rpmUtils/oldUtils.py:26 -+#: rpmUtils/oldUtils.py:33 - #, python-format - msgid "Header cannot be opened or does not match %s, %s." - msgstr "%s (%s) が一致しないかヘッダーが開けません" - --#: rpmUtils/oldUtils.py:46 -+#: rpmUtils/oldUtils.py:53 - #, python-format - msgid "RPM %s fails md5 check" - msgstr "RPM %s は MD5 検査に失敗しました" - --#: rpmUtils/oldUtils.py:144 -+#: rpmUtils/oldUtils.py:151 - msgid "Could not open RPM database for reading. Perhaps it is already in use?" - msgstr "" - "読み込みのために RPM データベースを開くことができません。おそらく既に使用して" - "いませんか?" - --#: rpmUtils/oldUtils.py:174 -+#: rpmUtils/oldUtils.py:183 - msgid "Got an empty Header, something has gone wrong" - msgstr "空のヘッダーを取得しました。何かがうまくいっていません" - --#: rpmUtils/oldUtils.py:244 rpmUtils/oldUtils.py:251 rpmUtils/oldUtils.py:254 --#: rpmUtils/oldUtils.py:257 -+#: rpmUtils/oldUtils.py:253 rpmUtils/oldUtils.py:260 rpmUtils/oldUtils.py:263 -+#: rpmUtils/oldUtils.py:266 - #, python-format - msgid "Damaged Header %s" - msgstr "ヘッダー %s は損傷があります" - --#: rpmUtils/oldUtils.py:272 -+#: rpmUtils/oldUtils.py:281 - #, python-format +@@ -2589,10 +2728,25 @@ msgstr "Header danneggiato %s" msgid "Error opening rpm %s - error %s" - msgstr "RPM %s へのアクセスでエラー - %s エラー" + msgstr "Errore nell'apertura dell'rpm %s - errore %s" -+#~ msgid "Matching packages for package list to user args" -+#~ msgstr "ユーザーの引数にパッケージ一覧のパッケージを一致させています" +-#~ msgid "Matching packages for package list to user args" ++#~ msgid "Finished Transaction Test" ++#~ msgstr "Test di transazione terminato" + +#~ msgid "" -+#~ "\n" -+#~ "Transaction Summary\n" -+#~ "%s\n" -+#~ "Install %5.5s Package(s) \n" -+#~ "Update %5.5s Package(s) \n" -+#~ "Remove %5.5s Package(s) \n" -+#~ msgstr "" -+#~ "\n" -+#~ "トランザクションの要約\n" -+#~ "%s\n" -+#~ "インストール %5.5s パッケージ \n" -+#~ "更新 %5.5s パッケージ \n" -+#~ "削除 %5.5s パッケージ \n" ++#~ " You could try running: package-cleanup --problems\n" ++#~ " package-cleanup --dupes\n" ++#~ " rpm -Va --nofiles --nodigest" + #~ msgstr "" +-#~ "Ricerca corrispondenza degli argomenti dell'utente nella lista dei " +-#~ "pacchetti" ++#~ " Provare a lanciare: package-cleanup --problems\n" ++#~ " package-cleanup --dupes" + -+#~ msgid "Excluding Packages in global exclude list" -+#~ msgstr "全体の除外一覧でパッケージを除外します" ++#~ msgid "Unresolvable requirement %s for %s" ++#~ msgstr "Requisito %s non risolvibile per %s" + -+#~ msgid "Excluding Packages from %s" -+#~ msgstr "%s からパッケージを除外しています" -+ -+#~ msgid "Keeping included package %s" -+#~ msgstr "%s を含んで維持しています" -+ -+#~ msgid "Removing unmatched package %s" -+#~ msgstr "%s に一致しないものを削除しています" -+ -+#~ msgid "Finished" -+#~ msgstr "完了しました" ++#~ msgid "Missing Dependency: %s is needed by package %s" ++#~ msgstr "Dipendenza mancante: %s è necessario per il pacchetto %s" + ++#~ msgid "Matching packages for package list to user args" ++#~ msgstr "Ricerca corrispondenza degli argomenti dell'utente nella lista dei pacchetti" + + #~ msgid "" + #~ "\n" +@@ -2630,21 +2784,14 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s" + #~ msgid "Finished" + #~ msgstr "Finito" + +-#~ msgid "" +-#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" +-#~ "().\n" +-#~ msgstr "" +-#~ "getInstalledPackageObject() è deprecato, usare self.rpmdb.searchPkgTuple" +-#~ "().\n" ++#~ msgid "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n" ++#~ msgstr "getInstalledPackageObject() è deprecato, usare self.rpmdb.searchPkgTuple().\n" + #~ msgid "Parsing package install arguments" - #~ msgstr "パッケージインストールの引数を解析しています" + #~ msgstr "Analisi degli argomenti di installazione dei pacchetti" + +-#~ msgid "" +-#~ "Failure finding best provider of %s for %s, exceeded maximum loop length" +-#~ msgstr "" +-#~ "Ricerca di un provider migliore di %s fallita per %s, superata la massima " +-#~ "lunghezza del ciclo" ++#~ msgid "Failure finding best provider of %s for %s, exceeded maximum loop length" ++#~ msgstr "Ricerca di un provider migliore di %s fallita per %s, superata la massima lunghezza del ciclo" + + #~ msgid "Comparing best: %s to po: %s" + #~ msgstr "Comparando meglio: %s in po: %s" +@@ -2671,9 +2818,7 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s" + #~ msgstr "bestpkg %s condivide piu del prefisso del nome con %s" + + #~ msgid "Invalid versioned dependency string, try quoting it." +-#~ msgstr "" +-#~ "Stringa di versione della dipendenza non valida, provare a metterla tra " +-#~ "virgolette." ++#~ msgstr "Stringa di versione della dipendenza non valida, provare a metterla tra virgolette." + + #~ msgid "Package %s conflicts with %s." + #~ msgstr "Il pacchetto %s va in conflitto con %s." +@@ -2686,6 +2831,3 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s" + + #~ msgid "TSINFO: Updating %s to resolve conflict." + #~ msgstr "TSINFO: %s aggiornato per risolvere conflitti." - --#~ msgid "Could not find update match for %s" --#~ msgstr "%s に一致する更新を見つけることができません" +-#~ msgid "%s conflicts with %s" +-#~ msgstr "%s è in conflitto con %s" diff --git a/po/pl.po b/po/pl.po -index ba98fc0..e159b2d 100644 +index 087f8fb..b7b128c 100644 --- a/po/pl.po +++ b/po/pl.po -@@ -5,15 +5,15 @@ msgid "" +@@ -5,41 +5,42 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-06-22 21:06+0200\n" --"PO-Revision-Date: 2009-06-22 21:07+0200\n" -+"POT-Creation-Date: 2009-09-04 22:38+0200\n" -+"PO-Revision-Date: 2009-09-04 22:54+0200\n" +-"POT-Creation-Date: 2009-10-15 15:45+0200\n" +-"PO-Revision-Date: 2009-12-19 09:43+0100\n" ++"POT-Creation-Date: 2010-02-11 10:54-0500\n" ++"PO-Revision-Date: 2010-02-11 21:38+0100\n" "Last-Translator: Piotr Drąg \n" --"Language-Team: Polish \n" -+"Language-Team: Polish \n" +-"Language-Team: Polish \n" ++"Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" --#: ../callback.py:48 ../output.py:939 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:938 ../yum/rpmtrans.py:71 +-#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 ++#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 msgid "Updating" msgstr "Aktualizowanie" -@@ -21,7 +21,7 @@ msgstr "Aktualizowanie" +-#: ../callback.py:49 ../yum/rpmtrans.py:72 ++#: ../callback.py:49 ../yum/rpmtrans.py:73 msgid "Erasing" msgstr "Usuwanie" --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:938 -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:937 - #: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 +-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 +-#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 ++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 ++#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 ++#: ../yum/rpmtrans.py:77 msgid "Installing" msgstr "Instalowanie" -@@ -30,7 +30,7 @@ msgstr "Instalowanie" + +-#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 ++#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 msgid "Obsoleted" msgstr "Przestarzałe" --#: ../callback.py:54 ../output.py:1060 -+#: ../callback.py:54 ../output.py:1061 +-#: ../callback.py:54 ../output.py:1063 ../output.py:1403 ++#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 msgid "Updated" msgstr "Zaktualizowano" -@@ -38,7 +38,7 @@ msgstr "Zaktualizowano" +-#: ../callback.py:55 ../output.py:1399 ++#: ../callback.py:55 ../output.py:1438 msgid "Erased" msgstr "Usunięto" --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1058 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1059 +-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 +-#: ../output.py:1395 ++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 ++#: ../output.py:1434 ../output.py:1646 msgid "Installed" msgstr "Zainstalowano" -@@ -60,7 +60,7 @@ msgstr "Błąd: nieprawidłowy stan wyjścia: %s dla %s" +@@ -61,68 +62,74 @@ msgstr "Błąd: nieprawidłowy stan wyjścia: %s dla %s" msgid "Erased: %s" msgstr "Usunięto: %s" --#: ../callback.py:217 ../output.py:940 -+#: ../callback.py:217 ../output.py:939 +-#: ../callback.py:217 ../output.py:941 ++#: ../callback.py:217 ../output.py:948 ../output.py:1648 msgid "Removing" msgstr "Usuwanie" -@@ -86,7 +86,7 @@ msgstr "Odczytywanie metadanych repozytoriów z lokalnych plików" +-#: ../callback.py:219 ../yum/rpmtrans.py:77 ++#: ../callback.py:219 ../yum/rpmtrans.py:78 + msgid "Cleanup" + msgstr "Czyszczenie" + +-#: ../cli.py:106 ++#: ../cli.py:107 + #, python-format + msgid "Command \"%s\" already defined" + msgstr "Polecenie \"%s\" zostało już określone" + +-#: ../cli.py:118 ++#: ../cli.py:119 + msgid "Setting up repositories" + msgstr "Ustawianie repozytoriów" + +-#: ../cli.py:129 ++#: ../cli.py:130 + msgid "Reading repository metadata in from local files" + msgstr "Odczytywanie metadanych repozytoriów z lokalnych plików" + +-#: ../cli.py:192 ../utils.py:107 ++#: ../cli.py:194 ../utils.py:193 + #, python-format msgid "Config Error: %s" msgstr "Błąd konfiguracji: %s" --#: ../cli.py:196 ../cli.py:1242 ../utils.py:90 -+#: ../cli.py:196 ../cli.py:1253 ../utils.py:90 +-#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 ++#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 #, python-format msgid "Options Error: %s" msgstr "Błąd opcji: %s" -@@ -145,40 +145,48 @@ msgstr "Pobieranie pakietów:" + +-#: ../cli.py:223 ++#: ../cli.py:227 + #, python-format + msgid " Installed: %s-%s at %s" + msgstr " Zainstalowane: %s-%s o %s" + +-#: ../cli.py:225 ++#: ../cli.py:229 + #, python-format + msgid " Built : %s at %s" + msgstr " Zbudowane : %s o %s" + +-#: ../cli.py:227 ++#: ../cli.py:231 + #, python-format + msgid " Committed: %s at %s" + msgstr " Wysłane: %s o %s" + +-#: ../cli.py:266 ++#: ../cli.py:270 + msgid "You need to give some command" + msgstr "Należy podać polecenie" + +-#: ../cli.py:309 ++#: ../cli.py:284 ++#, python-format ++msgid "No such command: %s. Please use %s --help" ++msgstr "Nie ma takiego polecenia: %s. Proszę użyć %s --help" ++ ++#: ../cli.py:314 + msgid "Disk Requirements:\n" + msgstr "Wymagane miejsce na dysku:\n" + +-#: ../cli.py:311 ++#: ../cli.py:316 + #, python-format +-msgid " At least %dMB needed on the %s filesystem.\n" +-msgstr " Wymagane jest co najmniej %d MB w systemie plików %s.\n" ++msgid " At least %dMB more space needed on the %s filesystem.\n" ++msgstr "" ++" Wymagane jest co najmniej %d MB więcej miejsca w systemie plików %s.\n" + + #. TODO: simplify the dependency errors? + #. Fixup the summary +-#: ../cli.py:316 ++#: ../cli.py:321 + msgid "" + "Error Summary\n" + "-------------\n" +@@ -130,65 +137,62 @@ msgstr "" + "Podsumowanie błędów\n" + "-------------------\n" + +-#: ../cli.py:359 ++#: ../cli.py:364 + msgid "Trying to run the transaction but nothing to do. Exiting." + msgstr "" +-"Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie pracy." ++"Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie " ++"działania." + +-#: ../cli.py:395 ++#: ../cli.py:403 + msgid "Exiting on user Command" +-msgstr "Kończenie pracy na polecenie użytkownika" ++msgstr "Kończenie działania na polecenie użytkownika" + +-#: ../cli.py:399 ++#: ../cli.py:407 + msgid "Downloading Packages:" + msgstr "Pobieranie pakietów:" + +-#: ../cli.py:404 ++#: ../cli.py:412 msgid "Error Downloading Packages:\n" msgstr "Błąd podczas pobierania pakietów:\n" --#: ../cli.py:420 ../yum/__init__.py:3750 -+#: ../cli.py:420 ../yum/__init__.py:3854 +-#: ../cli.py:418 ../yum/__init__.py:4014 ++#: ../cli.py:426 ../yum/__init__.py:4195 msgid "Running rpm_check_debug" msgstr "Wykonywanie rpm_check_debug" --#: ../cli.py:423 ../yum/__init__.py:3753 -+#: ../cli.py:429 ../yum/__init__.py:3863 -+msgid "ERROR You need to update rpm to handle:" -+msgstr "BŁĄD należy zaktualizować pakiet RPM, aby obsłużyć:" -+ -+#: ../cli.py:431 ../yum/__init__.py:3866 +-#: ../cli.py:427 ../yum/__init__.py:4023 ++#: ../cli.py:435 ../yum/__init__.py:4204 + msgid "ERROR You need to update rpm to handle:" + msgstr "BŁĄD należy zaktualizować pakiet RPM, aby obsłużyć:" + +-#: ../cli.py:429 ../yum/__init__.py:4026 ++#: ../cli.py:437 ../yum/__init__.py:4207 msgid "ERROR with rpm_check_debug vs depsolve:" msgstr "BŁĄD rpm_check_debug i rozwiązywania zależności:" --#: ../cli.py:427 -+#: ../cli.py:437 -+msgid "RPM needs to be updated" -+msgstr "Pakiet RPM musi zostać zaktualizowany" -+ -+#: ../cli.py:438 +-#: ../cli.py:435 ++#: ../cli.py:443 + msgid "RPM needs to be updated" + msgstr "Pakiet RPM musi zostać zaktualizowany" + +-#: ../cli.py:436 ++#: ../cli.py:444 #, python-format msgid "Please report this error in %s" - msgstr "Zgłoś ten błąd na %s" + msgstr "Proszę zgłosić ten błąd na %s" --#: ../cli.py:433 -+#: ../cli.py:444 +-#: ../cli.py:442 ++#: ../cli.py:450 msgid "Running Transaction Test" msgstr "Wykonywanie testu transakcji" --#: ../cli.py:449 -+#: ../cli.py:460 - msgid "Finished Transaction Test" - msgstr "Zakończono test transakcji" - --#: ../cli.py:451 -+#: ../cli.py:462 +-#: ../cli.py:458 +-msgid "Finished Transaction Test" +-msgstr "Ukończono test transakcji" +- +-#: ../cli.py:460 ++#: ../cli.py:466 msgid "Transaction Check Error:\n" msgstr "Błąd podczas sprawdzania transakcji:\n" --#: ../cli.py:458 -+#: ../cli.py:469 +-#: ../cli.py:467 ++#: ../cli.py:473 msgid "Transaction Test Succeeded" - msgstr "Test transakcji został zakończony powodzeniem" + msgstr "Test transakcji został ukończony powodzeniem" --#: ../cli.py:480 -+#: ../cli.py:491 +-#: ../cli.py:489 ++#: ../cli.py:495 msgid "Running Transaction" msgstr "Wykonywanie transakcji" --#: ../cli.py:510 -+#: ../cli.py:521 +-#: ../cli.py:519 ++#: ../cli.py:525 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -187,189 +195,189 @@ msgstr "" +@@ -197,79 +201,84 @@ msgstr "" "uruchomienia.\n" - "Użyj \"-y\", aby wymusić." + "Należy użyć \"-y\", aby wymusić." --#: ../cli.py:529 ../cli.py:563 -+#: ../cli.py:540 ../cli.py:574 +-#: ../cli.py:538 ../cli.py:572 ++#: ../cli.py:544 ../cli.py:578 msgid " * Maybe you meant: " msgstr " * Czy chodziło o: " --#: ../cli.py:546 ../cli.py:554 -+#: ../cli.py:557 ../cli.py:565 +-#: ../cli.py:555 ../cli.py:563 ++#: ../cli.py:561 ../cli.py:569 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Pakiety %s%s%s są dostępne, ale nie są zainstalowane." --#: ../cli.py:560 ../cli.py:591 ../cli.py:669 -+#: ../cli.py:571 ../cli.py:602 ../cli.py:680 +-#: ../cli.py:569 ../cli.py:600 ../cli.py:678 ++#: ../cli.py:575 ../cli.py:607 ../cli.py:687 #, python-format msgid "No package %s%s%s available." msgstr "Nie ma pakietu %s%s%s." --#: ../cli.py:596 ../cli.py:729 -+#: ../cli.py:607 ../cli.py:740 +-#: ../cli.py:605 ../cli.py:738 ++#: ../cli.py:612 ../cli.py:748 msgid "Package(s) to install" msgstr "Pakiety do zainstalowania" --#: ../cli.py:597 ../cli.py:675 ../cli.py:708 ../cli.py:730 -+#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741 - #: ../yumcommands.py:157 +-#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 +-#: ../yumcommands.py:159 ++#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 ++#: ../yumcommands.py:160 msgid "Nothing to do" msgstr "Nie ma niczego do zrobienia" --#: ../cli.py:630 -+#: ../cli.py:641 +-#: ../cli.py:639 ++#: ../cli.py:647 #, python-format msgid "%d packages marked for Update" msgstr "%d pakietów oznaczonych do aktualizacji" --#: ../cli.py:633 -+#: ../cli.py:644 +-#: ../cli.py:642 ++#: ../cli.py:650 msgid "No Packages marked for Update" msgstr "Brak pakietów oznaczonych do aktualizacji" --#: ../cli.py:647 -+#: ../cli.py:658 +-#: ../cli.py:656 ++#: ../cli.py:664 #, python-format msgid "%d packages marked for removal" msgstr "%d pakietów oznaczonych do usunięcia" --#: ../cli.py:650 -+#: ../cli.py:661 +-#: ../cli.py:659 ++#: ../cli.py:667 msgid "No Packages marked for removal" msgstr "Brak pakietów oznaczonych do usunięcia" --#: ../cli.py:674 -+#: ../cli.py:685 +-#: ../cli.py:683 ++#: ../cli.py:692 msgid "Package(s) to downgrade" - msgstr "Pakiety do instalacji starszej wersji" +-msgstr "Pakiety do instalacji starszej wersji" ++msgstr "Pakiety do instalacji poprzedniej wersji" --#: ../cli.py:698 -+#: ../cli.py:709 +-#: ../cli.py:707 ++#: ../cli.py:717 #, python-format msgid " (from %s)" msgstr " (z %s)" --#: ../cli.py:700 -+#: ../cli.py:711 +-#: ../cli.py:709 ++#: ../cli.py:719 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Zainstalowany pakiet %s%s%s%s jest niedostępny." --#: ../cli.py:707 -+#: ../cli.py:718 +-#: ../cli.py:716 ++#: ../cli.py:726 msgid "Package(s) to reinstall" msgstr "Pakiety do ponownego zainstalowania" --#: ../cli.py:720 -+#: ../cli.py:731 +-#: ../cli.py:729 ++#: ../cli.py:739 msgid "No Packages Provided" msgstr "Nie podano pakietów" --#: ../cli.py:804 -+#: ../cli.py:815 +-#: ../cli.py:813 ++#: ../cli.py:818 ++#, python-format ++msgid "Matched: %s" ++msgstr "Pasujące: %s" ++ ++#: ../cli.py:825 #, python-format msgid "Warning: No matches found for: %s" - msgstr "Ostrzeżenie: nie znaleziono wyników dla: %s" + msgstr "Ostrzeżenie: nie odnaleziono wyników dla: %s" --#: ../cli.py:807 -+#: ../cli.py:818 +-#: ../cli.py:816 ++#: ../cli.py:828 msgid "No Matches found" msgstr "Brak wyników" --#: ../cli.py:846 -+#: ../cli.py:857 +-#: ../cli.py:855 ++#: ../cli.py:868 #, python-format msgid "" "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" - " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" - msgstr "" --"Ostrzeżenie: wersje 3.0.x yuma błędnie dopasowują nazwy plików.\n" -+"Ostrzeżenie: wersje 3.0.x programu yum błędnie dopasowują nazwy plików.\n" +@@ -278,108 +287,112 @@ msgstr "" + "Ostrzeżenie: wersje 3.0.x programu yum błędnie dopasowują nazwy plików.\n" " Można użyć \"%s*/%s%s\" i/lub \"%s*bin/%s%s\", aby uzyskać to zachowanie" --#: ../cli.py:862 -+#: ../cli.py:873 +-#: ../cli.py:871 ++#: ../cli.py:884 #, python-format msgid "No Package Found for %s" - msgstr "Nie znaleziono pakietów dla %s" + msgstr "Nie odnaleziono pakietów dla %s" --#: ../cli.py:874 -+#: ../cli.py:885 +-#: ../cli.py:883 ++#: ../cli.py:896 msgid "Cleaning up Everything" msgstr "Czyszczenie wszystkiego" --#: ../cli.py:888 -+#: ../cli.py:899 +-#: ../cli.py:897 ++#: ../cli.py:912 msgid "Cleaning up Headers" msgstr "Czyszczenie nagłówków" --#: ../cli.py:891 -+#: ../cli.py:902 +-#: ../cli.py:900 ++#: ../cli.py:915 msgid "Cleaning up Packages" msgstr "Czyszczenie pakietów" --#: ../cli.py:894 -+#: ../cli.py:905 +-#: ../cli.py:903 ++#: ../cli.py:918 msgid "Cleaning up xml metadata" msgstr "Czytanie metadanych XML" --#: ../cli.py:897 -+#: ../cli.py:908 +-#: ../cli.py:906 ++#: ../cli.py:921 msgid "Cleaning up database cache" - msgstr "Czyszczenie pamięci podręcznej bazy danych" +-msgstr "Czyszczenie pamięci podręcznej bazy danych" ++msgstr "Czyszczenie bazy danych w pamięci podręcznej" --#: ../cli.py:900 -+#: ../cli.py:911 +-#: ../cli.py:909 ++#: ../cli.py:924 msgid "Cleaning up expire-cache metadata" - msgstr "Czytanie metadanych wygasłej pamięci podręcznej" +-msgstr "Czytanie metadanych wygasłej pamięci podręcznej" ++msgstr "Czyszczenie metadanych wygasłej pamięci podręcznej" --#: ../cli.py:903 -+#: ../cli.py:914 +-#: ../cli.py:912 ++#: ../cli.py:927 ++msgid "Cleaning up cached rpmdb data" ++msgstr "Czyszczenie bazy danych RPM w pamięci podręcznej" ++ ++#: ../cli.py:930 msgid "Cleaning up plugins" msgstr "Czyszczenie wtyczek" --#: ../cli.py:928 -+#: ../cli.py:939 +-#: ../cli.py:937 ++#: ../cli.py:955 msgid "Installed Groups:" msgstr "Zainstalowane grupy:" --#: ../cli.py:940 -+#: ../cli.py:951 +-#: ../cli.py:949 ++#: ../cli.py:967 msgid "Available Groups:" msgstr "Dostępne grupy:" --#: ../cli.py:950 -+#: ../cli.py:961 +-#: ../cli.py:959 ++#: ../cli.py:977 msgid "Done" - msgstr "Zakończono" + msgstr "Ukończono" --#: ../cli.py:961 ../cli.py:979 ../cli.py:985 ../yum/__init__.py:2513 -+#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2560 +-#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 ++#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 #, python-format msgid "Warning: Group %s does not exist." msgstr "Ostrzeżenie: grupa %s nie istnieje." --#: ../cli.py:989 -+#: ../cli.py:1000 +-#: ../cli.py:998 ++#: ../cli.py:1016 msgid "No packages in any requested group available to install or update" msgstr "" "Brak pakietów dostępnych do instalacji lub aktualizacji w żadnej z żądanych " "grup" --#: ../cli.py:991 -+#: ../cli.py:1002 +-#: ../cli.py:1000 ++#: ../cli.py:1018 #, python-format msgid "%d Package(s) to Install" msgstr "%d pakietów do instalacji" --#: ../cli.py:1001 ../yum/__init__.py:2525 -+#: ../cli.py:1012 ../yum/__init__.py:2572 +-#: ../cli.py:1010 ../yum/__init__.py:2641 ++#: ../cli.py:1028 ../yum/__init__.py:2800 #, python-format msgid "No group named %s exists" msgstr "Grupa o nazwie %s nie istnieje" --#: ../cli.py:1007 -+#: ../cli.py:1018 +-#: ../cli.py:1016 ++#: ../cli.py:1034 msgid "No packages to remove from groups" msgstr "Brak pakietów do usunięcia z grup" --#: ../cli.py:1009 -+#: ../cli.py:1020 +-#: ../cli.py:1018 ++#: ../cli.py:1036 #, python-format msgid "%d Package(s) to remove" msgstr "%d pakietów do usunięcia" --#: ../cli.py:1051 -+#: ../cli.py:1062 +-#: ../cli.py:1060 ++#: ../cli.py:1078 #, python-format msgid "Package %s is already installed, skipping" msgstr "Pakiet %s jest już zainstalowany, pomijanie" --#: ../cli.py:1062 -+#: ../cli.py:1073 +-#: ../cli.py:1071 ++#: ../cli.py:1089 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Odrzucanie pakietu %s.%s, którego nie można porównać" #. we've not got any installed that match n or n+a --#: ../cli.py:1088 -+#: ../cli.py:1099 +-#: ../cli.py:1097 ++#: ../cli.py:1115 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" "Inne %s nie są zainstalowane, dodawanie do listy potencjalnie instalowanych" --#: ../cli.py:1108 -+#: ../cli.py:1119 +-#: ../cli.py:1117 ++#: ../cli.py:1135 msgid "Plugin Options" msgstr "Opcje wtyczki" --#: ../cli.py:1116 -+#: ../cli.py:1127 +-#: ../cli.py:1125 ++#: ../cli.py:1143 #, python-format msgid "Command line error: %s" msgstr "Błąd wiersza poleceń: %s" --#: ../cli.py:1129 -+#: ../cli.py:1140 +-#: ../cli.py:1138 ++#: ../cli.py:1156 #, python-format msgid "" "\n" -@@ -380,103 +388,103 @@ msgstr "" +@@ -390,106 +403,116 @@ msgstr "" "\n" "%s: opcja %s wymaga parametru" --#: ../cli.py:1182 -+#: ../cli.py:1193 +-#: ../cli.py:1191 ++#: ../cli.py:1209 msgid "--color takes one of: auto, always, never" msgstr "--color przyjmuje jedną z: auto, always, never" --#: ../cli.py:1289 -+#: ../cli.py:1300 +-#: ../cli.py:1298 ++#: ../cli.py:1319 msgid "show this help message and exit" - msgstr "wyświetla ten komunikat pomocy i wyłącza" + msgstr "wyświetla ten komunikat pomocy i kończy pracę" --#: ../cli.py:1293 -+#: ../cli.py:1304 +-#: ../cli.py:1302 ++#: ../cli.py:1323 msgid "be tolerant of errors" msgstr "toleruje błędy" --#: ../cli.py:1295 -+#: ../cli.py:1306 - msgid "run entirely from cache, don't update cache" - msgstr "uruchamia wyłącznie z pamięci podręcznej i nie aktualizuje jej" +-#: ../cli.py:1304 +-msgid "run entirely from cache, don't update cache" +-msgstr "uruchamia wyłącznie z pamięci podręcznej i nie aktualizuje jej" ++#: ../cli.py:1326 ++msgid "run entirely from system cache, don't update cache" ++msgstr "uruchamia wyłącznie z pamięci podręcznej systemu i nie aktualizuje jej" --#: ../cli.py:1297 -+#: ../cli.py:1308 +-#: ../cli.py:1306 ++#: ../cli.py:1329 msgid "config file location" msgstr "położenie pliku konfiguracji" --#: ../cli.py:1299 -+#: ../cli.py:1310 +-#: ../cli.py:1308 ++#: ../cli.py:1332 msgid "maximum command wait time" msgstr "maksymalny czas oczekiwania na polecenie" --#: ../cli.py:1301 -+#: ../cli.py:1312 +-#: ../cli.py:1310 ++#: ../cli.py:1334 msgid "debugging output level" msgstr "poziom wyjścia debugowania" --#: ../cli.py:1305 -+#: ../cli.py:1316 +-#: ../cli.py:1314 ++#: ../cli.py:1338 msgid "show duplicates, in repos, in list/search commands" msgstr "wyświetla duplikaty w repozytoriach w poleceniach list/search" --#: ../cli.py:1307 -+#: ../cli.py:1318 +-#: ../cli.py:1316 ++#: ../cli.py:1340 msgid "error output level" msgstr "poziom wyjścia błędów" --#: ../cli.py:1310 -+#: ../cli.py:1321 +-#: ../cli.py:1319 ++#: ../cli.py:1343 ++msgid "debugging output level for rpm" ++msgstr "poziom wyjścia debugowania dla programu RPM" ++ ++#: ../cli.py:1346 msgid "quiet operation" msgstr "mało komunikatów" --#: ../cli.py:1312 -+#: ../cli.py:1323 +-#: ../cli.py:1321 ++#: ../cli.py:1348 msgid "verbose operation" msgstr "dużo komunikatów" --#: ../cli.py:1314 -+#: ../cli.py:1325 +-#: ../cli.py:1323 ++#: ../cli.py:1350 msgid "answer yes for all questions" msgstr "odpowiada tak na wszystkie pytania" --#: ../cli.py:1316 -+#: ../cli.py:1327 +-#: ../cli.py:1325 ++#: ../cli.py:1352 msgid "show Yum version and exit" --msgstr "wyświetla wersję yuma i wyłącza" -+msgstr "wyświetla wersję programu yum i wyłącza" + msgstr "wyświetla wersję programu yum i kończy pracę" --#: ../cli.py:1317 -+#: ../cli.py:1328 +-#: ../cli.py:1326 ++#: ../cli.py:1353 msgid "set install root" msgstr "ustawia roota instalacji" --#: ../cli.py:1321 -+#: ../cli.py:1332 +-#: ../cli.py:1330 ++#: ../cli.py:1357 msgid "enable one or more repositories (wildcards allowed)" msgstr "włącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" --#: ../cli.py:1325 -+#: ../cli.py:1336 +-#: ../cli.py:1334 ++#: ../cli.py:1361 msgid "disable one or more repositories (wildcards allowed)" msgstr "wyłącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" --#: ../cli.py:1328 -+#: ../cli.py:1339 +-#: ../cli.py:1337 ++#: ../cli.py:1364 msgid "exclude package(s) by name or glob" msgstr "wyklucza pakiety po nazwie lub wyrażeniu regularnym" --#: ../cli.py:1330 -+#: ../cli.py:1341 +-#: ../cli.py:1339 ++#: ../cli.py:1366 msgid "disable exclude from main, for a repo or for everything" msgstr "wyłącza wykluczanie z głównego, dla repozytorium lub wszystkiego" --#: ../cli.py:1333 -+#: ../cli.py:1344 +-#: ../cli.py:1342 ++#: ../cli.py:1369 msgid "enable obsoletes processing during updates" msgstr "włącza przetwarzanie przestarzałych pakietów podczas aktualizacji" --#: ../cli.py:1335 -+#: ../cli.py:1346 +-#: ../cli.py:1344 ++#: ../cli.py:1371 msgid "disable Yum plugins" --msgstr "wyłącza wtyczki yuma" -+msgstr "wyłącza wtyczki programu yum" + msgstr "wyłącza wtyczki programu yum" --#: ../cli.py:1337 -+#: ../cli.py:1348 +-#: ../cli.py:1346 ++#: ../cli.py:1373 msgid "disable gpg signature checking" msgstr "wyłącza sprawdzanie podpisu GPG" --#: ../cli.py:1339 -+#: ../cli.py:1350 +-#: ../cli.py:1348 ++#: ../cli.py:1375 msgid "disable plugins by name" msgstr "wyłącza wtyczki po nazwie" --#: ../cli.py:1342 -+#: ../cli.py:1353 +-#: ../cli.py:1351 ++#: ../cli.py:1378 msgid "enable plugins by name" msgstr "włącza wtyczki po nazwie" --#: ../cli.py:1345 -+#: ../cli.py:1356 +-#: ../cli.py:1354 ++#: ../cli.py:1381 msgid "skip packages with depsolving problems" msgstr "pomija pakiety mające problemy z rozwiązaniem zależności" --#: ../cli.py:1347 -+#: ../cli.py:1358 +-#: ../cli.py:1356 ++#: ../cli.py:1383 msgid "control whether color is used" msgstr "kontroluje użycie kolorów" -@@ -599,7 +607,7 @@ msgstr "Podsumowanie : " - #: ../output.py:554 ++#: ../cli.py:1385 ++msgid "set value of $releasever in yum config and repo files" ++msgstr "" ++"ustawia wartość zmiennej $releasever w konfiguracji programu yum i plikach " ++"repozytoriów" ++ + #: ../output.py:305 + msgid "Jan" + msgstr "sty" +@@ -542,105 +565,104 @@ msgstr "gru" + msgid "Trying other mirror." + msgstr "Próbowanie innego serwera lustrzanego." + +-#: ../output.py:538 ++#: ../output.py:534 + #, python-format + msgid "Name : %s%s%s" + msgstr "Nazwa : %s%s%s" + +-#: ../output.py:539 ++#: ../output.py:535 + #, python-format + msgid "Arch : %s" + msgstr "Architektura : %s" + +-#: ../output.py:541 ++#: ../output.py:537 + #, python-format + msgid "Epoch : %s" + msgstr "Epoka : %s" + +-#: ../output.py:542 ++#: ../output.py:538 + #, python-format + msgid "Version : %s" + msgstr "Wersja : %s" + +-#: ../output.py:543 ++#: ../output.py:539 + #, python-format + msgid "Release : %s" + msgstr "Wydanie : %s" + +-#: ../output.py:544 ++#: ../output.py:540 + #, python-format + msgid "Size : %s" + msgstr "Rozmiar : %s" + +-#: ../output.py:545 ++#: ../output.py:541 + #, python-format + msgid "Repo : %s" + msgstr "Repozytorium : %s" + +-#: ../output.py:547 ++#: ../output.py:543 + #, python-format + msgid "From repo : %s" + msgstr "Z repozytorium : %s" + +-#: ../output.py:549 ++#: ../output.py:545 + #, python-format + msgid "Committer : %s" + msgstr "Twórca : %s" + +-#: ../output.py:550 ++#: ../output.py:546 + #, python-format + msgid "Committime : %s" + msgstr "Czas wysłania : %s" + +-#: ../output.py:551 ++#: ../output.py:547 + #, python-format + msgid "Buildtime : %s" + msgstr "Czas zbudowania : %s" + +-#: ../output.py:553 ++#: ../output.py:549 + #, python-format + msgid "Installtime: %s" + msgstr "Czas zainstalowania: %s" + +-#: ../output.py:554 ++#: ../output.py:550 + msgid "Summary : " + msgstr "Podsumowanie : " + +-#: ../output.py:556 ++#: ../output.py:552 #, python-format msgid "URL : %s" --msgstr "URL : %s" -+msgstr "Adres URL : %s" + msgstr "Adres URL : %s" - #: ../output.py:555 +-#: ../output.py:557 +-#, python-format +-msgid "License : %s" +-msgstr "Licencja : %s" ++#: ../output.py:553 ++msgid "License : " ++msgstr "Licencja : " + +-#: ../output.py:558 ++#: ../output.py:554 + msgid "Description: " + msgstr "Opis : " + +-#: ../output.py:626 ++#: ../output.py:622 + msgid "y" + msgstr "t" + +-#: ../output.py:626 ++#: ../output.py:622 + msgid "yes" + msgstr "tak" + +-#: ../output.py:627 ++#: ../output.py:623 + msgid "n" + msgstr "n" + +-#: ../output.py:627 ++#: ../output.py:623 + msgid "no" + msgstr "nie" + +-#: ../output.py:631 ++#: ../output.py:627 + msgid "Is this ok [y/N]: " + msgstr "W porządku? [t/N]: " + +-#: ../output.py:722 ++#: ../output.py:715 #, python-format -@@ -699,7 +707,7 @@ msgstr "Opis : " - #: ../output.py:848 + msgid "" + "\n" +@@ -649,150 +671,151 @@ msgstr "" + "\n" + "Grupa: %s" + +-#: ../output.py:726 ++#: ../output.py:719 + #, python-format + msgid " Group-Id: %s" + msgstr " Identyfikator grupy: %s" + +-#: ../output.py:731 ++#: ../output.py:724 + #, python-format + msgid " Description: %s" + msgstr " Opis: %s" + +-#: ../output.py:733 ++#: ../output.py:726 + msgid " Mandatory Packages:" + msgstr " Pakiety obowiązkowe:" + +-#: ../output.py:734 ++#: ../output.py:727 + msgid " Default Packages:" + msgstr " Domyślne pakiety:" + +-#: ../output.py:735 ++#: ../output.py:728 + msgid " Optional Packages:" + msgstr " Pakiety opcjonalne:" + +-#: ../output.py:736 ++#: ../output.py:729 + msgid " Conditional Packages:" + msgstr " Pakiety warunkowe:" + +-#: ../output.py:756 ++#: ../output.py:749 + #, python-format + msgid "package: %s" + msgstr "pakiet: %s" + +-#: ../output.py:758 ++#: ../output.py:751 + msgid " No dependencies for this package" + msgstr " Brak zależności dla tego pakietu" + +-#: ../output.py:763 ++#: ../output.py:756 + #, python-format + msgid " dependency: %s" + msgstr " zależność: %s" + +-#: ../output.py:765 ++#: ../output.py:758 + msgid " Unsatisfied dependency" + msgstr " Nierozwiązana zależność" + +-#: ../output.py:837 ++#: ../output.py:830 + #, python-format + msgid "Repo : %s" + msgstr "Repozytorium: %s" + +-#: ../output.py:838 ++#: ../output.py:831 + msgid "Matched from:" + msgstr "Dopasowano z:" + +-#: ../output.py:847 ++#: ../output.py:840 + msgid "Description : " + msgstr "Opis : " + +-#: ../output.py:850 ++#: ../output.py:843 #, python-format msgid "URL : %s" --msgstr "URL : %s" -+msgstr "Adres URL : %s" + msgstr "Adres URL : %s" - #: ../output.py:851 +-#: ../output.py:853 ++#: ../output.py:846 + #, python-format + msgid "License : %s" + msgstr "Licencja : %s" + +-#: ../output.py:856 ++#: ../output.py:849 + #, python-format + msgid "Filename : %s" + msgstr "Nazwa pliku : %s" + +-#: ../output.py:860 ++#: ../output.py:853 + msgid "Other : " + msgstr "Inne : " + +-#: ../output.py:893 ++#: ../output.py:896 + msgid "There was an error calculating total download size" + msgstr "Wystąpił błąd podczas obliczania całkowitego rozmiaru pobierania" + +-#: ../output.py:898 ++#: ../output.py:901 + #, python-format + msgid "Total size: %s" + msgstr "Całkowity rozmiar: %s" + +-#: ../output.py:901 ++#: ../output.py:904 #, python-format -@@ -729,51 +737,51 @@ msgstr "Całkowity rozmiar: %s" msgid "Total download size: %s" msgstr "Całkowity rozmiar pobierania: %s" --#: ../output.py:941 -+#: ../output.py:940 +-#: ../output.py:942 ++#: ../output.py:908 ++#, python-format ++msgid "Installed size: %s" ++msgstr "Rozmiar po zainstalowaniu: %s" ++ ++#: ../output.py:949 msgid "Reinstalling" msgstr "Ponowne instalowanie" --#: ../output.py:942 -+#: ../output.py:941 - msgid "Downgrading" - msgstr "Instalowanie starszej wersji" - -#: ../output.py:943 -+#: ../output.py:942 ++#: ../output.py:950 + msgid "Downgrading" +-msgstr "Instalowanie starszej wersji" ++msgstr "Instalowanie poprzedniej wersji" + +-#: ../output.py:944 ++#: ../output.py:951 msgid "Installing for dependencies" msgstr "Instalowanie, aby rozwiązać zależności" --#: ../output.py:944 -+#: ../output.py:943 +-#: ../output.py:945 ++#: ../output.py:952 msgid "Updating for dependencies" msgstr "Aktualizowanie, aby rozwiązać zależności" --#: ../output.py:945 -+#: ../output.py:944 +-#: ../output.py:946 ++#: ../output.py:953 msgid "Removing for dependencies" msgstr "Usuwanie, aby rozwiązać zależności" --#: ../output.py:952 ../output.py:1062 -+#: ../output.py:951 ../output.py:1063 +-#: ../output.py:953 ../output.py:1065 ++#: ../output.py:960 ../output.py:1072 msgid "Skipped (dependency problems)" msgstr "Pominięto (problemy z zależnościami)" --#: ../output.py:973 -+#: ../output.py:974 +-#: ../output.py:976 ++#: ../output.py:983 msgid "Package" msgstr "Pakiet" --#: ../output.py:973 -+#: ../output.py:974 +-#: ../output.py:976 ++#: ../output.py:983 msgid "Arch" msgstr "Architektura" --#: ../output.py:974 -+#: ../output.py:975 +-#: ../output.py:977 ++#: ../output.py:984 msgid "Version" msgstr "Wersja" --#: ../output.py:974 -+#: ../output.py:975 +-#: ../output.py:977 ++#: ../output.py:984 msgid "Repository" msgstr "Repozytorium" --#: ../output.py:975 -+#: ../output.py:976 +-#: ../output.py:978 ++#: ../output.py:985 msgid "Size" msgstr "Rozmiar" --#: ../output.py:987 -+#: ../output.py:988 - #, python-format - msgid "" - " replacing %s%s%s.%s %s\n" -@@ -782,7 +790,7 @@ msgstr "" - " zastępuje %s%s%s.%s %s\n" - "\n" - --#: ../output.py:996 +-#: ../output.py:990 +#: ../output.py:997 #, python-format +-msgid "" +-" replacing %s%s%s.%s %s\n" +-"\n" +-msgstr "" +-" zastępuje %s%s%s.%s %s\n" +-"\n" ++msgid " replacing %s%s%s.%s %s\n" ++msgstr " zastępuje %s%s%s.%s %s\n" + +-#: ../output.py:999 ++#: ../output.py:1006 + #, python-format msgid "" "\n" -@@ -793,7 +801,7 @@ msgstr "" +@@ -803,7 +826,7 @@ msgstr "" "Podsumowanie transakcji\n" "%s\n" --#: ../output.py:1003 -+#: ../output.py:1004 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" -@@ -802,7 +810,7 @@ msgstr "" - "Instalacja %5.5s pakiet(y)\n" - "Aktualizacja %5.5s pakiet(y)\n" - --#: ../output.py:1012 +-#: ../output.py:1006 +#: ../output.py:1013 #, python-format msgid "" - "Remove %5.5s Package(s)\n" -@@ -813,32 +821,32 @@ msgstr "" - "Ponowna instalacja %5.5s pakiet(y)\n" - "Instalacja starszej wersji %5.5s pakiet(y)\n" + "Install %5.5s Package(s)\n" +@@ -812,43 +835,43 @@ msgstr "" + "Instalacja %5.5s pakiet(y)\n" + "Aktualizacja %5.5s pakiet(y)\n" --#: ../output.py:1056 -+#: ../output.py:1057 +-#: ../output.py:1015 ++#: ../output.py:1022 + #, python-format + msgid "" + "Remove %5.5s Package(s)\n" + "Reinstall %5.5s Package(s)\n" + "Downgrade %5.5s Package(s)\n" + msgstr "" +-"Usunięcie %5.5s pakiet(y)\n" +-"Ponowna instalacja %5.5s pakiet(y)\n" +-"Instalacja starszej wersji %5.5s pakiet(y)\n" ++"Usunięcie %5.5s pakiet(y)\n" ++"Ponowna instalacja %5.5s pakiet(y)\n" ++"Instalacja poprzedniej wersji %5.5s pakiet(y)\n" + +-#: ../output.py:1059 ++#: ../output.py:1066 msgid "Removed" msgstr "Usunięto" --#: ../output.py:1057 -+#: ../output.py:1058 +-#: ../output.py:1060 ++#: ../output.py:1067 msgid "Dependency Removed" msgstr "Usunięto zależność" --#: ../output.py:1059 -+#: ../output.py:1060 +-#: ../output.py:1062 ++#: ../output.py:1069 msgid "Dependency Installed" msgstr "Zainstalowano zależność" --#: ../output.py:1061 -+#: ../output.py:1062 +-#: ../output.py:1064 ++#: ../output.py:1071 msgid "Dependency Updated" msgstr "Zaktualizowano zależność" --#: ../output.py:1063 -+#: ../output.py:1064 +-#: ../output.py:1066 ++#: ../output.py:1073 msgid "Replaced" msgstr "Zastąpiono" --#: ../output.py:1064 -+#: ../output.py:1065 +-#: ../output.py:1067 ++#: ../output.py:1074 msgid "Failed" msgstr "Nie powiodło się" #. Delta between C-c's so we treat as exit --#: ../output.py:1130 -+#: ../output.py:1131 +-#: ../output.py:1133 ++#: ../output.py:1140 msgid "two" msgstr "dwóch" -@@ -846,7 +854,7 @@ msgstr "dwóch" +@@ -856,7 +879,7 @@ msgstr "dwóch" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1141 -+#: ../output.py:1142 +-#: ../output.py:1144 ++#: ../output.py:1151 #, python-format msgid "" "\n" -@@ -858,67 +866,67 @@ msgstr "" - " Obecne pobieranie zostało anulowane, %sprzerwij (ctrl-c) ponownie%s w ciągu " - "%s%s%s sekund, aby zakończyć.\n" +@@ -868,209 +891,364 @@ msgstr "" + " Obecne pobieranie zostało anulowane, należy %sprzerwać (Ctrl-C) ponownie%s " + "w ciągu %s%s%s sekund, aby zakończyć pracę.\n" --#: ../output.py:1152 -+#: ../output.py:1153 +-#: ../output.py:1155 ++#: ../output.py:1162 msgid "user interrupt" msgstr "przerwane przez użytkownika" --#: ../output.py:1168 -+#: ../output.py:1171 +-#: ../output.py:1173 ++#: ../output.py:1180 msgid "Total" msgstr "Razem" --#: ../output.py:1183 -+#: ../output.py:1186 ++#: ../output.py:1202 ++msgid "I" ++msgstr "I" ++ + #: ../output.py:1203 +-msgid "" +-msgstr "" ++msgid "O" ++msgstr "O" + + #: ../output.py:1204 ++msgid "E" ++msgstr "E" ++ ++#: ../output.py:1205 ++msgid "R" ++msgstr "R" ++ ++#: ../output.py:1206 ++msgid "D" ++msgstr "D" ++ ++#: ../output.py:1207 ++msgid "U" ++msgstr "U" ++ ++#: ../output.py:1217 ++msgid "" ++msgstr "" ++ ++#: ../output.py:1218 + msgid "System" + msgstr "System" + +-#: ../output.py:1240 ++#: ../output.py:1254 + msgid "Bad transaction IDs, or package(s), given" + msgstr "Podano błędne identyfikatory transakcji lub pakietów" + +-#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 +-msgid "Warning: RPMDB has been altered since the last yum transaction." +-msgstr "" +-"Ostrzeżenie: baza danych RPM została zmieniona od ostatniej transakcji " +-"programu yum." ++#: ../output.py:1266 ++msgid "ID" ++msgstr "Identyfikator" + +-#: ../output.py:1289 ++#: ../output.py:1267 ../output.py:1520 ++msgid "Login user" ++msgstr "Zalogowany użytkownik" ++ ++#: ../output.py:1268 ++msgid "Date and time" ++msgstr "Data i czas" ++ ++#: ../output.py:1269 ../output.py:1522 ++msgid "Action(s)" ++msgstr "Czynności" ++ ++#: ../output.py:1270 ../output.py:1523 ++msgid "Altered" ++msgstr "Zmieniono" ++ ++#: ../output.py:1310 + msgid "No transaction ID given" + msgstr "Nie podano identyfikatora transakcji" + +-#: ../output.py:1297 ++#: ../output.py:1336 + msgid "Bad transaction ID given" + msgstr "Podano błędny identyfikator transakcji" + +-#: ../output.py:1302 ++#: ../output.py:1341 + msgid "Not found given transaction ID" + msgstr "Nie odnaleziono podanego identyfikatora transakcji" + +-#: ../output.py:1310 ++#: ../output.py:1349 + msgid "Found more than one transaction ID!" + msgstr "Odnaleziono więcej niż jeden identyfikator transakcji." + +-#: ../output.py:1331 ++#: ../output.py:1370 + msgid "No transaction ID, or package, given" + msgstr "Podano błędny identyfikator transakcji lub pakietu" + +-#: ../output.py:1357 ++#: ../output.py:1396 + msgid "Transaction ID :" + msgstr "Identyfikator transakcji :" + +-#: ../output.py:1359 ++#: ../output.py:1398 + msgid "Begin time :" + msgstr "Czas rozpoczęcia :" + +-#: ../output.py:1362 ../output.py:1364 ++#: ../output.py:1401 ../output.py:1403 + msgid "Begin rpmdb :" + msgstr "Rozpoczęcie bazy danych RPM:" + +-#: ../output.py:1378 ++#: ../output.py:1417 + #, python-format + msgid "(%s seconds)" + msgstr "%s sekundy)" + +-#: ../output.py:1379 ++#: ../output.py:1418 + msgid "End time :" + msgstr "Czas ukończenia :" + +-#: ../output.py:1382 ../output.py:1384 ++#: ../output.py:1421 ../output.py:1423 + msgid "End rpmdb :" + msgstr "Ukończenie bazy danych RPM :" + +-#: ../output.py:1385 ++#: ../output.py:1424 + msgid "User :" + msgstr "Użytkownik :" + +-#: ../output.py:1387 ../output.py:1389 ../output.py:1391 ++#: ../output.py:1426 ../output.py:1428 ../output.py:1430 + msgid "Return-Code :" + msgstr "Kod zwrotny :" + +-#: ../output.py:1387 ++#: ../output.py:1426 + msgid "Aborted" + msgstr "Przerwano" + +-#: ../output.py:1389 ++#: ../output.py:1428 + msgid "Failure:" + msgstr "Niepowodzenie:" + +-#: ../output.py:1391 ++#: ../output.py:1430 + msgid "Success" + msgstr "Powodzenie" + +-#: ../output.py:1392 ++#: ../output.py:1431 + msgid "Transaction performed with:" + msgstr "Wykonano transakcję za pomocą:" + +-#: ../output.py:1405 ++#: ../output.py:1444 ../output.py:1489 + msgid "Downgraded" +-msgstr "Zainstalowano starszą wersję" ++msgstr "Zainstalowano poprzednią wersję" + + #. multiple versions installed, both older and newer +-#: ../output.py:1407 ++#: ../output.py:1446 + msgid "Weird" + msgstr "Dziwne" + +-#: ../output.py:1409 ++#: ../output.py:1448 + msgid "Packages Altered:" + msgstr "Zmienione pakiety:" + +-#: ../output.py:1412 ++#: ../output.py:1451 + msgid "Scriptlet output:" + msgstr "Wyjście skryptu:" + +-#: ../output.py:1418 ++#: ../output.py:1457 + msgid "Errors:" + msgstr "Błędy:" + +-#: ../output.py:1489 ++#: ../output.py:1481 ../output.py:1482 ++msgid "Install" ++msgstr "Instalacja" ++ ++#: ../output.py:1483 ++msgid "Dep-Install" ++msgstr "Instalacja zależności" ++ ++#: ../output.py:1485 ++msgid "Obsoleting" ++msgstr "Zastępowanie" ++ ++#: ../output.py:1486 ++msgid "Erase" ++msgstr "Usunięcie" ++ ++#: ../output.py:1487 ++msgid "Reinstall" ++msgstr "Ponowna instalacja" ++ ++#: ../output.py:1488 ++msgid "Downgrade" ++msgstr "Instalacja poprzedniej wersji" ++ ++#: ../output.py:1490 ++msgid "Update" ++msgstr "Aktualizacja" ++ ++#: ../output.py:1521 ++msgid "Time" ++msgstr "Czas" ++ ++#: ../output.py:1547 + msgid "Last day" + msgstr "Ostatni dzień" + +-#: ../output.py:1490 ++#: ../output.py:1548 + msgid "Last week" + msgstr "Ostatni tydzień" + +-#: ../output.py:1491 ++#: ../output.py:1549 + msgid "Last 2 weeks" + msgstr "Ostatnie dwa tygodnie" + + #. US default :p +-#: ../output.py:1492 ++#: ../output.py:1550 + msgid "Last 3 months" + msgstr "Ostatnie trzy miesiące" + +-#: ../output.py:1493 ++#: ../output.py:1551 + msgid "Last 6 months" + msgstr "Ostatnie pół roku" + +-#: ../output.py:1494 ++#: ../output.py:1552 + msgid "Last year" + msgstr "Ostatni rok" + +-#: ../output.py:1495 ++#: ../output.py:1553 + msgid "Over a year ago" + msgstr "Ponad rok temu" + +-#: ../output.py:1524 ++#: ../output.py:1585 msgid "installed" msgstr "zainstalowany" --#: ../output.py:1184 -+#: ../output.py:1187 +-#: ../output.py:1525 ++#: ../output.py:1586 msgid "updated" msgstr "zaktualizowany" --#: ../output.py:1185 -+#: ../output.py:1188 +-#: ../output.py:1526 ++#: ../output.py:1587 msgid "obsoleted" msgstr "zastąpiony" --#: ../output.py:1186 -+#: ../output.py:1189 +-#: ../output.py:1527 ++#: ../output.py:1588 msgid "erased" msgstr "usunięty" --#: ../output.py:1190 -+#: ../output.py:1193 +-#: ../output.py:1531 ++#: ../output.py:1592 #, python-format msgid "---> Package %s.%s %s:%s-%s set to be %s" msgstr "---> Pakiet %s.%s %s:%s-%s zostanie %s" --#: ../output.py:1197 -+#: ../output.py:1200 +-#: ../output.py:1538 ++#: ../output.py:1599 msgid "--> Running transaction check" msgstr "--> Wykonywanie sprawdzania transakcji" --#: ../output.py:1202 -+#: ../output.py:1205 +-#: ../output.py:1543 ++#: ../output.py:1604 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Ponowne uruchamianie rozwiązywania zależności z nowymi zmianami." --#: ../output.py:1207 -+#: ../output.py:1210 +-#: ../output.py:1548 ++#: ../output.py:1609 msgid "--> Finished Dependency Resolution" - msgstr "--> Zakończono rozwiązywanie zależności" + msgstr "--> Ukończono rozwiązywanie zależności" --#: ../output.py:1212 ../output.py:1217 -+#: ../output.py:1215 ../output.py:1220 +-#: ../output.py:1553 ../output.py:1558 ++#: ../output.py:1614 ../output.py:1619 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Przetwarzanie zależności: %s dla pakietu: %s" --#: ../output.py:1221 -+#: ../output.py:1224 +-#: ../output.py:1562 ++#: ../output.py:1623 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nierozwiązana zależność: %s" --#: ../output.py:1227 ../output.py:1232 -+#: ../output.py:1230 ../output.py:1235 +-#: ../output.py:1568 ../output.py:1573 ++#: ../output.py:1634 ++#, python-format ++msgid "Package: %s" ++msgstr "Pakiet: %s" ++ ++#: ../output.py:1636 ++#, python-format ++msgid "" ++"\n" ++" Requires: %s" ++msgstr "" ++"\n" ++" Wymaga: %s" ++ ++#: ../output.py:1649 ../output.py:1660 ++#, python-format ++msgid "" ++"\n" ++" %s: %s (%s)" ++msgstr "" ++"\n" ++" %s: %s (%s)" ++ ++#: ../output.py:1657 ++msgid "Available" ++msgstr "Dostępne" ++ ++#: ../output.py:1665 ../output.py:1670 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Przetwarzanie konfliktów: %s jest w konflikcie z %s" --#: ../output.py:1236 -+#: ../output.py:1239 +-#: ../output.py:1577 ++#: ../output.py:1674 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać." --#: ../output.py:1240 -+#: ../output.py:1243 +-#: ../output.py:1581 ++#: ../output.py:1678 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Pobieranie nagłówka dla %s do umieszczenia w zestawie transakcji." -@@ -952,8 +960,8 @@ msgstr "" - " rpm --import klucz.publiczny.gpg\n" - "\n" - "\n" --"Można także podać URL klucza, którego chcesz używać dla repozytorium w\n" --"opcji \"gpgkey\" w sekcji repozytorium, a yum go zainstaluje.\n" -+"Można także podać adres URL klucza, którego chcesz używać dla repozytorium\n" -+"w opcji \"gpgkey\" w sekcji repozytorium, a program yum go zainstaluje.\n" - "\n" - "Aby dowiedzieć się więcej, skontaktuj się z dostawcą dystrybucji lub\n" - "pakietu.\n" -@@ -1154,11 +1162,11 @@ msgstr "Wyszukiwanie pakietów dla zależności:" - #: ../yumcommands.py:709 - msgid "Run an interactive yum shell" --msgstr "Uruchom interaktywną powłokę yuma" -+msgstr "Uruchom interaktywną powłokę programu yum" - - #: ../yumcommands.py:715 - msgid "Setting up Yum Shell" --msgstr "Ustawianie powłoki yuma" -+msgstr "Ustawianie powłoki programu yum" - - #: ../yumcommands.py:733 - msgid "List a package's dependencies" -@@ -1181,15 +1189,15 @@ msgid "disabled" - msgstr "wyłączone" - - #: ../yumcommands.py:827 --msgid "Repo-id : " -+msgid "Repo-id : " - msgstr "Identyfikator repozytorium : " - - #: ../yumcommands.py:828 --msgid "Repo-name : " -+msgid "Repo-name : " - msgstr "Nazwa repozytorium : " - - #: ../yumcommands.py:829 --msgid "Repo-status : " -+msgid "Repo-status : " - msgstr "Stan repozytorium : " - - #: ../yumcommands.py:831 -@@ -1197,7 +1205,7 @@ msgid "Repo-revision: " - msgstr "Wersja repozytorium : " - - #: ../yumcommands.py:835 --msgid "Repo-tags : " -+msgid "Repo-tags : " - msgstr "Znaczniki repozytorium : " - - #: ../yumcommands.py:841 -@@ -1205,20 +1213,20 @@ msgid "Repo-distro-tags: " - msgstr "Znaczniki dystrybucji repozytorium: " - - #: ../yumcommands.py:846 --msgid "Repo-updated: " -+msgid "Repo-updated : " - msgstr "Aktualizacje repozytorium : " - - #: ../yumcommands.py:848 --msgid "Repo-pkgs : " -+msgid "Repo-pkgs : " - msgstr "Pakiety repozytorium : " - - #: ../yumcommands.py:849 --msgid "Repo-size : " -+msgid "Repo-size : " - msgstr "Rozmiar repozytorium : " - - #: ../yumcommands.py:856 --msgid "Repo-baseurl: " --msgstr "Podstawowy URL repozytorium : " -+msgid "Repo-baseurl : " -+msgstr "Podstawowy adres URL repozytorium : " - - #: ../yumcommands.py:864 - msgid "Repo-metalink: " -@@ -1229,41 +1237,64 @@ msgid " Updated : " - msgstr " Zaktualizowano : " - - #: ../yumcommands.py:871 --msgid "Repo-mirrors: " -+msgid "Repo-mirrors : " - msgstr "Serwery lustrzane repozytorium : " - --#: ../yumcommands.py:875 --msgid "Repo-exclude: " -+#: ../yumcommands.py:875 ../yummain.py:133 +-#: ../utils.py:137 ../yummain.py:42 ++#: ../utils.py:93 ++msgid "Running" ++msgstr "Wykonywanie" ++ ++#: ../utils.py:94 ++msgid "Sleeping" ++msgstr "Zasypianie" ++ ++#: ../utils.py:95 ++msgid "Uninterruptible" ++msgstr "Nie można przerywać" ++ ++#: ../utils.py:96 ++msgid "Zombie" ++msgstr "Zombie" ++ ++#: ../utils.py:97 ++msgid "Traced/Stopped" ++msgstr "Śledzone/zatrzymane" ++ ++#: ../utils.py:98 ../yumcommands.py:917 +msgid "Unknown" +msgstr "Nieznane" + -+#: ../yumcommands.py:881 -+#, python-format -+msgid "Never (last: %s)" -+msgstr "Nigdy (ostatnio: %s)" ++#: ../utils.py:109 ++msgid " The other application is: PackageKit" ++msgstr " Inna aplikacja to PackageKit" + ++#: ../utils.py:111 ++#, python-format ++msgid " The other application is: %s" ++msgstr " Inna aplikacja to: %s" ++ ++#: ../utils.py:114 ++#, python-format ++msgid " Memory : %5s RSS (%5sB VSZ)" ++msgstr " Pamięć: %5s RSS (%5sB VSZ)" ++ ++#: ../utils.py:119 ++#, python-format ++msgid " Started: %s - %s ago" ++msgstr " Uruchomiono: %s - %s temu" ++ ++#: ../utils.py:121 ++#, python-format ++msgid " State : %s, pid: %d" ++msgstr " Stan: %s, PID: %d" ++ ++#: ../utils.py:199 ++#, python-format ++msgid "PluginExit Error: %s" ++msgstr "Błąd wyjścia wtyczki: %s" ++ ++#: ../utils.py:202 ++#, python-format ++msgid "Yum Error: %s" ++msgstr "Błąd programu yum: %s" ++ ++#: ../utils.py:235 ../yummain.py:42 + msgid "" + "\n" + "\n" +@@ -1078,9 +1256,9 @@ msgid "" + msgstr "" + "\n" + "\n" +-"Kończenie pracy na polecenie użytkownika" ++"Kończenie działania na polecenie użytkownika" + +-#: ../utils.py:143 ../yummain.py:48 ++#: ../utils.py:241 ../yummain.py:48 + msgid "" + "\n" + "\n" +@@ -1088,9 +1266,9 @@ msgid "" + msgstr "" + "\n" + "\n" +-"Kończenie pracy z powodu przerwanego potoku" ++"Kończenie działania z powodu przerwanego potoku" + +-#: ../utils.py:145 ../yummain.py:50 ++#: ../utils.py:243 ../yummain.py:50 + #, python-format + msgid "" + "\n" +@@ -1101,15 +1279,15 @@ msgstr "" + "\n" + "%s" + +-#: ../utils.py:184 ../yummain.py:273 ++#: ../utils.py:282 ../yummain.py:211 + msgid "Complete!" + msgstr "Ukończono." + +-#: ../yumcommands.py:42 ++#: ../yumcommands.py:43 + msgid "You need to be root to perform this command." + msgstr "Należy być zalogowanym jako root, aby wykonać to polecenie." + +-#: ../yumcommands.py:49 ++#: ../yumcommands.py:50 + msgid "" + "\n" + "You have enabled checking of packages via GPG keys. This is a good thing. \n" +@@ -1140,335 +1318,335 @@ msgstr "" + "Aby dowiedzieć się więcej, proszę skontaktować się z dostawcą dystrybucji\n" + "lub pakietu.\n" + +-#: ../yumcommands.py:69 ++#: ../yumcommands.py:70 + #, python-format + msgid "Error: Need to pass a list of pkgs to %s" + msgstr "Błąd: wymagane jest przekazanie listy pakietów do %s" + +-#: ../yumcommands.py:75 ++#: ../yumcommands.py:76 + msgid "Error: Need an item to match" + msgstr "Błąd: wymagany jest parametr do dopasowania" + +-#: ../yumcommands.py:81 ++#: ../yumcommands.py:82 + msgid "Error: Need a group or list of groups" + msgstr "Błąd: wymagana jest grupa lub lista grup" + +-#: ../yumcommands.py:90 ++#: ../yumcommands.py:91 + #, python-format + msgid "Error: clean requires an option: %s" + msgstr "Błąd: czyszczenie wymaga opcji: %s" + +-#: ../yumcommands.py:95 ++#: ../yumcommands.py:96 + #, python-format + msgid "Error: invalid clean argument: %r" + msgstr "Błąd: nieprawidłowy parametr czyszczenia: %r" + +-#: ../yumcommands.py:108 ++#: ../yumcommands.py:109 + msgid "No argument to shell" + msgstr "Brak parametrów dla powłoki" + +-#: ../yumcommands.py:110 ++#: ../yumcommands.py:111 + #, python-format + msgid "Filename passed to shell: %s" + msgstr "Przekazano nazwę pliku do powłoki: %s" + +-#: ../yumcommands.py:114 ++#: ../yumcommands.py:115 + #, python-format + msgid "File %s given as argument to shell does not exist." + msgstr "Plik %s podany powłoce jako parametr nie istnieje." + +-#: ../yumcommands.py:120 ++#: ../yumcommands.py:121 + msgid "Error: more than one file given as argument to shell." + msgstr "Błąd: podano powłoce więcej niż jeden plik jako parametr." + +-#: ../yumcommands.py:169 ++#: ../yumcommands.py:170 + msgid "PACKAGE..." + msgstr "PAKIET..." + +-#: ../yumcommands.py:172 ++#: ../yumcommands.py:173 + msgid "Install a package or packages on your system" + msgstr "Instaluje pakiet lub pakiety w systemie" + +-#: ../yumcommands.py:180 ++#: ../yumcommands.py:181 + msgid "Setting up Install Process" + msgstr "Ustawianie procesu instalacji" + +-#: ../yumcommands.py:191 ++#: ../yumcommands.py:192 + msgid "[PACKAGE...]" + msgstr "[PAKIET...]" + +-#: ../yumcommands.py:194 ++#: ../yumcommands.py:195 + msgid "Update a package or packages on your system" + msgstr "Aktualizuje pakiet lub pakiety w systemie" + +-#: ../yumcommands.py:201 ++#: ../yumcommands.py:202 + msgid "Setting up Update Process" + msgstr "Ustawianie procesu aktualizacji" + +-#: ../yumcommands.py:246 ++#: ../yumcommands.py:244 + msgid "Display details about a package or group of packages" + msgstr "Wyświetla szczegóły o pakiecie lub grupie pakietów" + +-#: ../yumcommands.py:295 ++#: ../yumcommands.py:293 + msgid "Installed Packages" + msgstr "Zainstalowane pakiety" + +-#: ../yumcommands.py:303 ++#: ../yumcommands.py:301 + msgid "Available Packages" + msgstr "Dostępne pakiety" + +-#: ../yumcommands.py:307 ++#: ../yumcommands.py:305 + msgid "Extra Packages" + msgstr "Dodatkowe pakiety" + +-#: ../yumcommands.py:311 ++#: ../yumcommands.py:309 + msgid "Updated Packages" + msgstr "Zaktualizowane pakiety" + + #. This only happens in verbose mode +-#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 ++#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 + msgid "Obsoleting Packages" + msgstr "Zastępowanie przestarzałych pakietów" + +-#: ../yumcommands.py:328 ++#: ../yumcommands.py:326 + msgid "Recently Added Packages" + msgstr "Ostatnio dodane pakiety" + +-#: ../yumcommands.py:335 ++#: ../yumcommands.py:333 + msgid "No matching Packages to list" + msgstr "Brak pakietów pasujących do listy" + +-#: ../yumcommands.py:349 ++#: ../yumcommands.py:347 + msgid "List a package or groups of packages" + msgstr "Wyświetla listę pakietów lub grup pakietów" + +-#: ../yumcommands.py:361 ++#: ../yumcommands.py:359 + msgid "Remove a package or packages from your system" + msgstr "Usuwa pakiet lub pakiety z systemu" + +-#: ../yumcommands.py:368 ++#: ../yumcommands.py:366 + msgid "Setting up Remove Process" + msgstr "Ustawianie procesu usuwania" + +-#: ../yumcommands.py:382 ++#: ../yumcommands.py:380 + msgid "Setting up Group Process" + msgstr "Ustawianie procesu grup" + +-#: ../yumcommands.py:388 ++#: ../yumcommands.py:386 + msgid "No Groups on which to run command" + msgstr "Brak grup, na których można wykonać polecenie" + +-#: ../yumcommands.py:401 ++#: ../yumcommands.py:399 + msgid "List available package groups" + msgstr "Wyświetla listę dostępnych grup pakietów" + +-#: ../yumcommands.py:418 ++#: ../yumcommands.py:416 + msgid "Install the packages in a group on your system" + msgstr "Instaluje pakiety z grupy w systemie" + +-#: ../yumcommands.py:440 ++#: ../yumcommands.py:438 + msgid "Remove the packages in a group from your system" + msgstr "Usuwa pakiety z grupy z systemu" + +-#: ../yumcommands.py:467 ++#: ../yumcommands.py:465 + msgid "Display details about a package group" + msgstr "Wyświetla szczegóły o grupie pakietów" + +-#: ../yumcommands.py:491 ++#: ../yumcommands.py:489 + msgid "Generate the metadata cache" + msgstr "Utworzy pamięć podręczną metadanych" + +-#: ../yumcommands.py:497 ++#: ../yumcommands.py:495 + msgid "Making cache files for all metadata files." + msgstr "Tworzenie plików pamięci podręcznej ze wszystkich plików metadanych." + +-#: ../yumcommands.py:498 ++#: ../yumcommands.py:496 + msgid "This may take a while depending on the speed of this computer" + msgstr "Może to chwilę zająć, z zależności od prędkości komputera" + +-#: ../yumcommands.py:519 ++#: ../yumcommands.py:517 + msgid "Metadata Cache Created" + msgstr "Utworzono pamięć podręczną metadanych" + +-#: ../yumcommands.py:533 ++#: ../yumcommands.py:531 + msgid "Remove cached data" + msgstr "Usuwa dane z pamięci podręcznej" + +-#: ../yumcommands.py:553 ++#: ../yumcommands.py:551 + msgid "Find what package provides the given value" + msgstr "Wyszukuje pakiet dostarczający podaną wartość" + +-#: ../yumcommands.py:573 ++#: ../yumcommands.py:571 + msgid "Check for available package updates" + msgstr "Sprawdza dostępne aktualizacje pakietów" + +-#: ../yumcommands.py:623 ++#: ../yumcommands.py:621 + msgid "Search package details for the given string" + msgstr "Wyszukuje szczegóły pakietów dla podanego ciągu" + +-#: ../yumcommands.py:629 ++#: ../yumcommands.py:627 + msgid "Searching Packages: " + msgstr "Wyszukiwanie pakietów: " + +-#: ../yumcommands.py:646 ++#: ../yumcommands.py:644 + msgid "Update packages taking obsoletes into account" + msgstr "Aktualizuje pakiety, w tym przestarzałe" + +-#: ../yumcommands.py:654 ++#: ../yumcommands.py:652 + msgid "Setting up Upgrade Process" + msgstr "Ustawianie procesu aktualizacji" + +-#: ../yumcommands.py:668 ++#: ../yumcommands.py:666 + msgid "Install a local RPM" + msgstr "Instaluje lokalny pakiet RPM" + +-#: ../yumcommands.py:676 ++#: ../yumcommands.py:674 + msgid "Setting up Local Package Process" + msgstr "Ustawianie procesu lokalnego pakietu" + +-#: ../yumcommands.py:695 ++#: ../yumcommands.py:693 + msgid "Determine which package provides the given dependency" + msgstr "Określa, który pakiet dostarcza podaną zależność" + +-#: ../yumcommands.py:698 ++#: ../yumcommands.py:696 + msgid "Searching Packages for Dependency:" + msgstr "Wyszukiwanie pakietów dla zależności:" + +-#: ../yumcommands.py:712 ++#: ../yumcommands.py:710 + msgid "Run an interactive yum shell" + msgstr "Uruchamia interaktywną powłokę programu yum" + +-#: ../yumcommands.py:718 ++#: ../yumcommands.py:716 + msgid "Setting up Yum Shell" + msgstr "Ustawianie powłoki programu yum" + +-#: ../yumcommands.py:736 ++#: ../yumcommands.py:734 + msgid "List a package's dependencies" + msgstr "Wyświetla listę zależności pakietu" + +-#: ../yumcommands.py:742 ++#: ../yumcommands.py:740 + msgid "Finding dependencies: " + msgstr "Wyszukiwanie zależności: " + +-#: ../yumcommands.py:758 ++#: ../yumcommands.py:756 + msgid "Display the configured software repositories" + msgstr "Wyświetla skonfigurowane repozytoria oprogramowania" + +-#: ../yumcommands.py:810 ../yumcommands.py:811 ++#: ../yumcommands.py:822 ../yumcommands.py:823 + msgid "enabled" + msgstr "włączone" + +-#: ../yumcommands.py:819 ../yumcommands.py:820 ++#: ../yumcommands.py:849 ../yumcommands.py:850 + msgid "disabled" + msgstr "wyłączone" + +-#: ../yumcommands.py:834 ++#: ../yumcommands.py:866 + msgid "Repo-id : " + msgstr "Identyfikator repozytorium : " + +-#: ../yumcommands.py:835 ++#: ../yumcommands.py:867 + msgid "Repo-name : " + msgstr "Nazwa repozytorium : " + +-#: ../yumcommands.py:836 ++#: ../yumcommands.py:870 + msgid "Repo-status : " + msgstr "Stan repozytorium : " + +-#: ../yumcommands.py:838 ++#: ../yumcommands.py:873 + msgid "Repo-revision: " + msgstr "Wersja repozytorium : " + +-#: ../yumcommands.py:842 ++#: ../yumcommands.py:877 + msgid "Repo-tags : " + msgstr "Znaczniki repozytorium : " + +-#: ../yumcommands.py:848 +#: ../yumcommands.py:883 -+#, python-format -+msgid "Instant (last: %s)" -+msgstr "Natychmiast (ostatnio: %s)" -+ -+#: ../yumcommands.py:886 -+#, python-format -+msgid "%s second(s) (last: %s)" -+msgstr "%s sekundy (ostatnio: %s)" -+ + msgid "Repo-distro-tags: " + msgstr "Znaczniki dystrybucji repozytorium: " + +-#: ../yumcommands.py:853 +#: ../yumcommands.py:888 -+msgid "Repo-expire : " -+msgstr "Wygaszenie repozytorium : " -+ + msgid "Repo-updated : " + msgstr "Aktualizacje repozytorium : " + +-#: ../yumcommands.py:855 ++#: ../yumcommands.py:890 + msgid "Repo-pkgs : " + msgstr "Pakiety repozytorium : " + +-#: ../yumcommands.py:856 +#: ../yumcommands.py:891 -+msgid "Repo-exclude : " + msgid "Repo-size : " + msgstr "Rozmiar repozytorium : " + +-#: ../yumcommands.py:863 ++#: ../yumcommands.py:898 + msgid "Repo-baseurl : " + msgstr "Podstawowy adres URL repozytorium : " + +-#: ../yumcommands.py:871 ++#: ../yumcommands.py:906 + msgid "Repo-metalink: " + msgstr "Metaodnośnik repozytorium : " + +-#: ../yumcommands.py:875 ++#: ../yumcommands.py:910 + msgid " Updated : " + msgstr " Zaktualizowano : " + +-#: ../yumcommands.py:878 ++#: ../yumcommands.py:913 + msgid "Repo-mirrors : " + msgstr "Serwery lustrzane repozytorium : " + +-#: ../yumcommands.py:882 ../yummain.py:133 +-msgid "Unknown" +-msgstr "Nieznane" +- +-#: ../yumcommands.py:888 ++#: ../yumcommands.py:923 + #, python-format + msgid "Never (last: %s)" + msgstr "Nigdy (ostatnio: %s)" + +-#: ../yumcommands.py:890 ++#: ../yumcommands.py:925 + #, python-format + msgid "Instant (last: %s)" + msgstr "Natychmiast (ostatnio: %s)" + +-#: ../yumcommands.py:893 ++#: ../yumcommands.py:928 + #, python-format + msgid "%s second(s) (last: %s)" + msgstr "%s sekundy (ostatnio: %s)" + +-#: ../yumcommands.py:895 ++#: ../yumcommands.py:930 + msgid "Repo-expire : " + msgstr "Wygaszenie repozytorium : " + +-#: ../yumcommands.py:898 ++#: ../yumcommands.py:933 + msgid "Repo-exclude : " msgstr "Wykluczenia z repozytorium : " --#: ../yumcommands.py:879 --msgid "Repo-include: " -+#: ../yumcommands.py:895 -+msgid "Repo-include : " +-#: ../yumcommands.py:902 ++#: ../yumcommands.py:937 + msgid "Repo-include : " msgstr "Dołączone z repozytorium : " ++#: ../yumcommands.py:941 ++msgid "Repo-excluded: " ++msgstr "Wykluczenia z repozytorium : " ++ #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... --#: ../yumcommands.py:889 ../yumcommands.py:915 -+#: ../yumcommands.py:905 ../yumcommands.py:931 +-#: ../yumcommands.py:912 ../yumcommands.py:938 ++#: ../yumcommands.py:951 ../yumcommands.py:980 msgid "repo id" - msgstr "ID repozytorium" + msgstr "identyfikator repozytorium" --#: ../yumcommands.py:903 ../yumcommands.py:904 ../yumcommands.py:918 -+#: ../yumcommands.py:919 ../yumcommands.py:920 ../yumcommands.py:934 +-#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 ++#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 msgid "status" msgstr "stan" --#: ../yumcommands.py:916 -+#: ../yumcommands.py:932 +-#: ../yumcommands.py:939 ++#: ../yumcommands.py:981 msgid "repo name" msgstr "nazwa repozytorium" --#: ../yumcommands.py:942 -+#: ../yumcommands.py:958 +-#: ../yumcommands.py:965 ++#: ../yumcommands.py:1018 msgid "Display a helpful usage message" - msgstr "Wyświetl pomocny komunikat o używaniu" + msgstr "Wyświetla pomocny komunikat o używaniu" --#: ../yumcommands.py:976 -+#: ../yumcommands.py:992 +-#: ../yumcommands.py:999 ++#: ../yumcommands.py:1052 #, python-format msgid "No help available for %s" - msgstr "Brak pomocy dla %s" + msgstr "Brak dostępnej pomocy dla %s" --#: ../yumcommands.py:981 -+#: ../yumcommands.py:997 +-#: ../yumcommands.py:1004 ++#: ../yumcommands.py:1057 msgid "" "\n" "\n" -@@ -1273,7 +1304,7 @@ msgstr "" +@@ -1478,7 +1656,7 @@ msgstr "" "\n" "aliasy: " --#: ../yumcommands.py:983 -+#: ../yumcommands.py:999 +-#: ../yumcommands.py:1006 ++#: ../yumcommands.py:1059 msgid "" "\n" "\n" -@@ -1283,31 +1314,31 @@ msgstr "" +@@ -1488,143 +1666,97 @@ msgstr "" "\n" "alias: " --#: ../yumcommands.py:1011 -+#: ../yumcommands.py:1027 +-#: ../yumcommands.py:1034 ++#: ../yumcommands.py:1087 msgid "Setting up Reinstall Process" msgstr "Ustawianie procesu ponownej instalacji" --#: ../yumcommands.py:1019 -+#: ../yumcommands.py:1035 +-#: ../yumcommands.py:1042 ++#: ../yumcommands.py:1095 msgid "reinstall a package" - msgstr "ponownie zainstaluj pakiet" + msgstr "Ponownie instaluje pakiet" --#: ../yumcommands.py:1037 -+#: ../yumcommands.py:1053 +-#: ../yumcommands.py:1060 ++#: ../yumcommands.py:1113 msgid "Setting up Downgrade Process" - msgstr "Ustawianie procesu instalacji starszej wersji pakietu" +-msgstr "Ustawianie procesu instalacji starszej wersji pakietu" ++msgstr "Ustawianie procesu instalacji poprzedniej wersji pakietu" --#: ../yumcommands.py:1044 -+#: ../yumcommands.py:1060 +-#: ../yumcommands.py:1067 ++#: ../yumcommands.py:1120 msgid "downgrade a package" - msgstr "zainstaluj starszą wersję pakietu" +-msgstr "Instaluje starszą wersję pakietu" ++msgstr "Instaluje poprzednią wersję pakietu" --#: ../yumcommands.py:1058 -+#: ../yumcommands.py:1074 +-#: ../yumcommands.py:1081 ++#: ../yumcommands.py:1134 msgid "Display a version for the machine and/or available repos." - msgstr "Wyświetl wersję dla komputera i/lub dostępnych repozytoriów." + msgstr "Wyświetla wersję dla komputera i/lub dostępnych repozytoriów." --#: ../yumcommands.py:1085 -+#: ../yumcommands.py:1101 +-#: ../yumcommands.py:1111 ++#: ../yumcommands.py:1173 + msgid " Yum version groups:" + msgstr " Grupy wersji programu yum:" + +-#: ../yumcommands.py:1121 ++#: ../yumcommands.py:1183 + msgid " Group :" + msgstr " Grupa :" + +-#: ../yumcommands.py:1122 ++#: ../yumcommands.py:1184 + msgid " Packages:" + msgstr " Pakiety:" + +-#: ../yumcommands.py:1152 ++#: ../yumcommands.py:1213 msgid "Installed:" msgstr "Zainstalowano:" --#: ../yumcommands.py:1094 -+#: ../yumcommands.py:1110 +-#: ../yumcommands.py:1157 ++#: ../yumcommands.py:1218 + msgid "Group-Installed:" + msgstr "Zainstalowana grupa:" + +-#: ../yumcommands.py:1166 ++#: ../yumcommands.py:1227 msgid "Available:" msgstr "Dostępne:" -@@ -1331,79 +1362,87 @@ msgstr "" - "\n" - "Zamykanie na przerwanym potoku" +-#: ../yumcommands.py:1172 ++#: ../yumcommands.py:1233 + msgid "Group-Available:" + msgstr "Dostępne grupy:" --#: ../yummain.py:126 -+#: ../yummain.py:50 -+#, python-format -+msgid "" -+"\n" -+"\n" -+"%s" -+msgstr "" -+"\n" -+"\n" -+"%s" -+ -+#: ../yummain.py:128 - msgid "Running" - msgstr "Wykonywanie" +-#: ../yumcommands.py:1211 ++#: ../yumcommands.py:1272 + msgid "Display, or use, the transaction history" + msgstr "Wyświetla lub używa historii transakcji" --#: ../yummain.py:127 -+#: ../yummain.py:129 - msgid "Sleeping" - msgstr "Zasypianie" +-#: ../yumcommands.py:1239 ++#: ../yumcommands.py:1300 + #, python-format + msgid "Invalid history sub-command, use: %s." + msgstr "Nieprawidłowe podpolecenie historii, należy użyć: %s." -#: ../yummain.py:128 -+#: ../yummain.py:130 - msgid "Uninteruptable" - msgstr "Nie można przerywać" - +-msgid "Running" +-msgstr "Wykonywanie" +- -#: ../yummain.py:129 -+#: ../yummain.py:131 - msgid "Zombie" - msgstr "Zombie" - +-msgid "Sleeping" +-msgstr "Zasypianie" +- -#: ../yummain.py:130 -+#: ../yummain.py:132 - msgid "Traced/Stopped" - msgstr "Śledzone/zatrzymane" - +-msgid "Uninteruptable" +-msgstr "Nie można przerywać" +- -#: ../yummain.py:131 --msgid "Unknown" --msgstr "Nienznane" +-msgid "Zombie" +-msgstr "Zombie" +- +-#: ../yummain.py:132 +-msgid "Traced/Stopped" +-msgstr "Śledzone/zatrzymane" - --#: ../yummain.py:135 -+#: ../yummain.py:137 - msgid " The other application is: PackageKit" - msgstr " Inna aplikacja to PackageKit" - -#: ../yummain.py:137 -+#: ../yummain.py:139 - #, python-format - msgid " The other application is: %s" - msgstr " Inna aplikacja to: %s" - --#: ../yummain.py:140 -+#: ../yummain.py:142 - #, python-format - msgid " Memory : %5s RSS (%5sB VSZ)" - msgstr " Pamięć: %5s RSS (%5sB VSZ)" - --#: ../yummain.py:144 -+#: ../yummain.py:146 - #, python-format - msgid " Started: %s - %s ago" - msgstr " Uruchomiono: %s - %s temu" - +-msgid " The other application is: PackageKit" +-msgstr " Inna aplikacja to PackageKit" +- +-#: ../yummain.py:139 +-#, python-format +-msgid " The other application is: %s" +-msgstr " Inna aplikacja to: %s" +- +-#: ../yummain.py:142 +-#, python-format +-msgid " Memory : %5s RSS (%5sB VSZ)" +-msgstr " Pamięć: %5s RSS (%5sB VSZ)" +- -#: ../yummain.py:146 -+#: ../yummain.py:148 - #, python-format - msgid " State : %s, pid: %d" - msgstr " Stan: %s, PID: %d" +-#, python-format +-msgid " Started: %s - %s ago" +-msgstr " Uruchomiono: %s - %s temu" ++#: ../yumcommands.py:1345 ++msgid "Check for problems in the rpmdb" ++msgstr "Proszę sprawdzić, czy występują problemy w bazie danych RPM" --#: ../yummain.py:171 -+#: ../yummain.py:173 +-#: ../yummain.py:148 +-#, python-format +-msgid " State : %s, pid: %d" +-msgstr " Stan: %s, PID: %d" +- +-#: ../yummain.py:173 ++#: ../yummain.py:102 msgid "" "Another app is currently holding the yum lock; waiting for it to exit..." --msgstr "Inna aplikacja obecnie blokuje yuma. Oczekiwanie na jej zakończenie..." -+msgstr "" -+"Inna aplikacja obecnie blokuje program yum. Oczekiwanie na jej zakończenie..." + msgstr "" + "Inna aplikacja obecnie blokuje program yum. Oczekiwanie na jej zakończenie..." --#: ../yummain.py:199 ../yummain.py:238 -+#: ../yummain.py:201 ../yummain.py:240 +-#: ../yummain.py:201 ../yummain.py:240 ++#: ../yummain.py:130 ../yummain.py:169 #, python-format msgid "Error: %s" msgstr "Błąd: %s" --#: ../yummain.py:209 ../yummain.py:251 -+#: ../yummain.py:211 ../yummain.py:253 +-#: ../yummain.py:211 ../yummain.py:253 ++#: ../yummain.py:140 ../yummain.py:182 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Nieznane błędy: kod wyjścia: %d:" #. Depsolve stage --#: ../yummain.py:216 -+#: ../yummain.py:218 +-#: ../yummain.py:218 ++#: ../yummain.py:147 msgid "Resolving Dependencies" msgstr "Rozwiązywanie zależności" --#: ../yummain.py:240 -+#: ../yummain.py:242 +-#: ../yummain.py:242 ++#: ../yummain.py:173 msgid " You could try using --skip-broken to work around the problem" - msgstr " Powinieneś spróbować użyć --skip-broken, aby obejść problem" + msgstr " Można spróbować użyć --skip-broken, aby obejść problem" --#: ../yummain.py:241 -+#: ../yummain.py:243 - msgid "" - " You could try running: package-cleanup --problems\n" - " package-cleanup --dupes\n" -@@ -1413,7 +1452,7 @@ msgstr "" - " package-cleanup --dupes\n" - " rpm -Va --nofiles --nodigest" +-#: ../yummain.py:243 +-msgid "" +-" You could try running: package-cleanup --problems\n" +-" package-cleanup --dupes\n" +-" rpm -Va --nofiles --nodigest" +-msgstr "" +-" Można spróbować wykonać: package-cleanup --problems\n" +-" package-cleanup --dupes\n" +-" rpm -Va --nofiles --nodigest" ++#: ../yummain.py:175 ../yummain.py:208 ++msgid " You could try running: rpm -Va --nofiles --nodigest" ++msgstr " Można spróbować wykonać polecenie: rpm -Va --nofiles --nodigest" --#: ../yummain.py:257 -+#: ../yummain.py:259 +-#: ../yummain.py:259 ++#: ../yummain.py:188 msgid "" "\n" "Dependencies Resolved" -@@ -1421,11 +1460,11 @@ msgstr "" +@@ -1632,7 +1764,7 @@ msgstr "" "\n" "Rozwiązano zależności" --#: ../yummain.py:271 -+#: ../yummain.py:273 - msgid "Complete!" - msgstr "Zakończono!" - --#: ../yummain.py:318 -+#: ../yummain.py:320 +-#: ../yummain.py:326 ++#: ../yummain.py:265 msgid "" "\n" "\n" -@@ -1437,7 +1476,7 @@ msgstr "" +@@ -1640,7 +1772,7 @@ msgid "" + msgstr "" + "\n" + "\n" +-"Kończenie pracy na polecenie użytkownika." ++"Kończenie działania na polecenie użytkownika." - #: ../yum/depsolve.py:83 + #: ../yum/depsolve.py:82 msgid "doTsSetup() will go away in a future version of Yum.\n" --msgstr "doTsSetup() zostanie usunięte w przyszłych wersjach yuma.\n" -+msgstr "doTsSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" +@@ -1670,172 +1802,167 @@ msgstr "Potencjalny wynik dla %s z %s" + msgid "Matched %s to require for %s" + msgstr "%s pasuje jako wymaganie dla %s" - #: ../yum/depsolve.py:98 - msgid "Setting up TransactionSets before config class is up" -@@ -1468,7 +1507,7 @@ msgstr "%s pasuje jako wymaganie dla %s" +-#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:225 + #, python-format msgid "Member: %s" - msgstr "Członek: %s" + msgstr "Element: %s" --#: ../yum/depsolve.py:246 ../yum/depsolve.py:759 -+#: ../yum/depsolve.py:246 ../yum/depsolve.py:756 +-#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 ++#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 #, python-format msgid "%s converted to install" msgstr "%s przekonwertowano do zainstalowania" -@@ -1562,7 +1601,7 @@ msgstr "" + +-#: ../yum/depsolve.py:245 ++#: ../yum/depsolve.py:246 + #, python-format + msgid "Adding Package %s in mode %s" + msgstr "Dodawanie pakietu %s w trybie %s" + +-#: ../yum/depsolve.py:255 ++#: ../yum/depsolve.py:256 + #, python-format + msgid "Removing Package %s" + msgstr "Usuwanie pakietu %s" + +-#: ../yum/depsolve.py:277 ++#: ../yum/depsolve.py:278 + #, python-format + msgid "%s requires: %s" + msgstr "%s wymaga: %s" + +-#: ../yum/depsolve.py:335 ++#: ../yum/depsolve.py:319 ++#, python-format ++msgid "%s requires %s" ++msgstr "%s wymaga %s" ++ ++#: ../yum/depsolve.py:346 + msgid "Needed Require has already been looked up, cheating" + msgstr "Wymagana zależność została już odnaleziona, oszukiwanie" + +-#: ../yum/depsolve.py:345 ++#: ../yum/depsolve.py:356 + #, python-format + msgid "Needed Require is not a package name. Looking up: %s" + msgstr "Wymagana zależność nie jest nazwą pakietu. Wyszukiwanie: %s" + +-#: ../yum/depsolve.py:352 ++#: ../yum/depsolve.py:363 + #, python-format + msgid "Potential Provider: %s" + msgstr "Potencjalny dostawca: %s" + +-#: ../yum/depsolve.py:375 ++#: ../yum/depsolve.py:386 + #, python-format + msgid "Mode is %s for provider of %s: %s" + msgstr "Tryb to %s dla dostawcy %s: %s" + +-#: ../yum/depsolve.py:379 ++#: ../yum/depsolve.py:390 + #, python-format + msgid "Mode for pkg providing %s: %s" + msgstr "Tryb dla pakietu dostarczającego %s: %s" + +-#: ../yum/depsolve.py:383 ++#: ../yum/depsolve.py:394 + #, python-format + msgid "TSINFO: %s package requiring %s marked as erase" + msgstr "TSINFO: pakiet %s wymagający %s został oznaczony jako do usunięcia" + +-#: ../yum/depsolve.py:396 ++#: ../yum/depsolve.py:407 + #, python-format + msgid "TSINFO: Obsoleting %s with %s to resolve dep." + msgstr "" + "TSINFO: zastępowanie przestarzałego pakietu %s pakietem %s, aby rozwiązać " + "zależność." + +-#: ../yum/depsolve.py:399 ++#: ../yum/depsolve.py:410 + #, python-format + msgid "TSINFO: Updating %s to resolve dep." + msgstr "TSINFO: aktualizowanie %s, aby rozwiązać zależność." + +-#: ../yum/depsolve.py:407 ++#: ../yum/depsolve.py:418 + #, python-format + msgid "Cannot find an update path for dep for: %s" + msgstr "Nie można odnaleźć ścieżki aktualizacji dla zależności dla: %s" + +-#: ../yum/depsolve.py:417 +-#, python-format +-msgid "Unresolvable requirement %s for %s" +-msgstr "Nie można rozwiązać wymagania %s dla %s" +- +-#: ../yum/depsolve.py:440 ++#: ../yum/depsolve.py:449 + #, python-format + msgid "Quick matched %s to require for %s" + msgstr "Szybko dopasowano %s jako wymaganie %s" + + #. is it already installed? +-#: ../yum/depsolve.py:482 ++#: ../yum/depsolve.py:491 + #, python-format + msgid "%s is in providing packages but it is already installed, removing." + msgstr "" + "%s jest w dostarczających pakietach, ale jest już zainstalowany, usuwanie." + +-#: ../yum/depsolve.py:498 ++#: ../yum/depsolve.py:507 + #, python-format + msgid "Potential resolving package %s has newer instance in ts." + msgstr "" + "Pakiet %s potencjalnie rozwiązujący ma nowszą wersję w zestawie transakcji." + +-#: ../yum/depsolve.py:509 ++#: ../yum/depsolve.py:518 + #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Pakiet %s potencjalnie rozwiązujący ma zainstalowaną nowszą wersję." --#: ../yum/depsolve.py:525 ../yum/depsolve.py:574 -+#: ../yum/depsolve.py:525 ../yum/depsolve.py:571 +-#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 +-#, python-format +-msgid "Missing Dependency: %s is needed by package %s" +-msgstr "Brakująca zależność: %s jest wymagane przez pakiet %s" +- +-#: ../yum/depsolve.py:530 ++#: ../yum/depsolve.py:536 #, python-format - msgid "Missing Dependency: %s is needed by package %s" - msgstr "Brakująca zależność: %s jest wymagane przez pakiet %s" -@@ -1572,63 +1611,63 @@ msgstr "Brakująca zależność: %s jest wymagane przez pakiet %s" msgid "%s already in ts, skipping this one" msgstr "%s jest już w zestawie transakcji, pomijanie" --#: ../yum/depsolve.py:584 -+#: ../yum/depsolve.py:581 +-#: ../yum/depsolve.py:573 ++#: ../yum/depsolve.py:578 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: oznaczanie %s jako aktualizacji dla %s" --#: ../yum/depsolve.py:592 -+#: ../yum/depsolve.py:589 +-#: ../yum/depsolve.py:581 ++#: ../yum/depsolve.py:586 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: oznaczanie %s jako do zainstalowania dla %s" --#: ../yum/depsolve.py:695 ../yum/depsolve.py:777 -+#: ../yum/depsolve.py:692 ../yum/depsolve.py:774 +-#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 ++#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 msgid "Success - empty transaction" msgstr "Powodzenie - pusta transakcja" --#: ../yum/depsolve.py:734 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:731 ../yum/depsolve.py:746 +-#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 ++#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 msgid "Restarting Loop" msgstr "Ponowne uruchamianie pętli" --#: ../yum/depsolve.py:765 -+#: ../yum/depsolve.py:762 +-#: ../yum/depsolve.py:755 ++#: ../yum/depsolve.py:760 msgid "Dependency Process ending" msgstr "Kończenie procesu zależności" --#: ../yum/depsolve.py:771 -+#: ../yum/depsolve.py:768 +-#: ../yum/depsolve.py:761 ++#: ../yum/depsolve.py:774 #, python-format msgid "%s from %s has depsolving problems" msgstr "%s z %s ma problemy z rozwiązywaniem zależności" --#: ../yum/depsolve.py:778 -+#: ../yum/depsolve.py:775 +-#: ../yum/depsolve.py:768 ++#: ../yum/depsolve.py:782 msgid "Success - deps resolved" msgstr "Powodzenie - rozwiązano zależności" --#: ../yum/depsolve.py:792 -+#: ../yum/depsolve.py:789 +-#: ../yum/depsolve.py:782 ++#: ../yum/depsolve.py:796 #, python-format msgid "Checking deps for %s" msgstr "Sprawdzanie zależności dla %s" --#: ../yum/depsolve.py:875 -+#: ../yum/depsolve.py:872 +-#: ../yum/depsolve.py:865 ++#: ../yum/depsolve.py:874 #, python-format msgid "looking for %s as a requirement of %s" msgstr "wyszukiwanie %s jako wymagania %s" --#: ../yum/depsolve.py:1017 -+#: ../yum/depsolve.py:1014 +-#: ../yum/depsolve.py:1007 ++#: ../yum/depsolve.py:1090 #, python-format msgid "Running compare_providers() for %s" msgstr "Wykonywanie compare_providers() dla %s" --#: ../yum/depsolve.py:1051 ../yum/depsolve.py:1057 -+#: ../yum/depsolve.py:1048 ../yum/depsolve.py:1054 +-#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 ++#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 #, python-format msgid "better arch in po %s" msgstr "lepsze arch w po %s" --#: ../yum/depsolve.py:1132 -+#: ../yum/depsolve.py:1140 +-#: ../yum/depsolve.py:1142 ++#: ../yum/depsolve.py:1218 #, python-format msgid "%s obsoletes %s" msgstr "%s zastępuje %s" --#: ../yum/depsolve.py:1144 -+#: ../yum/depsolve.py:1152 +-#: ../yum/depsolve.py:1154 ++#: ../yum/depsolve.py:1230 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -1637,103 +1676,105 @@ msgstr "" +@@ -1844,124 +1971,144 @@ msgstr "" "archdist porównało %s do %s na %s\n" " Zwycięzca: %s" --#: ../yum/depsolve.py:1151 -+#: ../yum/depsolve.py:1159 +-#: ../yum/depsolve.py:1161 ++#: ../yum/depsolve.py:1237 #, python-format msgid "common sourcerpm %s and %s" msgstr "wspólny źródłowy pakiet RPM %s i %s" --#: ../yum/depsolve.py:1157 -+#: ../yum/depsolve.py:1165 +-#: ../yum/depsolve.py:1167 ++#: ../yum/depsolve.py:1241 ++#, python-format ++msgid "base package %s is installed for %s" ++msgstr "podstawowy pakiet %s jest zainstalowany dla %s" ++ ++#: ../yum/depsolve.py:1247 #, python-format msgid "common prefix of %s between %s and %s" msgstr "wspólny przedrostek %s dla %s i %s" --#: ../yum/depsolve.py:1165 -+#: ../yum/depsolve.py:1173 +-#: ../yum/depsolve.py:1175 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Best Order: %s" msgstr "Najlepszy porządek: %s" --#: ../yum/__init__.py:159 -+#: ../yum/__init__.py:180 +-#: ../yum/__init__.py:187 ++#: ../yum/__init__.py:192 msgid "doConfigSetup() will go away in a future version of Yum.\n" --msgstr "doConfigSetup() zostanie usunięte w przyszłych wersjach yuma.\n" -+msgstr "" -+"doConfigSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + msgstr "" + "doConfigSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" --#: ../yum/__init__.py:380 -+#: ../yum/__init__.py:401 +-#: ../yum/__init__.py:412 ++#: ../yum/__init__.py:424 #, python-format msgid "Repository %r is missing name in configuration, using id" - msgstr "Repozytorium %r nie posiada nazwy w konfiguracji, używanie ID" + msgstr "" + "Repozytorium %r nie posiada nazwy w konfiguracji, używanie identyfikatora" --#: ../yum/__init__.py:418 -+#: ../yum/__init__.py:439 +-#: ../yum/__init__.py:450 ++#: ../yum/__init__.py:462 msgid "plugins already initialised" msgstr "wtyczki zostały już zainicjowane" --#: ../yum/__init__.py:425 -+#: ../yum/__init__.py:446 +-#: ../yum/__init__.py:457 ++#: ../yum/__init__.py:469 msgid "doRpmDBSetup() will go away in a future version of Yum.\n" --msgstr "doRpmDBSetup() zostanie usunięte w przyszłych wersjach yuma.\n" -+msgstr "doRpmDBSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + msgstr "doRpmDBSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" --#: ../yum/__init__.py:436 -+#: ../yum/__init__.py:457 +-#: ../yum/__init__.py:468 ++#: ../yum/__init__.py:480 msgid "Reading Local RPMDB" msgstr "Odczytywanie lokalnej bazy danych RPM" --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:478 +-#: ../yum/__init__.py:489 ++#: ../yum/__init__.py:504 msgid "doRepoSetup() will go away in a future version of Yum.\n" --msgstr "doRepoSetup() zostanie usunięte w przyszłych wersjach yuma.\n" -+msgstr "doRepoSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + msgstr "doRepoSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" --#: ../yum/__init__.py:477 -+#: ../yum/__init__.py:498 +-#: ../yum/__init__.py:509 ++#: ../yum/__init__.py:524 msgid "doSackSetup() will go away in a future version of Yum.\n" --msgstr "doSackSetup() zostanie usunięte w przyszłych wersjach yuma.\n" -+msgstr "doSackSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + msgstr "doSackSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" --#: ../yum/__init__.py:494 -+#: ../yum/__init__.py:528 +-#: ../yum/__init__.py:539 ++#: ../yum/__init__.py:554 msgid "Setting up Package Sacks" msgstr "Ustawianie zestawów pakietów" --#: ../yum/__init__.py:537 -+#: ../yum/__init__.py:573 +-#: ../yum/__init__.py:584 ++#: ../yum/__init__.py:599 #, python-format msgid "repo object for repo %s lacks a _resetSack method\n" msgstr "obiekt repozytorium %s nie posiada metody _resetSack\n" --#: ../yum/__init__.py:538 -+#: ../yum/__init__.py:574 +-#: ../yum/__init__.py:585 ++#: ../yum/__init__.py:600 msgid "therefore this repo cannot be reset.\n" msgstr "więc to repozytorium nie może zostać przywrócone.\n" --#: ../yum/__init__.py:543 -+#: ../yum/__init__.py:579 +-#: ../yum/__init__.py:590 ++#: ../yum/__init__.py:605 msgid "doUpdateSetup() will go away in a future version of Yum.\n" --msgstr "doUpdateSetup() zostanie usunięte w przyszłych wersjach yuma.\n" -+msgstr "" -+"doUpdateSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + msgstr "" + "doUpdateSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" --#: ../yum/__init__.py:555 -+#: ../yum/__init__.py:591 +-#: ../yum/__init__.py:602 ++#: ../yum/__init__.py:617 msgid "Building updates object" msgstr "Budowanie obiektu aktualizacji" --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:626 +-#: ../yum/__init__.py:637 ++#: ../yum/__init__.py:652 msgid "doGroupSetup() will go away in a future version of Yum.\n" --msgstr "doGroupSetup() zostanie usunięte w przyszłych wersjach yuma.\n" -+msgstr "doGroupSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" + msgstr "doGroupSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" --#: ../yum/__init__.py:615 -+#: ../yum/__init__.py:651 +-#: ../yum/__init__.py:662 ++#: ../yum/__init__.py:677 msgid "Getting group metadata" msgstr "Pobieranie metadanych grup" --#: ../yum/__init__.py:641 -+#: ../yum/__init__.py:677 +-#: ../yum/__init__.py:688 ++#: ../yum/__init__.py:703 #, python-format msgid "Adding group file from repository: %s" msgstr "Dodawanie pliku grup z repozytorium: %s" --#: ../yum/__init__.py:650 -+#: ../yum/__init__.py:686 +-#: ../yum/__init__.py:697 ++#: ../yum/__init__.py:712 #, python-format msgid "Failed to add groups file for repository: %s - %s" msgstr "Dodanie pliku grup dla repozytorium nie powiodło się: %s - %s" --#: ../yum/__init__.py:656 -+#: ../yum/__init__.py:692 +-#: ../yum/__init__.py:703 ++#: ../yum/__init__.py:718 msgid "No Groups Available in any repository" msgstr "Brak dostępnych grup we wszystkich repozytoriach" --#: ../yum/__init__.py:706 -+#: ../yum/__init__.py:742 +-#: ../yum/__init__.py:763 ++#: ../yum/__init__.py:730 ++msgid "Getting pkgtags metadata" ++msgstr "Pobieranie metadanych znaczników pakietów" ++ ++#: ../yum/__init__.py:740 ++#, python-format ++msgid "Adding tags from repository: %s" ++msgstr "Dodawanie znaczników z repozytorium: %s" ++ ++#: ../yum/__init__.py:749 ++#, python-format ++msgid "Failed to add Pkg Tags for repository: %s - %s" ++msgstr "Dodanie znaczników pakietów dla repozytorium nie powiodło się: %s - %s" ++ ++#: ../yum/__init__.py:827 msgid "Importing additional filelist information" msgstr "Importowanie dodatkowych informacji o liście plików" --#: ../yum/__init__.py:720 -+#: ../yum/__init__.py:756 +-#: ../yum/__init__.py:777 ++#: ../yum/__init__.py:841 #, python-format msgid "The program %s%s%s is found in the yum-utils package." - msgstr "Program %s%s%s można znaleźć w pakiecie yum-utils." + msgstr "Program %s%s%s można odnaleźć w pakiecie yum-utils." --#: ../yum/__init__.py:728 -+#: ../yum/__init__.py:764 +-#: ../yum/__init__.py:785 ++#: ../yum/__init__.py:849 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -1741,17 +1782,17 @@ msgstr "" - "Pozostały niezakończone transakcje. Rozważ wykonanie yum-complete-" - "transaction, aby najpierw je zakończyć." + msgstr "" +-"Pozostały nieukończone transakcje. Można rozważyć wykonanie yum-complete-" +-"transaction, aby najpierw je ukończyć." ++"Pozostały nieukończone transakcje. Można rozważyć wykonanie najpierw " ++"polecenia yum-complete-transaction, aby je ukończyć." --#: ../yum/__init__.py:796 -+#: ../yum/__init__.py:832 +-#: ../yum/__init__.py:853 ++#. Kind of hacky ++#: ../yum/__init__.py:922 #, python-format msgid "Skip-broken round %i" msgstr "Pierwsza runda pomijania uszkodzonych %i" --#: ../yum/__init__.py:848 -+#: ../yum/__init__.py:884 +-#: ../yum/__init__.py:906 ++#: ../yum/__init__.py:975 #, python-format msgid "Skip-broken took %i rounds " msgstr "Pomijanie uszkodzonych zajęło %i rund " --#: ../yum/__init__.py:849 -+#: ../yum/__init__.py:885 +-#: ../yum/__init__.py:907 ++#: ../yum/__init__.py:976 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -1759,78 +1800,73 @@ msgstr "" +@@ -1969,79 +2116,94 @@ msgstr "" "\n" "Pakiety pominięto z powodu problemów z zależnościami:" --#: ../yum/__init__.py:853 -+#: ../yum/__init__.py:889 +-#: ../yum/__init__.py:911 ++#: ../yum/__init__.py:980 #, python-format msgid " %s from %s" msgstr " %s z %s" --#: ../yum/__init__.py:991 -+#: ../yum/__init__.py:1027 +-#: ../yum/__init__.py:1083 ++#: ../yum/__init__.py:1121 ++msgid "Warning: RPMDB altered outside of yum." ++msgstr "Ostrzeżenie: baza danych RPM została zmieniona poza programem yum." ++ ++#: ../yum/__init__.py:1126 ++msgid "missing requires" ++msgstr "brak wymaganych" ++ ++#: ../yum/__init__.py:1127 ++msgid "installed conflict" ++msgstr "zainstalowano konflikt" ++ ++#: ../yum/__init__.py:1180 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" - "Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie fatalne błędy." + "Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie krytyczne błędy." --#: ../yum/__init__.py:1006 -+#: ../yum/__init__.py:1042 +-#: ../yum/__init__.py:1101 ++#: ../yum/__init__.py:1198 #, python-format msgid "Failed to remove transaction file %s" msgstr "Usunięcie pliku transakcji %s nie powiodło się" #. maybe a file log here, too #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1035 -+#: ../yum/__init__.py:1071 +-#: ../yum/__init__.py:1130 ++#: ../yum/__init__.py:1227 #, python-format msgid "%s was supposed to be installed but is not!" - msgstr "%s miało zostać zainstalowane, ale nie zostało!" + msgstr "%s miało zostać zainstalowane, ale nie zostało." #. maybe a file log here, too #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1074 -+#: ../yum/__init__.py:1110 +-#: ../yum/__init__.py:1169 ++#: ../yum/__init__.py:1266 #, python-format msgid "%s was supposed to be removed but is not!" - msgstr "%s miało zostać usunięte, ale nie zostało!" + msgstr "%s miało zostać usunięte, ale nie zostało." --#: ../yum/__init__.py:1120 --#, python-format --msgid "excluding for cost: %s from %s" --msgstr "wykluczanie z kosztów: %s z %s" -- #. Whoa. What the heck happened? --#: ../yum/__init__.py:1191 -+#: ../yum/__init__.py:1225 +-#: ../yum/__init__.py:1289 ++#: ../yum/__init__.py:1386 #, python-format msgid "Unable to check if PID %s is active" msgstr "Nie można sprawdzić, czy PID %s jest aktywny" #. Another copy seems to be running. --#: ../yum/__init__.py:1195 -+#: ../yum/__init__.py:1229 +-#: ../yum/__init__.py:1293 ++#: ../yum/__init__.py:1390 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Istnieje blokada %s: inna kopia jest uruchomiona jako PID %s." --#: ../yum/__init__.py:1272 -+#: ../yum/__init__.py:1306 - msgid "Package does not match intended download" - msgstr "Pakiet nie zgadza się z zamierzonym pobieraniem" + #. Whoa. What the heck happened? +-#: ../yum/__init__.py:1328 ++#: ../yum/__init__.py:1425 + #, python-format + msgid "Could not create lock at %s: %s " + msgstr "Nie można utworzyć blokady na %s: %s " --#: ../yum/__init__.py:1287 -+#: ../yum/__init__.py:1321 +-#: ../yum/__init__.py:1373 +-msgid "Package does not match intended download" +-msgstr "Pakiet nie zgadza się z zamierzonym pobieraniem" ++#: ../yum/__init__.py:1470 ++msgid "" ++"Package does not match intended download. Suggestion: run yum clean metadata" ++msgstr "" ++"Pakiet nie zgadza się z zamierzonym pobieraniem. Sugestia: proszę wykonać " ++"polecenie yum clean metadata" + +-#: ../yum/__init__.py:1388 ++#: ../yum/__init__.py:1486 msgid "Could not perform checksum" msgstr "Nie można wykonać sprawdzenia sum kontrolnych" --#: ../yum/__init__.py:1290 -+#: ../yum/__init__.py:1324 +-#: ../yum/__init__.py:1391 ++#: ../yum/__init__.py:1489 msgid "Package does not match checksum" msgstr "Sumy kontrolne pakietu nie zgadzają się" --#: ../yum/__init__.py:1332 -+#: ../yum/__init__.py:1366 +-#: ../yum/__init__.py:1433 ++#: ../yum/__init__.py:1531 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" "sprawdzenie sum kontrolnych pakietu nie powiodło się, ale zapisywanie w " "pamięci podręcznej dla %s jest włączone" --#: ../yum/__init__.py:1335 ../yum/__init__.py:1364 -+#: ../yum/__init__.py:1369 ../yum/__init__.py:1398 +-#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 ++#: ../yum/__init__.py:1534 ../yum/__init__.py:1563 #, python-format msgid "using local copy of %s" msgstr "używanie lokalnej kopii %s" --#: ../yum/__init__.py:1376 -+#: ../yum/__init__.py:1410 +-#: ../yum/__init__.py:1477 ++#: ../yum/__init__.py:1575 #, python-format msgid "" "Insufficient space in download directory %s\n" -@@ -1841,11 +1877,11 @@ msgstr "" +@@ -2052,11 +2214,11 @@ msgstr "" " * wolne %s\n" " * wymagane %s" --#: ../yum/__init__.py:1425 -+#: ../yum/__init__.py:1459 +-#: ../yum/__init__.py:1526 ++#: ../yum/__init__.py:1624 msgid "Header is not complete." - msgstr "Nagłówek nie jest kompletny." + msgstr "Nagłówek nie jest pełny." --#: ../yum/__init__.py:1462 -+#: ../yum/__init__.py:1496 +-#: ../yum/__init__.py:1563 ++#: ../yum/__init__.py:1661 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -1853,62 +1889,62 @@ msgstr "" +@@ -2064,62 +2226,62 @@ msgstr "" "Nagłówek nie jest w lokalnej pamięci podręcznej, a tryb używania tylko " "pamięci podręcznej jest włączony. Nie można pobrać %s" --#: ../yum/__init__.py:1517 -+#: ../yum/__init__.py:1551 +-#: ../yum/__init__.py:1618 ++#: ../yum/__init__.py:1716 #, python-format msgid "Public key for %s is not installed" msgstr "Klucz publiczny dla %s nie jest zainstalowany" --#: ../yum/__init__.py:1521 -+#: ../yum/__init__.py:1555 +-#: ../yum/__init__.py:1622 ++#: ../yum/__init__.py:1720 #, python-format msgid "Problem opening package %s" - msgstr "Podczas otwierania pakietu %s wystąpił problem" + msgstr "Wystąpił problem podczas otwierania pakietu %s" --#: ../yum/__init__.py:1529 -+#: ../yum/__init__.py:1563 +-#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1728 #, python-format msgid "Public key for %s is not trusted" msgstr "Klucz publiczny dla %s nie jest zaufany" --#: ../yum/__init__.py:1533 -+#: ../yum/__init__.py:1567 +-#: ../yum/__init__.py:1634 ++#: ../yum/__init__.py:1732 #, python-format msgid "Package %s is not signed" msgstr "Pakiet %s nie jest podpisany" --#: ../yum/__init__.py:1571 -+#: ../yum/__init__.py:1605 +-#: ../yum/__init__.py:1672 ++#: ../yum/__init__.py:1770 #, python-format msgid "Cannot remove %s" msgstr "Nie można usunąć %s" --#: ../yum/__init__.py:1575 -+#: ../yum/__init__.py:1609 +-#: ../yum/__init__.py:1676 ++#: ../yum/__init__.py:1774 #, python-format msgid "%s removed" msgstr "Usunięto %s" --#: ../yum/__init__.py:1611 -+#: ../yum/__init__.py:1645 +-#: ../yum/__init__.py:1712 ++#: ../yum/__init__.py:1820 #, python-format msgid "Cannot remove %s file %s" msgstr "Nie można usunąć %s pliku %s" --#: ../yum/__init__.py:1615 -+#: ../yum/__init__.py:1649 +-#: ../yum/__init__.py:1716 ++#: ../yum/__init__.py:1824 #, python-format msgid "%s file %s removed" msgstr "Usunięto %s plik %s" --#: ../yum/__init__.py:1617 -+#: ../yum/__init__.py:1651 +-#: ../yum/__init__.py:1718 ++#: ../yum/__init__.py:1826 #, python-format msgid "%d %s files removed" msgstr "Usunięto %d %s plików" --#: ../yum/__init__.py:1686 -+#: ../yum/__init__.py:1720 +-#: ../yum/__init__.py:1787 ++#: ../yum/__init__.py:1895 #, python-format msgid "More than one identical match in sack for %s" msgstr "Więcej niż jeden identyczny wynik znajduje się w zestawie dla %s" --#: ../yum/__init__.py:1692 -+#: ../yum/__init__.py:1726 +-#: ../yum/__init__.py:1793 ++#: ../yum/__init__.py:1901 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Nic nie pasuje do %s.%s %s:%s-%s z aktualizacji" --#: ../yum/__init__.py:1925 -+#: ../yum/__init__.py:1959 +-#: ../yum/__init__.py:2026 ++#: ../yum/__init__.py:2180 msgid "" "searchPackages() will go away in a future version of " "Yum. Use searchGenerator() instead. \n" -@@ -1916,172 +1952,182 @@ msgstr "" - "searchPackages() zostanie usunięte w przyszłych wersjach " - "yuma. Zamiast tego użyj searchGenerator(). \n" +@@ -2127,285 +2289,295 @@ msgstr "" + "searchPackages() zostanie usunięte w przyszłych wersjach programu " + "yum. Zamiast tego należy użyć searchGenerator(). \n" --#: ../yum/__init__.py:1967 -+#: ../yum/__init__.py:2001 +-#: ../yum/__init__.py:2065 ++#: ../yum/__init__.py:2219 #, python-format msgid "Searching %d packages" msgstr "Wyszukiwanie %d pakietów" --#: ../yum/__init__.py:1971 -+#: ../yum/__init__.py:2005 +-#: ../yum/__init__.py:2069 ++#: ../yum/__init__.py:2223 #, python-format msgid "searching package %s" msgstr "wyszukiwanie pakietu %s" --#: ../yum/__init__.py:1983 -+#: ../yum/__init__.py:2017 +-#: ../yum/__init__.py:2081 ++#: ../yum/__init__.py:2235 msgid "searching in file entries" msgstr "wyszukiwanie we wpisach plików" --#: ../yum/__init__.py:1990 -+#: ../yum/__init__.py:2024 +-#: ../yum/__init__.py:2088 ++#: ../yum/__init__.py:2242 msgid "searching in provides entries" msgstr "wyszukiwanie we wpisach dostarczania" --#: ../yum/__init__.py:2023 -+#: ../yum/__init__.py:2057 +-#: ../yum/__init__.py:2121 ++#: ../yum/__init__.py:2275 #, python-format msgid "Provides-match: %s" msgstr "Wyniki dostarczania: %s" --#: ../yum/__init__.py:2072 -+#: ../yum/__init__.py:2106 +-#: ../yum/__init__.py:2170 ++#: ../yum/__init__.py:2324 msgid "No group data available for configured repositories" msgstr "Brak dostępnych danych grup dla skonfigurowanych repozytoriów" --#: ../yum/__init__.py:2103 ../yum/__init__.py:2122 ../yum/__init__.py:2153 --#: ../yum/__init__.py:2159 ../yum/__init__.py:2238 ../yum/__init__.py:2242 --#: ../yum/__init__.py:2539 -+#: ../yum/__init__.py:2137 ../yum/__init__.py:2156 ../yum/__init__.py:2187 -+#: ../yum/__init__.py:2193 ../yum/__init__.py:2272 ../yum/__init__.py:2276 -+#: ../yum/__init__.py:2586 +-#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 +-#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 +-#: ../yum/__init__.py:2655 ++#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405 ++#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497 ++#: ../yum/__init__.py:2814 #, python-format msgid "No Group named %s exists" msgstr "Grupa o nazwie %s nie istnieje" --#: ../yum/__init__.py:2134 ../yum/__init__.py:2255 -+#: ../yum/__init__.py:2168 ../yum/__init__.py:2289 +-#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 ++#: ../yum/__init__.py:2386 ../yum/__init__.py:2513 #, python-format msgid "package %s was not marked in group %s" msgstr "pakiet %s nie został oznaczony w grupie %s" --#: ../yum/__init__.py:2181 -+#: ../yum/__init__.py:2215 +-#: ../yum/__init__.py:2279 ++#: ../yum/__init__.py:2433 #, python-format msgid "Adding package %s from group %s" msgstr "Dodawanie pakietu %s z grupy %s" --#: ../yum/__init__.py:2185 -+#: ../yum/__init__.py:2219 +-#: ../yum/__init__.py:2283 ++#: ../yum/__init__.py:2437 #, python-format msgid "No package named %s available to be installed" msgstr "Brak dostępnego pakietu o nazwie %s do zainstalowania" --#: ../yum/__init__.py:2282 -+#: ../yum/__init__.py:2316 +-#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2539 #, python-format msgid "Package tuple %s could not be found in packagesack" - msgstr "Nie można znaleźć krotki pakietu %s w zestawie pakietów" + msgstr "Nie można odnaleźć krotki pakietu %s w zestawie pakietów" --#: ../yum/__init__.py:2296 -+#: ../yum/__init__.py:2330 - msgid "" - "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n" - msgstr "" - "getInstalledPackageObject() zostanie usunięte, użyj self.rpmdb.searchPkgTuple" - "().\n" +-#: ../yum/__init__.py:2399 ++#: ../yum/__init__.py:2558 + #, python-format + msgid "Package tuple %s could not be found in rpmdb" + msgstr "Nie można odnaleźć krotki pakietu %s w bazie danych RPM" --#: ../yum/__init__.py:2352 ../yum/__init__.py:2397 -+#: ../yum/__init__.py:2386 ../yum/__init__.py:2436 +-#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 ++#: ../yum/__init__.py:2614 ../yum/__init__.py:2664 msgid "Invalid version flag" msgstr "Nieprawidłowa flaga wersji" --#: ../yum/__init__.py:2367 ../yum/__init__.py:2372 -+#: ../yum/__init__.py:2406 ../yum/__init__.py:2411 +-#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 ++#: ../yum/__init__.py:2634 ../yum/__init__.py:2639 #, python-format msgid "No Package found for %s" - msgstr "Nie znaleziono pakietu %s" + msgstr "Nie odnaleziono pakietu %s" --#: ../yum/__init__.py:2572 -+#: ../yum/__init__.py:2627 +-#: ../yum/__init__.py:2696 ++#: ../yum/__init__.py:2855 msgid "Package Object was not a package object instance" msgstr "Obiekt pakietu nie był instancją obiektu pakietu" --#: ../yum/__init__.py:2576 -+#: ../yum/__init__.py:2631 +-#: ../yum/__init__.py:2700 ++#: ../yum/__init__.py:2859 msgid "Nothing specified to install" msgstr "Nie podano nic do zainstalowania" --#: ../yum/__init__.py:2592 ../yum/__init__.py:3307 -+#: ../yum/__init__.py:2647 ../yum/__init__.py:3411 +-#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 ++#: ../yum/__init__.py:2875 ../yum/__init__.py:3652 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Sprawdzanie wirtualnych zależności lub plików dla %s" --#: ../yum/__init__.py:2598 ../yum/__init__.py:2874 ../yum/__init__.py:3037 --#: ../yum/__init__.py:3313 -+#: ../yum/__init__.py:2653 ../yum/__init__.py:2960 ../yum/__init__.py:3127 -+#: ../yum/__init__.py:3417 +-#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 +-#: ../yum/__init__.py:3495 ++#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365 ++#: ../yum/__init__.py:3658 #, python-format msgid "No Match for argument: %s" msgstr "Brak wyników dla parametru: %s" --#: ../yum/__init__.py:2672 -+#: ../yum/__init__.py:2729 +-#: ../yum/__init__.py:2798 ++#: ../yum/__init__.py:2957 #, python-format msgid "Package %s installed and not available" msgstr "Pakiet %s jest zainstalowany, ale nie jest dostępny" --#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2732 +-#: ../yum/__init__.py:2801 ++#: ../yum/__init__.py:2960 msgid "No package(s) available to install" msgstr "Brak pakietów dostępnych do instalacji" --#: ../yum/__init__.py:2687 -+#: ../yum/__init__.py:2744 +-#: ../yum/__init__.py:2813 ++#: ../yum/__init__.py:2972 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pakiet: %s - jest już w zestawie transakcji" --#: ../yum/__init__.py:2702 -+#: ../yum/__init__.py:2770 -+#, python-format -+msgid "Package %s is obsoleted by %s which is already installed" -+msgstr "Pakiet %s został zastąpiony przez %s, który jest już zainstalowany" -+ -+#: ../yum/__init__.py:2773 +-#: ../yum/__init__.py:2839 ++#: ../yum/__init__.py:2998 + #, python-format + msgid "Package %s is obsoleted by %s which is already installed" + msgstr "Pakiet %s został zastąpiony przez %s, który jest już zainstalowany" + +-#: ../yum/__init__.py:2842 ++#: ../yum/__init__.py:3001 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" "Pakiet %s został zastąpiony przez %s, próbowanie instalacji %s zamiast niego" --#: ../yum/__init__.py:2710 -+#: ../yum/__init__.py:2781 +-#: ../yum/__init__.py:2850 ++#: ../yum/__init__.py:3009 #, python-format msgid "Package %s already installed and latest version" msgstr "Pakiet %s jest już zainstalowany w najnowszej wersji" --#: ../yum/__init__.py:2724 -+#: ../yum/__init__.py:2795 +-#: ../yum/__init__.py:2864 ++#: ../yum/__init__.py:3023 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" "Pakiet pasujący do %s jest już zainstalowany. Sprawdzanie aktualizacji." #. update everything (the easy case) --#: ../yum/__init__.py:2810 -+#: ../yum/__init__.py:2889 +-#: ../yum/__init__.py:2966 ++#: ../yum/__init__.py:3126 msgid "Updating Everything" msgstr "Aktualizowanie wszystkiego" --#: ../yum/__init__.py:2828 ../yum/__init__.py:2939 ../yum/__init__.py:2960 --#: ../yum/__init__.py:2986 -+#: ../yum/__init__.py:2910 ../yum/__init__.py:3025 ../yum/__init__.py:3054 -+#: ../yum/__init__.py:3081 +-#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 +-#: ../yum/__init__.py:3155 ++#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289 ++#: ../yum/__init__.py:3315 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s" --#: ../yum/__init__.py:2863 ../yum/__init__.py:3034 -+#: ../yum/__init__.py:2945 ../yum/__init__.py:3124 +-#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 ++#: ../yum/__init__.py:3182 ../yum/__init__.py:3362 #, python-format msgid "%s" msgstr "%s" --#: ../yum/__init__.py:2930 -+#: ../yum/__init__.py:3016 +-#: ../yum/__init__.py:3093 ++#: ../yum/__init__.py:3253 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Pakiet został już zastąpiony: %s.%s %s:%s-%s" --#: ../yum/__init__.py:2963 ../yum/__init__.py:2989 -+#: ../yum/__init__.py:3049 -+#, python-format -+msgid "Not Updating Package that is obsoleted: %s" -+msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s" -+ -+#: ../yum/__init__.py:3058 ../yum/__init__.py:3085 +-#: ../yum/__init__.py:3124 ++#: ../yum/__init__.py:3284 + #, python-format + msgid "Not Updating Package that is obsoleted: %s" + msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s" + +-#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 ++#: ../yum/__init__.py:3293 ../yum/__init__.py:3319 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Już zaktualizowany pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s" --#: ../yum/__init__.py:3050 -+#: ../yum/__init__.py:3140 +-#: ../yum/__init__.py:3218 ++#: ../yum/__init__.py:3378 msgid "No package matched to remove" msgstr "Brak pasujących pakietów do usunięcia" --#: ../yum/__init__.py:3084 ../yum/__init__.py:3175 ../yum/__init__.py:3262 -+#: ../yum/__init__.py:3173 ../yum/__init__.py:3277 ../yum/__init__.py:3366 +-#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 ++#: ../yum/__init__.py:3412 #, python-format - msgid "Cannot open file: %s. Skipping." - msgstr "Nie można otworzyć pliku: %s. Pomijanie." +-msgid "Cannot open file: %s. Skipping." +-msgstr "Nie można otworzyć pliku: %s. Pomijanie." ++msgid "Cannot open: %s. Skipping." ++msgstr "Nie można otworzyć: %s. Pomijanie." --#: ../yum/__init__.py:3087 ../yum/__init__.py:3178 ../yum/__init__.py:3265 -+#: ../yum/__init__.py:3176 ../yum/__init__.py:3280 ../yum/__init__.py:3369 +-#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 ++#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598 #, python-format msgid "Examining %s: %s" msgstr "Sprawdzanie %s: %s" --#: ../yum/__init__.py:3095 ../yum/__init__.py:3181 ../yum/__init__.py:3268 -+#: ../yum/__init__.py:3184 ../yum/__init__.py:3283 ../yum/__init__.py:3372 +-#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 ++#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601 #, python-format msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "Nie można dodać pakietu %s do transakcji. Niezgodna architektura: %s" --#: ../yum/__init__.py:3103 -+#: ../yum/__init__.py:3192 +-#: ../yum/__init__.py:3270 ++#: ../yum/__init__.py:3431 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2090,98 +2136,98 @@ msgstr "" - "Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Uruchom yum " - "install, aby go zainstalować." + "instead." + msgstr "" +-"Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Należy wykonać " ++"Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Proszę wykonać " + "polecenie yum install, aby go zainstalować." --#: ../yum/__init__.py:3138 ../yum/__init__.py:3192 ../yum/__init__.py:3279 -+#: ../yum/__init__.py:3227 ../yum/__init__.py:3294 ../yum/__init__.py:3383 +-#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 ++#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606 #, python-format msgid "Excluding %s" msgstr "Wykluczanie %s" --#: ../yum/__init__.py:3143 -+#: ../yum/__init__.py:3232 +-#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3465 #, python-format msgid "Marking %s to be installed" msgstr "Oznaczanie %s do zainstalowania" --#: ../yum/__init__.py:3149 -+#: ../yum/__init__.py:3238 +-#: ../yum/__init__.py:3310 ++#: ../yum/__init__.py:3471 #, python-format msgid "Marking %s as an update to %s" msgstr "Oznaczanie %s jako aktualizacji %s" --#: ../yum/__init__.py:3156 -+#: ../yum/__init__.py:3245 +-#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3478 #, python-format msgid "%s: does not update installed package." msgstr "%s: nie aktualizuj zainstalowanego pakietu." --#: ../yum/__init__.py:3211 -+#: ../yum/__init__.py:3313 +-#: ../yum/__init__.py:3379 ++#: ../yum/__init__.py:3511 ../yum/__init__.py:3595 ++#, python-format ++msgid "Cannot open file: %s. Skipping." ++msgstr "Nie można otworzyć pliku: %s. Pomijanie." ++ ++#: ../yum/__init__.py:3541 msgid "Problem in reinstall: no package matched to remove" msgstr "" "Podczas ponownego instalowania wystąpił problem: brak pasujących pakietów do " "usunięcia" --#: ../yum/__init__.py:3223 ../yum/__init__.py:3340 -+#: ../yum/__init__.py:3326 ../yum/__init__.py:3444 +-#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 ++#: ../yum/__init__.py:3554 ../yum/__init__.py:3686 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Pakiet %s może być wielokrotnie instalowany, pomijanie" --#: ../yum/__init__.py:3241 -+#: ../yum/__init__.py:3347 +-#: ../yum/__init__.py:3413 ++#: ../yum/__init__.py:3575 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" "Podczas ponownego instalowania wystąpił problem: brak pakietu %s pasującego " "do zainstalowania" --#: ../yum/__init__.py:3332 -+#: ../yum/__init__.py:3436 +-#: ../yum/__init__.py:3515 ++#: ../yum/__init__.py:3678 msgid "No package(s) available to downgrade" - msgstr "Brak pakietów dostępnych do instalacji starszej wersji" +-msgstr "Brak pakietów dostępnych do instalacji starszej wersji" ++msgstr "Brak pakietów dostępnych do instalacji poprzedniej wersji" --#: ../yum/__init__.py:3376 -+#: ../yum/__init__.py:3480 +-#: ../yum/__init__.py:3559 ++#: ../yum/__init__.py:3731 #, python-format msgid "No Match for available package: %s" msgstr "Brak wyników dla dostępnych pakietów: %s" --#: ../yum/__init__.py:3382 -+#: ../yum/__init__.py:3486 +-#: ../yum/__init__.py:3565 ++#: ../yum/__init__.py:3738 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Dla pakietu dostępna jest tylko aktualizacja: %s" --#: ../yum/__init__.py:3441 -+#: ../yum/__init__.py:3545 +-#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 ++#: ../yum/__init__.py:3808 ../yum/__init__.py:3845 + #, python-format + msgid "Failed to downgrade: %s" +-msgstr "Zainstalowanie starszej wersji nie powiodło się: %s" ++msgstr "Zainstalowanie poprzedniej wersji nie powiodło się: %s" + +-#: ../yum/__init__.py:3704 ++#: ../yum/__init__.py:3877 #, python-format msgid "Retrieving GPG key from %s" msgstr "Pobieranie klucza GPG z %s" --#: ../yum/__init__.py:3461 -+#: ../yum/__init__.py:3565 +-#: ../yum/__init__.py:3724 ++#: ../yum/__init__.py:3897 msgid "GPG key retrieval failed: " msgstr "Pobranie klucza GPG nie powiodło się: " --#: ../yum/__init__.py:3472 -+#: ../yum/__init__.py:3576 +-#: ../yum/__init__.py:3735 ++#: ../yum/__init__.py:3903 ++#, python-format ++msgid "Invalid GPG Key from %s: %s" ++msgstr "Nieprawidłowy klucz GPG z %s: %s" ++ ++#: ../yum/__init__.py:3912 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" - "Przeanalizowanie klucza GPG nie powiodło się: klucz nie posiada wartości %s" + "Przetworzenie klucza GPG nie powiodło się: klucz nie posiada wartości %s" --#: ../yum/__init__.py:3504 -+#: ../yum/__init__.py:3608 +-#: ../yum/__init__.py:3767 ++#: ../yum/__init__.py:3944 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "Klucz GPG %s (0x%s) jest już zainstalowany" #. Try installing/updating GPG key --#: ../yum/__init__.py:3509 ../yum/__init__.py:3571 -+#: ../yum/__init__.py:3613 ../yum/__init__.py:3675 +-#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 ++#: ../yum/__init__.py:3949 ../yum/__init__.py:4011 #, python-format msgid "Importing GPG key 0x%s \"%s\" from %s" msgstr "Importowanie klucza GPG 0x%s \"%s\" z %s" --#: ../yum/__init__.py:3526 -+#: ../yum/__init__.py:3630 +-#: ../yum/__init__.py:3789 ++#: ../yum/__init__.py:3966 msgid "Not installing key" msgstr "Klucz nie zostanie zainstalowany" --#: ../yum/__init__.py:3532 -+#: ../yum/__init__.py:3636 +-#: ../yum/__init__.py:3795 ++#: ../yum/__init__.py:3972 #, python-format msgid "Key import failed (code %d)" msgstr "Zaimportowanie klucza nie powiodło się (kod %d)" --#: ../yum/__init__.py:3533 ../yum/__init__.py:3592 -+#: ../yum/__init__.py:3637 ../yum/__init__.py:3696 +-#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 ++#: ../yum/__init__.py:3973 ../yum/__init__.py:4032 msgid "Key imported successfully" msgstr "Klucz został pomyślnie zaimportowany" --#: ../yum/__init__.py:3538 ../yum/__init__.py:3597 -+#: ../yum/__init__.py:3642 ../yum/__init__.py:3701 +-#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 ++#: ../yum/__init__.py:3978 ../yum/__init__.py:4037 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2190,81 +2236,81 @@ msgid "" - msgstr "" - "Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie " - "są poprawne dla tego pakietu.\n" --"Sprawdź, czy dla tego repozytorium skonfigurowane są poprawne adresy do " -+"Sprawdź, czy dla tego repozytorium skonfigurowane są poprawne adresy URL do " - "kluczy." +@@ -2417,41 +2589,46 @@ msgstr "" + "Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne " + "adresy URL do kluczy." --#: ../yum/__init__.py:3547 -+#: ../yum/__init__.py:3651 +-#: ../yum/__init__.py:3810 ++#: ../yum/__init__.py:3987 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Zaimportowanie kluczy nie pomogło, błędne klucze?" --#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3670 +-#: ../yum/__init__.py:3829 ++#: ../yum/__init__.py:4006 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "Klucz GPG %s (0x%s) został już zaimportowany" --#: ../yum/__init__.py:3586 -+#: ../yum/__init__.py:3690 +-#: ../yum/__init__.py:3849 ++#: ../yum/__init__.py:4026 #, python-format msgid "Not installing key for repo %s" msgstr "Klucz dla repozytorium %s nie zostanie zainstalowany" --#: ../yum/__init__.py:3591 -+#: ../yum/__init__.py:3695 +-#: ../yum/__init__.py:3854 ++#: ../yum/__init__.py:4031 msgid "Key import failed" msgstr "Zaimportowanie klucza nie powiodło się" --#: ../yum/__init__.py:3712 -+#: ../yum/__init__.py:3816 +-#: ../yum/__init__.py:3976 ++#: ../yum/__init__.py:4157 msgid "Unable to find a suitable mirror." - msgstr "Nie można znaleźć odpowiedniego serwera lustrzanego." + msgstr "Nie można odnaleźć odpowiedniego serwera lustrzanego." --#: ../yum/__init__.py:3714 -+#: ../yum/__init__.py:3818 +-#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4159 msgid "Errors were encountered while downloading packages." - msgstr "Podczas pobierania pakietów wystąpiły błędy." + msgstr "Wystąpiły błędy podczas pobierania pakietów." --#: ../yum/__init__.py:3755 -+#: ../yum/__init__.py:3868 +-#: ../yum/__init__.py:4028 ++#: ../yum/__init__.py:4209 #, python-format msgid "Please report this error at %s" - msgstr "Zgłoś ten błąd na %s" + msgstr "Proszę zgłosić ten błąd na %s" --#: ../yum/__init__.py:3779 -+#: ../yum/__init__.py:3892 +-#: ../yum/__init__.py:4052 ++#: ../yum/__init__.py:4233 msgid "Test Transaction Errors: " msgstr "Błędy testu transakcji: " ++#: ../yum/__init__.py:4334 ++#, python-format ++msgid "Could not set cachedir: %s" ++msgstr "Nie można ustawić katalogu pamięci podręcznej: %s " ++ #. Mostly copied from YumOutput._outKeyValFill() --#: ../yum/plugins.py:205 -+#: ../yum/plugins.py:202 + #: ../yum/plugins.py:202 msgid "Loaded plugins: " - msgstr "Wczytane wtyczki: " - --#: ../yum/plugins.py:219 ../yum/plugins.py:225 -+#: ../yum/plugins.py:216 ../yum/plugins.py:222 - #, python-format - msgid "No plugin match for: %s" - msgstr "Brak wyników dla wtyczki: %s" - --#: ../yum/plugins.py:255 -+#: ../yum/plugins.py:252 - #, python-format - msgid "Not loading \"%s\" plugin, as it is disabled" - msgstr "Wtyczka \"%s\" nie została wczytana, ponieważ jest wyłączona" - - #. Give full backtrace: --#: ../yum/plugins.py:267 -+#: ../yum/plugins.py:264 - #, python-format - msgid "Plugin \"%s\" can't be imported" - msgstr "Nie można zaimportować wtyczki \"%s\"" - --#: ../yum/plugins.py:274 -+#: ../yum/plugins.py:271 - #, python-format - msgid "Plugin \"%s\" doesn't specify required API version" - msgstr "Wtyczka \"%s\" nie określa wymaganej wersji API" - --#: ../yum/plugins.py:279 -+#: ../yum/plugins.py:276 - #, python-format - msgid "Plugin \"%s\" requires API %s. Supported API is %s." - msgstr "Wtyczka \"%s\" wymaga API %s. Obsługiwane API to %s." - --#: ../yum/plugins.py:312 -+#: ../yum/plugins.py:309 - #, python-format - msgid "Loading \"%s\" plugin" - msgstr "Wczytywanie wtyczki \"%s\"" - --#: ../yum/plugins.py:319 -+#: ../yum/plugins.py:316 - #, python-format - msgid "" - "Two or more plugins with the name \"%s\" exist in the plugin search path" -@@ -2272,19 +2318,19 @@ msgstr "" - "Istnieją dwie lub więcej wtyczek o nazwie \"%s\" w ścieżce wyszukiwania " - "wtyczek" - --#: ../yum/plugins.py:339 -+#: ../yum/plugins.py:336 - #, python-format - msgid "Configuration file %s not found" - msgstr "Nie znaleziono pliku konfiguracji %s" - - #. for - #. Configuration files for the plugin not found --#: ../yum/plugins.py:342 -+#: ../yum/plugins.py:339 - #, python-format - msgid "Unable to find configuration file for plugin %s" - msgstr "Nie można naleźć pliku konfiguracji dla wtyczki %s" - --#: ../yum/plugins.py:500 -+#: ../yum/plugins.py:497 +@@ -2512,7 +2689,20 @@ msgstr "Nie można odnaleźć pliku konfiguracji dla wtyczki %s" msgid "registration of commands not supported" msgstr "rejestracja poleceń nie jest obsługiwana" -diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py -index d22782b..edfc707 100644 ---- a/rpmUtils/arch.py -+++ b/rpmUtils/arch.py -@@ -255,6 +255,7 @@ def getCanonPPCArch(arch): - - def getCanonSPARCArch(arch): - # Deal with sun4v, sun4u, sun4m cases -+ SPARCtype = None - f = open("/proc/cpuinfo", "r") - lines = f.readlines() - f.close() -@@ -262,6 +263,9 @@ def getCanonSPARCArch(arch): - if line.startswith("type"): - SPARCtype = line.split(':')[1] - break -+ if SPARCtype is None: -+ return arch +-#: ../yum/rpmtrans.py:78 ++#: ../yum/rpmsack.py:102 ++msgid "has missing requires of" ++msgstr "posiada brakujące wymagania" + - if SPARCtype.find("sun4v") != -1: - if arch.startswith("sparc64"): - return "sparc64v" -diff --git a/rpmUtils/updates.py b/rpmUtils/updates.py -index f2d43f8..3264956 100644 ---- a/rpmUtils/updates.py -+++ b/rpmUtils/updates.py -@@ -24,7 +24,7 @@ class Updates: - """ - This class computes and keeps track of updates and obsoletes. - initialize, add installed packages, add available packages (both as -- unique lists of name, epoch, ver, rel, arch tuples), add an optional dict -+ unique lists of name, arch, ver, rel, epoch tuples), add an optional dict - of obsoleting packages with obsoletes and what they obsolete ie:: - foo, i386, 0, 1.1, 1: bar >= 1.1. - """ -diff --git a/test/skipbroken-tests.py b/test/skipbroken-tests.py -index db71a21..f8896f1 100644 ---- a/test/skipbroken-tests.py -+++ b/test/skipbroken-tests.py -@@ -582,6 +582,24 @@ class SkipBrokenTests(DepsolveTests): - self.assertEquals('empty', *self.resolveCode(skip=True)) - self.assertResult([c1,d1,r1,r2,r3,r4]) - -+ def testDualPackageUpdate(self): -+ ''' -+ RHBZ #522112 -+ two version of the same package installed on the system -+ and update will update both, but if it fail some dep only -+ One of the updated packages will be removed from the -+ transaction. -+ ''' -+ i1 = self.instPackage('xorg-x11-server-Xorg','1.6.99.900') -+ i2 = self.instPackage('xorg-x11-server-Xorg','1.6.3') -+ u1 = self.repoPackage('xorg-x11-server-Xorg', '1.6.99.901') -+ u1.addRequires("notfound") -+ self.tsInfo.addUpdate(u1, oldpo=i1) -+ self.tsInfo.addUpdate(u1, oldpo=i2) -+ self.assertEquals('empty', *self.resolveCode(skip=True)) -+ self.assertResult([i1,i2]) -+ -+ - - def resolveCode(self,skip = False): - solver = YumBase() ++#: ../yum/rpmsack.py:105 ++msgid "has installed conflicts" ++msgstr "posiada zainstalowane konflikty" ++ ++#: ../yum/rpmsack.py:114 ++#, python-format ++msgid "%s is a duplicate with %s" ++msgstr "%s jest duplikatem %s" ++ ++#: ../yum/rpmtrans.py:79 + msgid "Repackaging" + msgstr "Ponowne tworzenie pakietu" + +diff --git a/po/yum.pot b/po/yum.pot +index eaeb80c..f9a1d35 100644 +--- a/po/yum.pot ++++ b/po/yum.pot +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-10-15 15:45+0200\n" ++"POT-Creation-Date: 2010-02-11 10:54-0500\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" + "Language-Team: LANGUAGE \n" +@@ -16,33 +16,34 @@ msgstr "" + "Content-Type: text/plain; charset=CHARSET\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 ++#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 + msgid "Updating" + msgstr "" + +-#: ../callback.py:49 ../yum/rpmtrans.py:72 ++#: ../callback.py:49 ../yum/rpmtrans.py:73 + msgid "Erasing" + msgstr "" + +-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 +-#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 ++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 ++#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 ++#: ../yum/rpmtrans.py:77 + msgid "Installing" + msgstr "" + +-#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 ++#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 + msgid "Obsoleted" + msgstr "" + +-#: ../callback.py:54 ../output.py:1063 ../output.py:1403 ++#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 + msgid "Updated" + msgstr "" + +-#: ../callback.py:55 ../output.py:1399 ++#: ../callback.py:55 ../output.py:1438 + msgid "Erased" + msgstr "" + +-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 +-#: ../output.py:1395 ++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 ++#: ../output.py:1434 ../output.py:1646 + msgid "Installed" + msgstr "" + +@@ -64,314 +65,324 @@ msgstr "" + msgid "Erased: %s" + msgstr "" + +-#: ../callback.py:217 ../output.py:941 ++#: ../callback.py:217 ../output.py:948 ../output.py:1648 + msgid "Removing" + msgstr "" + +-#: ../callback.py:219 ../yum/rpmtrans.py:77 ++#: ../callback.py:219 ../yum/rpmtrans.py:78 + msgid "Cleanup" + msgstr "" + +-#: ../cli.py:106 ++#: ../cli.py:107 + #, python-format + msgid "Command \"%s\" already defined" + msgstr "" + +-#: ../cli.py:118 ++#: ../cli.py:119 + msgid "Setting up repositories" + msgstr "" + +-#: ../cli.py:129 ++#: ../cli.py:130 + msgid "Reading repository metadata in from local files" + msgstr "" + +-#: ../cli.py:192 ../utils.py:107 ++#: ../cli.py:194 ../utils.py:193 + #, python-format + msgid "Config Error: %s" + msgstr "" + +-#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 ++#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 + #, python-format + msgid "Options Error: %s" + msgstr "" + +-#: ../cli.py:223 ++#: ../cli.py:227 + #, python-format + msgid " Installed: %s-%s at %s" + msgstr "" + +-#: ../cli.py:225 ++#: ../cli.py:229 + #, python-format + msgid " Built : %s at %s" + msgstr "" + +-#: ../cli.py:227 ++#: ../cli.py:231 + #, python-format + msgid " Committed: %s at %s" + msgstr "" + +-#: ../cli.py:266 ++#: ../cli.py:270 + msgid "You need to give some command" + msgstr "" + +-#: ../cli.py:309 ++#: ../cli.py:284 ++#, python-format ++msgid "No such command: %s. Please use %s --help" ++msgstr "" ++ ++#: ../cli.py:314 + msgid "Disk Requirements:\n" + msgstr "" + +-#: ../cli.py:311 ++#: ../cli.py:316 + #, python-format +-msgid " At least %dMB needed on the %s filesystem.\n" ++msgid " At least %dMB more space needed on the %s filesystem.\n" + msgstr "" + + #. TODO: simplify the dependency errors? + #. Fixup the summary +-#: ../cli.py:316 ++#: ../cli.py:321 + msgid "" + "Error Summary\n" + "-------------\n" + msgstr "" + +-#: ../cli.py:359 ++#: ../cli.py:364 + msgid "Trying to run the transaction but nothing to do. Exiting." + msgstr "" + +-#: ../cli.py:395 ++#: ../cli.py:403 + msgid "Exiting on user Command" + msgstr "" + +-#: ../cli.py:399 ++#: ../cli.py:407 + msgid "Downloading Packages:" + msgstr "" + +-#: ../cli.py:404 ++#: ../cli.py:412 + msgid "Error Downloading Packages:\n" + msgstr "" + +-#: ../cli.py:418 ../yum/__init__.py:4014 ++#: ../cli.py:426 ../yum/__init__.py:4195 + msgid "Running rpm_check_debug" + msgstr "" + +-#: ../cli.py:427 ../yum/__init__.py:4023 ++#: ../cli.py:435 ../yum/__init__.py:4204 + msgid "ERROR You need to update rpm to handle:" + msgstr "" + +-#: ../cli.py:429 ../yum/__init__.py:4026 ++#: ../cli.py:437 ../yum/__init__.py:4207 + msgid "ERROR with rpm_check_debug vs depsolve:" + msgstr "" + +-#: ../cli.py:435 ++#: ../cli.py:443 + msgid "RPM needs to be updated" + msgstr "" + +-#: ../cli.py:436 ++#: ../cli.py:444 + #, python-format + msgid "Please report this error in %s" + msgstr "" + +-#: ../cli.py:442 ++#: ../cli.py:450 + msgid "Running Transaction Test" + msgstr "" + +-#: ../cli.py:458 +-msgid "Finished Transaction Test" +-msgstr "" +- +-#: ../cli.py:460 ++#: ../cli.py:466 + msgid "Transaction Check Error:\n" + msgstr "" + +-#: ../cli.py:467 ++#: ../cli.py:473 + msgid "Transaction Test Succeeded" + msgstr "" + +-#: ../cli.py:489 ++#: ../cli.py:495 + msgid "Running Transaction" + msgstr "" + +-#: ../cli.py:519 ++#: ../cli.py:525 + msgid "" + "Refusing to automatically import keys when running unattended.\n" + "Use \"-y\" to override." + msgstr "" + +-#: ../cli.py:538 ../cli.py:572 ++#: ../cli.py:544 ../cli.py:578 + msgid " * Maybe you meant: " + msgstr "" + +-#: ../cli.py:555 ../cli.py:563 ++#: ../cli.py:561 ../cli.py:569 + #, python-format + msgid "Package(s) %s%s%s available, but not installed." + msgstr "" + +-#: ../cli.py:569 ../cli.py:600 ../cli.py:678 ++#: ../cli.py:575 ../cli.py:607 ../cli.py:687 + #, python-format + msgid "No package %s%s%s available." + msgstr "" + +-#: ../cli.py:605 ../cli.py:738 ++#: ../cli.py:612 ../cli.py:748 + msgid "Package(s) to install" + msgstr "" + +-#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 +-#: ../yumcommands.py:159 ++#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 ++#: ../yumcommands.py:160 + msgid "Nothing to do" + msgstr "" + +-#: ../cli.py:639 ++#: ../cli.py:647 + #, python-format + msgid "%d packages marked for Update" + msgstr "" + +-#: ../cli.py:642 ++#: ../cli.py:650 + msgid "No Packages marked for Update" + msgstr "" + +-#: ../cli.py:656 ++#: ../cli.py:664 + #, python-format + msgid "%d packages marked for removal" + msgstr "" + +-#: ../cli.py:659 ++#: ../cli.py:667 + msgid "No Packages marked for removal" + msgstr "" + +-#: ../cli.py:683 ++#: ../cli.py:692 + msgid "Package(s) to downgrade" + msgstr "" + +-#: ../cli.py:707 ++#: ../cli.py:717 + #, python-format + msgid " (from %s)" + msgstr "" + +-#: ../cli.py:709 ++#: ../cli.py:719 + #, python-format + msgid "Installed package %s%s%s%s not available." + msgstr "" + +-#: ../cli.py:716 ++#: ../cli.py:726 + msgid "Package(s) to reinstall" + msgstr "" + +-#: ../cli.py:729 ++#: ../cli.py:739 + msgid "No Packages Provided" + msgstr "" + +-#: ../cli.py:813 ++#: ../cli.py:818 ++#, python-format ++msgid "Matched: %s" ++msgstr "" ++ ++#: ../cli.py:825 + #, python-format + msgid "Warning: No matches found for: %s" + msgstr "" + +-#: ../cli.py:816 ++#: ../cli.py:828 + msgid "No Matches found" + msgstr "" + +-#: ../cli.py:855 ++#: ../cli.py:868 + #, python-format + msgid "" + "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" + " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" + msgstr "" + +-#: ../cli.py:871 ++#: ../cli.py:884 + #, python-format + msgid "No Package Found for %s" + msgstr "" + +-#: ../cli.py:883 ++#: ../cli.py:896 + msgid "Cleaning up Everything" + msgstr "" + +-#: ../cli.py:897 ++#: ../cli.py:912 + msgid "Cleaning up Headers" + msgstr "" + +-#: ../cli.py:900 ++#: ../cli.py:915 + msgid "Cleaning up Packages" + msgstr "" + +-#: ../cli.py:903 ++#: ../cli.py:918 + msgid "Cleaning up xml metadata" + msgstr "" + +-#: ../cli.py:906 ++#: ../cli.py:921 + msgid "Cleaning up database cache" + msgstr "" + +-#: ../cli.py:909 ++#: ../cli.py:924 + msgid "Cleaning up expire-cache metadata" + msgstr "" + +-#: ../cli.py:912 ++#: ../cli.py:927 ++msgid "Cleaning up cached rpmdb data" ++msgstr "" ++ ++#: ../cli.py:930 + msgid "Cleaning up plugins" + msgstr "" + +-#: ../cli.py:937 ++#: ../cli.py:955 + msgid "Installed Groups:" + msgstr "" + +-#: ../cli.py:949 ++#: ../cli.py:967 + msgid "Available Groups:" + msgstr "" + +-#: ../cli.py:959 ++#: ../cli.py:977 + msgid "Done" + msgstr "" + +-#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 ++#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 + #, python-format + msgid "Warning: Group %s does not exist." + msgstr "" + +-#: ../cli.py:998 ++#: ../cli.py:1016 + msgid "No packages in any requested group available to install or update" + msgstr "" + +-#: ../cli.py:1000 ++#: ../cli.py:1018 + #, python-format + msgid "%d Package(s) to Install" + msgstr "" + +-#: ../cli.py:1010 ../yum/__init__.py:2641 ++#: ../cli.py:1028 ../yum/__init__.py:2800 + #, python-format + msgid "No group named %s exists" + msgstr "" + +-#: ../cli.py:1016 ++#: ../cli.py:1034 + msgid "No packages to remove from groups" + msgstr "" + +-#: ../cli.py:1018 ++#: ../cli.py:1036 + #, python-format + msgid "%d Package(s) to remove" + msgstr "" + +-#: ../cli.py:1060 ++#: ../cli.py:1078 + #, python-format + msgid "Package %s is already installed, skipping" + msgstr "" + +-#: ../cli.py:1071 ++#: ../cli.py:1089 + #, python-format + msgid "Discarding non-comparable pkg %s.%s" + msgstr "" + + #. we've not got any installed that match n or n+a +-#: ../cli.py:1097 ++#: ../cli.py:1115 + #, python-format + msgid "No other %s installed, adding to list for potential install" + msgstr "" + +-#: ../cli.py:1117 ++#: ../cli.py:1135 + msgid "Plugin Options" + msgstr "" + +-#: ../cli.py:1125 ++#: ../cli.py:1143 + #, python-format + msgid "Command line error: %s" + msgstr "" + +-#: ../cli.py:1138 ++#: ../cli.py:1156 + #, python-format + msgid "" + "\n" +@@ -379,106 +390,114 @@ msgid "" + "%s: %s option requires an argument" + msgstr "" + +-#: ../cli.py:1191 ++#: ../cli.py:1209 + msgid "--color takes one of: auto, always, never" + msgstr "" + +-#: ../cli.py:1298 ++#: ../cli.py:1319 + msgid "show this help message and exit" + msgstr "" + +-#: ../cli.py:1302 ++#: ../cli.py:1323 + msgid "be tolerant of errors" + msgstr "" + +-#: ../cli.py:1304 +-msgid "run entirely from cache, don't update cache" ++#: ../cli.py:1326 ++msgid "run entirely from system cache, don't update cache" + msgstr "" + +-#: ../cli.py:1306 ++#: ../cli.py:1329 + msgid "config file location" + msgstr "" + +-#: ../cli.py:1308 ++#: ../cli.py:1332 + msgid "maximum command wait time" + msgstr "" + +-#: ../cli.py:1310 ++#: ../cli.py:1334 + msgid "debugging output level" + msgstr "" + +-#: ../cli.py:1314 ++#: ../cli.py:1338 + msgid "show duplicates, in repos, in list/search commands" + msgstr "" + +-#: ../cli.py:1316 ++#: ../cli.py:1340 + msgid "error output level" + msgstr "" + +-#: ../cli.py:1319 ++#: ../cli.py:1343 ++msgid "debugging output level for rpm" ++msgstr "" ++ ++#: ../cli.py:1346 + msgid "quiet operation" + msgstr "" + +-#: ../cli.py:1321 ++#: ../cli.py:1348 + msgid "verbose operation" + msgstr "" + +-#: ../cli.py:1323 ++#: ../cli.py:1350 + msgid "answer yes for all questions" + msgstr "" + +-#: ../cli.py:1325 ++#: ../cli.py:1352 + msgid "show Yum version and exit" + msgstr "" + +-#: ../cli.py:1326 ++#: ../cli.py:1353 + msgid "set install root" + msgstr "" + +-#: ../cli.py:1330 ++#: ../cli.py:1357 + msgid "enable one or more repositories (wildcards allowed)" + msgstr "" + +-#: ../cli.py:1334 ++#: ../cli.py:1361 + msgid "disable one or more repositories (wildcards allowed)" + msgstr "" + +-#: ../cli.py:1337 ++#: ../cli.py:1364 + msgid "exclude package(s) by name or glob" + msgstr "" + +-#: ../cli.py:1339 ++#: ../cli.py:1366 + msgid "disable exclude from main, for a repo or for everything" + msgstr "" + +-#: ../cli.py:1342 ++#: ../cli.py:1369 + msgid "enable obsoletes processing during updates" + msgstr "" + +-#: ../cli.py:1344 ++#: ../cli.py:1371 + msgid "disable Yum plugins" + msgstr "" + +-#: ../cli.py:1346 ++#: ../cli.py:1373 + msgid "disable gpg signature checking" + msgstr "" + +-#: ../cli.py:1348 ++#: ../cli.py:1375 + msgid "disable plugins by name" + msgstr "" + +-#: ../cli.py:1351 ++#: ../cli.py:1378 + msgid "enable plugins by name" + msgstr "" + +-#: ../cli.py:1354 ++#: ../cli.py:1381 + msgid "skip packages with depsolving problems" + msgstr "" + +-#: ../cli.py:1356 ++#: ../cli.py:1383 + msgid "control whether color is used" + msgstr "" + ++#: ../cli.py:1385 ++msgid "set value of $releasever in yum config and repo files" ++msgstr "" ++ + #: ../output.py:305 + msgid "Jan" + msgstr "" +@@ -531,253 +550,255 @@ msgstr "" + msgid "Trying other mirror." + msgstr "" + +-#: ../output.py:538 ++#: ../output.py:534 + #, python-format + msgid "Name : %s%s%s" + msgstr "" + +-#: ../output.py:539 ++#: ../output.py:535 + #, python-format + msgid "Arch : %s" + msgstr "" + +-#: ../output.py:541 ++#: ../output.py:537 + #, python-format + msgid "Epoch : %s" + msgstr "" + +-#: ../output.py:542 ++#: ../output.py:538 + #, python-format + msgid "Version : %s" + msgstr "" + +-#: ../output.py:543 ++#: ../output.py:539 + #, python-format + msgid "Release : %s" + msgstr "" + +-#: ../output.py:544 ++#: ../output.py:540 + #, python-format + msgid "Size : %s" + msgstr "" + +-#: ../output.py:545 ++#: ../output.py:541 + #, python-format + msgid "Repo : %s" + msgstr "" + +-#: ../output.py:547 ++#: ../output.py:543 + #, python-format + msgid "From repo : %s" + msgstr "" + +-#: ../output.py:549 ++#: ../output.py:545 + #, python-format + msgid "Committer : %s" + msgstr "" + +-#: ../output.py:550 ++#: ../output.py:546 + #, python-format + msgid "Committime : %s" + msgstr "" + +-#: ../output.py:551 ++#: ../output.py:547 + #, python-format + msgid "Buildtime : %s" + msgstr "" + +-#: ../output.py:553 ++#: ../output.py:549 + #, python-format + msgid "Installtime: %s" + msgstr "" + +-#: ../output.py:554 ++#: ../output.py:550 + msgid "Summary : " + msgstr "" + +-#: ../output.py:556 ++#: ../output.py:552 + #, python-format + msgid "URL : %s" + msgstr "" + +-#: ../output.py:557 +-#, python-format +-msgid "License : %s" ++#: ../output.py:553 ++msgid "License : " + msgstr "" + +-#: ../output.py:558 ++#: ../output.py:554 + msgid "Description: " + msgstr "" + +-#: ../output.py:626 ++#: ../output.py:622 + msgid "y" + msgstr "" + +-#: ../output.py:626 ++#: ../output.py:622 + msgid "yes" + msgstr "" + +-#: ../output.py:627 ++#: ../output.py:623 + msgid "n" + msgstr "" + +-#: ../output.py:627 ++#: ../output.py:623 + msgid "no" + msgstr "" + +-#: ../output.py:631 ++#: ../output.py:627 + msgid "Is this ok [y/N]: " + msgstr "" + +-#: ../output.py:722 ++#: ../output.py:715 + #, python-format + msgid "" + "\n" + "Group: %s" + msgstr "" + +-#: ../output.py:726 ++#: ../output.py:719 + #, python-format + msgid " Group-Id: %s" + msgstr "" + +-#: ../output.py:731 ++#: ../output.py:724 + #, python-format + msgid " Description: %s" + msgstr "" + +-#: ../output.py:733 ++#: ../output.py:726 + msgid " Mandatory Packages:" + msgstr "" + +-#: ../output.py:734 ++#: ../output.py:727 + msgid " Default Packages:" + msgstr "" + +-#: ../output.py:735 ++#: ../output.py:728 + msgid " Optional Packages:" + msgstr "" + +-#: ../output.py:736 ++#: ../output.py:729 + msgid " Conditional Packages:" + msgstr "" + +-#: ../output.py:756 ++#: ../output.py:749 + #, python-format + msgid "package: %s" + msgstr "" + +-#: ../output.py:758 ++#: ../output.py:751 + msgid " No dependencies for this package" + msgstr "" + +-#: ../output.py:763 ++#: ../output.py:756 + #, python-format + msgid " dependency: %s" + msgstr "" + +-#: ../output.py:765 ++#: ../output.py:758 + msgid " Unsatisfied dependency" + msgstr "" + +-#: ../output.py:837 ++#: ../output.py:830 + #, python-format + msgid "Repo : %s" + msgstr "" + +-#: ../output.py:838 ++#: ../output.py:831 + msgid "Matched from:" + msgstr "" + +-#: ../output.py:847 ++#: ../output.py:840 + msgid "Description : " + msgstr "" + +-#: ../output.py:850 ++#: ../output.py:843 + #, python-format + msgid "URL : %s" + msgstr "" + +-#: ../output.py:853 ++#: ../output.py:846 + #, python-format + msgid "License : %s" + msgstr "" + +-#: ../output.py:856 ++#: ../output.py:849 + #, python-format + msgid "Filename : %s" + msgstr "" + +-#: ../output.py:860 ++#: ../output.py:853 + msgid "Other : " + msgstr "" + +-#: ../output.py:893 ++#: ../output.py:896 + msgid "There was an error calculating total download size" + msgstr "" + +-#: ../output.py:898 ++#: ../output.py:901 + #, python-format + msgid "Total size: %s" + msgstr "" + +-#: ../output.py:901 ++#: ../output.py:904 + #, python-format + msgid "Total download size: %s" + msgstr "" + +-#: ../output.py:942 ++#: ../output.py:908 ++#, python-format ++msgid "Installed size: %s" ++msgstr "" ++ ++#: ../output.py:949 + msgid "Reinstalling" + msgstr "" + +-#: ../output.py:943 ++#: ../output.py:950 + msgid "Downgrading" + msgstr "" + +-#: ../output.py:944 ++#: ../output.py:951 + msgid "Installing for dependencies" + msgstr "" + +-#: ../output.py:945 ++#: ../output.py:952 + msgid "Updating for dependencies" + msgstr "" + +-#: ../output.py:946 ++#: ../output.py:953 + msgid "Removing for dependencies" + msgstr "" + +-#: ../output.py:953 ../output.py:1065 ++#: ../output.py:960 ../output.py:1072 + msgid "Skipped (dependency problems)" + msgstr "" + +-#: ../output.py:976 ++#: ../output.py:983 + msgid "Package" + msgstr "" + +-#: ../output.py:976 ++#: ../output.py:983 + msgid "Arch" + msgstr "" + +-#: ../output.py:977 ++#: ../output.py:984 + msgid "Version" + msgstr "" + +-#: ../output.py:977 ++#: ../output.py:984 + msgid "Repository" + msgstr "" + +-#: ../output.py:978 ++#: ../output.py:985 + msgid "Size" + msgstr "" + +-#: ../output.py:990 ++#: ../output.py:997 + #, python-format +-msgid "" +-" replacing %s%s%s.%s %s\n" +-"\n" ++msgid " replacing %s%s%s.%s %s\n" + msgstr "" + +-#: ../output.py:999 ++#: ../output.py:1006 + #, python-format + msgid "" + "\n" +@@ -785,14 +806,14 @@ msgid "" + "%s\n" + msgstr "" + +-#: ../output.py:1006 ++#: ../output.py:1013 + #, python-format + msgid "" + "Install %5.5s Package(s)\n" + "Upgrade %5.5s Package(s)\n" + msgstr "" + +-#: ../output.py:1015 ++#: ../output.py:1022 + #, python-format + msgid "" + "Remove %5.5s Package(s)\n" +@@ -800,32 +821,32 @@ msgid "" + "Downgrade %5.5s Package(s)\n" + msgstr "" + +-#: ../output.py:1059 ++#: ../output.py:1066 + msgid "Removed" + msgstr "" + +-#: ../output.py:1060 ++#: ../output.py:1067 + msgid "Dependency Removed" + msgstr "" + +-#: ../output.py:1062 ++#: ../output.py:1069 + msgid "Dependency Installed" + msgstr "" + +-#: ../output.py:1064 ++#: ../output.py:1071 + msgid "Dependency Updated" + msgstr "" + +-#: ../output.py:1066 ++#: ../output.py:1073 + msgid "Replaced" + msgstr "" + +-#: ../output.py:1067 ++#: ../output.py:1074 + msgid "Failed" + msgstr "" + + #. Delta between C-c's so we treat as exit +-#: ../output.py:1133 ++#: ../output.py:1140 + msgid "two" + msgstr "" + +@@ -833,7 +854,7 @@ msgstr "" + #. Current download cancelled, interrupt (ctrl-c) again within two seconds + #. to exit. + #. Where "interupt (ctrl-c) again" and "two" are highlighted. +-#: ../output.py:1144 ++#: ../output.py:1151 + #, python-format + msgid "" + "\n" +@@ -842,221 +863,374 @@ msgid "" + "to exit.\n" + msgstr "" + +-#: ../output.py:1155 ++#: ../output.py:1162 + msgid "user interrupt" + msgstr "" + +-#: ../output.py:1173 ++#: ../output.py:1180 + msgid "Total" + msgstr "" + ++#: ../output.py:1202 ++msgid "I" ++msgstr "" ++ + #: ../output.py:1203 +-msgid "" ++msgid "O" + msgstr "" + + #: ../output.py:1204 ++msgid "E" ++msgstr "" ++ ++#: ../output.py:1205 ++msgid "R" ++msgstr "" ++ ++#: ../output.py:1206 ++msgid "D" ++msgstr "" ++ ++#: ../output.py:1207 ++msgid "U" ++msgstr "" ++ ++#: ../output.py:1217 ++msgid "" ++msgstr "" ++ ++#: ../output.py:1218 + msgid "System" + msgstr "" + +-#: ../output.py:1240 ++#: ../output.py:1254 + msgid "Bad transaction IDs, or package(s), given" + msgstr "" + +-#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 +-msgid "Warning: RPMDB has been altered since the last yum transaction." ++#: ../output.py:1266 ++msgid "ID" ++msgstr "" ++ ++#: ../output.py:1267 ../output.py:1520 ++msgid "Login user" + msgstr "" + +-#: ../output.py:1289 ++#: ../output.py:1268 ++msgid "Date and time" ++msgstr "" ++ ++#: ../output.py:1269 ../output.py:1522 ++msgid "Action(s)" ++msgstr "" ++ ++#: ../output.py:1270 ../output.py:1523 ++msgid "Altered" ++msgstr "" ++ ++#: ../output.py:1310 + msgid "No transaction ID given" + msgstr "" + +-#: ../output.py:1297 ++#: ../output.py:1336 + msgid "Bad transaction ID given" + msgstr "" + +-#: ../output.py:1302 ++#: ../output.py:1341 + msgid "Not found given transaction ID" + msgstr "" + +-#: ../output.py:1310 ++#: ../output.py:1349 + msgid "Found more than one transaction ID!" + msgstr "" + +-#: ../output.py:1331 ++#: ../output.py:1370 + msgid "No transaction ID, or package, given" + msgstr "" + +-#: ../output.py:1357 ++#: ../output.py:1396 + msgid "Transaction ID :" + msgstr "" + +-#: ../output.py:1359 ++#: ../output.py:1398 + msgid "Begin time :" + msgstr "" + +-#: ../output.py:1362 ../output.py:1364 ++#: ../output.py:1401 ../output.py:1403 + msgid "Begin rpmdb :" + msgstr "" + +-#: ../output.py:1378 ++#: ../output.py:1417 + #, python-format + msgid "(%s seconds)" + msgstr "" + +-#: ../output.py:1379 ++#: ../output.py:1418 + msgid "End time :" + msgstr "" + +-#: ../output.py:1382 ../output.py:1384 ++#: ../output.py:1421 ../output.py:1423 + msgid "End rpmdb :" + msgstr "" + +-#: ../output.py:1385 ++#: ../output.py:1424 + msgid "User :" + msgstr "" + +-#: ../output.py:1387 ../output.py:1389 ../output.py:1391 ++#: ../output.py:1426 ../output.py:1428 ../output.py:1430 + msgid "Return-Code :" + msgstr "" + +-#: ../output.py:1387 ++#: ../output.py:1426 + msgid "Aborted" + msgstr "" + +-#: ../output.py:1389 ++#: ../output.py:1428 + msgid "Failure:" + msgstr "" + +-#: ../output.py:1391 ++#: ../output.py:1430 + msgid "Success" + msgstr "" + +-#: ../output.py:1392 ++#: ../output.py:1431 + msgid "Transaction performed with:" + msgstr "" + +-#: ../output.py:1405 ++#: ../output.py:1444 ../output.py:1489 + msgid "Downgraded" + msgstr "" + + #. multiple versions installed, both older and newer +-#: ../output.py:1407 ++#: ../output.py:1446 + msgid "Weird" + msgstr "" + +-#: ../output.py:1409 ++#: ../output.py:1448 + msgid "Packages Altered:" + msgstr "" + +-#: ../output.py:1412 ++#: ../output.py:1451 + msgid "Scriptlet output:" + msgstr "" + +-#: ../output.py:1418 ++#: ../output.py:1457 + msgid "Errors:" + msgstr "" + +-#: ../output.py:1489 +-msgid "Last day" ++#: ../output.py:1481 ../output.py:1482 ++msgid "Install" ++msgstr "" ++ ++#: ../output.py:1483 ++msgid "Dep-Install" ++msgstr "" ++ ++#: ../output.py:1485 ++msgid "Obsoleting" ++msgstr "" ++ ++#: ../output.py:1486 ++msgid "Erase" ++msgstr "" ++ ++#: ../output.py:1487 ++msgid "Reinstall" ++msgstr "" ++ ++#: ../output.py:1488 ++msgid "Downgrade" + msgstr "" + + #: ../output.py:1490 ++msgid "Update" ++msgstr "" ++ ++#: ../output.py:1521 ++msgid "Time" ++msgstr "" ++ ++#: ../output.py:1547 ++msgid "Last day" ++msgstr "" ++ ++#: ../output.py:1548 + msgid "Last week" + msgstr "" + +-#: ../output.py:1491 ++#: ../output.py:1549 + msgid "Last 2 weeks" + msgstr "" + + #. US default :p +-#: ../output.py:1492 ++#: ../output.py:1550 + msgid "Last 3 months" + msgstr "" + +-#: ../output.py:1493 ++#: ../output.py:1551 + msgid "Last 6 months" + msgstr "" + +-#: ../output.py:1494 ++#: ../output.py:1552 + msgid "Last year" + msgstr "" + +-#: ../output.py:1495 ++#: ../output.py:1553 + msgid "Over a year ago" + msgstr "" + +-#: ../output.py:1524 ++#: ../output.py:1585 + msgid "installed" + msgstr "" + +-#: ../output.py:1525 ++#: ../output.py:1586 + msgid "updated" + msgstr "" + +-#: ../output.py:1526 ++#: ../output.py:1587 + msgid "obsoleted" + msgstr "" + +-#: ../output.py:1527 ++#: ../output.py:1588 + msgid "erased" + msgstr "" + +-#: ../output.py:1531 ++#: ../output.py:1592 + #, python-format + msgid "---> Package %s.%s %s:%s-%s set to be %s" + msgstr "" + +-#: ../output.py:1538 ++#: ../output.py:1599 + msgid "--> Running transaction check" + msgstr "" + +-#: ../output.py:1543 ++#: ../output.py:1604 + msgid "--> Restarting Dependency Resolution with new changes." + msgstr "" + +-#: ../output.py:1548 ++#: ../output.py:1609 + msgid "--> Finished Dependency Resolution" + msgstr "" + +-#: ../output.py:1553 ../output.py:1558 ++#: ../output.py:1614 ../output.py:1619 + #, python-format + msgid "--> Processing Dependency: %s for package: %s" + msgstr "" + +-#: ../output.py:1562 ++#: ../output.py:1623 + #, python-format + msgid "--> Unresolved Dependency: %s" + msgstr "" + +-#: ../output.py:1568 ../output.py:1573 ++#: ../output.py:1634 ++#, python-format ++msgid "Package: %s" ++msgstr "" ++ ++#: ../output.py:1636 ++#, python-format ++msgid "" ++"\n" ++" Requires: %s" ++msgstr "" ++ ++#: ../output.py:1649 ../output.py:1660 ++#, python-format ++msgid "" ++"\n" ++" %s: %s (%s)" ++msgstr "" ++ ++#: ../output.py:1657 ++msgid "Available" ++msgstr "" ++ ++#: ../output.py:1665 ../output.py:1670 + #, python-format + msgid "--> Processing Conflict: %s conflicts %s" + msgstr "" + +-#: ../output.py:1577 ++#: ../output.py:1674 + msgid "--> Populating transaction set with selected packages. Please wait." + msgstr "" + +-#: ../output.py:1581 ++#: ../output.py:1678 + #, python-format + msgid "---> Downloading header for %s to pack into transaction set." + msgstr "" + +-#: ../utils.py:137 ../yummain.py:42 ++#: ../utils.py:93 ++msgid "Running" ++msgstr "" ++ ++#: ../utils.py:94 ++msgid "Sleeping" ++msgstr "" ++ ++#: ../utils.py:95 ++msgid "Uninterruptible" ++msgstr "" ++ ++#: ../utils.py:96 ++msgid "Zombie" ++msgstr "" ++ ++#: ../utils.py:97 ++msgid "Traced/Stopped" ++msgstr "" ++ ++#: ../utils.py:98 ../yumcommands.py:917 ++msgid "Unknown" ++msgstr "" ++ ++#: ../utils.py:109 ++msgid " The other application is: PackageKit" ++msgstr "" ++ ++#: ../utils.py:111 ++#, python-format ++msgid " The other application is: %s" ++msgstr "" ++ ++#: ../utils.py:114 ++#, python-format ++msgid " Memory : %5s RSS (%5sB VSZ)" ++msgstr "" ++ ++#: ../utils.py:119 ++#, python-format ++msgid " Started: %s - %s ago" ++msgstr "" ++ ++#: ../utils.py:121 ++#, python-format ++msgid " State : %s, pid: %d" ++msgstr "" ++ ++#: ../utils.py:199 ++#, python-format ++msgid "PluginExit Error: %s" ++msgstr "" ++ ++#: ../utils.py:202 ++#, python-format ++msgid "Yum Error: %s" ++msgstr "" ++ ++#: ../utils.py:235 ../yummain.py:42 + msgid "" + "\n" + "\n" + "Exiting on user cancel" + msgstr "" + +-#: ../utils.py:143 ../yummain.py:48 ++#: ../utils.py:241 ../yummain.py:48 + msgid "" + "\n" + "\n" + "Exiting on Broken Pipe" + msgstr "" + +-#: ../utils.py:145 ../yummain.py:50 ++#: ../utils.py:243 ../yummain.py:50 + #, python-format + msgid "" + "\n" +@@ -1064,15 +1238,15 @@ msgid "" + "%s" + msgstr "" + +-#: ../utils.py:184 ../yummain.py:273 ++#: ../utils.py:282 ../yummain.py:211 + msgid "Complete!" + msgstr "" + +-#: ../yumcommands.py:42 ++#: ../yumcommands.py:43 + msgid "You need to be root to perform this command." + msgstr "" + +-#: ../yumcommands.py:49 ++#: ../yumcommands.py:50 + msgid "" + "\n" + "You have enabled checking of packages via GPG keys. This is a good thing. \n" +@@ -1090,487 +1264,444 @@ msgid "" + "For more information contact your distribution or package provider.\n" + msgstr "" + +-#: ../yumcommands.py:69 ++#: ../yumcommands.py:70 + #, python-format + msgid "Error: Need to pass a list of pkgs to %s" + msgstr "" + +-#: ../yumcommands.py:75 ++#: ../yumcommands.py:76 + msgid "Error: Need an item to match" + msgstr "" + +-#: ../yumcommands.py:81 ++#: ../yumcommands.py:82 + msgid "Error: Need a group or list of groups" + msgstr "" + +-#: ../yumcommands.py:90 ++#: ../yumcommands.py:91 + #, python-format + msgid "Error: clean requires an option: %s" + msgstr "" + +-#: ../yumcommands.py:95 ++#: ../yumcommands.py:96 + #, python-format + msgid "Error: invalid clean argument: %r" + msgstr "" + +-#: ../yumcommands.py:108 ++#: ../yumcommands.py:109 + msgid "No argument to shell" + msgstr "" + +-#: ../yumcommands.py:110 ++#: ../yumcommands.py:111 + #, python-format + msgid "Filename passed to shell: %s" + msgstr "" + +-#: ../yumcommands.py:114 ++#: ../yumcommands.py:115 + #, python-format + msgid "File %s given as argument to shell does not exist." + msgstr "" + +-#: ../yumcommands.py:120 ++#: ../yumcommands.py:121 + msgid "Error: more than one file given as argument to shell." + msgstr "" + +-#: ../yumcommands.py:169 ++#: ../yumcommands.py:170 + msgid "PACKAGE..." + msgstr "" + +-#: ../yumcommands.py:172 ++#: ../yumcommands.py:173 + msgid "Install a package or packages on your system" + msgstr "" + +-#: ../yumcommands.py:180 ++#: ../yumcommands.py:181 + msgid "Setting up Install Process" + msgstr "" + +-#: ../yumcommands.py:191 ++#: ../yumcommands.py:192 + msgid "[PACKAGE...]" + msgstr "" + +-#: ../yumcommands.py:194 ++#: ../yumcommands.py:195 + msgid "Update a package or packages on your system" + msgstr "" + +-#: ../yumcommands.py:201 ++#: ../yumcommands.py:202 + msgid "Setting up Update Process" + msgstr "" + +-#: ../yumcommands.py:246 ++#: ../yumcommands.py:244 + msgid "Display details about a package or group of packages" + msgstr "" + +-#: ../yumcommands.py:295 ++#: ../yumcommands.py:293 + msgid "Installed Packages" + msgstr "" + +-#: ../yumcommands.py:303 ++#: ../yumcommands.py:301 + msgid "Available Packages" + msgstr "" + +-#: ../yumcommands.py:307 ++#: ../yumcommands.py:305 + msgid "Extra Packages" + msgstr "" + +-#: ../yumcommands.py:311 ++#: ../yumcommands.py:309 + msgid "Updated Packages" + msgstr "" + + #. This only happens in verbose mode +-#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 ++#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 + msgid "Obsoleting Packages" + msgstr "" + +-#: ../yumcommands.py:328 ++#: ../yumcommands.py:326 + msgid "Recently Added Packages" + msgstr "" + +-#: ../yumcommands.py:335 ++#: ../yumcommands.py:333 + msgid "No matching Packages to list" + msgstr "" + +-#: ../yumcommands.py:349 ++#: ../yumcommands.py:347 + msgid "List a package or groups of packages" + msgstr "" + +-#: ../yumcommands.py:361 ++#: ../yumcommands.py:359 + msgid "Remove a package or packages from your system" + msgstr "" + +-#: ../yumcommands.py:368 ++#: ../yumcommands.py:366 + msgid "Setting up Remove Process" + msgstr "" + +-#: ../yumcommands.py:382 ++#: ../yumcommands.py:380 + msgid "Setting up Group Process" + msgstr "" + +-#: ../yumcommands.py:388 ++#: ../yumcommands.py:386 + msgid "No Groups on which to run command" + msgstr "" + +-#: ../yumcommands.py:401 ++#: ../yumcommands.py:399 + msgid "List available package groups" + msgstr "" + +-#: ../yumcommands.py:418 ++#: ../yumcommands.py:416 + msgid "Install the packages in a group on your system" + msgstr "" + +-#: ../yumcommands.py:440 ++#: ../yumcommands.py:438 + msgid "Remove the packages in a group from your system" + msgstr "" + +-#: ../yumcommands.py:467 ++#: ../yumcommands.py:465 + msgid "Display details about a package group" + msgstr "" + +-#: ../yumcommands.py:491 ++#: ../yumcommands.py:489 + msgid "Generate the metadata cache" + msgstr "" + +-#: ../yumcommands.py:497 ++#: ../yumcommands.py:495 + msgid "Making cache files for all metadata files." + msgstr "" + +-#: ../yumcommands.py:498 ++#: ../yumcommands.py:496 + msgid "This may take a while depending on the speed of this computer" + msgstr "" + +-#: ../yumcommands.py:519 ++#: ../yumcommands.py:517 + msgid "Metadata Cache Created" + msgstr "" + +-#: ../yumcommands.py:533 ++#: ../yumcommands.py:531 + msgid "Remove cached data" + msgstr "" + +-#: ../yumcommands.py:553 ++#: ../yumcommands.py:551 + msgid "Find what package provides the given value" + msgstr "" + +-#: ../yumcommands.py:573 ++#: ../yumcommands.py:571 + msgid "Check for available package updates" + msgstr "" + +-#: ../yumcommands.py:623 ++#: ../yumcommands.py:621 + msgid "Search package details for the given string" + msgstr "" + +-#: ../yumcommands.py:629 ++#: ../yumcommands.py:627 + msgid "Searching Packages: " + msgstr "" + +-#: ../yumcommands.py:646 ++#: ../yumcommands.py:644 + msgid "Update packages taking obsoletes into account" + msgstr "" + +-#: ../yumcommands.py:654 ++#: ../yumcommands.py:652 + msgid "Setting up Upgrade Process" + msgstr "" + +-#: ../yumcommands.py:668 ++#: ../yumcommands.py:666 + msgid "Install a local RPM" + msgstr "" + +-#: ../yumcommands.py:676 ++#: ../yumcommands.py:674 + msgid "Setting up Local Package Process" + msgstr "" + +-#: ../yumcommands.py:695 ++#: ../yumcommands.py:693 + msgid "Determine which package provides the given dependency" + msgstr "" + +-#: ../yumcommands.py:698 ++#: ../yumcommands.py:696 + msgid "Searching Packages for Dependency:" + msgstr "" + +-#: ../yumcommands.py:712 ++#: ../yumcommands.py:710 + msgid "Run an interactive yum shell" + msgstr "" + +-#: ../yumcommands.py:718 ++#: ../yumcommands.py:716 + msgid "Setting up Yum Shell" + msgstr "" + +-#: ../yumcommands.py:736 ++#: ../yumcommands.py:734 + msgid "List a package's dependencies" + msgstr "" + +-#: ../yumcommands.py:742 ++#: ../yumcommands.py:740 + msgid "Finding dependencies: " + msgstr "" + +-#: ../yumcommands.py:758 ++#: ../yumcommands.py:756 + msgid "Display the configured software repositories" + msgstr "" + +-#: ../yumcommands.py:810 ../yumcommands.py:811 ++#: ../yumcommands.py:822 ../yumcommands.py:823 + msgid "enabled" + msgstr "" + +-#: ../yumcommands.py:819 ../yumcommands.py:820 ++#: ../yumcommands.py:849 ../yumcommands.py:850 + msgid "disabled" + msgstr "" + +-#: ../yumcommands.py:834 ++#: ../yumcommands.py:866 + msgid "Repo-id : " + msgstr "" + +-#: ../yumcommands.py:835 ++#: ../yumcommands.py:867 + msgid "Repo-name : " + msgstr "" + +-#: ../yumcommands.py:836 ++#: ../yumcommands.py:870 + msgid "Repo-status : " + msgstr "" + +-#: ../yumcommands.py:838 ++#: ../yumcommands.py:873 + msgid "Repo-revision: " + msgstr "" + +-#: ../yumcommands.py:842 ++#: ../yumcommands.py:877 + msgid "Repo-tags : " + msgstr "" + +-#: ../yumcommands.py:848 ++#: ../yumcommands.py:883 + msgid "Repo-distro-tags: " + msgstr "" + +-#: ../yumcommands.py:853 ++#: ../yumcommands.py:888 + msgid "Repo-updated : " + msgstr "" + +-#: ../yumcommands.py:855 ++#: ../yumcommands.py:890 + msgid "Repo-pkgs : " + msgstr "" + +-#: ../yumcommands.py:856 ++#: ../yumcommands.py:891 + msgid "Repo-size : " + msgstr "" + +-#: ../yumcommands.py:863 ++#: ../yumcommands.py:898 + msgid "Repo-baseurl : " + msgstr "" + +-#: ../yumcommands.py:871 ++#: ../yumcommands.py:906 + msgid "Repo-metalink: " + msgstr "" + +-#: ../yumcommands.py:875 ++#: ../yumcommands.py:910 + msgid " Updated : " + msgstr "" + +-#: ../yumcommands.py:878 ++#: ../yumcommands.py:913 + msgid "Repo-mirrors : " + msgstr "" + +-#: ../yumcommands.py:882 ../yummain.py:133 +-msgid "Unknown" +-msgstr "" +- +-#: ../yumcommands.py:888 ++#: ../yumcommands.py:923 + #, python-format + msgid "Never (last: %s)" + msgstr "" + +-#: ../yumcommands.py:890 ++#: ../yumcommands.py:925 + #, python-format + msgid "Instant (last: %s)" + msgstr "" + +-#: ../yumcommands.py:893 ++#: ../yumcommands.py:928 + #, python-format + msgid "%s second(s) (last: %s)" + msgstr "" + +-#: ../yumcommands.py:895 ++#: ../yumcommands.py:930 + msgid "Repo-expire : " + msgstr "" + +-#: ../yumcommands.py:898 ++#: ../yumcommands.py:933 + msgid "Repo-exclude : " + msgstr "" + +-#: ../yumcommands.py:902 ++#: ../yumcommands.py:937 + msgid "Repo-include : " + msgstr "" + ++#: ../yumcommands.py:941 ++msgid "Repo-excluded: " ++msgstr "" ++ + #. Work out the first (id) and last (enabled/disalbed/count), + #. then chop the middle (name)... +-#: ../yumcommands.py:912 ../yumcommands.py:938 ++#: ../yumcommands.py:951 ../yumcommands.py:980 + msgid "repo id" + msgstr "" + +-#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 ++#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 + msgid "status" + msgstr "" + +-#: ../yumcommands.py:939 ++#: ../yumcommands.py:981 + msgid "repo name" + msgstr "" + +-#: ../yumcommands.py:965 ++#: ../yumcommands.py:1018 + msgid "Display a helpful usage message" + msgstr "" + +-#: ../yumcommands.py:999 ++#: ../yumcommands.py:1052 + #, python-format + msgid "No help available for %s" + msgstr "" + +-#: ../yumcommands.py:1004 ++#: ../yumcommands.py:1057 + msgid "" + "\n" + "\n" + "aliases: " + msgstr "" + +-#: ../yumcommands.py:1006 ++#: ../yumcommands.py:1059 + msgid "" + "\n" + "\n" + "alias: " + msgstr "" + +-#: ../yumcommands.py:1034 ++#: ../yumcommands.py:1087 + msgid "Setting up Reinstall Process" + msgstr "" + +-#: ../yumcommands.py:1042 ++#: ../yumcommands.py:1095 + msgid "reinstall a package" + msgstr "" + +-#: ../yumcommands.py:1060 ++#: ../yumcommands.py:1113 + msgid "Setting up Downgrade Process" + msgstr "" + +-#: ../yumcommands.py:1067 ++#: ../yumcommands.py:1120 + msgid "downgrade a package" + msgstr "" + +-#: ../yumcommands.py:1081 ++#: ../yumcommands.py:1134 + msgid "Display a version for the machine and/or available repos." + msgstr "" + +-#: ../yumcommands.py:1111 ++#: ../yumcommands.py:1173 + msgid " Yum version groups:" + msgstr "" + +-#: ../yumcommands.py:1121 ++#: ../yumcommands.py:1183 + msgid " Group :" + msgstr "" + +-#: ../yumcommands.py:1122 ++#: ../yumcommands.py:1184 + msgid " Packages:" + msgstr "" + +-#: ../yumcommands.py:1152 ++#: ../yumcommands.py:1213 + msgid "Installed:" + msgstr "" + +-#: ../yumcommands.py:1157 ++#: ../yumcommands.py:1218 + msgid "Group-Installed:" + msgstr "" + +-#: ../yumcommands.py:1166 ++#: ../yumcommands.py:1227 + msgid "Available:" + msgstr "" + +-#: ../yumcommands.py:1172 ++#: ../yumcommands.py:1233 + msgid "Group-Available:" + msgstr "" + +-#: ../yumcommands.py:1211 ++#: ../yumcommands.py:1272 + msgid "Display, or use, the transaction history" + msgstr "" + +-#: ../yumcommands.py:1239 ++#: ../yumcommands.py:1300 + #, python-format + msgid "Invalid history sub-command, use: %s." + msgstr "" + +-#: ../yummain.py:128 +-msgid "Running" +-msgstr "" +- +-#: ../yummain.py:129 +-msgid "Sleeping" +-msgstr "" +- +-#: ../yummain.py:130 +-msgid "Uninteruptable" +-msgstr "" +- +-#: ../yummain.py:131 +-msgid "Zombie" ++#: ../yumcommands.py:1345 ++msgid "Check for problems in the rpmdb" + msgstr "" + +-#: ../yummain.py:132 +-msgid "Traced/Stopped" +-msgstr "" +- +-#: ../yummain.py:137 +-msgid " The other application is: PackageKit" +-msgstr "" +- +-#: ../yummain.py:139 +-#, python-format +-msgid " The other application is: %s" +-msgstr "" +- +-#: ../yummain.py:142 +-#, python-format +-msgid " Memory : %5s RSS (%5sB VSZ)" +-msgstr "" +- +-#: ../yummain.py:146 +-#, python-format +-msgid " Started: %s - %s ago" +-msgstr "" +- +-#: ../yummain.py:148 +-#, python-format +-msgid " State : %s, pid: %d" +-msgstr "" +- +-#: ../yummain.py:173 ++#: ../yummain.py:102 + msgid "" + "Another app is currently holding the yum lock; waiting for it to exit..." + msgstr "" + +-#: ../yummain.py:201 ../yummain.py:240 ++#: ../yummain.py:130 ../yummain.py:169 + #, python-format + msgid "Error: %s" + msgstr "" + +-#: ../yummain.py:211 ../yummain.py:253 ++#: ../yummain.py:140 ../yummain.py:182 + #, python-format + msgid "Unknown Error(s): Exit Code: %d:" + msgstr "" + + #. Depsolve stage +-#: ../yummain.py:218 ++#: ../yummain.py:147 + msgid "Resolving Dependencies" + msgstr "" + +-#: ../yummain.py:242 ++#: ../yummain.py:173 + msgid " You could try using --skip-broken to work around the problem" + msgstr "" + +-#: ../yummain.py:243 +-msgid "" +-" You could try running: package-cleanup --problems\n" +-" package-cleanup --dupes\n" +-" rpm -Va --nofiles --nodigest" ++#: ../yummain.py:175 ../yummain.py:208 ++msgid " You could try running: rpm -Va --nofiles --nodigest" + msgstr "" + +-#: ../yummain.py:259 ++#: ../yummain.py:188 + msgid "" + "\n" + "Dependencies Resolved" + msgstr "" + +-#: ../yummain.py:326 ++#: ../yummain.py:265 + msgid "" + "\n" + "\n" +@@ -1605,362 +1736,390 @@ msgstr "" + msgid "Matched %s to require for %s" + msgstr "" + +-#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:225 + #, python-format + msgid "Member: %s" + msgstr "" + +-#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 ++#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 + #, python-format + msgid "%s converted to install" + msgstr "" + +-#: ../yum/depsolve.py:245 ++#: ../yum/depsolve.py:246 + #, python-format + msgid "Adding Package %s in mode %s" + msgstr "" + +-#: ../yum/depsolve.py:255 ++#: ../yum/depsolve.py:256 + #, python-format + msgid "Removing Package %s" + msgstr "" + +-#: ../yum/depsolve.py:277 ++#: ../yum/depsolve.py:278 + #, python-format + msgid "%s requires: %s" + msgstr "" + +-#: ../yum/depsolve.py:335 ++#: ../yum/depsolve.py:319 ++#, python-format ++msgid "%s requires %s" ++msgstr "" ++ ++#: ../yum/depsolve.py:346 + msgid "Needed Require has already been looked up, cheating" + msgstr "" + +-#: ../yum/depsolve.py:345 ++#: ../yum/depsolve.py:356 + #, python-format + msgid "Needed Require is not a package name. Looking up: %s" + msgstr "" + +-#: ../yum/depsolve.py:352 ++#: ../yum/depsolve.py:363 + #, python-format + msgid "Potential Provider: %s" + msgstr "" + +-#: ../yum/depsolve.py:375 ++#: ../yum/depsolve.py:386 + #, python-format + msgid "Mode is %s for provider of %s: %s" + msgstr "" + +-#: ../yum/depsolve.py:379 ++#: ../yum/depsolve.py:390 + #, python-format + msgid "Mode for pkg providing %s: %s" + msgstr "" + +-#: ../yum/depsolve.py:383 ++#: ../yum/depsolve.py:394 + #, python-format + msgid "TSINFO: %s package requiring %s marked as erase" + msgstr "" + +-#: ../yum/depsolve.py:396 ++#: ../yum/depsolve.py:407 + #, python-format + msgid "TSINFO: Obsoleting %s with %s to resolve dep." + msgstr "" + +-#: ../yum/depsolve.py:399 ++#: ../yum/depsolve.py:410 + #, python-format + msgid "TSINFO: Updating %s to resolve dep." + msgstr "" + +-#: ../yum/depsolve.py:407 ++#: ../yum/depsolve.py:418 + #, python-format + msgid "Cannot find an update path for dep for: %s" + msgstr "" + +-#: ../yum/depsolve.py:417 +-#, python-format +-msgid "Unresolvable requirement %s for %s" +-msgstr "" +- +-#: ../yum/depsolve.py:440 ++#: ../yum/depsolve.py:449 + #, python-format + msgid "Quick matched %s to require for %s" + msgstr "" + + #. is it already installed? +-#: ../yum/depsolve.py:482 ++#: ../yum/depsolve.py:491 + #, python-format + msgid "%s is in providing packages but it is already installed, removing." + msgstr "" + +-#: ../yum/depsolve.py:498 ++#: ../yum/depsolve.py:507 + #, python-format + msgid "Potential resolving package %s has newer instance in ts." + msgstr "" + +-#: ../yum/depsolve.py:509 ++#: ../yum/depsolve.py:518 + #, python-format + msgid "Potential resolving package %s has newer instance installed." + msgstr "" + +-#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 +-#, python-format +-msgid "Missing Dependency: %s is needed by package %s" +-msgstr "" +- +-#: ../yum/depsolve.py:530 ++#: ../yum/depsolve.py:536 + #, python-format + msgid "%s already in ts, skipping this one" + msgstr "" + +-#: ../yum/depsolve.py:573 ++#: ../yum/depsolve.py:578 + #, python-format + msgid "TSINFO: Marking %s as update for %s" + msgstr "" + +-#: ../yum/depsolve.py:581 ++#: ../yum/depsolve.py:586 + #, python-format + msgid "TSINFO: Marking %s as install for %s" + msgstr "" + +-#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 ++#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 + msgid "Success - empty transaction" + msgstr "" + +-#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 ++#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 + msgid "Restarting Loop" + msgstr "" + +-#: ../yum/depsolve.py:755 ++#: ../yum/depsolve.py:760 + msgid "Dependency Process ending" + msgstr "" + +-#: ../yum/depsolve.py:761 ++#: ../yum/depsolve.py:774 + #, python-format + msgid "%s from %s has depsolving problems" + msgstr "" + +-#: ../yum/depsolve.py:768 ++#: ../yum/depsolve.py:782 + msgid "Success - deps resolved" + msgstr "" + +-#: ../yum/depsolve.py:782 ++#: ../yum/depsolve.py:796 + #, python-format + msgid "Checking deps for %s" + msgstr "" + +-#: ../yum/depsolve.py:865 ++#: ../yum/depsolve.py:874 + #, python-format + msgid "looking for %s as a requirement of %s" + msgstr "" + +-#: ../yum/depsolve.py:1007 ++#: ../yum/depsolve.py:1090 + #, python-format + msgid "Running compare_providers() for %s" + msgstr "" + +-#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 ++#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 + #, python-format + msgid "better arch in po %s" + msgstr "" + +-#: ../yum/depsolve.py:1142 ++#: ../yum/depsolve.py:1218 + #, python-format + msgid "%s obsoletes %s" + msgstr "" + +-#: ../yum/depsolve.py:1154 ++#: ../yum/depsolve.py:1230 + #, python-format + msgid "" + "archdist compared %s to %s on %s\n" + " Winner: %s" + msgstr "" + +-#: ../yum/depsolve.py:1161 ++#: ../yum/depsolve.py:1237 + #, python-format + msgid "common sourcerpm %s and %s" + msgstr "" + +-#: ../yum/depsolve.py:1167 ++#: ../yum/depsolve.py:1241 ++#, python-format ++msgid "base package %s is installed for %s" ++msgstr "" ++ ++#: ../yum/depsolve.py:1247 + #, python-format + msgid "common prefix of %s between %s and %s" + msgstr "" + +-#: ../yum/depsolve.py:1175 ++#: ../yum/depsolve.py:1256 + #, python-format + msgid "Best Order: %s" + msgstr "" + +-#: ../yum/__init__.py:187 ++#: ../yum/__init__.py:192 + msgid "doConfigSetup() will go away in a future version of Yum.\n" + msgstr "" + +-#: ../yum/__init__.py:412 ++#: ../yum/__init__.py:424 + #, python-format + msgid "Repository %r is missing name in configuration, using id" + msgstr "" + +-#: ../yum/__init__.py:450 ++#: ../yum/__init__.py:462 + msgid "plugins already initialised" + msgstr "" + +-#: ../yum/__init__.py:457 ++#: ../yum/__init__.py:469 + msgid "doRpmDBSetup() will go away in a future version of Yum.\n" + msgstr "" + +-#: ../yum/__init__.py:468 ++#: ../yum/__init__.py:480 + msgid "Reading Local RPMDB" + msgstr "" + +-#: ../yum/__init__.py:489 ++#: ../yum/__init__.py:504 + msgid "doRepoSetup() will go away in a future version of Yum.\n" + msgstr "" + +-#: ../yum/__init__.py:509 ++#: ../yum/__init__.py:524 + msgid "doSackSetup() will go away in a future version of Yum.\n" + msgstr "" + +-#: ../yum/__init__.py:539 ++#: ../yum/__init__.py:554 + msgid "Setting up Package Sacks" + msgstr "" + +-#: ../yum/__init__.py:584 ++#: ../yum/__init__.py:599 + #, python-format + msgid "repo object for repo %s lacks a _resetSack method\n" + msgstr "" + +-#: ../yum/__init__.py:585 ++#: ../yum/__init__.py:600 + msgid "therefore this repo cannot be reset.\n" + msgstr "" + +-#: ../yum/__init__.py:590 ++#: ../yum/__init__.py:605 + msgid "doUpdateSetup() will go away in a future version of Yum.\n" + msgstr "" + +-#: ../yum/__init__.py:602 ++#: ../yum/__init__.py:617 + msgid "Building updates object" + msgstr "" + +-#: ../yum/__init__.py:637 ++#: ../yum/__init__.py:652 + msgid "doGroupSetup() will go away in a future version of Yum.\n" + msgstr "" + +-#: ../yum/__init__.py:662 ++#: ../yum/__init__.py:677 + msgid "Getting group metadata" + msgstr "" + +-#: ../yum/__init__.py:688 ++#: ../yum/__init__.py:703 + #, python-format + msgid "Adding group file from repository: %s" + msgstr "" + +-#: ../yum/__init__.py:697 ++#: ../yum/__init__.py:712 + #, python-format + msgid "Failed to add groups file for repository: %s - %s" + msgstr "" + +-#: ../yum/__init__.py:703 ++#: ../yum/__init__.py:718 + msgid "No Groups Available in any repository" + msgstr "" + +-#: ../yum/__init__.py:763 ++#: ../yum/__init__.py:730 ++msgid "Getting pkgtags metadata" ++msgstr "" ++ ++#: ../yum/__init__.py:740 ++#, python-format ++msgid "Adding tags from repository: %s" ++msgstr "" ++ ++#: ../yum/__init__.py:749 ++#, python-format ++msgid "Failed to add Pkg Tags for repository: %s - %s" ++msgstr "" ++ ++#: ../yum/__init__.py:827 + msgid "Importing additional filelist information" + msgstr "" + +-#: ../yum/__init__.py:777 ++#: ../yum/__init__.py:841 + #, python-format + msgid "The program %s%s%s is found in the yum-utils package." + msgstr "" + +-#: ../yum/__init__.py:785 ++#: ../yum/__init__.py:849 + msgid "" + "There are unfinished transactions remaining. You might consider running yum-" + "complete-transaction first to finish them." + msgstr "" + +-#: ../yum/__init__.py:853 ++#. Kind of hacky ++#: ../yum/__init__.py:922 + #, python-format + msgid "Skip-broken round %i" + msgstr "" + +-#: ../yum/__init__.py:906 ++#: ../yum/__init__.py:975 + #, python-format + msgid "Skip-broken took %i rounds " + msgstr "" + +-#: ../yum/__init__.py:907 ++#: ../yum/__init__.py:976 + msgid "" + "\n" + "Packages skipped because of dependency problems:" + msgstr "" + +-#: ../yum/__init__.py:911 ++#: ../yum/__init__.py:980 + #, python-format + msgid " %s from %s" + msgstr "" + +-#: ../yum/__init__.py:1083 ++#: ../yum/__init__.py:1121 ++msgid "Warning: RPMDB altered outside of yum." ++msgstr "" ++ ++#: ../yum/__init__.py:1126 ++msgid "missing requires" ++msgstr "" ++ ++#: ../yum/__init__.py:1127 ++msgid "installed conflict" ++msgstr "" ++ ++#: ../yum/__init__.py:1180 + msgid "" + "Warning: scriptlet or other non-fatal errors occurred during transaction." + msgstr "" + +-#: ../yum/__init__.py:1101 ++#: ../yum/__init__.py:1198 + #, python-format + msgid "Failed to remove transaction file %s" + msgstr "" + + #. maybe a file log here, too + #. but raising an exception is not going to do any good +-#: ../yum/__init__.py:1130 ++#: ../yum/__init__.py:1227 + #, python-format + msgid "%s was supposed to be installed but is not!" + msgstr "" + + #. maybe a file log here, too + #. but raising an exception is not going to do any good +-#: ../yum/__init__.py:1169 ++#: ../yum/__init__.py:1266 + #, python-format + msgid "%s was supposed to be removed but is not!" + msgstr "" + + #. Whoa. What the heck happened? +-#: ../yum/__init__.py:1289 ++#: ../yum/__init__.py:1386 + #, python-format + msgid "Unable to check if PID %s is active" + msgstr "" + + #. Another copy seems to be running. +-#: ../yum/__init__.py:1293 ++#: ../yum/__init__.py:1390 + #, python-format + msgid "Existing lock %s: another copy is running as pid %s." + msgstr "" + + #. Whoa. What the heck happened? +-#: ../yum/__init__.py:1328 ++#: ../yum/__init__.py:1425 + #, python-format + msgid "Could not create lock at %s: %s " + msgstr "" + +-#: ../yum/__init__.py:1373 +-msgid "Package does not match intended download" ++#: ../yum/__init__.py:1470 ++msgid "" ++"Package does not match intended download. Suggestion: run yum clean metadata" + msgstr "" + +-#: ../yum/__init__.py:1388 ++#: ../yum/__init__.py:1486 + msgid "Could not perform checksum" + msgstr "" + +-#: ../yum/__init__.py:1391 ++#: ../yum/__init__.py:1489 + msgid "Package does not match checksum" + msgstr "" + +-#: ../yum/__init__.py:1433 ++#: ../yum/__init__.py:1531 + #, python-format + msgid "package fails checksum but caching is enabled for %s" + msgstr "" + +-#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 ++#: ../yum/__init__.py:1534 ../yum/__init__.py:1563 + #, python-format + msgid "using local copy of %s" + msgstr "" + +-#: ../yum/__init__.py:1477 ++#: ../yum/__init__.py:1575 + #, python-format + msgid "" + "Insufficient space in download directory %s\n" +@@ -1968,347 +2127,357 @@ msgid "" + " * needed %s" + msgstr "" + +-#: ../yum/__init__.py:1526 ++#: ../yum/__init__.py:1624 + msgid "Header is not complete." + msgstr "" + +-#: ../yum/__init__.py:1563 ++#: ../yum/__init__.py:1661 + #, python-format + msgid "" + "Header not in local cache and caching-only mode enabled. Cannot download %s" + msgstr "" + +-#: ../yum/__init__.py:1618 ++#: ../yum/__init__.py:1716 + #, python-format + msgid "Public key for %s is not installed" + msgstr "" + +-#: ../yum/__init__.py:1622 ++#: ../yum/__init__.py:1720 + #, python-format + msgid "Problem opening package %s" + msgstr "" + +-#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1728 + #, python-format + msgid "Public key for %s is not trusted" + msgstr "" + +-#: ../yum/__init__.py:1634 ++#: ../yum/__init__.py:1732 + #, python-format + msgid "Package %s is not signed" + msgstr "" + +-#: ../yum/__init__.py:1672 ++#: ../yum/__init__.py:1770 + #, python-format + msgid "Cannot remove %s" + msgstr "" + +-#: ../yum/__init__.py:1676 ++#: ../yum/__init__.py:1774 + #, python-format + msgid "%s removed" + msgstr "" + +-#: ../yum/__init__.py:1712 ++#: ../yum/__init__.py:1820 + #, python-format + msgid "Cannot remove %s file %s" + msgstr "" + +-#: ../yum/__init__.py:1716 ++#: ../yum/__init__.py:1824 + #, python-format + msgid "%s file %s removed" + msgstr "" + +-#: ../yum/__init__.py:1718 ++#: ../yum/__init__.py:1826 + #, python-format + msgid "%d %s files removed" + msgstr "" + +-#: ../yum/__init__.py:1787 ++#: ../yum/__init__.py:1895 + #, python-format + msgid "More than one identical match in sack for %s" + msgstr "" + +-#: ../yum/__init__.py:1793 ++#: ../yum/__init__.py:1901 + #, python-format + msgid "Nothing matches %s.%s %s:%s-%s from update" + msgstr "" + +-#: ../yum/__init__.py:2026 ++#: ../yum/__init__.py:2180 + msgid "" + "searchPackages() will go away in a future version of " + "Yum. Use searchGenerator() instead. \n" + msgstr "" + +-#: ../yum/__init__.py:2065 ++#: ../yum/__init__.py:2219 + #, python-format + msgid "Searching %d packages" + msgstr "" + +-#: ../yum/__init__.py:2069 ++#: ../yum/__init__.py:2223 + #, python-format + msgid "searching package %s" + msgstr "" + +-#: ../yum/__init__.py:2081 ++#: ../yum/__init__.py:2235 + msgid "searching in file entries" + msgstr "" + +-#: ../yum/__init__.py:2088 ++#: ../yum/__init__.py:2242 + msgid "searching in provides entries" + msgstr "" + +-#: ../yum/__init__.py:2121 ++#: ../yum/__init__.py:2275 + #, python-format + msgid "Provides-match: %s" + msgstr "" + +-#: ../yum/__init__.py:2170 ++#: ../yum/__init__.py:2324 + msgid "No group data available for configured repositories" + msgstr "" + +-#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 +-#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 +-#: ../yum/__init__.py:2655 ++#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405 ++#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497 ++#: ../yum/__init__.py:2814 + #, python-format + msgid "No Group named %s exists" + msgstr "" + +-#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 ++#: ../yum/__init__.py:2386 ../yum/__init__.py:2513 + #, python-format + msgid "package %s was not marked in group %s" + msgstr "" + +-#: ../yum/__init__.py:2279 ++#: ../yum/__init__.py:2433 + #, python-format + msgid "Adding package %s from group %s" + msgstr "" + +-#: ../yum/__init__.py:2283 ++#: ../yum/__init__.py:2437 + #, python-format + msgid "No package named %s available to be installed" + msgstr "" + +-#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2539 + #, python-format + msgid "Package tuple %s could not be found in packagesack" + msgstr "" + +-#: ../yum/__init__.py:2399 ++#: ../yum/__init__.py:2558 + #, python-format + msgid "Package tuple %s could not be found in rpmdb" + msgstr "" + +-#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 ++#: ../yum/__init__.py:2614 ../yum/__init__.py:2664 + msgid "Invalid version flag" + msgstr "" + +-#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 ++#: ../yum/__init__.py:2634 ../yum/__init__.py:2639 + #, python-format + msgid "No Package found for %s" + msgstr "" + +-#: ../yum/__init__.py:2696 ++#: ../yum/__init__.py:2855 + msgid "Package Object was not a package object instance" + msgstr "" + +-#: ../yum/__init__.py:2700 ++#: ../yum/__init__.py:2859 + msgid "Nothing specified to install" + msgstr "" + +-#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 ++#: ../yum/__init__.py:2875 ../yum/__init__.py:3652 + #, python-format + msgid "Checking for virtual provide or file-provide for %s" + msgstr "" + +-#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 +-#: ../yum/__init__.py:3495 ++#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365 ++#: ../yum/__init__.py:3658 + #, python-format + msgid "No Match for argument: %s" + msgstr "" + +-#: ../yum/__init__.py:2798 ++#: ../yum/__init__.py:2957 + #, python-format + msgid "Package %s installed and not available" + msgstr "" + +-#: ../yum/__init__.py:2801 ++#: ../yum/__init__.py:2960 + msgid "No package(s) available to install" + msgstr "" + +-#: ../yum/__init__.py:2813 ++#: ../yum/__init__.py:2972 + #, python-format + msgid "Package: %s - already in transaction set" + msgstr "" + +-#: ../yum/__init__.py:2839 ++#: ../yum/__init__.py:2998 + #, python-format + msgid "Package %s is obsoleted by %s which is already installed" + msgstr "" + +-#: ../yum/__init__.py:2842 ++#: ../yum/__init__.py:3001 + #, python-format + msgid "Package %s is obsoleted by %s, trying to install %s instead" + msgstr "" + +-#: ../yum/__init__.py:2850 ++#: ../yum/__init__.py:3009 + #, python-format + msgid "Package %s already installed and latest version" + msgstr "" + +-#: ../yum/__init__.py:2864 ++#: ../yum/__init__.py:3023 + #, python-format + msgid "Package matching %s already installed. Checking for update." + msgstr "" + + #. update everything (the easy case) +-#: ../yum/__init__.py:2966 ++#: ../yum/__init__.py:3126 + msgid "Updating Everything" + msgstr "" + +-#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 +-#: ../yum/__init__.py:3155 ++#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289 ++#: ../yum/__init__.py:3315 + #, python-format + msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" + msgstr "" + +-#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 ++#: ../yum/__init__.py:3182 ../yum/__init__.py:3362 + #, python-format + msgid "%s" + msgstr "" + +-#: ../yum/__init__.py:3093 ++#: ../yum/__init__.py:3253 + #, python-format + msgid "Package is already obsoleted: %s.%s %s:%s-%s" + msgstr "" + +-#: ../yum/__init__.py:3124 ++#: ../yum/__init__.py:3284 + #, python-format + msgid "Not Updating Package that is obsoleted: %s" + msgstr "" + +-#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 ++#: ../yum/__init__.py:3293 ../yum/__init__.py:3319 + #, python-format + msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" + msgstr "" + +-#: ../yum/__init__.py:3218 ++#: ../yum/__init__.py:3378 + msgid "No package matched to remove" + msgstr "" + +-#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 ++#: ../yum/__init__.py:3412 + #, python-format +-msgid "Cannot open file: %s. Skipping." ++msgid "Cannot open: %s. Skipping." + msgstr "" + +-#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 ++#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598 + #, python-format + msgid "Examining %s: %s" + msgstr "" + +-#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 ++#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601 + #, python-format + msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" + msgstr "" + +-#: ../yum/__init__.py:3270 ++#: ../yum/__init__.py:3431 + #, python-format + msgid "" + "Package %s not installed, cannot update it. Run yum install to install it " + "instead." + msgstr "" + +-#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 ++#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606 + #, python-format + msgid "Excluding %s" + msgstr "" + +-#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3465 + #, python-format + msgid "Marking %s to be installed" + msgstr "" + +-#: ../yum/__init__.py:3310 ++#: ../yum/__init__.py:3471 + #, python-format + msgid "Marking %s as an update to %s" + msgstr "" + +-#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3478 + #, python-format + msgid "%s: does not update installed package." + msgstr "" + +-#: ../yum/__init__.py:3379 ++#: ../yum/__init__.py:3511 ../yum/__init__.py:3595 ++#, python-format ++msgid "Cannot open file: %s. Skipping." ++msgstr "" ++ ++#: ../yum/__init__.py:3541 + msgid "Problem in reinstall: no package matched to remove" + msgstr "" + +-#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 ++#: ../yum/__init__.py:3554 ../yum/__init__.py:3686 + #, python-format + msgid "Package %s is allowed multiple installs, skipping" + msgstr "" + +-#: ../yum/__init__.py:3413 ++#: ../yum/__init__.py:3575 + #, python-format + msgid "Problem in reinstall: no package %s matched to install" + msgstr "" + +-#: ../yum/__init__.py:3515 ++#: ../yum/__init__.py:3678 + msgid "No package(s) available to downgrade" + msgstr "" + +-#: ../yum/__init__.py:3559 ++#: ../yum/__init__.py:3731 + #, python-format + msgid "No Match for available package: %s" + msgstr "" + +-#: ../yum/__init__.py:3565 ++#: ../yum/__init__.py:3738 + #, python-format + msgid "Only Upgrade available on package: %s" + msgstr "" + +-#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 ++#: ../yum/__init__.py:3808 ../yum/__init__.py:3845 + #, python-format + msgid "Failed to downgrade: %s" + msgstr "" + +-#: ../yum/__init__.py:3704 ++#: ../yum/__init__.py:3877 + #, python-format + msgid "Retrieving GPG key from %s" + msgstr "" + +-#: ../yum/__init__.py:3724 ++#: ../yum/__init__.py:3897 + msgid "GPG key retrieval failed: " + msgstr "" + +-#: ../yum/__init__.py:3735 ++#: ../yum/__init__.py:3903 ++#, python-format ++msgid "Invalid GPG Key from %s: %s" ++msgstr "" ++ ++#: ../yum/__init__.py:3912 + #, python-format + msgid "GPG key parsing failed: key does not have value %s" + msgstr "" + +-#: ../yum/__init__.py:3767 ++#: ../yum/__init__.py:3944 + #, python-format + msgid "GPG key at %s (0x%s) is already installed" + msgstr "" + + #. Try installing/updating GPG key +-#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 ++#: ../yum/__init__.py:3949 ../yum/__init__.py:4011 + #, python-format + msgid "Importing GPG key 0x%s \"%s\" from %s" + msgstr "" + +-#: ../yum/__init__.py:3789 ++#: ../yum/__init__.py:3966 + msgid "Not installing key" + msgstr "" + +-#: ../yum/__init__.py:3795 ++#: ../yum/__init__.py:3972 + #, python-format + msgid "Key import failed (code %d)" + msgstr "" + +-#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 ++#: ../yum/__init__.py:3973 ../yum/__init__.py:4032 + msgid "Key imported successfully" + msgstr "" + +-#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 ++#: ../yum/__init__.py:3978 ../yum/__init__.py:4037 + #, python-format + msgid "" + "The GPG keys listed for the \"%s\" repository are already installed but they " +@@ -2316,41 +2485,46 @@ msgid "" + "Check that the correct key URLs are configured for this repository." + msgstr "" + +-#: ../yum/__init__.py:3810 ++#: ../yum/__init__.py:3987 + msgid "Import of key(s) didn't help, wrong key(s)?" + msgstr "" + +-#: ../yum/__init__.py:3829 ++#: ../yum/__init__.py:4006 + #, python-format + msgid "GPG key at %s (0x%s) is already imported" + msgstr "" + +-#: ../yum/__init__.py:3849 ++#: ../yum/__init__.py:4026 + #, python-format + msgid "Not installing key for repo %s" + msgstr "" + +-#: ../yum/__init__.py:3854 ++#: ../yum/__init__.py:4031 + msgid "Key import failed" + msgstr "" + +-#: ../yum/__init__.py:3976 ++#: ../yum/__init__.py:4157 + msgid "Unable to find a suitable mirror." + msgstr "" + +-#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4159 + msgid "Errors were encountered while downloading packages." + msgstr "" + +-#: ../yum/__init__.py:4028 ++#: ../yum/__init__.py:4209 + #, python-format + msgid "Please report this error at %s" + msgstr "" + +-#: ../yum/__init__.py:4052 ++#: ../yum/__init__.py:4233 + msgid "Test Transaction Errors: " + msgstr "" + ++#: ../yum/__init__.py:4334 ++#, python-format ++msgid "Could not set cachedir: %s" ++msgstr "" ++ + #. Mostly copied from YumOutput._outKeyValFill() + #: ../yum/plugins.py:202 + msgid "Loaded plugins: " +@@ -2409,7 +2583,20 @@ msgstr "" + msgid "registration of commands not supported" + msgstr "" + +-#: ../yum/rpmtrans.py:78 ++#: ../yum/rpmsack.py:102 ++msgid "has missing requires of" ++msgstr "" ++ ++#: ../yum/rpmsack.py:105 ++msgid "has installed conflicts" ++msgstr "" ++ ++#: ../yum/rpmsack.py:114 ++#, python-format ++msgid "%s is a duplicate with %s" ++msgstr "" ++ ++#: ../yum/rpmtrans.py:79 + msgid "Repackaging" + msgstr "" + diff --git a/utils.py b/utils.py -index 5456c68..945aa65 100644 +index 2b0f655..dd6b642 100644 --- a/utils.py +++ b/utils.py -@@ -15,14 +15,29 @@ - - import sys - import time -+import exceptions - - import yum - from cli import * -+from yum import Errors - from yum import _ -+from yum import logginglevels - from optparse import OptionGroup - - import yum.plugins as plugins - -+ -+def suppress_keyboard_interrupt_message(): -+ old_excepthook = sys.excepthook -+ -+ def new_hook(type, value, traceback): -+ if type != exceptions.KeyboardInterrupt: -+ old_excepthook(type, value, traceback) -+ else: -+ pass -+ -+ sys.excepthook = new_hook -+ - class YumUtilBase(YumBaseCli): - def __init__(self,name,ver,usage): - YumBaseCli.__init__(self) -@@ -32,7 +47,7 @@ class YumUtilBase(YumBaseCli): - self._utilVer = ver - self._option_group = OptionGroup(self._parser, "%s options" % self._utilName,"") - self._parser.add_option_group(self._option_group) -- -+ suppress_keyboard_interrupt_message() - - def getOptionParser(self): - return self._parser -@@ -46,7 +61,7 @@ class YumUtilBase(YumBaseCli): - while True: - try: - self.doLock() -- except yum.Errors.LockError, e: -+ except Errors.LockError, e: - if "%s" %(e.msg,) != lockerr: - lockerr = "%s" %(e.msg,) - self.logger.critical(lockerr) -@@ -83,7 +98,7 @@ class YumUtilBase(YumBaseCli): - pc.enabled_plugins = self._parser._splitArg(opts.enableplugins) - self.conf - -- except yum.Errors.ConfigError, e: -+ except Errors.ConfigError, e: - self.logger.critical(_('Config Error: %s'), e) - sys.exit(1) - except ValueError, e: -@@ -108,10 +123,63 @@ class YumUtilBase(YumBaseCli): - self._getRpmDB() - self._getRepos(doSetup = True) - self._getSacks() -- except yum.Errors.YumBaseError, msg: -+ except Errors.YumBaseError, msg: - self.logger.critical(str(msg)) - sys.exit(1) -- -+ -+ def doUtilTransaction(self): -+ def exUserCancel(): -+ self.logger.critical(_('\n\nExiting on user cancel')) -+ if unlock(): return 200 -+ return 1 -+ -+ def exIOError(e): -+ if e.errno == 32: -+ self.logger.critical(_('\n\nExiting on Broken Pipe')) -+ else: -+ self.logger.critical(_('\n\n%s') % str(e)) -+ if unlock(): return 200 -+ return 1 -+ -+ def exPluginExit(e): -+ '''Called when a plugin raises PluginYumExit. -+ -+ Log the plugin's exit message if one was supplied. -+ ''' # ' xemacs hack -+ exitmsg = str(e) -+ if exitmsg: -+ self.logger.warn('\n\n%s', exitmsg) -+ if unlock(): return 200 -+ return 1 -+ -+ def exFatal(e): -+ self.logger.critical('\n\n%s', to_unicode(e.value)) -+ if unlock(): return 200 -+ return 1 -+ -+ def unlock(): -+ try: -+ self.closeRpmDB() -+ self.doUnlock() -+ except Errors.LockError, e: -+ return 200 -+ return 0 -+ -+ try: -+ return_code = self.doTransaction() -+ except plugins.PluginYumExit, e: -+ return exPluginExit(e) -+ except Errors.YumBaseError, e: -+ return exFatal(e) -+ except KeyboardInterrupt: -+ return exUserCancel() -+ except IOError, e: -+ return exIOError(e) -+ -+ self.verbose_logger.log(logginglevels.INFO_2, _('Complete!')) -+ if unlock(): return 200 -+ return return_code -+ - def main(): - name = 'testutil' - ver = '0.1' -diff --git a/yum.spec b/yum.spec -index 5145061..5652586 100644 ---- a/yum.spec -+++ b/yum.spec -@@ -78,6 +78,7 @@ exit 0 - %defattr(-, root, root) - %doc README AUTHORS COPYING TODO INSTALL ChangeLog PLUGINS - %config(noreplace) %{_sysconfdir}/yum/yum.conf -+%config(noreplace) %{_sysconfdir}/yum/version-groups.conf - %dir %{_sysconfdir}/%{name} - %dir %{_sysconfdir}/yum/repos.d - %config %{_sysconfdir}/logrotate.d/%{name} -diff --git a/yum/Errors.py b/yum/Errors.py -index 6f0ffe4..3a5aca9 100644 ---- a/yum/Errors.py -+++ b/yum/Errors.py -@@ -101,6 +101,9 @@ class RepoMDError(YumBaseError): - class PackageSackError(YumBaseError): - pass - -+class RpmDBError(YumBaseError): -+ pass -+ - class CompsException(YumBaseError): - pass - +@@ -92,7 +92,7 @@ def get_process_info(pid): + ps['start_time'] = boot_time + jiffies_to_seconds(ps_stat[21]) + ps['state'] = {'R' : _('Running'), + 'S' : _('Sleeping'), +- 'D' : _('Uninteruptable'), ++ 'D' : _('Uninterruptible'), + 'Z' : _('Zombie'), + 'T' : _('Traced/Stopped') + }.get(ps_stat[2], _('Unknown')) diff --git a/yum/__init__.py b/yum/__init__.py -index 8211c70..6e06005 100644 +index d0bd4cc..06f6156 100644 --- a/yum/__init__.py +++ b/yum/__init__.py -@@ -32,9 +32,9 @@ import logging.config - import operator - import gzip +@@ -1467,7 +1467,8 @@ class YumBase(depsolve.Depsolve): + os.unlink(fo) --import yum.i18n --_ = yum.i18n._ --P_ = yum.i18n.P_ -+import i18n -+_ = i18n._ -+P_ = i18n.P_ + if raiseError: +- raise URLGrabError(-1, _('Package does not match intended download')) ++ msg = _('Package does not match intended download. Suggestion: run yum clean metadata') ++ raise URLGrabError(-1, msg) + else: + return False - import config - from config import ParsingError, ConfigParser -@@ -57,14 +57,15 @@ import plugins - import logginglevels - import yumRepo - import callbacks -+import history - - import warnings - warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning) - - from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage, comparePoEVR - from constants import * --from yum.rpmtrans import RPMTransaction,SimpleCliCallBack --from yum.i18n import to_unicode -+from rpmtrans import RPMTransaction,SimpleCliCallBack -+from i18n import to_unicode, to_str - - import string - -@@ -137,6 +138,7 @@ class YumBase(depsolve.Depsolve): - self._rpmdb = None - self._up = None - self._comps = None -+ self._history = None - self._pkgSack = None - self._lockfile = None - self.skipped_packages = [] # packages skip by the skip-broken code -@@ -153,6 +155,7 @@ class YumBase(depsolve.Depsolve): - self.arch = ArchStorage() - self.preconf = _YumPreBaseConf() - -+ self.run_with_package_names = set() - - def __del__(self): - self.close() -@@ -160,6 +163,10 @@ class YumBase(depsolve.Depsolve): - self.doUnlock() - - def close(self): -+ # We don't want to create the object, so we test if it's been created -+ if self._history is not None: -+ self.history.close() -+ - if self._repos: - self._repos.close() - -@@ -272,6 +279,10 @@ class YumBase(depsolve.Depsolve): - # worthless. So we delete it, and thus. it'll raise AttributeError - del self.preconf - -+ # Packages used to run yum... -+ for pkgname in self.conf.history_record_packages: -+ self.run_with_package_names.add(pkgname) -+ - # run the postconfig plugin hook - self.plugins.run('postconfig') - self.yumvar = self.conf.yumvar -@@ -694,6 +705,13 @@ class YumBase(depsolve.Depsolve): - self._comps.compile(self.rpmdb.simplePkgList()) - self.verbose_logger.debug('group time: %0.3f' % (time.time() - group_st)) - return self._comps -+ -+ def _getHistory(self): -+ """auto create the history object that to acess/append the transaction -+ history information. """ -+ if self._history is None: -+ self._history = yum.history.YumHistory(root=self.conf.installroot) -+ return self._history - - # properties so they auto-create themselves with defaults - repos = property(fget=lambda self: self._getRepos(), -@@ -718,6 +736,9 @@ class YumBase(depsolve.Depsolve): - comps = property(fget=lambda self: self._getGroups(), - fset=lambda self, value: self._setGroups(value), - fdel=lambda self: setattr(self, "_comps", None)) -+ history = property(fget=lambda self: self._getHistory(), -+ fset=lambda self, value: setattr(self, "_history",value), -+ fdel=lambda self: setattr(self, "_history", None)) - - - def doSackFilelistPopulate(self): -@@ -879,6 +900,7 @@ class YumBase(depsolve.Depsolve): - self.verbose_logger.debug('SKIPBROKEN: sanity check the current transaction' ) - self.tsInfo.resetResolved(hard=True) - self._checkMissingObsoleted() # This is totally insane, but needed :( -+ self._checkUpdatedLeftovers() # Cleanup updated leftovers - rescode, restring = self.resolveDeps() - if rescode != 1: - self.verbose_logger.debug(_("Skip-broken took %i rounds "), count) -@@ -901,7 +923,7 @@ class YumBase(depsolve.Depsolve): - then the TS_OBSOLETED can get removed from the transaction - so we must make sure that they, exist and else create them - """ -- for txmbr in self.tsInfo: -+ for txmbr in self.tsInfo.getMembersWithState(None, [TS_OBSOLETING,TS_OBSOLETED]): - for pkg in txmbr.obsoletes: - if not self.tsInfo.exists(pkg.pkgtup): - obs = self.tsInfo.addObsoleted(pkg,txmbr.po) -@@ -914,6 +936,21 @@ class YumBase(depsolve.Depsolve): - self.verbose_logger.debug('SKIPBROKEN: Remove extra obsoleted %s (%s)' % (txmbr.po,pkg) ) - self.tsInfo.remove(txmbr.po.pkgtup) - -+ def _checkUpdatedLeftovers(self): -+ """ -+ If multiple packages is updated the same package -+ and this package get removed because of an dep issue -+ then make sure that all the TS_UPDATED get removed. -+ """ -+ for txmbr in self.tsInfo.getMembersWithState(None, [TS_UPDATED]): -+ for pkg in txmbr.updated_by: -+ # check if the updating txmbr is in the transaction -+ # else remove the updated txmbr -+ # it clean out some really wierd cases with dupes installed on the system -+ if not self.tsInfo.exists(pkg.pkgtup): -+ self.verbose_logger.debug('SKIPBROKEN: Remove extra updated %s (%s)' % (txmbr.po,pkg) ) -+ self.tsInfo.remove(txmbr.po.pkgtup) -+ - def _getPackagesToRemoveAllArch(self,po): - ''' get all compatible arch packages in pkgSack''' - pkgs = [] -@@ -1013,6 +1050,18 @@ class YumBase(depsolve.Depsolve): - - self.plugins.run('pretrans') - -+ using_pkgs_pats = list(self.run_with_package_names) -+ using_pkgs = self.rpmdb.returnPackages(patterns=using_pkgs_pats) -+ rpmdbv = self.rpmdb.simpleVersion(main_only=True)[0] -+ lastdbv = self.history.last() -+ if lastdbv is not None: -+ lastdbv = lastdbv.end_rpmdbversion -+ if lastdbv is not None and rpmdbv != lastdbv: -+ errstring = _('Warning: RPMDB has been altered since the last yum transaction.') -+ self.logger.warning(errstring) -+ if self.conf.history_record: -+ self.history.beg(rpmdbv, using_pkgs, list(self.tsInfo)) -+ - errors = self.ts.run(cb.callback, '') - # ts.run() exit codes are, hmm, "creative": None means all ok, empty - # list means some errors happened in the transaction and non-empty -@@ -1028,6 +1077,9 @@ class YumBase(depsolve.Depsolve): - self.verbose_logger.debug(errstring) - resultobject.return_code = 1 - else: -+ if self.conf.history_record: -+ herrors = [to_unicode(to_str(x)) for x in errors] -+ self.history.end(rpmdbv, 2, errors=herrors) - raise Errors.YumBaseError, errors - - if not self.conf.keepcache: -@@ -1044,10 +1096,10 @@ class YumBase(depsolve.Depsolve): - self.rpmdb.dropCachedData() # drop out the rpm cache so we don't step on bad hdr indexes - self.plugins.run('posttrans') - # sync up what just happened versus what is in the rpmdb -- self.verifyTransaction() -+ self.verifyTransaction(resultobject) - return resultobject - -- def verifyTransaction(self): -+ def verifyTransaction(self, resultobject=None): - """checks that the transaction did what we expected it to do. Also - propagates our external yumdb info""" +@@ -2591,30 +2592,7 @@ class YumBase(depsolve.Depsolve): + """Pass in a generic [build]require string and this function will + pass back the packages it finds providing that dep.""" -@@ -1071,7 +1123,7 @@ class YumBase(depsolve.Depsolve): - self.logger.critical(_('%s was supposed to be installed' \ - ' but is not!' % txmbr.po)) - continue -- po = self.rpmdb.searchPkgTuple(txmbr.pkgtup)[0] -+ po = self.getInstalledPackageObject(txmbr.pkgtup) - rpo = txmbr.po - po.yumdb_info.from_repo = rpo.repoid - po.yumdb_info.reason = txmbr.reason -@@ -1115,6 +1167,11 @@ class YumBase(depsolve.Depsolve): - else: - self.verbose_logger.log(logginglevels.DEBUG_2, 'What is this? %s' % txmbr.po) - -+ if self.conf.history_record: -+ ret = -1 -+ if resultobject is not None: -+ ret = resultobject.return_code -+ self.history.end(self.rpmdb.simpleVersion(main_only=True)[0], ret) - self.rpmdb.dropCachedData() - - def costExcludePackages(self): -@@ -1259,7 +1316,10 @@ class YumBase(depsolve.Depsolve): - os.makedirs(lockdir, mode=0755) - fd = os.open(filename, os.O_EXCL|os.O_CREAT|os.O_WRONLY, mode) - except OSError, msg: -- if not msg.errno == errno.EEXIST: raise msg -+ if not msg.errno == errno.EEXIST: -+ # Whoa. What the heck happened? -+ errmsg = _('Could not create lock at %s: %s ') % (filename, str(msg)) -+ raise Errors.LockError(msg.errno, errmsg, contents) - return 0 - else: - os.write(fd, contents) -@@ -1783,7 +1843,7 @@ class YumBase(depsolve.Depsolve): - for (pkgtup, instTup) in self.up.getObsoletesTuples(): - (n,a,e,v,r) = pkgtup - pkgs = self.pkgSack.searchNevra(name=n, arch=a, ver=v, rel=r, epoch=e) -- instpo = self.rpmdb.searchPkgTuple(instTup)[0] # the first one -+ instpo = self.getInstalledPackageObject(instTup) - for po in pkgs: - obsoletes.append(po) - obsoletesTuples.append((po, instpo)) -@@ -1986,10 +2046,7 @@ class YumBase(depsolve.Depsolve): - canBeFile = True - else: - isglob = True -- if arg[0] != '/' and not misc.re_glob(arg[0]): -- canBeFile = False -- else: -- canBeFile = True -+ canBeFile = misc.re_filename(arg) - - if not isglob: - usedDepString = True -@@ -2326,11 +2383,16 @@ class YumBase(depsolve.Depsolve): - return result - - def getInstalledPackageObject(self, pkgtup): -- """returns a YumInstallPackage object for the pkgtup specified""" -- warnings.warn(_('getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n'), -- Errors.YumFutureDeprecationWarning, stacklevel=2) +- results = [] +- # parse the string out +- # either it is 'dep (some operator) e:v-r' +- # or /file/dep +- # or packagename +- # or a full dep tuple +- if type(depstring) == types.TupleType: +- (depname, depflags, depver) = depstring +- else: +- depname = depstring +- depflags = None +- depver = None - -- po = self.rpmdb.searchPkgTuple(pkgtup)[0] # take the first one -+ """ Returns a YumInstallPackage object for the pkgtup specified, or -+ raises an exception. You should use this instead of -+ searchPkgTuple() if you are assuming there is a value. """ -+ -+ pkgs = self.rpmdb.searchPkgTuple(pkgtup) -+ if len(pkgs) == 0: -+ raise Errors.RpmDBError, _('Package tuple %s could not be found in rpmdb') % str(pkgtup) -+ -+ # Dito. FIXME from getPackageObject() for len() > 1 ... :) -+ po = pkgs[0] # take the first one - return po +- if depstring[0] != '/': +- # not a file dep - look at it for being versioned +- dep_split = depstring.split() +- if len(dep_split) == 3: +- depname, flagsymbol, depver = dep_split +- if not flagsymbol in SYMBOLFLAGS: +- raise Errors.YumBaseError, _('Invalid version flag') +- depflags = SYMBOLFLAGS[flagsymbol] +- +- sack = self.whatProvides(depname, depflags, depver) +- results = sack.returnPackages() ++ results = self.pkgSack.searchProvides(depstring) + return results - def gpgKeyCheck(self): -@@ -2594,7 +2656,7 @@ class YumBase(depsolve.Depsolve): - if not isinstance(po, YumLocalPackage): - for (obstup, inst_tup) in self.up.getObsoletersTuples(name=po.name): - if po.pkgtup == obstup: -- installed_pkg = self.rpmdb.searchPkgTuple(inst_tup)[0] -+ installed_pkg = self.getInstalledPackageObject(inst_tup) - yield installed_pkg - else: - for (obs_n, obs_f, (obs_e, obs_v, obs_r)) in po.obsoletes: -@@ -2898,7 +2960,7 @@ class YumBase(depsolve.Depsolve): - topkg = self._test_loop(obsoleting_pkg, self._pkg2obspkg) - if topkg is not None: - obsoleting_pkg = topkg -- installed_pkg = self.rpmdb.searchPkgTuple(installed)[0] -+ installed_pkg = self.getInstalledPackageObject(installed) - txmbr = self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg) - self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg) - if requiringPo: -@@ -3059,7 +3121,7 @@ class YumBase(depsolve.Depsolve): - updated) - - else: -- updated_pkg = self.rpmdb.searchPkgTuple(updated)[0] -+ updated_pkg = self.getInstalledPackageObject(updated) - txmbr = self.tsInfo.addUpdate(available_pkg, updated_pkg) - if requiringPo: - txmbr.setAsDep(requiringPo) -@@ -3426,6 +3488,7 @@ class YumBase(depsolve.Depsolve): - if not apkgs: - # Do we still want to return errors here? - # We don't in the cases below, so I didn't here... -+ pkgs = [] - if 'pattern' in kwargs: - pkgs = self.rpmdb.returnPackages(patterns=[kwargs['pattern']], - ignore_case=False) -@@ -3534,6 +3597,84 @@ class YumBase(depsolve.Depsolve): - return returndict - -+ def history_redo(self, transaction): -+ """ Given a valid historical transaction object, try and repeat -+ that transaction. """ -+ # NOTE: This is somewhat basic atm. ... see comment in undo. -+ old_conf_obs = self.conf.obsoletes -+ self.conf.obsoletes = False -+ done = False -+ for pkg in transaction.trans_data: -+ if pkg.state == 'Reinstall': -+ if self.reinstall(pkgtup=pkg.pkgtup): -+ done = True -+ for pkg in transaction.trans_data: -+ if pkg.state == 'Downgrade': -+ try: -+ if self.downgrade(pkgtup=pkg.pkgtup): -+ done = True -+ except yum.Errors.DowngradeError: -+ self.logger.critical(_('Failed to downgrade: %s'), pkg) -+ for pkg in transaction.trans_data: -+ if pkg.state == 'Update': -+ if self.update(pkgtup=pkg.pkgtup): -+ done = True -+ for pkg in transaction.trans_data: -+ if pkg.state in ('Install', 'True-Install', 'Obsoleting'): -+ if self.install(pkgtup=pkg.pkgtup): -+ done = True -+ for pkg in transaction.trans_data: -+ if pkg.state == 'Erase': -+ if self.remove(pkgtup=pkg.pkgtup): -+ done = True -+ self.conf.obsoletes = old_conf_obs -+ return done -+ -+ def history_undo(self, transaction): -+ """ Given a valid historical transaction object, try and undo -+ that transaction. """ -+ # NOTE: This is somewhat basic atm. ... for instance we don't check -+ # that we are going from the old new version. However it's still -+ # better than the RHN rollback code, and people pay for that :). -+ # We turn obsoletes off because we want the specific versions of stuff -+ # from history ... even if they've been obsoleted since then. -+ old_conf_obs = self.conf.obsoletes -+ self.conf.obsoletes = False -+ done = False -+ for pkg in transaction.trans_data: -+ if pkg.state == 'Reinstall': -+ if self.reinstall(pkgtup=pkg.pkgtup): -+ done = True -+ for pkg in transaction.trans_data: -+ if pkg.state == 'Updated': -+ try: -+ if self.downgrade(pkgtup=pkg.pkgtup): -+ done = True -+ except yum.Errors.DowngradeError: -+ self.logger.critical(_('Failed to downgrade: %s'), pkg) -+ for pkg in transaction.trans_data: -+ if pkg.state == 'Downgraded': -+ if self.update(pkgtup=pkg.pkgtup): -+ done = True -+ for pkg in transaction.trans_data: -+ if pkg.state == 'Obsoleting': -+ if self.remove(pkgtup=pkg.pkgtup): -+ done = True -+ for pkg in transaction.trans_data: -+ if pkg.state in ('Install', 'True-Install'): -+ if self.remove(pkgtup=pkg.pkgtup): -+ done = True -+ for pkg in transaction.trans_data: -+ if pkg.state == 'Obsoleted': -+ if self.install(pkgtup=pkg.pkgtup): -+ done = True -+ for pkg in transaction.trans_data: -+ if pkg.state == 'Erase': -+ if self.install(pkgtup=pkg.pkgtup): -+ done = True -+ self.conf.obsoletes = old_conf_obs -+ return done -+ - def _retrievePublicKey(self, keyurl, repo=None): - """ - Retrieve a key file -@@ -3726,6 +3867,7 @@ class YumBase(depsolve.Depsolve): - - if True: # Don't to magic sorting, yet - ret_mid.append(pkg) -+ continue - - if pkg.yumdb_info.installonly == 'remove-first': - ret_beg.append(pkg) -diff --git a/yum/comps.py b/yum/comps.py -index 2048c77..d310b1b 100755 ---- a/yum/comps.py -+++ b/yum/comps.py -@@ -26,7 +26,7 @@ from Errors import CompsException - # switch all compsexceptions to grouperrors after api break - import fnmatch - import re --from yum.i18n import to_unicode -+from i18n import to_unicode - from misc import get_my_lang_code - - lang_attr = '{http://www.w3.org/XML/1998/namespace}lang' -diff --git a/yum/config.py b/yum/config.py -index 2f057c3..63b3d17 100644 ---- a/yum/config.py -+++ b/yum/config.py -@@ -703,6 +703,8 @@ class YumConf(StartupConf): - sslclientcert = Option() - sslclientkey = Option() - -+ history_record = BoolOption(True) -+ history_record_packages = ListOption(['yum', 'rpm', 'yum-metadata-parser']) - - _reposlist = [] - -@@ -763,6 +765,11 @@ class RepoConf(BaseConfig): - sslclientkey = Inherit(YumConf.sslclientkey) - - -+class VersionGroupConf(BaseConfig): -+ pkglist = ListOption() -+ run_with_packages = BoolOption(False) -+ -+ - def readStartupConfig(configfile, root): - ''' - Parse Yum's main configuration file and return a StartupConf instance. -@@ -849,6 +856,20 @@ def readMainConfig(startupconf): - - return yumconf - -+def readVersionGroupsConfig(configfile="/etc/yum/version-groups.conf"): -+ parser = ConfigParser() -+ confpp_obj = ConfigPreProcessor(configfile) -+ try: -+ parser.readfp(confpp_obj) -+ except ParsingError, e: -+ raise Errors.ConfigError("Parsing file failed: %s" % e) -+ ret = {} -+ for section in parser.sections(): -+ ret[section] = VersionGroupConf() -+ ret[section].populate(parser, section) -+ return ret -+ -+ - def getOption(conf, section, name, option): - '''Convenience function to retrieve a parsed and converted value from a - ConfigParser. -@@ -893,7 +914,13 @@ def _getsysver(installroot, distroverpkg): - idx = ts.dbMatch('provides', distroverpkg) - except TypeError, e: - # This is code for "cannot open rpmdb" -- raise Errors.YumBaseError("Error: " + e.message) -+ # this is for pep 352 compliance on python 2.6 and above :( -+ if sys.hexversion < 0x02050000: -+ if hasattr(e,'message'): -+ raise Errors.YumBaseError("Error: " + str(e.message)) -+ else: -+ raise Errors.YumBaseError("Error: " + str(e)) -+ raise Errors.YumBaseError("Error: " + str(e)) - # we're going to take the first one - if there is more than one of these - # then the user needs a beating - if idx.count() == 0: +@@ -4101,7 +4079,7 @@ class YumBase(depsolve.Depsolve): + numleft -= 1 + + for po,rel in toremove: +- txmbr = self.tsInfo.addErase(toremove) ++ txmbr = self.tsInfo.addErase(po) + # Add a dep relation to the new version of the package, causing this one to be erased + # this way skipbroken, should clean out the old one, if the new one is skipped + txmbr.depends_on.append(rel) diff --git a/yum/depsolve.py b/yum/depsolve.py -index d6b1b02..c5baacb 100644 +index c1e90c5..11c9f29 100644 --- a/yum/depsolve.py +++ b/yum/depsolve.py -@@ -159,13 +159,6 @@ class Depsolve(object): +@@ -158,30 +158,7 @@ class Depsolve(object): self.verbose_logger.log(logginglevels.DEBUG_1, _('Searching pkgSack for dep: %s'), name) -- # we need to check the name - if it doesn't match: -- # /etc/* bin/* or /usr/lib/sendmail then we should fetch the -- # filelists.xml for all repos to make the searchProvides more complete. -- if name[0] == '/': -- if not misc.re_primary_filename(name): -- self.doSackFilelistPopulate() -- - pkgs = self.pkgSack.searchProvides(name) +- pkgs = self.pkgSack.searchProvides(name) +- +- +- if flags == 0: +- flags = None +- if type(version) in (types.StringType, types.NoneType, types.UnicodeType): +- (r_e, r_v, r_r) = rpmUtils.miscutils.stringToVersion(version) +- elif type(version) in (types.TupleType, types.ListType): # would this ever be a ListType? +- (r_e, r_v, r_r) = version +- +- defSack = ListPackageSack() # holder for items definitely providing this dep +- +- for po in pkgs: +- self.verbose_logger.log(logginglevels.DEBUG_2, +- _('Potential match for %s from %s'), name, po) +- if misc.re_filename(name) and r_v is None: +- # file dep add all matches to the defSack +- defSack.addPackage(po) +- continue +- +- if po.checkPrco('provides', (name, flags, (r_e, r_v, r_r))): +- defSack.addPackage(po) +- self.verbose_logger.debug(_('Matched %s to require for %s'), po, name) +- ++ defSack = ListPackageSack(self.pkgSack.searchProvides((name, flags, version))) + return defSack - -@@ -181,7 +174,7 @@ class Depsolve(object): - for po in pkgs: - self.verbose_logger.log(logginglevels.DEBUG_2, - _('Potential match for %s from %s'), name, po) -- if name[0] == '/' and r_v is None: -+ if misc.re_filename(name) and r_v is None: - # file dep add all matches to the defSack - defSack.addPackage(po) - continue -@@ -1083,7 +1076,16 @@ class Depsolve(object): - # could play a part ... this probably needs a better fix. - newest = sorted(rpmdbpkgs)[-1] - if newest.verLT(pkg): -- ipkgresults[pkg] = 0 -+ # give pkgs which are updates just a SLIGHT edge -+ # we should also make sure that any pkg -+ # we are giving an edge to is not obsoleted by -+ # something else in the transaction. :( -+ # there are many ways I hate this - this is but one -+ ipkgresults[pkg] = 5 -+ else: -+ # just b/c they're not installed pkgs doesn't mean they should -+ # be ignored entirely. Just not preferred -+ ipkgresults[pkg] = 0 - - # This is probably only for "renames". What happens is that pkgA-1 gets - # obsoleted by pkgB but pkgB requires pkgA-2, now _if_ the pkgA txmbr + def allowedMultipleInstalls(self, po): diff --git a/yum/history.py b/yum/history.py -new file mode 100644 -index 0000000..18d2a41 ---- /dev/null +index 8de7459..2707cac 100644 +--- a/yum/history.py +++ b/yum/history.py -@@ -0,0 +1,639 @@ -+#!/usr/bin/python -t -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU Library General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# Copyright 2009 Red Hat -+# -+# James Antill +@@ -22,7 +22,7 @@ import os, os.path + import glob + from weakref import proxy as weakref + +-from sqlutils import sqlite, executeSQL ++from sqlutils import sqlite, executeSQL, sql_esc, sql_esc_glob + import yum.misc as misc + import yum.constants + from yum.constants import * +@@ -56,30 +56,6 @@ _sttxt2stcode = {'Update' : TS_UPDATE, + 'Obsoleting' : TS_OBSOLETING} + + # ---- horrible Copy and paste from sqlitesack ---- +-def _sql_esc(pattern): +- """ Apply SQLite escaping, if needed. Returns pattern and esc. """ +- esc = '' +- if "_" in pattern or "%" in pattern: +- esc = ' ESCAPE "!"' +- pattern = pattern.replace("!", "!!") +- pattern = pattern.replace("%", "!%") +- pattern = pattern.replace("_", "!_") +- return (pattern, esc) +- +-def _sql_esc_glob(patterns): +- """ Converts patterns to SQL LIKE format, if required (or gives up if +- not possible). """ +- ret = [] +- for pattern in patterns: +- if '[' in pattern: # LIKE only has % and _, so [abc] can't be done. +- return [] # So Load everything +- +- # Convert to SQL LIKE format +- (pattern, esc) = _sql_esc(pattern) +- pattern = pattern.replace("*", "%") +- pattern = pattern.replace("?", "_") +- ret.append((pattern, esc)) +- return ret + + def _setupHistorySearchSQL(patterns=None, ignore_case=False): + """Setup need_full and patterns for _yieldSQLDataList, also see if +@@ -104,7 +80,7 @@ def _setupHistorySearchSQL(patterns=None, ignore_case=False): + if len(patterns) > pat_max: + patterns = [] + if ignore_case: +- patterns = _sql_esc_glob(patterns) ++ patterns = sql_esc_glob(patterns) + else: + tmp = [] + need_glob = False +diff --git a/yum/i18n.py b/yum/i18n.py +index 6b9eab5..9889bf6 100755 +--- a/yum/i18n.py ++++ b/yum/i18n.py +@@ -452,7 +452,16 @@ def to_str(obj): + obj = str(obj) + return obj + +- ++def str_eq(a, b): ++ """ convert between unicode and not and compare them, w/o warning or being annoying""" ++ if isinstance(a, unicode) == isinstance(b, unicode): ++ if a == b: # stupid python... ++ return True ++ elif to_utf8(a) == to_utf8(b): ++ return True ++ ++ return False ++ + try: + ''' + Setup the yum translation domain and make _() and P_() translation wrappers +diff --git a/yum/misc.py b/yum/misc.py +index d63993b..66b0653 100644 +--- a/yum/misc.py ++++ b/yum/misc.py +@@ -11,6 +11,7 @@ import struct + import re + import errno + import Errors ++import constants + import pgpmsg + import tempfile + import glob +@@ -18,6 +19,7 @@ import pwd + import fnmatch + import bz2 + import gzip ++from rpmUtils.miscutils import stringToVersion, flagToString + from stat import * + try: + import gpgme +@@ -77,6 +79,8 @@ def unshare_data(): + _re_compiled_glob_match = None + def re_glob(s): + """ Tests if a string is a shell wildcard. """ ++ # TODO/FIXME maybe consider checking if it is a stringsType before going on - otherwise ++ # returning None + global _re_compiled_glob_match + if _re_compiled_glob_match is None: + _re_compiled_glob_match = re.compile('[*?]|\[.+\]').search +@@ -628,7 +632,40 @@ def prco_tuple_to_string(prcoTuple): + return name + + return '%s %s %s' % (name, flags[flag], version_tuple_to_string(evr)) + -+import time -+import os, os.path -+import glob -+from weakref import proxy as weakref ++def string_to_prco_tuple(prcoString): ++ """returns a prco tuple (name, flags, (e, v, r)) for a string""" + -+from sqlutils import sqlite, executeSQL -+import misc -+from constants import * -+from packages import YumInstalledPackage, YumAvailablePackage, PackageObject -+from i18n import to_unicode ++ if type(prcoString) == types.TupleType: ++ (n, f, v) = prcoString ++ else: ++ n = prcoString ++ f = v = None ++ ++ if n[0] != '/': ++ # not a file dep - look at it for being versioned ++ prco_split = n.split() ++ if len(prco_split) == 3: ++ n, f, v = prco_split + ++ # now we have 'n, f, v' where f and v could be None and None ++ if f is not None and f not in constants.LETTERFLAGS: ++ if f not in constants.SYMBOLFLAGS: ++ try: ++ f = flagToString(int(f)) ++ except (ValueError,TypeError), e: ++ raise Errors.MiscError, 'Invalid version flag: %s' % f ++ else: ++ f = constants.SYMBOLFLAGS[f] + -+_history_dir = '/var/lib/yum/history' ++ if type(v) in (types.StringType, types.NoneType, types.UnicodeType): ++ (prco_e, prco_v, prco_r) = stringToVersion(v) ++ elif type(v) in (types.TupleType, types.ListType): ++ (prco_e, prco_v, prco_r) = v ++ ++ #now we have (n, f, (e, v, r)) for the thing specified ++ return (n, f, (prco_e, prco_v, prco_r)) + -+# NOTE: That we don't list TS_FAILED, because pkgs shouldn't go into the -+# transaction with that. And if they come out with that we don't want to -+# match them to anything anyway. -+_stcode2sttxt = {TS_UPDATE : 'Update', -+ TS_UPDATED : 'Updated', -+ TS_ERASE: 'Erase', -+ TS_INSTALL: 'Install', -+ TS_TRUEINSTALL : 'True-Install', -+ TS_OBSOLETED: 'Obsoleted', -+ TS_OBSOLETING: 'Obsoleting'} + def refineSearchPattern(arg): + """Takes a search string from the cli for Search or Provides + and cleans it up so it doesn't make us vomit""" +diff --git a/yum/packageSack.py b/yum/packageSack.py +index 95b278a..6e986a4 100644 +--- a/yum/packageSack.py ++++ b/yum/packageSack.py +@@ -702,42 +702,50 @@ class PackageSack(PackageSackBase): + result[po] = hits + return result + ++ def searchPrco(self, name, prcotype): ++ self._checkIndexes(failure='build') ++ prcodict = getattr(self, prcotype) ++ (n,f,(e,v,r)) = misc.string_to_prco_tuple(name) ++ ++ basic_results = [] ++ results = [] ++ if n in prcodict: ++ basic_results.extend(prcodict[n]) + -+_sttxt2stcode = {'Update' : TS_UPDATE, -+ 'Updated' : TS_UPDATED, -+ 'Erase' : TS_ERASE, -+ 'Install' : TS_INSTALL, -+ 'True-Install' : TS_TRUEINSTALL, -+ 'Reinstall' : TS_INSTALL, # Broken -+ 'Downgrade' : TS_INSTALL, # Broken -+ 'Downgraded' : TS_INSTALL, # Broken -+ 'Obsoleted' : TS_OBSOLETED, -+ 'Obsoleting' : TS_OBSOLETING} ++ for po in basic_results: ++ if po.checkPrco(prcotype, (n, f, (e,v,r))): ++ results.append(po) + -+# ---- horrible Copy and paste from sqlitesack ---- -+def _sql_esc(pattern): ++ if prcotype != "provides": ++ return results ++ ++ if not misc.re_filename(n): ++ return results ++ ++ results.extend(self.searchFiles(n)) ++ return misc.unique(results) ++ ++ + def searchRequires(self, name): +- """return list of package requiring the name (any evr and flag)""" +- self._checkIndexes(failure='build') +- if self.requires.has_key(name): +- return self.requires[name] +- else: +- return [] ++ """return list of package requiring the item requested""" ++ ++ return self.searchPrco(name, 'requires') + + def searchProvides(self, name): +- """return list of package providing the name (any evr and flag)""" +- # FIXME - should this do a pkgobj.checkPrco((name, flag, (e,v,r,))?? +- # has to do a searchFiles and a searchProvides for things starting with / +- self._checkIndexes(failure='build') +- returnList = [] +- if name[0] == '/': +- returnList.extend(self.searchFiles(name)) +- if self.provides.has_key(name): +- returnList.extend(self.provides[name]) +- return returnList ++ """return list of package providing the item requested""" ++ ++ return self.searchPrco(name, 'provides') + + def searchConflicts(self, name): +- """return list of package conflicting with the name (any evr and flag)""" +- self._checkIndexes(failure='build') +- if self.conflicts.has_key(name): +- return self.conflicts[name] +- else: +- return [] +- ++ """return list of package conflicting with item requested""" ++ ++ return self.searchPrco(name, 'conflicts') ++ + def searchObsoletes(self, name): +- """return list of package obsoleting the name (any evr and flag)""" +- self._checkIndexes(failure='build') +- if self.obsoletes.has_key(name): +- return self.obsoletes[name] +- else: +- return [] ++ """return list of package obsoleting the item requested""" + ++ return self.searchPrco(name, 'obsoletes') ++ + def returnObsoletes(self, newest=False): + """returns a dict of obsoletes dict[obsoleting pkgtuple] = [list of obs]""" + obs = {} +diff --git a/yum/packages.py b/yum/packages.py +index ba10136..c473ece 100644 +--- a/yum/packages.py ++++ b/yum/packages.py +@@ -23,6 +23,7 @@ import rpm + import os + import os.path + import misc ++import i18n + import re + import fnmatch + import stat +@@ -414,7 +415,7 @@ class RpmBase(object): + return self.inPrcoRange(prcotype, prcotuple) + else: + for (n, f, (e, v, r)) in self.returnPrco(prcotype): +- if reqn == n: ++ if i18n.str_eq(reqn, n): + return 1 + + return 0 +@@ -430,10 +431,7 @@ class RpmBase(object): + # find the named entry in pkgobj, do the comparsion + result = [] + for (n, f, (e, v, r)) in self.returnPrco(prcotype): +- if isinstance(reqn, unicode) == isinstance(n, unicode): +- if reqn != n: # stupid python... +- continue +- elif misc.to_utf8(reqn) != misc.to_utf8(n): ++ if not i18n.str_eq(reqn, n): + continue + + if f == '=': +diff --git a/yum/pkgtag_db.py b/yum/pkgtag_db.py +index eddf175..e72fd05 100644 +--- a/yum/pkgtag_db.py ++++ b/yum/pkgtag_db.py +@@ -18,7 +18,7 @@ + # parse sqlite tag database + # return pkgnames and tag that was matched + import sqlite3 as sqlite +-from sqlutils import executeSQL ++from sqlutils import executeSQL, sql_esc, sql_esc_glob + from Errors import PkgTagsError + import sqlutils + import sys +@@ -68,8 +68,9 @@ class PackageTagDB(object): + """Search by tag name/glob + Return dict of dict[packagename] = [stringmatched, stringmatched, ...]""" + res = {} +- tag = '%%%s%%' % tag +- query = "SELECT name, tag, score FROM packagetags where tag like ?" ++ (tag, esc) = sql_esc(tag) ++ query = "SELECT name, tag, score FROM packagetags where tag like ? %s" % esc ++ tag = '%' + tag + '%' + rows = self._sql_exec(query, (tag,)) + for (name, tag, score) in rows: + if name not in res: +@@ -82,8 +83,9 @@ class PackageTagDB(object): + """Search by package name/glob. + Return dict of dict[packagename] = [tag1, tag2, tag3, tag4, ...]""" + res = {} +- name = '%%%s%%' % name +- query = "SELECT name, tag, score FROM packagetags where name like ?" ++ (name, esc) = sql_esc(tag) ++ query = "SELECT name, tag, score FROM packagetags where name like ?%s " % esc ++ name = '%' + name + '%' + rows = self._sql_exec(query, (name,)) + for (name, tag, score) in rows: + if name not in res: +diff --git a/yum/rpmsack.py b/yum/rpmsack.py +index b45f315..83b684e 100644 +--- a/yum/rpmsack.py ++++ b/yum/rpmsack.py +@@ -282,18 +282,28 @@ class RPMDBPackageSack(PackageSackBase): + result = self._cache[prcotype].get(name) + if result is not None: + return result +- ++ (n,f,(e,v,r)) = misc.string_to_prco_tuple(name) ++ glob = False ++ ++ if misc.re_glob(n): ++ glob = True ++ + ts = self.readOnlyTS() + result = {} + tag = self.DEP_TABLE[prcotype][0] +- mi = ts.dbMatch(tag, misc.to_utf8(name)) ++ mi = ts.dbMatch(tag, misc.to_utf8(n)) + for hdr in mi: + if hdr['name'] == 'gpg-pubkey': + continue + po = self._makePackageObject(hdr, mi.instance()) +- result[po.pkgid] = po ++ if not glob: ++ if po.checkPrco(prcotype, (n, f, (e,v,r))): ++ result[po.pkgid] = po ++ else: ++ result[po.pkgid] = po + del mi + ++ + # If it's not a provides or filename, we are done + if prcotype == 'provides' and name[0] == '/': + fileresults = self.searchFiles(name) +diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py +index bf0cea9..1d6c764 100644 +--- a/yum/sqlitesack.py ++++ b/yum/sqlitesack.py +@@ -28,7 +28,7 @@ from packages import PackageObject, RpmBase, YumAvailablePackage, parsePackages + import Errors + import misc + +-from sqlutils import executeSQL ++from sqlutils import executeSQL, sql_esc, sql_esc_glob + import rpmUtils.miscutils + import sqlutils + import constants +@@ -812,32 +812,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): + pkgs.append(pkg) + return pkgs + +- @staticmethod +- def _sql_esc(pattern): +- """ Apply SQLite escaping, if needed. Returns pattern and esc. """ +- esc = '' +- if "_" in pattern or "%" in pattern: +- esc = ' ESCAPE "!"' +- pattern = pattern.replace("!", "!!") +- pattern = pattern.replace("%", "!%") +- pattern = pattern.replace("_", "!_") +- return (pattern, esc) +- +- def _sql_esc_glob(self, patterns): +- """ Converts patterns to SQL LIKE format, if required (or gives up if +- not possible). """ +- ret = [] +- for pattern in patterns: +- if '[' in pattern: # LIKE only has % and _, so [abc] can't be done. +- return [] # So Load everything +- +- # Convert to SQL LIKE format +- (pattern, esc) = self._sql_esc(pattern) +- pattern = pattern.replace("*", "%") +- pattern = pattern.replace("?", "_") +- ret.append((pattern, esc)) +- return ret +- + def _skip_all(self): + """ Are we going to skip every package in all our repos? """ + skip_all = True +@@ -917,12 +891,12 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): + sql_params = [] + dirname_check = "" + if not glob: +- (pattern, esc) = self._sql_esc(filename) ++ (pattern, esc) = sql_esc(filename) + dirname_check = "dirname = ? and filenames LIKE ? %s and " % esc + sql_params.append(dirname) + sql_params.append('%' + pattern + '%') + elif not file_glob: +- (pattern, esc) = self._sql_esc(filename) ++ (pattern, esc) = sql_esc(filename) + dirname_check = "dirname GLOB ? and filenames LIKE ? %s and " % esc + sql_params.append(dirname) + sql_params.append('%' + pattern + '%') +@@ -996,7 +970,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): + return result + + searchstring = searchstring.replace("'", "''") +- (searchstring, esc) = self._sql_esc(searchstring) ++ (searchstring, esc) = sql_esc(searchstring) + sql = "select DISTINCT pkgKey from packages where %s like '%%%s%%'%s " % (fields[0], searchstring, esc) + + for f in fields[1:]: +@@ -1042,7 +1016,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): + + for s in searchstrings: + s = s.replace("'", "''") +- (s, esc) = self._sql_esc(s) ++ (s, esc) = sql_esc(s) + sql="select pkgKey,1 AS cumul from packages where %s like '%%%s%%'%s " % (fields[0], s, esc) + for f in fields[1:]: + sql = "%s or %s like '%%%s%%'%s " % (sql, f, s, esc) +@@ -1289,38 +1263,61 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): + + @catchSqliteException + def searchPrco(self, name, prcotype): +- """return list of packages having prcotype name (any evr and flag)""" ++ """return list of packages matching name and prcotype """ ++ # we take name to be a string of some kind ++ # we parse the string to see if it is a foo > 1.1 or if it is just 'foo' ++ # or what - so we can answer correctly ++ + if self._skip_all(): + return [] ++ try: ++ (n,f,(e,v,r)) = misc.string_to_prco_tuple(name) ++ except Errors.MiscError, e: ++ raise Errors.PackageSackError, to_unicode(e) + +- name = to_unicode(name) ++ n = to_unicode(n) ++ + glob = True + querytype = 'glob' +- if not misc.re_glob(name): ++ if not misc.re_glob(n): + glob = False + querytype = '=' + ++ basic_results = [] + results = [] + for (rep,cache) in self.primarydb.items(): + cur = cache.cursor() +- executeSQL(cur, "select DISTINCT pkgKey from %s where name %s ?" % (prcotype,querytype), (name,)) +- self._sql_pkgKey2po(rep, cur, results) ++ executeSQL(cur, "select DISTINCT pkgKey from %s where name %s ?" % (prcotype,querytype), (n,)) ++ self._sql_pkgKey2po(rep, cur, basic_results) + ++ # now we have a list of items matching just the name - let's match them out ++ for po in basic_results: ++ if misc.re_filename(n) and v is None: ++ # file dep add all matches to the results ++ results.append(po) ++ continue ++ ++ if not glob: ++ if po.checkPrco(prcotype, (n, f, (e,v,r))): ++ results.append(po) ++ else: ++ # if it is a glob we can't really get any closer to checking it ++ results.append(po) + # If it's not a provides or a filename, we are done + if prcotype != "provides": + return results +- if not misc.re_filename(name): ++ if not misc.re_filename(n): + return results + + # If it is a filename, search the primary.xml file info +- results.extend(self._search_primary_files(name)) ++ results.extend(self._search_primary_files(n)) + + # if its in the primary.xml files then skip the other check +- if misc.re_primary_filename(name) and not glob: ++ if misc.re_primary_filename(n) and not glob: + return misc.unique(results) + + # If it is a filename, search the files.xml file info +- results.extend(self.searchFiles(name)) ++ results.extend(self.searchFiles(n)) + return misc.unique(results) + + +@@ -1516,7 +1513,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): + if len(patterns) > pat_max: + patterns = [] + if ignore_case: +- patterns = self._sql_esc_glob(patterns) ++ patterns = sql_esc_glob(patterns) + else: + tmp = [] + need_glob = False +diff --git a/yum/sqlutils.py b/yum/sqlutils.py +index 4326910..4d7e36e 100644 +--- a/yum/sqlutils.py ++++ b/yum/sqlutils.py +@@ -173,3 +173,27 @@ else: + executeSQL = executeSQLPyFormat + + ++def sql_esc(pattern): + """ Apply SQLite escaping, if needed. Returns pattern and esc. """ + esc = '' + if "_" in pattern or "%" in pattern: @@ -11571,7 +16518,7 @@ index 0000000..18d2a41 + pattern = pattern.replace("_", "!_") + return (pattern, esc) + -+def _sql_esc_glob(patterns): ++def sql_esc_glob(patterns): + """ Converts patterns to SQL LIKE format, if required (or gives up if + not possible). """ + ret = [] @@ -11580,1457 +16527,8 @@ index 0000000..18d2a41 + return [] # So Load everything + + # Convert to SQL LIKE format -+ (pattern, esc) = _sql_esc(pattern) ++ (pattern, esc) = sql_esc(pattern) + pattern = pattern.replace("*", "%") + pattern = pattern.replace("?", "_") + ret.append((pattern, esc)) + return ret -+ -+def _setupHistorySearchSQL(patterns=None, ignore_case=False): -+ """Setup need_full and patterns for _yieldSQLDataList, also see if -+ we can get away with just using searchNames(). """ -+ -+ if patterns is None: -+ patterns = [] -+ -+ fields = ['name', 'sql_nameArch', 'sql_nameVerRelArch', -+ 'sql_nameVer', 'sql_nameVerRel', -+ 'sql_envra', 'sql_nevra'] -+ need_full = False -+ for pat in patterns: -+ if yum.misc.re_full_search_needed(pat): -+ need_full = True -+ break -+ -+ pat_max = PATTERNS_MAX -+ if not need_full: -+ fields = ['name'] -+ pat_max = PATTERNS_INDEXED_MAX -+ if len(patterns) > pat_max: -+ patterns = [] -+ if ignore_case: -+ patterns = _sql_esc_glob(patterns) -+ else: -+ tmp = [] -+ need_glob = False -+ for pat in patterns: -+ if misc.re_glob(pat): -+ tmp.append((pat, 'glob')) -+ need_glob = True -+ else: -+ tmp.append((pat, '=')) -+ if not need_full and not need_glob and patterns: -+ return (need_full, patterns, fields, True) -+ patterns = tmp -+ return (need_full, patterns, fields, False) -+# ---- horrible Copy and paste from sqlitesack ---- -+ -+class YumHistoryPackage(PackageObject): -+ -+ def __init__(self, name, arch, epoch, version, release, checksum): -+ self.name = name -+ self.version = version -+ self.release = release -+ self.epoch = epoch -+ self.arch = arch -+ self.pkgtup = (self.name, self.arch, -+ self.epoch, self.version, self.release) -+ if checksum is None: -+ self._checksums = [] # (type, checksum, id(0,1) -+ else: -+ chk = checksum.split(':') -+ self._checksums = [(chk[0], chk[1], 0)] # (type, checksum, id(0,1)) -+ -+class YumHistoryTransaction: -+ """ Holder for a history transaction. """ -+ -+ def __init__(self, history, row): -+ self._history = weakref(history) -+ -+ self.tid = row[0] -+ self.beg_timestamp = row[1] -+ self.beg_rpmdbversion = row[2] -+ self.end_timestamp = row[3] -+ self.end_rpmdbversion = row[4] -+ self.loginuid = row[5] -+ self.return_code = row[6] -+ -+ self._loaded_TW = None -+ self._loaded_TD = None -+ -+ self.altered_lt_rpmdb = None -+ self.altered_gt_rpmdb = None -+ -+ def __cmp__(self, other): -+ if other is None: -+ return 1 -+ ret = cmp(self.beg_timestamp, other.beg_timestamp) -+ if ret: return -ret -+ ret = cmp(self.end_timestamp, other.end_timestamp) -+ if ret: return ret -+ ret = cmp(self.tid, other.tid) -+ return -ret -+ -+ def _getTransWith(self): -+ if self._loaded_TW is None: -+ self._loaded_TW = sorted(self._history._old_with_pkgs(self.tid)) -+ return self._loaded_TW -+ def _getTransData(self): -+ if self._loaded_TD is None: -+ self._loaded_TD = sorted(self._history._old_data_pkgs(self.tid)) -+ return self._loaded_TD -+ -+ trans_with = property(fget=lambda self: self._getTransWith()) -+ trans_data = property(fget=lambda self: self._getTransData()) -+ -+class YumHistory: -+ """ API for accessing the history sqlite data. """ -+ -+ def __init__(self, root='/', db_path=_history_dir): -+ self._conn = None -+ -+ self.conf = yum.misc.GenericHolder() -+ self.conf.db_path = os.path.normpath(root + '/' + db_path) -+ self.conf.writable = False -+ -+ if not os.path.exists(self.conf.db_path): -+ try: -+ os.makedirs(self.conf.db_path) -+ except (IOError, OSError), e: -+ # some sort of useful thing here? A warning? -+ return -+ self.conf.writable = True -+ else: -+ if os.access(self.conf.db_path, os.W_OK): -+ self.conf.writable = True -+ -+ DBs = glob.glob('%s/history-*-*-*.sqlite' % self.conf.db_path) -+ self._db_file = None -+ for d in reversed(sorted(DBs)): -+ fname = os.path.basename(d) -+ fname = fname[len("history-"):-len(".sqlite")] -+ pieces = fname.split('-', 4) -+ if len(pieces) != 3: -+ continue -+ try: -+ map(int, pieces) -+ except ValueError: -+ continue -+ -+ self._db_file = d -+ break -+ -+ if self._db_file is None: -+ self._create_db_file() -+ -+ def __del__(self): -+ self.close() -+ -+ def _get_cursor(self): -+ if self._conn is None: -+ self._conn = sqlite.connect(self._db_file) -+ return self._conn.cursor() -+ def _commit(self): -+ return self._conn.commit() -+ -+ def close(self): -+ if self._conn is not None: -+ self._conn.close() -+ self._conn = None -+ -+ def _pkgtup2pid(self, pkgtup, checksum=None): -+ cur = self._get_cursor() -+ executeSQL(cur, """SELECT pkgtupid, checksum FROM pkgtups -+ WHERE name=? AND arch=? AND -+ epoch=? AND version=? AND release=?""", pkgtup) -+ for sql_pkgtupid, sql_checksum in cur: -+ if checksum is None and sql_checksum is None: -+ return sql_pkgtupid -+ if checksum is None: -+ continue -+ if sql_checksum is None: -+ continue -+ if checksum == sql_checksum: -+ return sql_pkgtupid -+ -+ (n,a,e,v,r) = pkgtup -+ (n,a,e,v,r) = (to_unicode(n),to_unicode(a), -+ to_unicode(e),to_unicode(v),to_unicode(r)) -+ if checksum is not None: -+ res = executeSQL(cur, -+ """INSERT INTO pkgtups -+ (name, arch, epoch, version, release, checksum) -+ VALUES (?, ?, ?, ?, ?, ?)""", (n,a,e,v,r, -+ checksum)) -+ else: -+ res = executeSQL(cur, -+ """INSERT INTO pkgtups -+ (name, arch, epoch, version, release) -+ VALUES (?, ?, ?, ?, ?)""", (n,a,e,v,r)) -+ return cur.lastrowid -+ def _apkg2pid(self, po): -+ csum = po.returnIdSum() -+ if csum is not None: -+ csum = "%s:%s" % (str(csum[0]), str(csum[1])) -+ return self._pkgtup2pid(po.pkgtup, csum) -+ def _ipkg2pid(self, po): -+ csum = None -+ yumdb = po.yumdb_info -+ if 'checksum_type' in yumdb and 'checksum_type' in yumdb: -+ csum = "%s:%s" % (yumdb.checksum_type, yumdb.checksum_data) -+ return self._pkgtup2pid(po.pkgtup, csum) -+ def pkg2pid(self, po): -+ if isinstance(po, YumInstalledPackage): -+ return self._ipkg2pid(po) -+ if isinstance(po, YumAvailablePackage): -+ return self._apkg2pid(po) -+ return self._pkgtup2pid(po.pkgtup, None) -+ -+ @staticmethod -+ def txmbr2state(txmbr): -+ state = None -+ if txmbr.output_state in (TS_INSTALL, TS_TRUEINSTALL): -+ if hasattr(txmbr, 'reinstall'): -+ state = 'Reinstall' -+ elif txmbr.downgrades: -+ state = 'Downgrade' -+ if txmbr.output_state == TS_ERASE: -+ if txmbr.downgraded_by: -+ state = 'Downgraded' -+ if state is None: -+ state = _stcode2sttxt.get(txmbr.output_state) -+ return state -+ -+ def trans_with_pid(self, pid): -+ cur = self._get_cursor() -+ res = executeSQL(cur, -+ """INSERT INTO trans_with_pkgs -+ (tid, pkgtupid) -+ VALUES (?, ?)""", (self._tid, pid)) -+ return cur.lastrowid -+ -+ def trans_data_pid_beg(self, pid, state): -+ assert state is not None -+ if not hasattr(self, '_tid') or state is None: -+ return # Not configured to run -+ cur = self._get_cursor() -+ res = executeSQL(cur, -+ """INSERT INTO trans_data_pkgs -+ (tid, pkgtupid, state) -+ VALUES (?, ?, ?)""", (self._tid, pid, state)) -+ return cur.lastrowid -+ def trans_data_pid_end(self, pid, state): -+ # State can be none here, Eg. TS_FAILED from rpmtrans -+ if not hasattr(self, '_tid') or state is None: -+ return # Not configured to run -+ -+ cur = self._get_cursor() -+ res = executeSQL(cur, -+ """UPDATE trans_data_pkgs SET done = ? -+ WHERE tid = ? AND pkgtupid = ? AND state = ? -+ """, ('TRUE', self._tid, pid, state)) -+ self._commit() -+ return cur.lastrowid -+ -+ def beg(self, rpmdb_version, using_pkgs, txmbrs): -+ cur = self._get_cursor() -+ res = executeSQL(cur, -+ """INSERT INTO trans_beg -+ (timestamp, rpmdb_version, loginuid) -+ VALUES (?, ?, ?)""", (int(time.time()), -+ str(rpmdb_version), -+ yum.misc.getloginuid())) -+ self._tid = cur.lastrowid -+ -+ for pkg in using_pkgs: -+ pid = self._ipkg2pid(pkg) -+ self.trans_with_pid(pid) -+ -+ for txmbr in txmbrs: -+ pid = self.pkg2pid(txmbr.po) -+ state = self.txmbr2state(txmbr) -+ self.trans_data_pid_beg(pid, state) -+ -+ self._commit() -+ -+ def _log_errors(self, errors): -+ cur = self._get_cursor() -+ for error in errors: -+ error = to_unicode(error) -+ executeSQL(cur, -+ """INSERT INTO trans_error -+ (tid, msg) VALUES (?, ?)""", (self._tid, error)) -+ self._commit() -+ -+ def log_scriptlet_output(self, data, msg): -+ """ Note that data can be either a real pkg. ... or not. """ -+ if msg is None or not hasattr(self, '_tid'): -+ return # Not configured to run -+ -+ cur = self._get_cursor() -+ for error in msg.split('\n'): -+ error = to_unicode(error) -+ executeSQL(cur, -+ """INSERT INTO trans_script_stdout -+ (tid, line) VALUES (?, ?)""", (self._tid, error)) -+ self._commit() -+ -+ def end(self, rpmdb_version, return_code, errors=None): -+ assert return_code or not errors -+ cur = self._get_cursor() -+ res = executeSQL(cur, -+ """INSERT INTO trans_end -+ (tid, timestamp, rpmdb_version, return_code) -+ VALUES (?, ?, ?, ?)""", (self._tid,int(time.time()), -+ str(rpmdb_version), -+ return_code)) -+ self._commit() -+ if not return_code: -+ # Simple hack, if the transaction finished. Note that this -+ # catches the erase cases (as we still don't get pkgtups for them), -+ # Eg. Updated elements. -+ executeSQL(cur, -+ """UPDATE trans_data_pkgs SET done = ? -+ WHERE tid = ?""", ('TRUE', self._tid,)) -+ self._commit() -+ if errors is not None: -+ self._log_errors(errors) -+ del self._tid -+ -+ def _old_with_pkgs(self, tid): -+ cur = self._get_cursor() -+ executeSQL(cur, -+ """SELECT name, arch, epoch, version, release, checksum -+ FROM trans_with_pkgs JOIN pkgtups USING(pkgtupid) -+ WHERE tid = ? -+ ORDER BY name ASC, epoch ASC""", (tid,)) -+ ret = [] -+ for row in cur: -+ obj = YumHistoryPackage(row[0],row[1],row[2],row[3],row[4], row[5]) -+ ret.append(obj) -+ return ret -+ def _old_data_pkgs(self, tid): -+ cur = self._get_cursor() -+ executeSQL(cur, -+ """SELECT name, arch, epoch, version, release, -+ checksum, done, state -+ FROM trans_data_pkgs JOIN pkgtups USING(pkgtupid) -+ WHERE tid = ? -+ ORDER BY name ASC, epoch ASC, state DESC""", (tid,)) -+ ret = [] -+ for row in cur: -+ obj = YumHistoryPackage(row[0],row[1],row[2],row[3],row[4], row[5]) -+ obj.done = row[6] == 'TRUE' -+ obj.state = row[7] -+ obj.state_installed = None -+ if _sttxt2stcode[obj.state] in TS_INSTALL_STATES: -+ obj.state_installed = True -+ if _sttxt2stcode[obj.state] in TS_REMOVE_STATES: -+ obj.state_installed = False -+ ret.append(obj) -+ return ret -+ -+ def old(self, tids=[], limit=None, complete_transactions_only=False): -+ """ Return a list of the last transactions, note that this includes -+ partial transactions (ones without an end transaction). """ -+ cur = self._get_cursor() -+ sql = """SELECT tid, -+ trans_beg.timestamp AS beg_ts, -+ trans_beg.rpmdb_version AS beg_rv, -+ trans_end.timestamp AS end_ts, -+ trans_end.rpmdb_version AS end_rv, -+ loginuid, return_code -+ FROM trans_beg JOIN trans_end USING(tid)""" -+ # NOTE: sqlite doesn't do OUTER JOINs ... *sigh*. So we have to do it -+ # ourself. -+ if not complete_transactions_only: -+ sql = """SELECT tid, -+ trans_beg.timestamp AS beg_ts, -+ trans_beg.rpmdb_version AS beg_rv, -+ NULL, NULL, -+ loginuid, NULL -+ FROM trans_beg""" -+ params = None -+ if tids and len(tids) <= yum.constants.PATTERNS_INDEXED_MAX: -+ params = tids = list(set(tids)) -+ sql += " WHERE tid IN (%s)" % ", ".join(['?'] * len(tids)) -+ sql += " ORDER BY beg_ts DESC, tid ASC" -+ if limit is not None: -+ sql += " LIMIT " + str(limit) -+ executeSQL(cur, sql, params) -+ ret = [] -+ tid2obj = {} -+ for row in cur: -+ if tids and len(tids) > yum.constants.PATTERNS_INDEXED_MAX: -+ if row[0] not in tids: -+ continue -+ obj = YumHistoryTransaction(self, row) -+ tid2obj[row[0]] = obj -+ ret.append(obj) -+ -+ sql = """SELECT tid, -+ trans_end.timestamp AS end_ts, -+ trans_end.rpmdb_version AS end_rv, -+ return_code -+ FROM trans_end""" -+ params = tid2obj.keys() -+ if len(params) > yum.constants.PATTERNS_INDEXED_MAX: -+ executeSQL(cur, sql) -+ else: -+ sql += " WHERE tid IN (%s)" % ", ".join(['?'] * len(params)) -+ executeSQL(cur, sql, params) -+ for row in cur: -+ if row[0] not in tid2obj: -+ continue -+ tid2obj[row[0]].end_timestamp = row[1] -+ tid2obj[row[0]].end_rpmdbversion = row[2] -+ tid2obj[row[0]].return_code = row[3] -+ -+ # Go through backwards, and see if the rpmdb versions match -+ las = None -+ for obj in reversed(ret): -+ cur_rv = obj.beg_rpmdbversion -+ las_rv = None -+ if las is not None: -+ las_rv = las.end_rpmdbversion -+ if las_rv is None or cur_rv is None or (las.tid + 1) != obj.tid: -+ pass -+ elif las_rv != cur_rv: -+ obj.altered_lt_rpmdb = True -+ las.altered_gt_rpmdb = True -+ else: -+ obj.altered_lt_rpmdb = False -+ las.altered_gt_rpmdb = False -+ las = obj -+ -+ return ret -+ -+ def last(self): -+ """ This is the last full transaction. So any imcomplete transactions -+ do not count. """ -+ cur = self._get_cursor() -+ sql = """SELECT tid, -+ trans_beg.timestamp AS beg_ts, -+ trans_beg.rpmdb_version AS beg_rv, -+ trans_end.timestamp AS end_ts, -+ trans_end.rpmdb_version AS end_rv, -+ loginuid, return_code -+ FROM trans_beg JOIN trans_end USING(tid) -+ ORDER BY beg_ts DESC, tid ASC -+ LIMIT 1""" -+ executeSQL(cur, sql) -+ for row in cur: -+ return YumHistoryTransaction(self, row) -+ return None -+ -+ def _yieldSQLDataList(self, patterns, fields, ignore_case): -+ """Yields all the package data for the given params. """ -+ -+ cur = self._get_cursor() -+ qsql = _FULL_PARSE_QUERY_BEG -+ -+ pat_sqls = [] -+ pat_data = [] -+ for (pattern, rest) in patterns: -+ for field in fields: -+ if ignore_case: -+ pat_sqls.append("%s LIKE ?%s" % (field, rest)) -+ else: -+ pat_sqls.append("%s %s ?" % (field, rest)) -+ pat_data.append(pattern) -+ assert pat_sqls -+ -+ qsql += " OR ".join(pat_sqls) -+ executeSQL(cur, qsql, pat_data) -+ for x in cur: -+ yield x -+ -+ def search(self, patterns, ignore_case=True): -+ """ Search for history transactions which contain specified -+ packages al. la. "yum list". Returns transaction ids. """ -+ # Search packages ... kind of sucks that it's search not list, pkglist? -+ -+ data = _setupHistorySearchSQL(patterns, ignore_case) -+ (need_full, patterns, fields, names) = data -+ -+ ret = [] -+ pkgtupids = set() -+ for row in self._yieldSQLDataList(patterns, fields, ignore_case): -+ pkgtupids.add(row[0]) -+ -+ cur = self._get_cursor() -+ sql = """SELECT tid FROM trans_data_pkgs WHERE pkgtupid IN """ -+ sql += "(%s)" % ",".join(['?'] * len(pkgtupids)) -+ params = list(pkgtupids) -+ tids = set() -+ if len(params) > yum.constants.PATTERNS_INDEXED_MAX: -+ executeSQL(cur, """SELECT tid FROM trans_data_pkgs""") -+ for row in cur: -+ if row[0] in params: -+ tids.add(row[0]) -+ return tids -+ if not params: -+ return tids -+ executeSQL(cur, sql, params) -+ for row in cur: -+ tids.add(row[0]) -+ return tids -+ -+ def _create_db_file(self): -+ """ Create a new history DB file, populating tables etc. """ -+ -+ _db_file = '%s/%s-%s.%s' % (self.conf.db_path, -+ 'history', -+ time.strftime('%Y-%m-%d'), -+ 'sqlite') -+ if self._db_file == _db_file: -+ os.rename(_db_file, _db_file + '.old') -+ self._db_file = _db_file -+ -+ cur = self._get_cursor() -+ ops = ['''\ -+ CREATE TABLE trans_beg ( -+ tid INTEGER PRIMARY KEY, -+ timestamp INTEGER NOT NULL, rpmdb_version TEXT NOT NULL, -+ loginuid INTEGER); -+''', '''\ -+ CREATE TABLE trans_end ( -+ tid INTEGER PRIMARY KEY REFERENCES trans_beg, -+ timestamp INTEGER NOT NULL, rpmdb_version TEXT NOT NULL, -+ return_code INTEGER NOT NULL); -+''', '''\ -+\ -+ CREATE TABLE trans_with_pkgs ( -+ tid INTEGER NOT NULL REFERENCES trans_beg, -+ pkgtupid INTEGER NOT NULL REFERENCES pkgtups); -+''', '''\ -+\ -+ CREATE TABLE trans_error ( -+ mid INTEGER PRIMARY KEY, -+ tid INTEGER NOT NULL REFERENCES trans_beg, -+ msg TEXT NOT NULL); -+''', '''\ -+ CREATE TABLE trans_script_stdout ( -+ lid INTEGER PRIMARY KEY, -+ tid INTEGER NOT NULL REFERENCES trans_beg, -+ line TEXT NOT NULL); -+''', '''\ -+\ -+ CREATE TABLE trans_data_pkgs ( -+ tid INTEGER NOT NULL REFERENCES trans_beg, -+ pkgtupid INTEGER NOT NULL REFERENCES pkgtups, -+ done BOOL NOT NULL DEFAULT FALSE, state TEXT NOT NULL); -+''', '''\ -+\ -+ CREATE TABLE pkgtups ( -+ pkgtupid INTEGER PRIMARY KEY, name TEXT NOT NULL, arch TEXT NOT NULL, -+ epoch TEXT NOT NULL, version TEXT NOT NULL, release TEXT NOT NULL, -+ checksum TEXT); -+''', '''\ -+ CREATE INDEX i_pkgtup_naevr ON pkgtups (name, arch, epoch, version, release); -+'''] -+ for op in ops: -+ cur.execute(op) -+ self._commit() -+ -+# Pasted from sqlitesack -+_FULL_PARSE_QUERY_BEG = """ -+SELECT pkgtupid,name,epoch,version,release,arch, -+ name || "." || arch AS sql_nameArch, -+ name || "-" || version || "-" || release || "." || arch AS sql_nameVerRelArch, -+ name || "-" || version AS sql_nameVer, -+ name || "-" || version || "-" || release AS sql_nameVerRel, -+ epoch || ":" || name || "-" || version || "-" || release || "." || arch AS sql_envra, -+ name || "-" || epoch || ":" || version || "-" || release || "." || arch AS sql_nevra -+ FROM pkgtups -+ WHERE -+""" -diff --git a/yum/misc.py b/yum/misc.py -index a8f7954..16ffca0 100644 ---- a/yum/misc.py -+++ b/yum/misc.py -@@ -76,35 +76,38 @@ def unshare_data(): - _re_compiled_glob_match = None - def re_glob(s): - """ Tests if a string is a shell wildcard. """ -- # re.match('.*[\*\?\[\]].*', name) - global _re_compiled_glob_match - if _re_compiled_glob_match is None: - _re_compiled_glob_match = re.compile('.*([*?]|\[.+\])') - return _re_compiled_glob_match.match(s) - --_re_compiled_pri_fnames_match = None -+_re_compiled_filename_match = None -+def re_filename(s): -+ """ Tests if a string could be a filename. We still get negated character -+ classes wrong (are they supported), and ranges in character classes. """ -+ global _re_compiled_filename_match -+ if _re_compiled_filename_match is None: -+ _re_compiled_filename_match = re.compile('^(/|[*?]|\[[^]]*/[^]]*\])') -+ return _re_compiled_filename_match.match(s) -+ - def re_primary_filename(filename): -- global _re_compiled_pri_fnames_match -- if _re_compiled_pri_fnames_match is None: -- one = re.compile('.*bin\/.*') -- two = re.compile('^\/etc\/.*') -- three = re.compile('^\/usr\/lib\/sendmail$') -- _re_compiled_pri_fnames_match = (one, two, three) -- for rec in _re_compiled_pri_fnames_match: -- if rec.match(filename): -- return True -+ """ Tests if a filename string, can be matched against just primary. -+ Note that this can produce false negatives (but not false -+ positives). """ -+ if 'bin/' in filename: -+ return True -+ if filename.startswith('/etc/'): -+ return True -+ if filename == '/usr/lib/sendmail': -+ return True - return False - --_re_compiled_pri_dnames_match = None - def re_primary_dirname(dirname): -- global _re_compiled_pri_dnames_match -- if _re_compiled_pri_dnames_match is None: -- one = re.compile('.*bin\/.*') -- two = re.compile('^\/etc\/.*') -- _re_compiled_pri_dnames_match = (one, two) -- for rec in _re_compiled_pri_dnames_match: -- if rec.match(dirname): -- return True -+ """ Tests if a dirname string, can be matched against just primary. """ -+ if 'bin/' in dirname: -+ return True -+ if dirname.startswith('/etc/'): -+ return True - return False - - _re_compiled_full_match = None -@@ -290,7 +293,8 @@ def checksum(sumtype, file, CHUNK=2**16, datasize=None): - - data = Checksums([sumtype]) - while data.read(fo, CHUNK): -- pass -+ if datasize is not None and len(data) > datasize: -+ break - - if type(file) is types.StringType: - fo.close() -@@ -298,7 +302,7 @@ def checksum(sumtype, file, CHUNK=2**16, datasize=None): - - # This screws up the length, but that shouldn't matter. We only care - # if this checksum == what we expect. -- if datasize is not None and datasize > len(data): -+ if datasize is not None and datasize != len(data): - return '!%u!%s' % (datasize, data.hexdigest(sumtype)) - - return data.hexdigest(sumtype) -@@ -797,6 +801,21 @@ def unlink_f(filename): - if e.errno != errno.ENOENT: - raise - -+def getloginuid(): -+ """ Get the audit-uid/login-uid, if available. None is returned if there -+ was a problem. Note that no caching is done here. """ -+ # We might normally call audit.audit_getloginuid(), except that requires -+ # importing all of the audit module. And it doesn't work anyway: BZ 518721 -+ try: -+ fo = open("/proc/self/loginuid") -+ except IOError: -+ return None -+ data = fo.read() -+ try: -+ return int(data) -+ except ValueError: -+ return None -+ - # ---------- i18n ---------- - import locale - import sys -diff --git a/yum/packageSack.py b/yum/packageSack.py -index 3716410..45e4e2d 100644 ---- a/yum/packageSack.py -+++ b/yum/packageSack.py -@@ -35,6 +35,8 @@ class PackageSackVersion: - - def __eq__(self, other): - if other is None: return False -+ if type(other) in (type(''), type(u'')): -+ return str(self) == other - if self._num != other._num: return False - if self._chksum.digest() != other._chksum.digest(): return False - return True -@@ -182,23 +184,42 @@ class PackageSackBase(object): - then it's still not a huge wart. """ - raise NotImplementedError() - -- def simpleVersion(self): -+ def simpleVersion(self, main_only=False, groups={}): - """ Return a simple version for all available packages. """ -+ def _up_revs(arepos, repoid, rev, pkg, csum): -+ arevs = arepos.setdefault(repoid, {}) -+ rpsv = arevs.setdefault(None, PackageSackVersion()) -+ rpsv.update(pkg, csum) -+ if rev is not None: -+ rpsv = arevs.setdefault(rev, PackageSackVersion()) -+ rpsv.update(pkg, csum) -+ - main = PackageSackVersion() - arepos = {} -+ main_grps = {} -+ arepos_grps = {} - for pkg in sorted(self.returnPackages()): - csum = pkg.returnIdSum() - main.update(pkg, csum) - -- arevs = arepos.setdefault(pkg.repoid, {}) -- rpsv = arevs.setdefault(None, PackageSackVersion()) -- rpsv.update(pkg, csum) -+ for group in groups: -+ if pkg.name in groups[group]: -+ if group not in main_grps: -+ main_grps[group] = PackageSackVersion() -+ arepos_grps[group] = {} -+ main_grps[group].update(pkg, csum) - -- if pkg.repo.repoXML.revision is not None: -- rev = pkg.repo.repoXML.revision -- rpsv = arevs.setdefault(rev, PackageSackVersion()) -- rpsv.update(pkg, csum) -+ if main_only: -+ continue -+ -+ rev = pkg.repo.repoXML.revision -+ _up_revs(arepos, pkg.repoid, rev, pkg, csum) -+ for group in groups: -+ if pkg.name in groups[group]: -+ _up_revs(arepos_grps[group], pkg.repoid, rev, pkg, csum) - -+ if groups: -+ return [main, arepos, main_grps, arepos_grps] - return [main, arepos] - - def returnNewestByNameArch(self, naTup=None, -diff --git a/yum/packages.py b/yum/packages.py -index 9a56fc4..7bbb61d 100644 ---- a/yum/packages.py -+++ b/yum/packages.py -@@ -617,7 +617,10 @@ class YumAvailablePackage(PackageObject, RpmBase): - # ignoring "bad" chars. - val = _nf2ascii(val) - # Hacky way to get rid of version numbers... -- self._committer_ret = re.sub("""> .*""", '>', val) -+ ix = val.find('> ') -+ if ix != -1: -+ val = val[0:ix+1] -+ self._committer_ret = val - return self._committer_ret - - committer = property(_committer) -diff --git a/yum/plugins.py b/yum/plugins.py -index 27b1aa5..c0e510f 100644 ---- a/yum/plugins.py -+++ b/yum/plugins.py -@@ -34,7 +34,7 @@ from weakref import proxy as weakref - - from yum import _ - --from yum.i18n import utf8_width -+from i18n import utf8_width - - # TODO: expose rpm package sack objects to plugins (once finished) - # TODO: allow plugins to use the existing config stuff to define options for -@@ -457,6 +457,10 @@ class PluginConduit: - ''' - return config.getOption(self._conf, section, opt, config.BoolOption(default)) - -+ def registerPackageName(self, name): -+ self._base.run_with_package_names.add(name) -+ -+ - class ConfigPluginConduit(PluginConduit): - - def registerOpt(self, name, valuetype, where, default): -diff --git a/yum/rpmsack.py b/yum/rpmsack.py -index fbeb9b3..74dd69d 100644 ---- a/yum/rpmsack.py -+++ b/yum/rpmsack.py -@@ -31,7 +31,7 @@ from packageSack import PackageSackBase, PackageSackVersion - import fnmatch - import re - --from yum.i18n import to_unicode -+from i18n import to_unicode - import constants - - class RPMInstalledPackage(YumInstalledPackage): -@@ -339,10 +339,20 @@ class RPMDBPackageSack(PackageSackBase): - pkgobjlist = pkgobjlist[0] + pkgobjlist[1] - return pkgobjlist - -- def simpleVersion(self): -+ def simpleVersion(self, main_only=False, groups={}): - """ Return a simple version for all installed packages. """ -+ def _up_revs(irepos, repoid, rev, pkg, csum): -+ irevs = irepos.setdefault(repoid, {}) -+ rpsv = irevs.setdefault(None, PackageSackVersion()) -+ rpsv.update(pkg, csum) -+ if rev is not None: -+ rpsv = irevs.setdefault(rev, PackageSackVersion()) -+ rpsv.update(pkg, csum) -+ - main = PackageSackVersion() - irepos = {} -+ main_grps = {} -+ irepos_grps = {} - for pkg in sorted(self.returnPackages()): - ydbi = pkg.yumdb_info - csum = None -@@ -350,19 +360,30 @@ class RPMDBPackageSack(PackageSackBase): - csum = (ydbi.checksum_type, ydbi.checksum_data) - main.update(pkg, csum) - -+ for group in groups: -+ if pkg.name in groups[group]: -+ if group not in main_grps: -+ main_grps[group] = PackageSackVersion() -+ irepos_grps[group] = {} -+ main_grps[group].update(pkg, csum) -+ -+ if main_only: -+ continue -+ - repoid = 'installed' - rev = None - if 'from_repo' in pkg.yumdb_info: - repoid = '@' + pkg.yumdb_info.from_repo - if 'from_repo_revision' in pkg.yumdb_info: - rev = pkg.yumdb_info.from_repo_revision -- irevs = irepos.setdefault(repoid, {}) -- rpsv = irevs.setdefault(None, PackageSackVersion()) -- rpsv.update(pkg, csum) -- if rev is not None: -- rpsv = irevs.setdefault(rev, PackageSackVersion()) -- rpsv.update(pkg, csum) - -+ _up_revs(irepos, repoid, rev, pkg, csum) -+ for group in groups: -+ if pkg.name in groups[group]: -+ _up_revs(irepos_grps[group], repoid, rev, pkg, csum) -+ -+ if groups: -+ return [main, irepos, main_grps, irepos_grps] - return [main, irepos] - - @staticmethod -diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py -index 77b06a2..ed52df0 100644 ---- a/yum/rpmtrans.py -+++ b/yum/rpmtrans.py -@@ -23,7 +23,7 @@ import time - import logging - import types - import sys --from yum.constants import * -+from constants import * - from yum import _ - import misc - -@@ -230,6 +230,11 @@ class RPMTransaction: - except IOError: - pass - -+ def _scriptout(self, data): -+ msgs = self._scriptOutput() -+ self.display.scriptout(data, msgs) -+ self.base.history.log_scriptlet_output(data, msgs) -+ - def __del__(self): - self._shutdownOutputLogging() - -@@ -339,7 +344,7 @@ class RPMTransaction: - # we hand back the right path to those 'outside' of the chroot() calls - # but we're using the right path inside. - if self.base.conf.installroot != '/': -- tsfn = tsfn.replace(self.base.conf.installroot,'') -+ tsfn = tsfn.replace(os.path.normpath(self.base.conf.installroot),'') - try: - if not os.path.exists(os.path.dirname(tsfn)): - os.makedirs(os.path.dirname(tsfn)) # make the dir, -@@ -439,10 +444,14 @@ class RPMTransaction: - txmbrs = self.base.tsInfo.getMembers(pkgtup=pkgtup) - for txmbr in txmbrs: - self.display.filelog(txmbr.po, txmbr.output_state) -- self.display.scriptout(txmbr.po, self._scriptOutput()) -+ self._scriptout(txmbr.po) -+ # NOTE: We only do this for install, not erase atm. -+ # because we don't get pkgtup data for erase (this -+ # includes "Updated" pkgs). -+ pid = self.base.history.pkg2pid(txmbr.po) -+ state = self.base.history.txmbr2state(txmbr) -+ self.base.history.trans_data_pid_end(pid, state) - self.ts_done(txmbr.po, txmbr.output_state) -- -- - - def _instProgress(self, bytes, total, h): - if h is not None: -@@ -477,7 +486,7 @@ class RPMTransaction: - - self.display.event(h, action, 100, 100, self.complete_actions, - self.total_actions) -- self.display.scriptout(h, self._scriptOutput()) -+ self._scriptout(h) - - if self.test: return # and we're done - self.ts_done(h, action) -diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py -index b6c14c5..89744ff 100644 ---- a/yum/sqlitesack.py -+++ b/yum/sqlitesack.py -@@ -33,8 +33,8 @@ import rpmUtils.miscutils - import sqlutils - import constants - import operator --from yum.misc import seq_max_split --from yum.i18n import to_utf8, to_unicode -+from misc import seq_max_split -+from i18n import to_utf8, to_unicode - import sys - import re - -@@ -911,6 +911,20 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - dirname_check = "dirname GLOB ? and filenames LIKE ? %s and " % esc - sql_params.append(dirname) - sql_params.append('%' + pattern + '%') -+ elif filename == '*': -+ # We only care about matching on dirname... -+ for (rep,cache) in self.filelistsdb.items(): -+ if rep in self._all_excludes: -+ continue -+ -+ cur = cache.cursor() -+ sql_params.append(dirname) -+ executeSQL(cur, """SELECT pkgKey FROM filelist -+ WHERE dirname %s ?""" % (querytype,), -+ sql_params) -+ self._sql_pkgKey2po(rep, cur, pkgs) -+ -+ return misc.unique(pkgs) - - for (rep,cache) in self.filelistsdb.items(): - if rep in self._all_excludes: -@@ -929,15 +943,19 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - if file_glob: - name_re = re.compile(fnmatch.translate(name)) - def filelist_globber(sql_dirname, sql_filenames): -+ # Note: Can't return bool, because sqlite doesn't like it in -+ # weird ways. Test: -+ # install '*bin/autoheader' -+ # provides /lib/security/pam_loginuid.so - files = sql_filenames.split('/') - if not file_glob: -- return filename in files -+ return int(filename in files) - - fns = map(lambda f: '%s/%s' % (sql_dirname, f), files) - for match in fns: - if name_re.match(match): -- return True -- return False -+ return 1 -+ return 0 - - cache.create_function("filelist_globber", 2, filelist_globber) - # for all the ones where filenames is multiple files, -@@ -1277,7 +1295,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - # If it's not a provides or a filename, we are done - if prcotype != "provides": - return results -- if name[0] != '/' and (not glob or not misc.re_glob(name[0])): -+ if not misc.re_filename(name): - return results - - # If it is a filename, search the primary.xml file info -diff --git a/yum/sqlutils.py b/yum/sqlutils.py -index fda380e..3a93146 100644 ---- a/yum/sqlutils.py -+++ b/yum/sqlutils.py -@@ -121,6 +121,11 @@ def QmarkToPyformat(query, params): - if token.endswith("?"): - output.append(token[:-1] + "%%(param%d)s" % count) - count+=1 -+ elif token.endswith("?,") or token.endswith("?)"): -+ ntoken = token[:-2] + "%%(param%d)s" % count -+ ntoken += token[-1] -+ output.append(ntoken) -+ count+=1 - else: - output.append(token) - -diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py -index be772e5..bd7bf80 100644 ---- a/yum/transactioninfo.py -+++ b/yum/transactioninfo.py -@@ -271,6 +271,7 @@ class TransactionData: - - elif txmbr.output_state in (TS_INSTALL, TS_TRUEINSTALL): - if include_reinstall and self.rpmdb.contains(po=txmbr.po): -+ txmbr.reinstall = True - self.reinstalled.append(txmbr) - continue - -@@ -319,6 +320,8 @@ class TransactionData: - self.depremoved.sort() - self.instgroups.sort() - self.removedgroups.sort() -+ self.reinstalled.sort() -+ self.downgraded.sort() - self.failed.sort() - - -diff --git a/yum/update_md.py b/yum/update_md.py -index b3a120e..34179ea 100644 ---- a/yum/update_md.py -+++ b/yum/update_md.py -@@ -24,10 +24,10 @@ Update metadata (updateinfo.xml) parsing. - import sys - import gzip - --from yum.i18n import utf8_text_wrap, to_utf8 --from yum.yumRepo import YumRepository --from yum.packages import FakeRepository --from yum.misc import to_xml -+from i18n import utf8_text_wrap, to_utf8 -+from yumRepo import YumRepository -+from packages import FakeRepository -+from misc import to_xml - import Errors - - import rpmUtils.miscutils -diff --git a/yum/yumRepo.py b/yum/yumRepo.py -index fac218a..2bc7476 100644 ---- a/yum/yumRepo.py -+++ b/yum/yumRepo.py -@@ -32,9 +32,9 @@ from repos import Repository - import parser - import sqlitecachec - import sqlitesack --from yum import config --from yum import misc --from yum import comps -+import config -+import misc -+import comps - from constants import * - import metalink - -@@ -233,6 +233,7 @@ class YumRepository(Repository, config.RepoConf): - Repository.__init__(self, repoid) - - self.repofile = None -+ self.mirrorurls = [] - self._urls = [] - self.enablegroups = 0 - self.groupsfilename = 'yumgroups.xml' # something some freaks might -@@ -712,7 +713,8 @@ class YumRepository(Repository, config.RepoConf): - fdel=lambda self: setattr(self, "_metalink", None)) - - def _getFile(self, url=None, relative=None, local=None, start=None, end=None, -- copy_local=None, checkfunc=None, text=None, reget='simple', cache=True): -+ copy_local=None, checkfunc=None, text=None, reget='simple', -+ cache=True, size=None): - """retrieve file from the mirrorgroup for the repo - relative to local, optionally get range from - start to end, also optionally retrieve from a specific baseurl""" -@@ -784,7 +786,8 @@ class YumRepository(Repository, config.RepoConf): - ssl_verify_host=self.sslverify, - ssl_ca_cert=self.sslcacert, - ssl_cert=self.sslclientcert, -- ssl_key=self.sslclientkey -+ ssl_key=self.sslclientkey, -+ size=size - ) - - ug.opts.user_agent = default_grabber.opts.user_agent -@@ -816,6 +819,7 @@ class YumRepository(Repository, config.RepoConf): - reget = reget, - checkfunc=checkfunc, - http_headers=headers, -+ size=size - ) - except URLGrabError, e: - errstr = "failure: %s from %s: %s" % (relative, self.id, e) -@@ -827,7 +831,7 @@ class YumRepository(Repository, config.RepoConf): - return result - __get = _getFile - -- def getPackage(self, package, checkfunc = None, text = None, cache = True): -+ def getPackage(self, package, checkfunc=None, text=None, cache=True): - remote = package.relativepath - local = package.localPkg() - basepath = package.basepath -@@ -842,7 +846,8 @@ class YumRepository(Repository, config.RepoConf): - local=local, - checkfunc=checkfunc, - text=text, -- cache=cache -+ cache=cache, -+ size=package.size, - ) - - def getHeader(self, package, checkfunc = None, reget = 'simple', -@@ -852,6 +857,7 @@ class YumRepository(Repository, config.RepoConf): - local = package.localHdr() - start = package.hdrstart - end = package.hdrend -+ size = end-start - basepath = package.basepath - # yes, I know, don't ask - if not os.path.exists(self.hdrdir): -@@ -859,7 +865,7 @@ class YumRepository(Repository, config.RepoConf): - - return self._getFile(url=basepath, relative=remote, local=local, start=start, - reget=None, end=end, checkfunc=checkfunc, copy_local=1, -- cache=cache, -+ cache=cache, size=size, - ) - - def metadataCurrent(self): -@@ -988,7 +994,8 @@ class YumRepository(Repository, config.RepoConf): - text=text, - reget=None, - checkfunc=checkfunc, -- cache=self.http_caching == 'all') -+ cache=self.http_caching == 'all', -+ size=102400) # setting max size as 100K - - except URLGrabError, e: - misc.unlink_f(tfname) -@@ -1034,6 +1041,8 @@ class YumRepository(Repository, config.RepoConf): - old_local = local + '.old.tmp' # locked, so this is ok - shutil.copy2(local, old_local) - xml = self._parseRepoXML(old_local, True) -+ if xml is None: -+ return None - self._oldRepoMDData = {'old_repo_XML' : xml, 'local' : local, - 'old_local' : old_local, 'new_MD_files' : []} - return xml -@@ -1419,7 +1428,8 @@ class YumRepository(Repository, config.RepoConf): - text='%s/signature' % self.id, - reget=None, - checkfunc=None, -- cache=self.http_caching == 'all') -+ cache=self.http_caching == 'all', -+ size=102400) - except URLGrabError, e: - raise URLGrabError(-1, 'Error finding signature for repomd.xml for %s: %s' % (self, e)) - -@@ -1533,9 +1543,14 @@ class YumRepository(Repository, config.RepoConf): - try: - checkfunc = (self.checkMD, (mdtype,), {}) - text = "%s/%s" % (self.id, mdtype) -- local = self._getFile(relative=remote, local=local, copy_local=1, -- checkfunc=checkfunc, reget=None, text=text, -- cache=self.http_caching == 'all') -+ local = self._getFile(relative=remote, -+ local=local, -+ copy_local=1, -+ checkfunc=checkfunc, -+ reget=None, -+ text=text, -+ cache=self.http_caching == 'all', -+ size=thisdata.size) - except (Errors.NoMoreMirrorsRepoError, Errors.RepoError): - if retrieve_can_fail: - return None -@@ -1605,8 +1620,8 @@ class YumRepository(Repository, config.RepoConf): - for line in content: - if re.match('^\s*\#.*', line) or re.match('^\s*$', line): - continue -- mirror = re.sub('\n$', '', line) # no more trailing \n's -- (mirror, count) = re.subn('\$ARCH', '$BASEARCH', mirror) -+ mirror = line.rstrip() # no more trailing \n's -+ mirror = mirror.replace('$ARCH', '$BASEARCH') - returnlist.append(mirror) - - return (returnlist, content) -@@ -1807,8 +1822,8 @@ def getMirrorList(mirrorlist, pdict = None): - for line in content: - if re.match('^\s*\#.*', line) or re.match('^\s*$', line): - continue -- mirror = re.sub('\n$', '', line) # no more trailing \n's -- (mirror, count) = re.subn('\$ARCH', '$BASEARCH', mirror) -+ mirror = line.rstrip() # no more trailing \n's -+ mirror = mirror.replace('$ARCH', '$BASEARCH') - returnlist.append(mirror) - - return returnlist -diff --git a/yumcommands.py b/yumcommands.py -index bd73d0c..1451a36 100644 ---- a/yumcommands.py -+++ b/yumcommands.py -@@ -30,6 +30,8 @@ import fnmatch - import time - from yum.i18n import utf8_width, utf8_width_fill, to_unicode - -+import yum.config -+ - def checkRootUID(base): - """ - Verify that the program is being run by the root user. -@@ -575,7 +577,8 @@ class CheckUpdateCommand(YumCommand): - result = 0 - try: - ypl = base.returnPkgLists(extcmds) -- if base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3): -+ if (base.conf.obsoletes or -+ base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3)): - typl = base.returnPkgLists(['obsoletes']) - ypl.obsoletes = typl.obsoletes - ypl.obsoletesTuples = typl.obsoletesTuples -@@ -778,13 +781,17 @@ class RepoListCommand(YumCommand): - arg = 'enabled' - extcmds = map(lambda x: x.lower(), extcmds) - -- # Setup so len(repo.sack) is correct -- base.repos.populateSack() -+ verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) -+ try: -+ # Setup so len(repo.sack) is correct -+ base.repos.populateSack() -+ except yum.Errors.RepoError: -+ if verbose: -+ raise - - repos = base.repos.repos.values() - repos.sort() - enabled_repos = base.repos.listEnabled() -- verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) - if arg == 'all': - ehibeg = base.term.FG_COLOR['green'] + base.term.MODE['bold'] - dhibeg = base.term.FG_COLOR['red'] -@@ -1061,7 +1068,7 @@ class DowngradeCommand(YumCommand): - - def needTs(self, base, basecmd, extcmds): - return False -- -+ - - class VersionCommand(YumCommand): - def getNames(self): -@@ -1092,25 +1099,80 @@ class VersionCommand(YumCommand): - cols.append((" %s" % repoid, str(cur[None]))) - cols.extend(ncols) - -+ verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) -+ groups = {} -+ gconf = yum.config.readVersionGroupsConfig() -+ for group in gconf: -+ groups[group] = set(gconf[group].pkglist) -+ if gconf[group].run_with_packages: -+ groups[group].update(base.run_with_package_names) -+ -+ if vcmd in ('grouplist'): -+ print _(" Yum version groups:") -+ for group in sorted(groups): -+ print " ", group -+ -+ return 0, ['version grouplist'] -+ -+ if vcmd in ('groupinfo'): -+ for group in groups: -+ if group not in extcmds[1:]: -+ continue -+ print _(" Group :"), group -+ print _(" Packages:") -+ if not verbose: -+ for pkgname in sorted(groups[group]): -+ print " ", pkgname -+ else: -+ data = {'envra' : {}, 'rid' : {}} -+ pkg_names = groups[group] -+ pkg_names2pkgs = base._group_names2aipkgs(pkg_names) -+ base._calcDataPkgColumns(data, pkg_names, pkg_names2pkgs) -+ data = [data['envra'], data['rid']] -+ columns = base.calcColumns(data) -+ columns = (-columns[0], -columns[1]) -+ base._displayPkgsFromNames(pkg_names, True, pkg_names2pkgs, -+ columns=columns) -+ -+ return 0, ['version groupinfo'] -+ - rel = base.yumvar['releasever'] - ba = base.yumvar['basearch'] - cols = [] -- if vcmd in ('installed', 'all'): -+ if vcmd in ('installed', 'all', 'group-installed', 'group-all'): - try: -- data = base.rpmdb.simpleVersion() -- cols.append(("%s %s/%s" % (_("Installed:"), rel, ba), -- str(data[0]))) -- if base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3): -+ data = base.rpmdb.simpleVersion(not verbose, groups=groups) -+ lastdbv = base.history.last() -+ if lastdbv is not None: -+ lastdbv = lastdbv.end_rpmdbversion -+ if lastdbv is not None and data[0] != lastdbv: -+ errstring = _('Warning: RPMDB has been altered since the last yum transaction.') -+ base.logger.warning(errstring) -+ if vcmd not in ('group-installed', 'group-all'): -+ cols.append(("%s %s/%s" % (_("Installed:"), rel, ba), -+ str(data[0]))) - _append_repos(cols, data[1]) -+ if groups: -+ for grp in sorted(data[2]): -+ cols.append(("%s %s" % (_("Group-Installed:"), grp), -+ str(data[2][grp]))) -+ _append_repos(cols, data[3][grp]) - except yum.Errors.YumBaseError, e: - return 1, [str(e)] -- if vcmd in ('available', 'all'): -+ if vcmd in ('available', 'all', 'group-available', 'group-all'): - try: -- data = base.pkgSack.simpleVersion() -- cols.append(("%s %s/%s" % (_("Available:"), rel, ba), -- str(data[0]))) -- if base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3): -- _append_repos(cols, data[1]) -+ data = base.pkgSack.simpleVersion(not verbose, groups=groups) -+ if vcmd not in ('group-available', 'group-all'): -+ cols.append(("%s %s/%s" % (_("Available:"), rel, ba), -+ str(data[0]))) -+ if verbose: -+ _append_repos(cols, data[1]) -+ if groups: -+ for grp in sorted(data[2]): -+ cols.append(("%s %s" % (_("Group-Available:"), grp), -+ str(data[2][grp]))) -+ if verbose: -+ _append_repos(cols, data[3][grp]) - except yum.Errors.YumBaseError, e: - return 1, [str(e)] - -@@ -1126,10 +1188,86 @@ class VersionCommand(YumCommand): - for line in cols: - print base.fmtColumns(zip(line, columns)) - -- return 0, [] -+ return 0, ['version'] - - def needTs(self, base, basecmd, extcmds): - vcmd = 'installed' - if extcmds: - vcmd = extcmds[0] -- return vcmd in ('available', 'all') -+ verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) -+ if vcmd == 'groupinfo' and verbose: -+ return True -+ return vcmd in ('available', 'all', 'group-available', 'group-all') -+ -+ -+class HistoryCommand(YumCommand): -+ def getNames(self): -+ return ['history'] -+ -+ def getUsage(self): -+ return "[info|list|summary|redo|undo|new]" -+ -+ def getSummary(self): -+ return _("Display, or use, the transaction history") -+ -+ def _hcmd_redo(self, base, extcmds): -+ old = base._history_get_transaction(extcmds) -+ if old is None: -+ return 1, ['Failed history redo'] -+ tm = time.ctime(old.beg_timestamp) -+ print "Repeating transaction %u, from %s" % (old.tid, tm) -+ base.historyInfoCmdPkgsAltered(old) -+ if base.history_redo(old): -+ return 2, ["Repeating transaction %u" % (old.tid,)] -+ -+ def _hcmd_undo(self, base, extcmds): -+ old = base._history_get_transaction(extcmds) -+ if old is None: -+ return 1, ['Failed history undo'] -+ tm = time.ctime(old.beg_timestamp) -+ print "Undoing transaction %u, from %s" % (old.tid, tm) -+ base.historyInfoCmdPkgsAltered(old) -+ if base.history_undo(old): -+ return 2, ["Undoing transaction %u" % (old.tid,)] -+ -+ def _hcmd_new(self, base, extcmds): -+ base.history._create_db_file() -+ -+ def doCheck(self, base, basecmd, extcmds): -+ cmds = ('list', 'info', 'summary', 'repeat', 'redo', 'undo', 'new') -+ if extcmds and extcmds[0] not in cmds: -+ base.logger.critical(_('Invalid history sub-command, use: %s.'), -+ ", ".join(cmds)) -+ raise cli.CliError -+ if extcmds and extcmds[0] in ('repeat', 'redo', 'undo', 'new'): -+ checkRootUID(base) -+ checkGPGKey(base) -+ -+ def doCommand(self, base, basecmd, extcmds): -+ vcmd = 'list' -+ if extcmds: -+ vcmd = extcmds[0] -+ -+ if False: pass -+ elif vcmd == 'list': -+ ret = base.historyListCmd(extcmds) -+ elif vcmd == 'info': -+ ret = base.historyInfoCmd(extcmds) -+ elif vcmd == 'summary': -+ ret = base.historySummaryCmd(extcmds) -+ elif vcmd == 'undo': -+ ret = self._hcmd_undo(base, extcmds) -+ elif vcmd in ('redo', 'repeat'): -+ ret = self._hcmd_redo(base, extcmds) -+ elif vcmd == 'new': -+ ret = self._hcmd_new(base, extcmds) -+ -+ if ret is None: -+ return 0, ['history %s' % (vcmd,)] -+ return ret -+ -+ def needTs(self, base, basecmd, extcmds): -+ vcmd = 'list' -+ if extcmds: -+ vcmd = extcmds[0] -+ return vcmd in ('repeat', 'redo', 'undo') -diff --git a/yummain.py b/yummain.py -index 964975b..b2a09cc 100755 ---- a/yummain.py -+++ b/yummain.py -@@ -31,7 +31,7 @@ from yum import _ - from yum.i18n import to_unicode - import yum.misc - import cli -- -+from utils import suppress_keyboard_interrupt_message - - def main(args): - """This does all the real work""" -@@ -307,12 +307,18 @@ def user_main(args, exit_code=False): - errcode = cprof(main, args) - if os.environ['YUM_PROF'] == 'hotshot': - errcode = hotshot(main, args) -+ if 'YUM_PDB' in os.environ: -+ import pdb -+ pdb.run(main(args)) -+ - if errcode is None: - errcode = main(args) - if exit_code: - sys.exit(errcode) - return errcode - -+suppress_keyboard_interrupt_message() -+ - if __name__ == "__main__": - try: - user_main(sys.argv[1:], exit_code=True) diff --git a/yum-fix-skip-broken-with-post-depsolve-change.patch b/yum-fix-skip-broken-with-post-depsolve-change.patch new file mode 100644 index 0000000..97f8d5b --- /dev/null +++ b/yum-fix-skip-broken-with-post-depsolve-change.patch @@ -0,0 +1,67 @@ +commit 359ae828b915101116bb57fbe2645eae056c158b +Author: Tim Lauridsen +Date: Tue Mar 2 16:47:45 2010 +0100 + + Make skipbroken run again if packages has been added to transaction by a postresolve plugin + +diff --git a/yum/__init__.py b/yum/__init__.py +index f21001d..69af7ba 100644 +--- a/yum/__init__.py ++++ b/yum/__init__.py +@@ -866,20 +866,16 @@ class YumBase(depsolve.Depsolve): + # works for downloads / mirror failover etc. + self.rpmdb.ts = None + +- # if depsolve failed and skipbroken is enabled +- # The remove the broken packages from the transactions and +- # Try another depsolve +- if self.conf.skip_broken and rescode==1: +- self.skipped_packages = [] # reset the public list of skipped packages. +- sb_st = time.time() +- rescode, restring = self._skipPackagesWithProblems(rescode, restring) +- self._printTransaction() +- self.verbose_logger.debug('Skip-Broken time: %0.3f' % (time.time() - sb_st)) ++ # do the skip broken magic, if enabled and problems exist ++ (rescode, restring) = self._doSkipBroken(rescode, restring) + + self.plugins.run('postresolve', rescode=rescode, restring=restring) + + if self.tsInfo.changed: + (rescode, restring) = self.resolveDeps(rescode == 1) ++ # If transaction was changed by postresolve plugins then we should run skipbroken again ++ (rescode, restring) = self._doSkipBroken(rescode, restring, clear_skipped=False ) ++ + if self.tsInfo.pkgSack is not None: # rm Transactions don't have pkgSack + self.tsInfo.pkgSack.dropCachedData() + self.rpmdb.dropCachedData() +@@ -887,6 +883,21 @@ class YumBase(depsolve.Depsolve): + self.verbose_logger.debug('Depsolve time: %0.3f' % (time.time() - ds_st)) + return rescode, restring + ++ def _doSkipBroken(self,rescode, restring, clear_skipped=True): ++ ''' do skip broken if it is enabled ''' ++ # if depsolve failed and skipbroken is enabled ++ # The remove the broken packages from the transactions and ++ # Try another depsolve ++ if self.conf.skip_broken and rescode==1: ++ if clear_skipped: ++ self.skipped_packages = [] # reset the public list of skipped packages. ++ sb_st = time.time() ++ rescode, restring = self._skipPackagesWithProblems(rescode, restring) ++ self._printTransaction() ++ self.verbose_logger.debug('Skip-Broken time: %0.3f' % (time.time() - sb_st)) ++ return (rescode, restring) ++ ++ + def _skipPackagesWithProblems(self, rescode, restring): + ''' Remove the packages with depsolve errors and depsolve again ''' + +@@ -983,7 +994,7 @@ class YumBase(depsolve.Depsolve): + for po in skipped_list: + msg = _(" %s from %s") % (str(po),po.repo.id) + self.verbose_logger.info(msg) +- self.skipped_packages = skipped_list # make the skipped packages public ++ self.skipped_packages.extend(skipped_list) # make the skipped packages public + else: + # If we cant solve the problems the show the original error messages. + self.verbose_logger.info("Skip-broken could not solve problems") diff --git a/yum.spec b/yum.spec index 5607d8d..b155d44 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.26 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -15,7 +15,9 @@ Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch -Patch6: fix-kernel-updates.patch +Patch6: yum-HEAD.patch +Patch7: yum-fix-skip-broken-with-post-depsolve-change.patch + URL: http://yum.baseurl.org/ BuildArch: noarch @@ -60,6 +62,7 @@ can notify you when they are available via email, syslog or dbus. %patch4 -p0 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build make @@ -110,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Thu Mar 4 2010 Seth Vidal - 3.2.26-3 +- up to head-as-f13-has and include the skip-broken fix + + * Wed Feb 10 2010 Seth Vidal - 3.2.26-2 - grumble. From 9ad869fb98292ee80e73e29bb13130e73de1cd54 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Thu, 18 Mar 2010 18:50:05 +0000 Subject: [PATCH 11/21] 3.2.27 for f12, too --- sources | 2 +- yum.spec | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sources b/sources index de9bf69..46923a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84eede25288772f38719d5c9e13ae75e yum-3.2.26.tar.gz +b2b84be5fad612c4c698e37cc8510492 yum-3.2.27.tar.gz diff --git a/yum.spec b/yum.spec index b155d44..538e4a8 100644 --- a/yum.spec +++ b/yum.spec @@ -2,8 +2,8 @@ Summary: RPM installer/updater Name: yum -Version: 3.2.26 -Release: 3%{?dist} +Version: 3.2.27 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -16,7 +16,6 @@ Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch Patch6: yum-HEAD.patch -Patch7: yum-fix-skip-broken-with-post-depsolve-change.patch URL: http://yum.baseurl.org/ @@ -61,8 +60,7 @@ can notify you when they are available via email, syslog or dbus. %patch3 -p0 %patch4 -p0 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 +#%%%%patch6 -p1 %build make @@ -113,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Thu Mar 18 2010 Seth Vidal - 3.2.27-1 +- update to 3.2.27 - lots of fixes since 3.2.26 + * Thu Mar 4 2010 Seth Vidal - 3.2.26-3 - up to head-as-f13-has and include the skip-broken fix From 5d67ee57b17b7b75a0ec951af3ae5d831fab3ad6 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Tue, 23 Mar 2010 14:35:50 +0000 Subject: [PATCH 12/21] fix for breaking PK in f12, too --- yum-do-not-overwrite-keys.patch | 39 +++++++++++++++++++++++++++++++++ yum.spec | 8 +++++-- 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 yum-do-not-overwrite-keys.patch diff --git a/yum-do-not-overwrite-keys.patch b/yum-do-not-overwrite-keys.patch new file mode 100644 index 0000000..7280f90 --- /dev/null +++ b/yum-do-not-overwrite-keys.patch @@ -0,0 +1,39 @@ +commit 11dfde5e065e21c5bdb25a087501b90afe0b0dab +Author: Seth Vidal +Date: Tue Mar 23 10:09:20 2010 -0400 + + make sure we aren't overwriting the value of 'keys' + + this determines how many args we pass back in our yielded results + never noticed it b/c nothing in yum uses keys=True - but it broke PK + +diff --git a/yum/__init__.py b/yum/__init__.py +index ea73549..0aaa819 100644 +--- a/yum/__init__.py ++++ b/yum/__init__.py +@@ -2163,10 +2163,10 @@ class YumBase(depsolve.Depsolve): + + # do the ones we already have + for item in sorted_lists.values(): +- for pkg, keys, values in item: ++ for pkg, k, v in item: + if pkg not in results_by_pkg: + results_by_pkg[pkg] = [] +- results_by_pkg[pkg].append((keys,values)) ++ results_by_pkg[pkg].append((k,v)) + + # take our existing dict-by-pkg and make the dict-by-count for + # this bizarro sorted_lists format +@@ -2175,9 +2175,9 @@ class YumBase(depsolve.Depsolve): + for pkg in results_by_pkg: + totkeys = [] + totvals = [] +- for (keys, values) in results_by_pkg[pkg]: +- totkeys.extend(keys) +- totvals.extend(values) ++ for (k, v) in results_by_pkg[pkg]: ++ totkeys.extend(k) ++ totvals.extend(v) + + totkeys = misc.unique(totkeys) + totvals = misc.unique(totvals) diff --git a/yum.spec b/yum.spec index 538e4a8..d76a3ef 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.27 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -16,7 +16,7 @@ Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch Patch6: yum-HEAD.patch - +Patch7: yum-do-not-overwrite-keys.patch URL: http://yum.baseurl.org/ BuildArch: noarch @@ -61,6 +61,7 @@ can notify you when they are available via email, syslog or dbus. %patch4 -p0 %patch5 -p1 #%%%%patch6 -p1 +%patch7 -p1 %build make @@ -111,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Tue Mar 23 2010 Seth Vidal - 3.2.27-2 +- broke searching in PK, this patch fixes it. + * Thu Mar 18 2010 Seth Vidal - 3.2.27-1 - update to 3.2.27 - lots of fixes since 3.2.26 From ffebcd2974f5593a6b8ee7926ffce2a5123e2f40 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Thu, 8 Apr 2010 21:14:13 +0000 Subject: [PATCH 13/21] add reget size patch --- reget-metadata-size-fix.patch | 28 ++++++++++++++++++++++++++++ yum.spec | 8 +++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 reget-metadata-size-fix.patch diff --git a/reget-metadata-size-fix.patch b/reget-metadata-size-fix.patch new file mode 100644 index 0000000..2430310 --- /dev/null +++ b/reget-metadata-size-fix.patch @@ -0,0 +1,28 @@ +commit 2a9161a8b4bfc121fa8245700df355c63b58b442 +Author: James Antill +Date: Wed Mar 31 00:12:09 2010 -0400 + + Should work around the reget MD problems + +diff --git a/yum/yumRepo.py b/yum/yumRepo.py +index 8d7617e..b67b897 100644 +--- a/yum/yumRepo.py ++++ b/yum/yumRepo.py +@@ -1552,9 +1552,17 @@ class YumRepository(Repository, config.RepoConf): + try: + checkfunc = (self.checkMD, (mdtype,), {}) + text = "%s/%s" % (self.id, mdtype) ++ if thisdata.size is None: ++ reget = None ++ else: ++ reget = 'simple' ++ if os.path.exists(local): ++ if os.stat(local).st_size >= int(thisdata.size): ++ misc.unlink_f(local) + local = self._getFile(relative=remote, + local=local, + copy_local=1, ++ reget=reget, + checkfunc=checkfunc, + text=text, + cache=self.http_caching == 'all', diff --git a/yum.spec b/yum.spec index d76a3ef..147f9be 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.27 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -17,6 +17,7 @@ Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch Patch6: yum-HEAD.patch Patch7: yum-do-not-overwrite-keys.patch +Patch8: reget-metadata-size-fix.patch URL: http://yum.baseurl.org/ BuildArch: noarch @@ -62,6 +63,7 @@ can notify you when they are available via email, syslog or dbus. %patch5 -p1 #%%%%patch6 -p1 %patch7 -p1 +%patch8 -p1 %build make @@ -112,6 +114,10 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Thu Apr 8 2010 Seth Vidal - 3.2.27-3 +- fix regets on metadata when we run into an old file that's larger + than the new one + * Tue Mar 23 2010 Seth Vidal - 3.2.27-2 - broke searching in PK, this patch fixes it. From 09195f20f0ecf23cc601679976781d0c73851e8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:24:38 +0000 Subject: [PATCH 14/21] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index cc96bb3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yum -# $Id: Makefile,v 1.2 2007/10/15 19:38:44 notting Exp $ -NAME := yum -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From 93ab7205d41bb979f280a2550fb2742da26d2e25 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Fri, 30 Jul 2010 17:10:22 -0400 Subject: [PATCH 15/21] 3.2.28 and manpage patch --- sources | 2 +- yum-manpage-files.patch | 50 ++++++++++++++++++++++++++++------------- yum.spec | 27 ++++++++++++++-------- 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/sources b/sources index 46923a9..fa09d52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b2b84be5fad612c4c698e37cc8510492 yum-3.2.27.tar.gz +91eff58aa4c25cd4f46b21201bbf9bea yum-3.2.28.tar.gz diff --git a/yum-manpage-files.patch b/yum-manpage-files.patch index 4681ac5..f688725 100644 --- a/yum-manpage-files.patch +++ b/yum-manpage-files.patch @@ -1,20 +1,38 @@ -diff -urN olddocs/yum.8 docs/yum.8 ---- olddocs/yum.8 2008-03-17 12:09:29.000000000 -0400 -+++ docs/yum.8 2008-03-17 12:08:18.000000000 -0400 -@@ -339,8 +339,8 @@ +commit 102915d4d402493c48d434ae1d1756225c4468e0 +Author: James Antill +Date: Mon Jun 14 01:15:21 2010 -0400 + + Port manpage files path fixups. + +diff --git a/docs/yum.8 b/docs/yum.8 +index d5ede0a..3bdb408 100644 +--- a/docs/yum.8 ++++ b/docs/yum.8 +@@ -568,7 +568,7 @@ option in yum.conf. For a plugin to work, the following conditions must be met: + 1. The plugin module file must be installed in the plugin path as just + described. + .LP +-2. The global \fBplugins\fP option in /etc/yum/yum.conf must be set to `1'. ++2. The global \fBplugins\fP option in /etc/yum.conf must be set to `1'. + .LP + 3. A configuration file for the plugin must exist in + /etc/yum/pluginconf.d/.conf and the \fBenabled\fR setting in this +@@ -584,9 +584,9 @@ configuration options. .PP .SH "FILES" .nf -/etc/yum/yum.conf --/etc/yum/repos.d/ +/etc/yum.conf + /etc/yum/version-groups.conf +-/etc/yum/repos.d/ +/etc/yum.repos.d/ /etc/yum/pluginconf.d/ /var/cache/yum/ .fi - ---- olddocs/yum.conf.5.orig 2009-01-21 13:33:04.000000000 -0500 -+++ docs/yum.conf.5 2009-01-21 13:34:47.000000000 -0500 +diff --git a/docs/yum.conf.5 b/docs/yum.conf.5 +index ca36103..42815b9 100644 +--- a/docs/yum.conf.5 ++++ b/docs/yum.conf.5 @@ -4,10 +4,10 @@ \fByum.conf\fR \- Configuration file for \fByum(8)\fR. .SH "DESCRIPTION" @@ -28,9 +46,9 @@ diff -urN olddocs/yum.8 docs/yum.8 See the \fBreposdir\fR option below for further details. .SH "PARAMETERS" -@@ -38,10 +38,10 @@ - - .IP \fBreposdir\fR +@@ -42,10 +42,10 @@ of headers and packages after successful installation. Default is '1' + .IP + \fBreposdir\fR A list of directories where yum should look for .repo files which define -repositories to use. Default is `/etc/yum/repos.d'. Each +repositories to use. Default is `/etc/yum.repos.d'. Each @@ -40,8 +58,8 @@ diff -urN olddocs/yum.8 docs/yum.8 +repositories defined in /etc/yum.conf to form the complete set of repositories that yum will use. - .IP \fBdebuglevel\fR -@@ -511,8 +511,8 @@ + .IP +@@ -745,8 +745,8 @@ for any given command. Defaults to False. .SH "URL INCLUDE SYNTAX" .LP @@ -52,7 +70,7 @@ diff -urN olddocs/yum.8 docs/yum.8 line of the following format: include=url://to/some/location -@@ -549,8 +549,8 @@ +@@ -812,8 +812,8 @@ data in any value. .SH "FILES" .nf @@ -61,5 +79,5 @@ diff -urN olddocs/yum.8 docs/yum.8 +/etc/yum.conf +/etc/yum.repos.d/ /etc/yum/pluginconf.d/ - - .SH "SEE ALSO" + /etc/yum/protected.d + /etc/yum/vars diff --git a/yum.spec b/yum.spec index 147f9be..b91cbdc 100644 --- a/yum.spec +++ b/yum.spec @@ -2,8 +2,8 @@ Summary: RPM installer/updater Name: yum -Version: 3.2.27 -Release: 3%{?dist} +Version: 3.2.28 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -15,9 +15,9 @@ Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch -Patch6: yum-HEAD.patch -Patch7: yum-do-not-overwrite-keys.patch -Patch8: reget-metadata-size-fix.patch + +Patch20: yum-manpage-files.patch + URL: http://yum.baseurl.org/ BuildArch: noarch @@ -31,7 +31,14 @@ Requires: python-sqlite Requires: python-urlgrabber >= 3.9.0-8 Requires: yum-metadata-parser >= 1.1.0 Requires: pygpgme -Obsoletes: yum-skip-broken, yum-basearchonly +Obsoletes: yum-skip-broken <= 1.1.18 +Obsoletes: yum-basearchonly <= 1.1.9 +Obsoletes: yum-allow-downgrade < 1.1.20-0 +Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0 +Provides: yum-skip-broken +Provides: yum-basearchonly +Provides: yum-allow-downgrade +Provides: yum-plugin-allow-downgrade BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -61,9 +68,8 @@ can notify you when they are available via email, syslog or dbus. %patch3 -p0 %patch4 -p0 %patch5 -p1 -#%%%%patch6 -p1 -%patch7 -p1 -%patch8 -p1 + +%patch20 -p1 %build make @@ -114,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Fri Jul 30 2010 Seth Vidal - 3.2.28-1 +- 3.2.28 + * Thu Apr 8 2010 Seth Vidal - 3.2.27-3 - fix regets on metadata when we run into an old file that's larger than the new one From 55739e96b8bc3bdfe39805c20a6f06687926b39a Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Mon, 9 Aug 2010 15:39:48 -0400 Subject: [PATCH 16/21] update to head --- yum-HEAD.patch | 16789 +---------------------------------------------- yum.spec | 11 +- 2 files changed, 291 insertions(+), 16509 deletions(-) diff --git a/yum-HEAD.patch b/yum-HEAD.patch index 8a56e43..b1666fa 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -1,16534 +1,311 @@ -diff --git a/po/es.po b/po/es.po -index 49bf1c4..d9badab 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -1,15 +1,16 @@ - # Fedora Spanish translation of yum.yum-3_2_X. - # This file is distributed under the same license as the yum.yum-3_2_X. package. --# Héctor Daniel Cabrera , 2009. -+# - # Domingo Becker , 2009. -+# Héctor Daniel Cabrera , 2009, 2010. - # - msgid "" - msgstr "" - "Project-Id-Version: Fedora Spanish translation of yum.yum-3_2_X.\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" -+"POT-Creation-Date: 2010-02-10 10:43-0500\n" - "PO-Revision-Date: \n" --"Last-Translator: Héctor Daniel Cabrera \n" -+"Last-Translator: Héctor Daniel Cabrera \n" - "Language-Team: Fedora Spanish \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,33 +18,53 @@ msgstr "" - "X-Poedit-Language: Spanish\n" - "X-Poedit-Country: ARGENTINA\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 -+#: ../output.py:947 -+#: ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "Actualizando" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 -+#: ../yum/rpmtrans.py:73 - msgid "Erasing" - msgstr "Eliminando" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 -+#: ../callback.py:51 -+#: ../callback.py:53 -+#: ../output.py:946 -+#: ../output.py:1659 -+#: ../yum/rpmtrans.py:74 -+#: ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "Instalando" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 -+#: ../callback.py:58 -+#: ../output.py:1484 -+#: ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "Obsoleto" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 -+#: ../output.py:1070 -+#: ../output.py:1442 -+#: ../output.py:1491 - msgid "Updated" - msgstr "Actualizado" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 -+#: ../output.py:1438 - msgid "Erased" - msgstr "Eliminado" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 -+#: ../callback.py:57 -+#: ../callback.py:59 -+#: ../output.py:1068 -+#: ../output.py:1434 -+#: ../output.py:1646 - msgid "Installed" - msgstr "Instalado" - -@@ -65,68 +86,79 @@ msgstr "Error: estado de salida no válido: %s de %s" - msgid "Erased: %s" - msgstr "Eliminado: %s" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 -+#: ../output.py:948 -+#: ../output.py:1648 - msgid "Removing" - msgstr "Eliminando" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 -+#: ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "Limpieza" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "El comando \"%s\" ya ha sido definido" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "Configurando los repositorios" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "Leyendo en archivos locales los metadatos de los repositorios" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 -+#: ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "Error de configuración: %s" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 -+#: ../cli.py:1272 -+#: ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "Error de opciones: %s" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr " Instalado: %s-%s en %s" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" - msgstr " Construido: %s en %s" - --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" - msgstr " Enviado: %s en %s" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" - msgstr "Necesita ingresar algún comando" - --#: ../cli.py:309 -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "No existe el comando: %s. Por favor, utilice %s --help" -+ -+#: ../cli.py:314 - msgid "Disk Requirements:\n" - msgstr "Requerimientos de disco:\n" - --#: ../cli.py:311 -+#: ../cli.py:316 - #, python-format --msgid " At least %dMB needed on the %s filesystem.\n" --msgstr " Como mínimo se necesitan %dMB en el sistema de archivos %s.\n" -+msgid " At least %dMB more space needed on the %s filesystem.\n" -+msgstr " Como mínimo se necesitan %dMB más en el sistema de archivos %s.\n" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" -@@ -134,259 +166,271 @@ msgstr "" - "Resumen de errores\n" - "-------------\n" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." --msgstr "" --"Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo." -+msgstr "Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo." - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" - msgstr "Saliendo de acuerdo al comando del usuario" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "Descargando paquetes:" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "Error al descargar los paquetes:\n" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 -+#: ../yum/__init__.py:4194 - msgid "Running rpm_check_debug" - msgstr "Ejecutando el rpm_check_debug" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 -+#: ../yum/__init__.py:4203 - msgid "ERROR You need to update rpm to handle:" - msgstr "ERROR Necesita actualizar el rpm para manipular:" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 -+#: ../yum/__init__.py:4206 - msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "ERROR con el rpm_check_debug vs depsolve:" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" - msgstr "El RPM necesita ser actualizado" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" - msgstr "Por favor, reporte este error en %s" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "Ejecutando prueba de transacción" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "Prueba de transacción finalizada" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "Error en la verificación de la transacción:\n" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "La prueba de transacción ha sido exitosa" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "Ejecutando transacción" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." - msgstr "" --"Se rechaza la importación automática de claves cuando se ejecuta " --"desatendida.\n" -+"Se rechaza la importación automática de claves cuando se ejecuta desatendida.\n" - "Utilice \"-y\" para forzar." - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 -+#: ../cli.py:578 - msgid " * Maybe you meant: " - msgstr " * Tal vez quería decir: " - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 -+#: ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." --msgstr "" --"El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) " --"instalado." -+msgstr "El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) instalado." - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 -+#: ../cli.py:607 -+#: ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "No existe disponible ningún paquete %s%s%s." - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 -+#: ../cli.py:748 - msgid "Package(s) to install" - msgstr "Paquete(s) a instalarse" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 -+#: ../cli.py:693 -+#: ../cli.py:727 -+#: ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "Nada para hacer" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "%d paquetes han sido seleccionados para ser actualizados" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "No se han seleccionando paquetes para ser actualizados" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "%d paquetes han sido seleccionados para ser eliminados" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "No se han seleccionado paquetes para ser eliminados" - --#: ../cli.py:683 -+#: ../cli.py:692 - msgid "Package(s) to downgrade" - msgstr "Paquete(s) a desactualizar" - --#: ../cli.py:707 -+#: ../cli.py:717 - #, python-format - msgid " (from %s)" - msgstr " (desde %s)" - --#: ../cli.py:709 -+#: ../cli.py:719 - #, python-format - msgid "Installed package %s%s%s%s not available." - msgstr "El paquete instalado %s%s%s%s no se encuentra disponible." - --#: ../cli.py:716 -+#: ../cli.py:726 - msgid "Package(s) to reinstall" - msgstr "Paquete(s) a reinstalar" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" - msgstr "No se ha ofrecido ningún paquete" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "Concordante: %s" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" - msgstr "Aviso: No se ha encontrado ningún resultado para: %s" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "No se ha encontrado ningún resultado" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" - " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" - msgstr "" --"Aviso: las versiones 3.0.x de yum podrían hacer corresponder equivocadamente " --"los nombres de los archivos.\n" -+"Aviso: las versiones 3.0.x de yum podrían hacer corresponder equivocadamente los nombres de los archivos.\n" - " Puede usar \"%s*/%s%s\" y/o \"%s*bin/%s%s\" para conseguir eso" - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "No se ha encontrado ningún paquete para %s" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "Limpiando todo" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" - msgstr "Limpiando encabezados" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "Limpiando paquetes" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "Limpiando metadatos xml" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" - msgstr "Limpiando el caché de la base de datos" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" - msgstr "Limpiando metadatos expirados del caché" - --#: ../cli.py:912 -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "Limpiando datos de rpmdb en el caché" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" - msgstr "Limpiando complementos" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "Grupos instalados:" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "Grupos disponibles:" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "Listo" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 -+#: ../cli.py:1006 -+#: ../cli.py:1012 -+#: ../yum/__init__.py:2787 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "Aviso: el grupo %s no existe." - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" --msgstr "" --"En los grupos solicitados no existe disponible ningún paquete para ser " --"instalado o actualizado" -+msgstr "En los grupos solicitados no existe disponible ningún paquete para ser instalado o actualizado" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "%d paquete(s) a instalar" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 -+#: ../yum/__init__.py:2799 - #, python-format - msgid "No group named %s exists" - msgstr "No existe ningún grupo denominado %s" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "No existen paquetes a eliminarse de los grupos" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" - msgstr "%d paquete(s) a eliminar" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" - msgstr "Ya se encuentra instalado el paquete %s, ignorando" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" - msgstr "Descartando paquete no comparable %s.%s" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" --msgstr "" --"No existe instalado otro %s, agregando a la lista para instalación posible" -+msgstr "No existe instalado otro %s, agregando a la lista para instalación posible" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" - msgstr "Opciones de complementos" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" - msgstr "Error en la línea de comando: %s" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -397,109 +441,114 @@ msgstr "" - "\n" - "%s: la opción %s necesita un argumento" - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "--color acepta una de las siguientes opciones: auto, always, never" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" - msgstr "muestra este mensaje de ayuda y cierra" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" - msgstr "sea tolerante con los errores" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" - msgstr "se ejecuta completamente a partir del caché, pero no lo actualiza" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" - msgstr "configurar ubicación de archivo" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" - msgstr "tiempo máximo de espera del comando" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "nivel de depuración de la salida" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" --msgstr "" --"muestra duplicados en los repositorios, y en los comandos para mostrar/buscar" -+msgstr "muestra duplicados en los repositorios, y en los comandos para mostrar/buscar" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "nivel de error de la salida" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "nivel de depuración de salida para rpm" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "operación discreta" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "operación detallada" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "responde \"si\" a todas las preguntas" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" - msgstr "muestra la versión de Yum y finaliza" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" - msgstr "define la raíz de instalación" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "activa uno o más repositorios (los comodines son permitidos)" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" - msgstr "desactiva uno o más repositorios (los comodines son permitidos)" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" - msgstr "excluya paquete(s) de acuerdo a su nombre o glob " - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" --msgstr "" --"deshabilita la posibilidad de exclusión desde main, para un repositorio o " --"para todos" -+msgstr "deshabilita la posibilidad de exclusión desde main, para un repositorio o para todos" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "habilita el proceso de paquetes obsoletos durante las actualizaciones" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "deshabilita los complementos de Yum" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "deshabilita la verificación de firmas GPG" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "deshabilita complementos de acuerdo a su nombre" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "habilita complementos de acuerdo a su nombre" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" - msgstr "ignora paquetes con problemas de resolución de dependencias" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" - msgstr "controla la utilización de colores" - -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "define el valor de $releasever en los aarchivos de configuración de yum y de los repositorios" -+ - #: ../output.py:305 - msgid "Jan" - msgstr "Ene" -@@ -552,105 +601,104 @@ msgstr "Dic" - msgid "Trying other mirror." - msgstr "Intentando con otro espejo." - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "Nombre : %s%s%s" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "Arquitectura : %s" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" - msgstr "Período : %s" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "Versión : %s" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" - msgstr "Lanzamiento : %s" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "Tamaño : %s" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "Repositorio : %s" - --#: ../output.py:547 -+#: ../output.py:543 - #, python-format - msgid "From repo : %s" - msgstr "Desde el repositorio : %s" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "Enviado por : %s" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "Horario del envio : %s" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "Horario de la construcción : %s" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "Horario de la instalación: %s" - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "Resumen : " - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:557 --#, python-format --msgid "License : %s" --msgstr "Licencia : %s" -+#: ../output.py:553 -+msgid "License : " -+msgstr "Licencia : " - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "Descripción:" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "s" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "si" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "n" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "no" - --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " - msgstr "Está de acuerdo [s/N]:" - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" -@@ -659,150 +707,152 @@ msgstr "" - "\n" - "Grupo: %s" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr " Group-Id: %s" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr " Descripción: %s" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr " Paquetes obligatorios:" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr " Paquetes predeterminados:" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" - msgstr " Paquetes opcionales:" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr " Paquetes condicionales:" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "paquete: %s" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr " No existen dependencias para este paquete" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr " dependencia: %s" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr " Dependencia no satisfecha" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "Repositorio : %s" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "Resultado obtenido desde:" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " - msgstr "Descripción :" - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "Licencia : %s" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" - msgstr "Nombre del archivo : %s" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "Otro : " - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" - msgstr "Hubo un error mientras se calculaba el tamaño total de la descarga" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "Tamaño total: %s" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "Tamaño total de la descarga: %s" - --#: ../output.py:942 -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "Tamaño instalado: %s" -+ -+#: ../output.py:949 - msgid "Reinstalling" - msgstr "Reinstalando" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" - msgstr "Desactualizando" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" - msgstr "Instalando para las dependencias" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" - msgstr "Actualizando para las dependencias" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "Eliminando para las dependencias" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 -+#: ../output.py:1072 - msgid "Skipped (dependency problems)" - msgstr "Ignorando (problemas de dependencias)" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" - msgstr "Paquete" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" - msgstr "Arquitectura" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" - msgstr "Versión" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" - msgstr "Repositorio" - --#: ../output.py:978 -+#: ../output.py:985 - msgid "Size" - msgstr "Tamaño" - --#: ../output.py:990 -+#: ../output.py:997 - #, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" --msgstr "" --" reemplazando %s%s%s.%s %s\n" --"\n" -+msgid " replacing %s%s%s.%s %s\n" -+msgstr " reemplazando %s%s%s.%s %s\n" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" -@@ -813,7 +863,7 @@ msgstr "" - "Resumen de la transacción\n" - "%s\n" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" -@@ -822,7 +872,7 @@ msgstr "" - "Instalar %5.5s Paquete(s)\n" - "Actualizar %5.5s Paquete(s)\n" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" -@@ -833,32 +883,32 @@ msgstr "" - "Reinstalar %5.5s Paquete(s)\n" - "Desactualizar %5.5s Paquete(s)\n" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" - msgstr "Eliminado(s)" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "Dependencia(s) eliminada(s)" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "Dependencia(s) instalada(s)" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "Dependencia(s) actualizada(s)" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "Sustituido(s)" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "Falló" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" - msgstr "dos" - -@@ -866,228 +916,389 @@ msgstr "dos" - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 -+#: ../output.py:1151 - #, python-format - msgid "" - "\n" --" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " --"seconds\n" -+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" - "to exit.\n" - msgstr "" - "\n" --" Se ha cancelado la descarga actual, %sinterrumpa con (ctrl-c) nuevamente%s " --"dentro de %s%s%s segundos\n" -+" Se ha cancelado la descarga actual, %sinterrumpa con (ctrl-c) nuevamente%s dentro de %s%s%s segundos\n" - "para finalizar.\n" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "interrupción solicitada por el usuario" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "Total" - -+#: ../output.py:1202 -+msgid "I" -+msgstr "I" -+ - #: ../output.py:1203 -+msgid "O" -+msgstr "O" -+ -+#: ../output.py:1204 -+msgid "E" -+msgstr "E" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "R" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "D" -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "U" -+ -+#: ../output.py:1217 - msgid "" - msgstr "" - --#: ../output.py:1204 -+#: ../output.py:1218 - msgid "System" - msgstr "Sistema" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" - msgstr "Se ha(n) indicado paquete(s), o IDs de transacciones erróneas" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." --msgstr "" --"Aviso: Desde la última transacción, han sido modificadas las bases de datos " --"(RPMDB)." -+#: ../output.py:1266 -+msgid "ID" -+msgstr "ID" -+ -+#: ../output.py:1267 -+#: ../output.py:1520 -+msgid "Login user" -+msgstr "Registro de usuario" -+ -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "Día y hora" -+ -+#: ../output.py:1269 -+#: ../output.py:1522 -+msgid "Action(s)" -+msgstr "Acción(es)" - --#: ../output.py:1289 -+#: ../output.py:1270 -+#: ../output.py:1523 -+msgid "Altered" -+msgstr "Modificado" -+ -+#: ../output.py:1310 - msgid "No transaction ID given" - msgstr "No se ha indicado un ID de transacción" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" - msgstr "Se ha indicado un ID de transacción no válido " - --#: ../output.py:1302 -+#: ../output.py:1341 - msgid "Not found given transaction ID" - msgstr "No se ha encontrado el ID de transacción indicado" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" - msgstr "¡Se ha encontrado más de un ID de transacción!" - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" - msgstr "No se ha indicado ningún paquete, o ID de transacción" - --#: ../output.py:1357 -+#: ../output.py:1396 - msgid "Transaction ID :" - msgstr "ID de transacción :" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" - msgstr "Hora inicial :" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 -+#: ../output.py:1403 - msgid "Begin rpmdb :" - msgstr "Rpmdb inicial :" - --#: ../output.py:1378 -+#: ../output.py:1417 - #, python-format - msgid "(%s seconds)" - msgstr "(%s segundos)" - --#: ../output.py:1379 -+#: ../output.py:1418 - msgid "End time :" - msgstr "Hora final : " - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 -+#: ../output.py:1423 - msgid "End rpmdb :" - msgstr "Rpmdb final :" - --#: ../output.py:1385 -+#: ../output.py:1424 - msgid "User :" - msgstr "Usuario :" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 -+#: ../output.py:1426 -+#: ../output.py:1428 -+#: ../output.py:1430 - msgid "Return-Code :" - msgstr "Codigo-obtenido :" - --#: ../output.py:1387 -+#: ../output.py:1426 - msgid "Aborted" - msgstr "Abortado" - --#: ../output.py:1389 -+#: ../output.py:1428 - msgid "Failure:" - msgstr "Falla:" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" - msgstr "Exito" - --#: ../output.py:1392 -+#: ../output.py:1431 - msgid "Transaction performed with:" - msgstr "Transacción realizada con:" - --#: ../output.py:1405 -+#: ../output.py:1444 -+#: ../output.py:1489 - msgid "Downgraded" - msgstr "Desactualizado" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" - msgstr "Extraño" - --#: ../output.py:1409 -+#: ../output.py:1448 - msgid "Packages Altered:" - msgstr "Paquetes modificados:" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" - msgstr "Información del scriptlet:" - --#: ../output.py:1418 -+#: ../output.py:1457 - msgid "Errors:" - msgstr "Errores:" - --#: ../output.py:1489 -+#: ../output.py:1481 -+#: ../output.py:1482 -+msgid "Install" -+msgstr "Instalar" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "Instalación de dependencias" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "Convirtiendo en obsoleto" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "Eliminar" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "Reinstalar" -+ -+#: ../output.py:1488 -+msgid "Downgrade" -+msgstr "Desactualizar" -+ -+#: ../output.py:1490 -+msgid "Update" -+msgstr "Actualizar" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "Hora" -+ -+#: ../output.py:1547 - msgid "Last day" - msgstr "Ultimo día" - --#: ../output.py:1490 -+#: ../output.py:1548 - msgid "Last week" - msgstr "Ultima semana" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" - msgstr "Ultimas 2 semanas" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" - msgstr "Ultimos 3 meses" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" - msgstr "Ultimos 6 meses" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" - msgstr "Ultimo año" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" - msgstr "Hace más de un año" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "instalado" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "actualizado" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "obsoleto" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" - msgstr "eliminado" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> Paquete %s.%s %s:%s-%s definido para ser %s" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "--> Ejecutando prueba de transacción" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." --msgstr "" --"--> Reiniciando la resolución de las dependencias con las nuevas " --"modificaciones." -+msgstr "--> Reiniciando la resolución de las dependencias con las nuevas modificaciones." - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" - msgstr "--> Resolución de dependencias finalizada" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 -+#: ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" - msgstr "--> Procesando dependencias: %s para el paquete: %s" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" - msgstr "--> Dependencia no resuelta: %s" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "Paquete: %s" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+"\n" -+" Necesita: %s" -+ -+#: ../output.py:1649 -+#: ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+"\n" -+" %s: %s (%s)" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "Disponible" -+ -+#: ../output.py:1665 -+#: ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> Procesando conflictos: %s choca con %s" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." --msgstr "" --"--> Construyendo el conjunto de las transacciones con los paquetes " --"seleccionados. Por favor aguarde." -+msgstr "--> Construyendo el conjunto de las transacciones con los paquetes seleccionados. Por favor aguarde." - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." --msgstr "" --"---> Descargando el encabezado de %s para incluirlo en el conjunto de " --"transacciones." -+msgstr "---> Descargando el encabezado de %s para incluirlo en el conjunto de transacciones." -+ -+#: ../utils.py:93 -+msgid "Running" -+msgstr "Ejecutando" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "Durmiendo" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "Ininterrumplible" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "Zombi" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "Rastreado/Detenido" - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:98 -+#: ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "Desconocido" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr " La otra aplicación es: PackageKit" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr " La otra aplicación es: %s" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " Memoria : %5s RSS (%5sB VSZ)" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " Iniciado: %s - %s atrás" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " Estado : %s, pid: %d" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "Error de PluginExit: %s" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "Error de yum: %s" -+ -+#: ../utils.py:235 -+#: ../yummain.py:42 - msgid "" - "\n" - "\n" -@@ -1097,7 +1308,8 @@ msgstr "" - "\n" - "Saliendo por cancelación del usuario" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 -+#: ../yummain.py:48 - msgid "" - "\n" - "\n" -@@ -1107,7 +1319,8 @@ msgstr "" - "\n" - "Saliendo por tubería rota" - --#: ../utils.py:145 ../yummain.py:50 -+#: ../utils.py:243 -+#: ../yummain.py:50 - #, python-format - msgid "" - "\n" -@@ -1118,20 +1331,20 @@ msgstr "" - "\n" - "%s" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 -+#: ../yummain.py:211 - msgid "Complete!" - msgstr "¡Listo!" - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." - msgstr "Necesita ser usuario root para poder ejecutar este comando." - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" --"However, you do not have any GPG public keys installed. You need to " --"download\n" -+"However, you do not have any GPG public keys installed. You need to download\n" - "the keys for packages you wish to install and install them.\n" - "You can do that by running the command:\n" - " rpm --import public.gpg.key\n" -@@ -1144,10 +1357,8 @@ msgid "" - "For more information contact your distribution or package provider.\n" - msgstr "" - "\n" --"Usted tiene habilitada la verificación de paquetes mediante llaves GPG. Eso " --"es bueno. \n" --"Sin embargo, usted no tiene ninguna llave pública GPG instalada. Necesita " --"descargar\n" -+"Usted tiene habilitada la verificación de paquetes mediante llaves GPG. Eso es bueno. \n" -+"Sin embargo, usted no tiene ninguna llave pública GPG instalada. Necesita descargar\n" - "e instalar las llaves de todos los paquetes que desee instalar.\n" - "Esto puede hacerlo si ejecuta el comando:\n" - " rpm --import public.gpg.key\n" -@@ -1157,339 +1368,344 @@ msgstr "" - "en la opción 'gpgkey' en la sección del repositorio, y yum \n" - "la instalará por usted.\n" - "\n" --"Para obtener mayor información, póngase en contacto con su distribución o " --"con su proveedor de paquetes.\n" -+"Para obtener mayor información, póngase en contacto con su distribución o con su proveedor de paquetes.\n" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" - msgstr "Error: Necesita pasar una lista de paquetes a %s " - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" - msgstr "Error: Es necesario un ítem con el cual corresponderse" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" - msgstr "Error: Es necesario un grupo o una lista de grupos" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "Error: la limpieza necesita una opción: %s" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "Error: argumento de limpieza no válido: %r" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "No hay argumento para el shell" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "Nombre de archivo pasado al shell: %s" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "El archivo %s indicado como argumento para el shell no existe." - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "Error: se ha indicado más de un archivo como argumento para el shell" - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "PAQUETE..." - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "Instala uno o varios paquetes en su sistema" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" - msgstr "Configurando el proceso de instalación" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "[PAQUETE...]" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "Actualiza uno o varios paquetes en su sistema" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" - msgstr "Configurando el proceso de actualización" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" - msgstr "Muestra detalles acerca de un paquete o de un grupo de paquetes" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "Paquetes instalados" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "Paquetes disponibles" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "Paquetes extra" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" - msgstr "Paquetes actualizados" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 -+#: ../yumcommands.py:324 -+#: ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "Convirtiendo paquetes en obsoletos" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "Paquetes añadidos recientemente" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "No hay paquetes que se correspondan con la lista" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "Muestra un paquete o grupos de paquete" - --#: ../yumcommands.py:361 -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" - msgstr "Elimina uno o varios paquetes de su sistema" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" - msgstr "Configurando el proceso de eliminación" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" - msgstr "Configurando el proceso de grupo" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" - msgstr "No existen grupos sobre los cuales ejecutar el comando" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "Muestra los grupos de paquetes disponibles" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" - msgstr "Instala los paquetes en un grupo de su sistema" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" - msgstr "Elimina los paquetes de un grupo de su sistema" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "Muestra detalles acerca de un grupo de paquetes" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "Genera el caché de metadatos" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "Creando los archivos de caché para todos los archivos de metadatos." - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" --msgstr "" --"Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo" -+msgstr "Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "Se ha creado el caché de metadatos" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" - msgstr "Elimina los datos del caché" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" - msgstr "Localiza el paquete que ofrezca el valor indicado" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "Verifica la existencia de actualizaciones de paquetes" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "Busca detalles en los paquetes para la cadena indicada" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "Buscando paquetes:" - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" - msgstr "Actualiza los paquetes tomando en cuenta los obsoletos" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" - msgstr "Configurando el proceso de actualización" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" - msgstr "Instala un RPM local" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" - msgstr "Configurando el proceso de instalación local de paquetes" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" - msgstr "Determina qué paquetes ofrecen la dependencia indicada" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "Buscando paquetes para la dependencia:" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" - msgstr "Ejecuta una shell de Yum interactiva " - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "Configurando la shell de Yum" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" - msgstr "Muestra las dependencias que necesita un paquete" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "Buscando dependencias:" - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "Muestra los repositorios de software configurados" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 -+#: ../yumcommands.py:823 - msgid "enabled" - msgstr "habilitado" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 -+#: ../yumcommands.py:850 - msgid "disabled" - msgstr "deshabilitado" - --#: ../yumcommands.py:834 -+#: ../yumcommands.py:866 - msgid "Repo-id : " - msgstr "Repo-id : " - --#: ../yumcommands.py:835 -+#: ../yumcommands.py:867 - msgid "Repo-name : " - msgstr "Repo-name : " - --#: ../yumcommands.py:836 -+#: ../yumcommands.py:870 - msgid "Repo-status : " - msgstr "Repo-status : " - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "Repo-revision: " - --#: ../yumcommands.py:842 -+#: ../yumcommands.py:877 - msgid "Repo-tags : " - msgstr "Repo-tags : " - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "Repo-distro-tags: " - --#: ../yumcommands.py:853 -+#: ../yumcommands.py:888 - msgid "Repo-updated : " - msgstr "Repo-updated : " - --#: ../yumcommands.py:855 -+#: ../yumcommands.py:890 - msgid "Repo-pkgs : " - msgstr "Repo-pkgs : " - --#: ../yumcommands.py:856 -+#: ../yumcommands.py:891 - msgid "Repo-size : " - msgstr "Repo-size : " - --#: ../yumcommands.py:863 -+#: ../yumcommands.py:898 - msgid "Repo-baseurl : " - msgstr "Repo-baseurl : " - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " - msgstr "Repo-metalink: " - --#: ../yumcommands.py:875 -+#: ../yumcommands.py:910 - msgid " Updated : " - msgstr " Actualizados : " - --#: ../yumcommands.py:878 -+#: ../yumcommands.py:913 - msgid "Repo-mirrors : " - msgstr "Repo-mirrors : " - --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "Desconocido" -- --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" - msgstr "Nunca (último: %s)" - --#: ../yumcommands.py:890 -+#: ../yumcommands.py:925 - #, python-format - msgid "Instant (last: %s)" - msgstr "Instante (último: %s)" - --#: ../yumcommands.py:893 -+#: ../yumcommands.py:928 - #, python-format - msgid "%s second(s) (last: %s)" - msgstr "%s segundo(s) (último: %s)" - --#: ../yumcommands.py:895 -+#: ../yumcommands.py:930 - msgid "Repo-expire : " - msgstr "Repo-expire : " - --#: ../yumcommands.py:898 -+#: ../yumcommands.py:933 - msgid "Repo-exclude : " - msgstr "Repo-exclude : " - --#: ../yumcommands.py:902 -+#: ../yumcommands.py:937 - msgid "Repo-include : " - msgstr "Repo-include : " - -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "Repositorio excluído:" -+ - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 -+#: ../yumcommands.py:980 - msgid "repo id" - msgstr "id del repositorio" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 -+#: ../yumcommands.py:969 -+#: ../yumcommands.py:987 - msgid "status" - msgstr "estado" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "nombre del repositorio" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" - msgstr "Muestra un mensaje de ayuda del uso" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "No existe asistencia disponible para %s" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" -@@ -1499,7 +1715,7 @@ msgstr "" - "\n" - "apodos: " - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" -@@ -1509,144 +1725,98 @@ msgstr "" - "\n" - "apodo: " - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" - msgstr "Configurando el proceso de reinstalación" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" - msgstr "reinstalar un paquete" - --#: ../yumcommands.py:1060 -+#: ../yumcommands.py:1113 - msgid "Setting up Downgrade Process" - msgstr "Configurando el proceso de desactualización" - --#: ../yumcommands.py:1067 -+#: ../yumcommands.py:1120 - msgid "downgrade a package" - msgstr "desactualizar un paquete a una versión anterior" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." - msgstr "Muestra una versión para la máquina y/o los repositorios disponibles." - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" - msgstr " Grupos de la versión de Yum:" - --#: ../yumcommands.py:1121 -+#: ../yumcommands.py:1183 - msgid " Group :" - msgstr " Grupo :" - --#: ../yumcommands.py:1122 -+#: ../yumcommands.py:1184 - msgid " Packages:" - msgstr " Paquetes:" - --#: ../yumcommands.py:1152 -+#: ../yumcommands.py:1213 - msgid "Installed:" - msgstr "Instalado:" - --#: ../yumcommands.py:1157 -+#: ../yumcommands.py:1218 - msgid "Group-Installed:" - msgstr "Grupo-Instalado:" - --#: ../yumcommands.py:1166 -+#: ../yumcommands.py:1227 - msgid "Available:" - msgstr "Disponible:" - --#: ../yumcommands.py:1172 -+#: ../yumcommands.py:1233 - msgid "Group-Available:" - msgstr "Grupo-Disponible:" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" - msgstr "Mostrar, o utilizar, el historial de la transacción" - --#: ../yumcommands.py:1239 -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." - msgstr "Sub-comando de historia no válido, utilice: %s" - --#: ../yummain.py:128 --msgid "Running" --msgstr "Ejecutando" -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" -+msgstr "Verifica si hay problemas en la base de datos (rpmdb)" - --#: ../yummain.py:129 --msgid "Sleeping" --msgstr "Durmiendo" -+#: ../yummain.py:102 -+msgid "Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " - - #: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "Ininterrumplible" -- --#: ../yummain.py:131 --msgid "Zombie" --msgstr "Zombi" -- --#: ../yummain.py:132 --msgid "Traced/Stopped" --msgstr "Rastreado/Detenido" -- --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr " La otra aplicación es: PackageKit" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr " La otra aplicación es: %s" -- --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr " Memoria : %5s RSS (%5sB VSZ)" -- --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr " Iniciado: %s - %s atrás" -- --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr " Estado : %s, pid: %d" -- --#: ../yummain.py:173 --msgid "" --"Another app is currently holding the yum lock; waiting for it to exit..." --msgstr "" --"Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " -- --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "Error: %s" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 -+#: ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" - msgstr "Error(es) desconocido(s): Código de salida: %d:" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "Resolviendo dependencias" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" --msgstr "" --" Podría intentar utilizar el comando --skip-broken para sortear el problema" -+msgstr " Podría intentar utilizar el comando --skip-broken para sortear el problema" - --#: ../yummain.py:243 --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" --msgstr "" --" Podría intentar ejecutar: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+#: ../yummain.py:175 -+#: ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" -+msgstr "Podría intentar ejecutar: rpm- Va --nofiles --nodigest" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" -@@ -1654,7 +1824,7 @@ msgstr "" - "\n" - "Dependencias resueltas" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1670,8 +1840,7 @@ msgstr "doTsSetup() desaparecerá en alguna versión posterior de Yum.\n" - - #: ../yum/depsolve.py:97 - msgid "Setting up TransactionSets before config class is up" --msgstr "" --"Configurando TransactionSets antes de la activación de clase de configuración" -+msgstr "Configurando TransactionSets antes de la activación de clase de configuración" - - #: ../yum/depsolve.py:148 - #, python-format -@@ -1693,177 +1862,167 @@ msgstr "Posible correspondencia para %s desde %s" - msgid "Matched %s to require for %s" - msgstr "Se ha encontrado %s para poder solicitar %s" - --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:225 - #, python-format - msgid "Member: %s" - msgstr "Miembro: %s" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:239 -+#: ../yum/depsolve.py:754 - #, python-format - msgid "%s converted to install" - msgstr "%s convertido para instalar" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:246 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "Agregando paquete %s en modo %s" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:256 - #, python-format - msgid "Removing Package %s" - msgstr "Eliminando paquete %s" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:278 - #, python-format - msgid "%s requires: %s" - msgstr "%s necesita: %s" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:319 -+#, python-format -+msgid "%s requires %s" -+msgstr "%s necesita %s" -+ -+#: ../yum/depsolve.py:346 - msgid "Needed Require has already been looked up, cheating" - msgstr "El requerimiento que se necesita ya fue buscado, haciendo trampa" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:356 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" - msgstr "El requerimiento necesitado no es un nombre de paquete. Buscando: %s" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Potential Provider: %s" - msgstr "Proveedor posible: %s" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:386 - #, python-format - msgid "Mode is %s for provider of %s: %s" - msgstr "El modo es %s para el proveedor de %s: %s" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:390 - #, python-format - msgid "Mode for pkg providing %s: %s" - msgstr "Modo para el paquete que ofrece %s: %s" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:394 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "TSINFO: el paquete %s que necesita %s ha sido marcado para eliminarse" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:407 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." --msgstr "" --"TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la " --"dependencia." -+msgstr "TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la dependencia." - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:410 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "TSINFO: Actualizando %s para resolver la dependencia." - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:418 - #, python-format - msgid "Cannot find an update path for dep for: %s" --msgstr "" --"No es posible encontrar un camino de actualización para la dependencia para: " --"%s" -- --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "Requerimiento %s irresoluble para %s" -+msgstr "No es posible encontrar un camino de actualización para la dependencia para: %s" - --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:449 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "Rápidamente se ha localizado %s al ser requerido por %s" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:491 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." --msgstr "" --"%s se encuentra entre los paquetes provistos, pero ya está instalado, " --"eliminando. " -+msgstr "%s se encuentra entre los paquetes provistos, pero ya está instalado, eliminando. " - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:507 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." - msgstr "El paquete de solución posible %s posee una nueva instancia en ts." - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:518 - #, python-format - msgid "Potential resolving package %s has newer instance installed." --msgstr "" --"El paquete de solución posible %s posee una nueva instancia ya instalada." -- --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "" --"No se encuentra una dependencia: es necesario %s para poder instalar el " --"paquete %s" -+msgstr "El paquete de solución posible %s posee una nueva instancia ya instalada." - --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:536 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "%s ya se encuentra en ts, ignorándolo" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:578 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: Seleccionado %s como actualización de %s" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:586 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: Seleccionando %s como una instalación para %s" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:690 -+#: ../yum/depsolve.py:781 - msgid "Success - empty transaction" - msgstr "Exito - transacción vacía" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:729 -+#: ../yum/depsolve.py:744 - msgid "Restarting Loop" - msgstr "Reiniciando el bucle" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:760 - msgid "Dependency Process ending" - msgstr "Finalizando el proceso de dependencias" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:774 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "%s desde %s tiene problemas de resolución de dependencias" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:782 - msgid "Success - deps resolved" - msgstr "Exito - dependencias resueltas" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:796 - #, python-format - msgid "Checking deps for %s" - msgstr "Verificando dependencias para %s" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:874 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "localizando a %s como un requerimiento de %s" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1090 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "Ejecutando compare_providers() para %s" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1117 -+#: ../yum/depsolve.py:1123 - #, python-format - msgid "better arch in po %s" - msgstr "mejor arquitectura en po %s" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1218 - #, python-format - msgid "%s obsoletes %s" - msgstr "%s hace obsoleto a %s" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1230 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" -@@ -1872,124 +2031,137 @@ msgstr "" - "archdist comparó %s con %s en %s\n" - " Vencedor: %s" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1237 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "sourcerpm común %s y %s" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1241 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "el paquete principal %s está instalado para %s" -+ -+#: ../yum/depsolve.py:1247 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "prefijo común de %s entre %s y %s" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1256 - #, python-format - msgid "Best Order: %s" - msgstr "Mejor orden: %s" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "doConfigSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" --msgstr "" --"Al repositorio %r le falta un nombre en su configuración, utilizando el id" -+msgstr "Al repositorio %r le falta un nombre en su configuración, utilizando el id" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "los complementos ya se encuentran inicializados" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "doRpmDBSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "Leyendo RPDMDB local" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "Configurando sacos de paquetes" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" --msgstr "" --"el objeto del repositorio para el repositorio %s necesita de un método a " --"_resetSack\n" -+msgstr "el objeto del repositorio para el repositorio %s necesita de un método a _resetSack\n" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "por lo tanto, este repositorio no puede ser restaurado.\n" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "doUpdateSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "Construyendo objeto de actualizaciones" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "Obteniendo metadatos de grupo" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "Agregando archivo de grupos desde el repositorio: %s" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "Falló al agregarse el archivo de grupos desde el repositorio: %s - %s" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "No hay grupos disponibles en ningún repositorio" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "Obteniendo metadatos de etiquetas de paquete (pkgtags)" -+ -+#: ../yum/__init__.py:740 -+#, python-format -+msgid "Adding tags from repository: %s" -+msgstr "Agregando etiquetas del repositorio: %s" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "Falló al agregarse etiquetas de paquetes para el repositorio: %s - %s" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" - msgstr "Importando información adicional de listas de archivo" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." - msgstr "El programa %s%s%s se encuentra en el paquete yum-utils." - --#: ../yum/__init__.py:785 --msgid "" --"There are unfinished transactions remaining. You might consider running yum-" --"complete-transaction first to finish them." --msgstr "" --"Existen transacciones restantes no finalizadas. Podría considerar primero " --"ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas." -+#: ../yum/__init__.py:849 -+msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them." -+msgstr "Existen transacciones restantes no finalizadas. Podría considerar primero ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas." - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "Etapa %i ignorando dependencias rotas" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "El proceso de ignorar dependencias rotas llevó %i vueltas" - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" -@@ -1997,81 +2169,88 @@ msgstr "" - "\n" - "Paquetes ignorados por problemas de dependencias:" - --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr " %s de %s" - --#: ../yum/__init__.py:1083 --msgid "" --"Warning: scriptlet or other non-fatal errors occurred during transaction." --msgstr "" --"Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la " --"transacción." -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "Advertencia: Las bases de datos (RPMDB) han sido modificadas por un elemento ajeno a yum." -+ -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "no se encuentra necesita" -+ -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "conflicto instalado" - --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1180 -+msgid "Warning: scriptlet or other non-fatal errors occurred during transaction." -+msgstr "Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la transacción." -+ -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" - msgstr "Falló al eliminar archivo de transacción %s" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" - msgstr "¡se suponía que %s estuviera instalado, pero no lo está! " - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 - #, python-format - msgid "%s was supposed to be removed but is not!" - msgstr "¡se suponía que %s estuviera eliminado, pero no lo está! " - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "No es posible verificar si se encuentra activo el PID %s" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 - #, python-format - msgid "Existing lock %s: another copy is running as pid %s." --msgstr "" --"Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s." -+msgstr "Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s." - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 -+#: ../yum/__init__.py:1425 - #, python-format - msgid "Could not create lock at %s: %s " - msgstr "No se ha podido crear el bloqueo en %s: %s" - --#: ../yum/__init__.py:1373 -+#: ../yum/__init__.py:1470 - msgid "Package does not match intended download" - msgstr "El paquete no se corresponde con la descarga pretendida" - --#: ../yum/__init__.py:1388 -+#: ../yum/__init__.py:1485 - msgid "Could not perform checksum" - msgstr "No se pudo realizar una suma de verificación" - --#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1488 - msgid "Package does not match checksum" - msgstr "El paquete no se corresponde con la suma de verificación" - --#: ../yum/__init__.py:1433 -+#: ../yum/__init__.py:1530 - #, python-format - msgid "package fails checksum but caching is enabled for %s" --msgstr "" --"el paquete no ha superado la suma de verificación, pero el caché se " --"encuentra habilitado para %s" -+msgstr "el paquete no ha superado la suma de verificación, pero el caché se encuentra habilitado para %s" - --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 -+#: ../yum/__init__.py:1533 -+#: ../yum/__init__.py:1562 - #, python-format - msgid "using local copy of %s" - msgstr "utilizando una copia local de %s" - --#: ../yum/__init__.py:1477 -+#: ../yum/__init__.py:1574 - #, python-format - msgid "" - "Insufficient space in download directory %s\n" -@@ -2082,416 +2261,433 @@ msgstr "" - " * libre %s\n" - " * necesario %s" - --#: ../yum/__init__.py:1526 -+#: ../yum/__init__.py:1623 - msgid "Header is not complete." - msgstr "El encabezado no está completo." - --#: ../yum/__init__.py:1563 -+#: ../yum/__init__.py:1660 - #, python-format --msgid "" --"Header not in local cache and caching-only mode enabled. Cannot download %s" --msgstr "" --"El encabezado no se encuentra en el caché local, y está habilitado el modo " --"de solo cacheo. No es posible descargar %s" -+msgid "Header not in local cache and caching-only mode enabled. Cannot download %s" -+msgstr "El encabezado no se encuentra en el caché local, y está habilitado el modo de solo cacheo. No es posible descargar %s" - --#: ../yum/__init__.py:1618 -+#: ../yum/__init__.py:1715 - #, python-format - msgid "Public key for %s is not installed" - msgstr "No se ha instalado la llave pública de %s " - --#: ../yum/__init__.py:1622 -+#: ../yum/__init__.py:1719 - #, python-format - msgid "Problem opening package %s" - msgstr "Problemas abriendo el paquete %s" - --#: ../yum/__init__.py:1630 -+#: ../yum/__init__.py:1727 - #, python-format - msgid "Public key for %s is not trusted" - msgstr "La llave pública de %s no es confiable" - --#: ../yum/__init__.py:1634 -+#: ../yum/__init__.py:1731 - #, python-format - msgid "Package %s is not signed" - msgstr "El paquete %s no está firmado" - --#: ../yum/__init__.py:1672 -+#: ../yum/__init__.py:1769 - #, python-format - msgid "Cannot remove %s" - msgstr "No es posible eliminar %s" - --#: ../yum/__init__.py:1676 -+#: ../yum/__init__.py:1773 - #, python-format - msgid "%s removed" - msgstr "%s eliminado" - --#: ../yum/__init__.py:1712 -+#: ../yum/__init__.py:1819 - #, python-format - msgid "Cannot remove %s file %s" - msgstr "No es posible eliminar %s archivo %s" - --#: ../yum/__init__.py:1716 -+#: ../yum/__init__.py:1823 - #, python-format - msgid "%s file %s removed" - msgstr "%s archivo %s eliminado" - --#: ../yum/__init__.py:1718 -+#: ../yum/__init__.py:1825 - #, python-format - msgid "%d %s files removed" - msgstr "%d %s archivos eliminados" - --#: ../yum/__init__.py:1787 -+#: ../yum/__init__.py:1894 - #, python-format - msgid "More than one identical match in sack for %s" - msgstr "Más de una correspondencia exacta en el saco para %s" - --#: ../yum/__init__.py:1793 -+#: ../yum/__init__.py:1900 - #, python-format - msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "Nada se corresponde con %s.%s %s:%s-%s desde la actualización" - --#: ../yum/__init__.py:2026 --msgid "" --"searchPackages() will go away in a future version of " --"Yum. Use searchGenerator() instead. \n" --msgstr "" --"searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar " --"utilice searchGenerator(). \n" -+#: ../yum/__init__.py:2179 -+msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n" -+msgstr "searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar utilice searchGenerator(). \n" - --#: ../yum/__init__.py:2065 -+#: ../yum/__init__.py:2218 - #, python-format - msgid "Searching %d packages" - msgstr "Buscando %d paquetes" - --#: ../yum/__init__.py:2069 -+#: ../yum/__init__.py:2222 - #, python-format - msgid "searching package %s" - msgstr "buscando paquete %s" - --#: ../yum/__init__.py:2081 -+#: ../yum/__init__.py:2234 - msgid "searching in file entries" - msgstr "buscando en las entradas de archivo" - --#: ../yum/__init__.py:2088 -+#: ../yum/__init__.py:2241 - msgid "searching in provides entries" - msgstr "buscando en las entradas \"provee\"" - --#: ../yum/__init__.py:2121 -+#: ../yum/__init__.py:2274 - #, python-format - msgid "Provides-match: %s" - msgstr "Lo que se ha indicado combina con: %s" - --#: ../yum/__init__.py:2170 -+#: ../yum/__init__.py:2323 - msgid "No group data available for configured repositories" - msgstr "No existen datos de grupo disponibles en los repositorios configurados" - --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 -+#: ../yum/__init__.py:2354 -+#: ../yum/__init__.py:2373 -+#: ../yum/__init__.py:2404 -+#: ../yum/__init__.py:2410 -+#: ../yum/__init__.py:2492 -+#: ../yum/__init__.py:2496 -+#: ../yum/__init__.py:2813 - #, python-format - msgid "No Group named %s exists" - msgstr "No existe un grupo denominado %s" - --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 -+#: ../yum/__init__.py:2385 -+#: ../yum/__init__.py:2512 - #, python-format - msgid "package %s was not marked in group %s" - msgstr "el paquete %s no fue marcado en el grupo %s" - --#: ../yum/__init__.py:2279 -+#: ../yum/__init__.py:2432 - #, python-format - msgid "Adding package %s from group %s" - msgstr "Agregando paquete %s del grupo %s" - --#: ../yum/__init__.py:2283 -+#: ../yum/__init__.py:2436 - #, python-format - msgid "No package named %s available to be installed" - msgstr "No existe un paquete denominado %s disponible para ser instalado" - --#: ../yum/__init__.py:2380 -+#: ../yum/__init__.py:2538 - #, python-format - msgid "Package tuple %s could not be found in packagesack" - msgstr "La tupla %s de paquetes no pudo ser encontrada en el saco de paquetes" - --#: ../yum/__init__.py:2399 -+#: ../yum/__init__.py:2557 - #, python-format - msgid "Package tuple %s could not be found in rpmdb" - msgstr "La tupla %s de paquetes no pudo ser encontrada en la base de datos" - --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 -+#: ../yum/__init__.py:2613 -+#: ../yum/__init__.py:2663 - msgid "Invalid version flag" - msgstr "Marca de versión no válida" - --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2633 -+#: ../yum/__init__.py:2638 - #, python-format - msgid "No Package found for %s" - msgstr "No se ha encontrado ningún paquete para %s" - --#: ../yum/__init__.py:2696 -+#: ../yum/__init__.py:2854 - msgid "Package Object was not a package object instance" - msgstr "El objeto de paquete no era una instancia de objeto de paquete" - --#: ../yum/__init__.py:2700 -+#: ../yum/__init__.py:2858 - msgid "Nothing specified to install" - msgstr "No se ha indicado nada para instalar" - --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 -+#: ../yum/__init__.py:2874 -+#: ../yum/__init__.py:3651 - #, python-format - msgid "Checking for virtual provide or file-provide for %s" - msgstr "Verificando la provision virtual o provision de archivo de %s" - --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 -+#: ../yum/__init__.py:2880 -+#: ../yum/__init__.py:3196 -+#: ../yum/__init__.py:3364 -+#: ../yum/__init__.py:3657 - #, python-format - msgid "No Match for argument: %s" - msgstr "No hay nada concordante con el argumento: %s" - --#: ../yum/__init__.py:2798 -+#: ../yum/__init__.py:2956 - #, python-format - msgid "Package %s installed and not available" - msgstr "El paquete %s está instalado y no se encuentra disponible" - --#: ../yum/__init__.py:2801 -+#: ../yum/__init__.py:2959 - msgid "No package(s) available to install" - msgstr "No existe(n) paquete(s) disponible(s) para instalar" - --#: ../yum/__init__.py:2813 -+#: ../yum/__init__.py:2971 - #, python-format - msgid "Package: %s - already in transaction set" - msgstr "Paquete: %s - ya se encuentra en un conjunto de transacción" - --#: ../yum/__init__.py:2839 -+#: ../yum/__init__.py:2997 - #, python-format - msgid "Package %s is obsoleted by %s which is already installed" - msgstr "El paquete %s se hace obsoleto con %s, que ya se encuentra instalado" - --#: ../yum/__init__.py:2842 -+#: ../yum/__init__.py:3000 - #, python-format - msgid "Package %s is obsoleted by %s, trying to install %s instead" --msgstr "" --"El paquete %s se hace obsoleto con %s, en su lugar se está intentando " --"instalar %s" -+msgstr "El paquete %s se hace obsoleto con %s, en su lugar se está intentando instalar %s" - --#: ../yum/__init__.py:2850 -+#: ../yum/__init__.py:3008 - #, python-format - msgid "Package %s already installed and latest version" - msgstr "El paquete %s ya se encuentra instalado con su versión más reciente" - --#: ../yum/__init__.py:2864 -+#: ../yum/__init__.py:3022 - #, python-format - msgid "Package matching %s already installed. Checking for update." --msgstr "" --"El paquete concordante con %s ya se encuentra instalado. Verificando si " --"puede actualizarse." -+msgstr "El paquete concordante con %s ya se encuentra instalado. Verificando si puede actualizarse." - - #. update everything (the easy case) --#: ../yum/__init__.py:2966 -+#: ../yum/__init__.py:3125 - msgid "Updating Everything" - msgstr "Actualizando todo" - --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 -+#: ../yum/__init__.py:3146 -+#: ../yum/__init__.py:3261 -+#: ../yum/__init__.py:3288 -+#: ../yum/__init__.py:3314 - #, python-format - msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 -+#: ../yum/__init__.py:3181 -+#: ../yum/__init__.py:3361 - #, python-format - msgid "%s" - msgstr "%s" - --#: ../yum/__init__.py:3093 -+#: ../yum/__init__.py:3252 - #, python-format - msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "El paquete ya es obsoleto: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3124 -+#: ../yum/__init__.py:3283 - #, python-format - msgid "Not Updating Package that is obsoleted: %s" - msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s" - --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 -+#: ../yum/__init__.py:3292 -+#: ../yum/__init__.py:3318 - #, python-format - msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" --msgstr "" --"Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s %s:%" --"s-%s" -+msgstr "Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3218 -+#: ../yum/__init__.py:3377 - msgid "No package matched to remove" - msgstr "No hay paquete correspondiente para ser eliminado" - --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 -+#: ../yum/__init__.py:3411 - #, python-format --msgid "Cannot open file: %s. Skipping." --msgstr "No es posible abrir el archivo: %s. Ignorando." -+msgid "Cannot open: %s. Skipping." -+msgstr "No es posible abrir: %s. Ignorando." - --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 -+#: ../yum/__init__.py:3414 -+#: ../yum/__init__.py:3513 -+#: ../yum/__init__.py:3597 - #, python-format - msgid "Examining %s: %s" - msgstr "Examinando %s: %s" - --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 -+#: ../yum/__init__.py:3422 -+#: ../yum/__init__.py:3516 -+#: ../yum/__init__.py:3600 - #, python-format - msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" --msgstr "" --"No es posible añadir el paquete %s a la transacción. La arquitectura no es " --"compatible: %s" -+msgstr "No es posible añadir el paquete %s a la transacción. La arquitectura no es compatible: %s" - --#: ../yum/__init__.py:3270 -+#: ../yum/__init__.py:3430 - #, python-format --msgid "" --"Package %s not installed, cannot update it. Run yum install to install it " --"instead." --msgstr "" --"El paquete %s no está instalado, no puede actualizarse. En su lugar, para " --"instalarlo, ejecute el comando yum install." -+msgid "Package %s not installed, cannot update it. Run yum install to install it instead." -+msgstr "El paquete %s no está instalado, no puede actualizarse. En su lugar, para instalarlo, ejecute el comando yum install." - --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 -+#: ../yum/__init__.py:3459 -+#: ../yum/__init__.py:3521 -+#: ../yum/__init__.py:3605 - #, python-format - msgid "Excluding %s" - msgstr "Excluyendo %s" - --#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3464 - #, python-format - msgid "Marking %s to be installed" - msgstr "Marcando %s para ser instalado" - --#: ../yum/__init__.py:3310 -+#: ../yum/__init__.py:3470 - #, python-format - msgid "Marking %s as an update to %s" - msgstr "Marcando %s como una actualización de %s" - --#: ../yum/__init__.py:3317 -+#: ../yum/__init__.py:3477 - #, python-format - msgid "%s: does not update installed package." - msgstr "%s: no actualiza el paquete instalado." - --#: ../yum/__init__.py:3379 -+#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3594 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "No es posible abrir el archivo: %s. Ignorando." -+ -+#: ../yum/__init__.py:3540 - msgid "Problem in reinstall: no package matched to remove" --msgstr "" --"Problema al reinstalar: no existe ningún paquete concordante para eliminar" -+msgstr "Problema al reinstalar: no existe ningún paquete concordante para eliminar" - --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 -+#: ../yum/__init__.py:3553 -+#: ../yum/__init__.py:3685 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "El paquete %s permite múltiples instalaciones, ignorando" - --#: ../yum/__init__.py:3413 -+#: ../yum/__init__.py:3574 - #, python-format - msgid "Problem in reinstall: no package %s matched to install" --msgstr "" --"Problema al reinstalar: no existe ningún paquete concordante con %s para " --"instalar" -+msgstr "Problema al reinstalar: no existe ningún paquete concordante con %s para instalar" - --#: ../yum/__init__.py:3515 -+#: ../yum/__init__.py:3677 - msgid "No package(s) available to downgrade" - msgstr "No existe(n) paquete(s) disponible(s) para desactualizar" - --#: ../yum/__init__.py:3559 -+#: ../yum/__init__.py:3730 - #, python-format - msgid "No Match for available package: %s" - msgstr "Ninguna correspondencia disponible para el paquete: %s" - --#: ../yum/__init__.py:3565 -+#: ../yum/__init__.py:3737 - #, python-format - msgid "Only Upgrade available on package: %s" - msgstr "Solo existe la posibilidad de actualizar el paquete: %s" - --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 -+#: ../yum/__init__.py:3807 -+#: ../yum/__init__.py:3844 - #, python-format - msgid "Failed to downgrade: %s" - msgstr "Falló al desactualizar: %s" - --#: ../yum/__init__.py:3704 -+#: ../yum/__init__.py:3876 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "Obteniendo llave GPG desde %s" - --#: ../yum/__init__.py:3724 -+#: ../yum/__init__.py:3896 - msgid "GPG key retrieval failed: " - msgstr "La obtención de la llave GPG ha fallado:" - --#: ../yum/__init__.py:3735 -+#: ../yum/__init__.py:3902 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "Llave GPG no válida de %s: %s" -+ -+#: ../yum/__init__.py:3911 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "El análisis de la llave GPG ha fallado: la llave no posee valor %s" - --#: ../yum/__init__.py:3767 -+#: ../yum/__init__.py:3943 - #, python-format - msgid "GPG key at %s (0x%s) is already installed" - msgstr "La llave GPG de %s (0x%s) ya se encuentra instalada" - - #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 -+#: ../yum/__init__.py:3948 -+#: ../yum/__init__.py:4010 - #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "Importando la llave GPG 0x%s \"%s\" desde %s" - --#: ../yum/__init__.py:3789 -+#: ../yum/__init__.py:3965 - msgid "Not installing key" - msgstr "No se está instalando la llave" - --#: ../yum/__init__.py:3795 -+#: ../yum/__init__.py:3971 - #, python-format - msgid "Key import failed (code %d)" - msgstr "La importación de la llave falló (código %d)" - --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 -+#: ../yum/__init__.py:3972 -+#: ../yum/__init__.py:4031 - msgid "Key imported successfully" - msgstr "La llave ha sido importada exitosamente" - --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 -+#: ../yum/__init__.py:3977 -+#: ../yum/__init__.py:4036 - #, python-format - msgid "" --"The GPG keys listed for the \"%s\" repository are already installed but they " --"are not correct for this package.\n" -+"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" - "Check that the correct key URLs are configured for this repository." - msgstr "" --"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran " --"instaladas, pero con este paquete no son correctas.\n" --"Verifique que las URLs de la llave para este repositorio estén correctamente " --"configuradas." -+"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero con este paquete no son correctas.\n" -+"Verifique que las URLs de la llave para este repositorio estén correctamente configuradas." - --#: ../yum/__init__.py:3810 -+#: ../yum/__init__.py:3986 - msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "La importación de la(s) llave(s) no funcionó, ¿llave(s) equivocada(s)?" - --#: ../yum/__init__.py:3829 -+#: ../yum/__init__.py:4005 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "La llave GPG de %s (0x%s) ya ha sido importada" - --#: ../yum/__init__.py:3849 -+#: ../yum/__init__.py:4025 - #, python-format - msgid "Not installing key for repo %s" - msgstr "No se está instalando la llave para el repositorio %s" - --#: ../yum/__init__.py:3854 -+#: ../yum/__init__.py:4030 - msgid "Key import failed" - msgstr "Falló la importación de la llave" - --#: ../yum/__init__.py:3976 -+#: ../yum/__init__.py:4156 - msgid "Unable to find a suitable mirror." - msgstr "No es posible encontrar un espejo que funcione." - --#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4158 - msgid "Errors were encountered while downloading packages." - msgstr "Fueron encontrados errores mientras los paquetes eran descargados." - --#: ../yum/__init__.py:4028 -+#: ../yum/__init__.py:4208 - #, python-format - msgid "Please report this error at %s" - msgstr "Por favor, informe este error en %s" - --#: ../yum/__init__.py:4052 -+#: ../yum/__init__.py:4232 - msgid "Test Transaction Errors: " - msgstr "Errores de la prueba de transacción:" - -+#: ../yum/__init__.py:4333 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "No se ha podido definir un directorio de chaché: %s" -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " - msgstr "Complementos cargados:" - --#: ../yum/plugins.py:216 ../yum/plugins.py:222 -+#: ../yum/plugins.py:216 -+#: ../yum/plugins.py:222 - #, python-format - msgid "No plugin match for: %s" - msgstr "No hay un complemento que se corresponda con: %s" -@@ -2499,8 +2695,7 @@ msgstr "No hay un complemento que se corresponda con: %s" - #: ../yum/plugins.py:252 - #, python-format - msgid "Not loading \"%s\" plugin, as it is disabled" --msgstr "" --"El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado" -+msgstr "El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado" - - #. Give full backtrace: - #: ../yum/plugins.py:264 -@@ -2525,11 +2720,8 @@ msgstr "Cargando el complemento \"%s\"" - - #: ../yum/plugins.py:316 - #, python-format --msgid "" --"Two or more plugins with the name \"%s\" exist in the plugin search path" --msgstr "" --"Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda " --"de complementos " -+msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" -+msgstr "Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda de complementos " - - #: ../yum/plugins.py:336 - #, python-format -@@ -2541,14 +2733,26 @@ msgstr "No se encuentra el archivo de configuración %s" - #: ../yum/plugins.py:339 - #, python-format - msgid "Unable to find configuration file for plugin %s" --msgstr "" --"No es posible encontrar el archivo de configuración para el complemento %s" -+msgstr "No es posible encontrar el archivo de configuración para el complemento %s" - - #: ../yum/plugins.py:501 - msgid "registration of commands not supported" - msgstr "registro de comando no soportado" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "no se encuentran necesita de" -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "se ha instalado choca con" -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "%s es uin duplicado con %s" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" - msgstr "Reempaquetando" - -@@ -2564,16 +2768,16 @@ msgstr "El RPM %s ha fallado la verificación md5" - - #: ../rpmUtils/oldUtils.py:151 - msgid "Could not open RPM database for reading. Perhaps it is already in use?" --msgstr "" --"No es posible abrir la base de datos de RPM para su lectura. ¿Tal vez se " --"encuentre en uso?" -+msgstr "No es posible abrir la base de datos de RPM para su lectura. ¿Tal vez se encuentre en uso?" - - #: ../rpmUtils/oldUtils.py:183 - msgid "Got an empty Header, something has gone wrong" - msgstr "Se obtuvo un encabezado vacío, algo ha salido mal" - --#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260 --#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266 -+#: ../rpmUtils/oldUtils.py:253 -+#: ../rpmUtils/oldUtils.py:260 -+#: ../rpmUtils/oldUtils.py:263 -+#: ../rpmUtils/oldUtils.py:266 - #, python-format - msgid "Damaged Header %s" - msgstr "Encabezado %s dañado" -@@ -2583,9 +2787,26 @@ msgstr "Encabezado %s dañado" - msgid "Error opening rpm %s - error %s" - msgstr "Error al abrir el rpm %s - error %s" - -+#~ msgid "Finished Transaction Test" -+#~ msgstr "Prueba de transacción finalizada" -+#~ msgid "" -+#~ " You could try running: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" -+#~ msgstr "" -+#~ " Podría intentar ejecutar: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" -+#~ msgid "Unresolvable requirement %s for %s" -+#~ msgstr "Requerimiento %s irresoluble para %s" -+#~ msgid "Missing Dependency: %s is needed by package %s" -+#~ msgstr "" -+#~ "No se encuentra una dependencia: es necesario %s para poder instalar el " -+#~ "paquete %s" - #~ msgid "" - #~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" - #~ "().\n" - #~ msgstr "" - #~ "getInstalledPackageObject() desaparecerá en alguna versión próxima de " - #~ "Yum, utilice en su lugar self.rpmdb.searchPkgTuple().\n" -+ -diff --git a/po/fi.po b/po/fi.po -index 363f1de..4347eba 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -1,49 +1,48 @@ - # Finnish translation of yum. - # Copyright (C) 2009 yum's COPYRIGHT HOLDER - # This file is distributed under the same license as the yum package. --# Ville-Pekka Vainio , 2009. -+# Ville-Pekka Vainio , 2009, 2010. - msgid "" - msgstr "" - "Project-Id-Version: yum\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" --"PO-Revision-Date: 2009-11-11 01:39+0200\n" -+"POT-Creation-Date: 2010-02-10 10:43-0500\n" -+"PO-Revision-Date: 2010-02-11 21:50+0200\n" - "Last-Translator: Ville-Pekka Vainio \n" - "Language-Team: Finnish \n" --"Language: fi\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Virtaal 0.4.1\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "Päivitetään" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 ../yum/rpmtrans.py:73 - msgid "Erasing" - msgstr "Poistetaan" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 -+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "Asennetaan" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "Vanhennettu" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 - msgid "Updated" - msgstr "Päivitetty" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 ../output.py:1438 - msgid "Erased" - msgstr "Poistettu" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 -+#: ../output.py:1434 ../output.py:1646 - msgid "Installed" - msgstr "Asennettu" - -@@ -65,69 +64,74 @@ msgstr "Virhe: virheellinen tulostetila: %s, paketti %s" - msgid "Erased: %s" - msgstr "Poistettiin: %s" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 ../output.py:948 ../output.py:1648 - msgid "Removing" - msgstr "Poistetaan" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "Siivotaan" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "Komento ”%s” on jo määritelty" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "Tehdään asennuslähdeasetuksia" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "Luetaan asennuslähteiden metadataa paikallisista tiedostoista" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "Asetusvirhe: %s" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "Valitsinvirhe: %s" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr " Asennettiin : %s-%s ajassa %s" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" - msgstr " Käännettiin : %s ajassa %s" - - # mitä on "commit" suomeksi? --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" - msgstr " Suoritettiin: %s ajassa %s" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" - msgstr "Jokin komento on annettava" - --#: ../cli.py:309 -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "Komentoa %s ei ole olemassa. Käytä komentoa %s --help" -+ -+#: ../cli.py:314 - msgid "Disk Requirements:\n" - msgstr "Vaadittu levytila:\n" - --#: ../cli.py:311 -+#: ../cli.py:316 - #, python-format --msgid " At least %dMB needed on the %s filesystem.\n" -+msgid " At least %dMB more space needed on the %s filesystem.\n" - msgstr " Vähintään %d Mt levytilaa tarvitaan tiedostojärjestelmällä %s.\n" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" -@@ -135,65 +139,61 @@ msgstr "" - "Yhteenveto virheistä\n" - "--------------------\n" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "Yritettiin suorittaa transaktio, mutta ei ole mitään tehtävää. Lopetetaan." - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" - msgstr "Lopetetaan, käyttäjä antoi lopetuskomennon" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "Ladataan paketteja:" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "Virhe pakettien latauksessa:\n" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 ../yum/__init__.py:4194 - msgid "Running rpm_check_debug" - msgstr "Suoritetaan rpm_check_debug" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 ../yum/__init__.py:4203 - msgid "ERROR You need to update rpm to handle:" - msgstr "VIRHE RPM on päivitettävä, jotta se osaa käsitellä:" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 ../yum/__init__.py:4206 - msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "VIRHE rpm_check_debugin ja riippuvuuksien tarkistuksen välillä:" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" - msgstr "RPM on päivitettävä" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" - msgstr "Ilmoita tästä ongelmasta osoitteeseen %s" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "Suoritetaan transaktiotestiä" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "Transaktiotesti valmistui" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "Transaktiotarkistuksen virhe:\n" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "Transaktiotesti onnistui" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "Suoritetaan transaktiota" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." -@@ -201,80 +201,85 @@ msgstr "" - "Avaimia ei tuoda automaattisesti, kun yumia suoritetaan ilman valvontaa.\n" - "Käytä valitsinta ”-y” tämän muuttamiseksi." - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 ../cli.py:578 - msgid " * Maybe you meant: " - msgstr " * Tarkoititko: " - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." - msgstr "" - "Paketti tai paketit %s%s%s ovat saatavilla, mutta niitä ei ole asennettu." - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 ../cli.py:607 ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "Pakettia %s%s%s ei ole saatavilla." - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 ../cli.py:748 - msgid "Package(s) to install" - msgstr "Asennettavat paketit" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "Ei mitään tehtävää" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "%d pakettia merkitty päivitettäväksi" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "Yhtään pakettia ei ole merkitty päivitettäväksi" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "%d pakettia merkitty poistettavaksi" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "Yhtään pakettia ei ole merkitty poistettavaksi" - --#: ../cli.py:683 -+#: ../cli.py:692 - msgid "Package(s) to downgrade" - msgstr "Vanhennettavat paketit" - --#: ../cli.py:707 -+#: ../cli.py:717 - #, python-format - msgid " (from %s)" - msgstr " (versiosta %s)" - --#: ../cli.py:709 -+#: ../cli.py:719 - #, python-format - msgid "Installed package %s%s%s%s not available." - msgstr "Asennettua pakettia %s%s%s%s ei ole saatavilla." - --#: ../cli.py:716 -+#: ../cli.py:726 - msgid "Package(s) to reinstall" - msgstr "Uudelleenasennettavat paketit" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" - msgstr "Yhtään pakettia ei annettu" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "Löytyi: %s" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" - msgstr "Varoitus: hakutuloksia ei löytynyt hakusanalle %s" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "Hakutuloksia ei löytynyt" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" -@@ -285,109 +290,113 @@ msgstr "" - " Hakusanoilla ”%s*/%s%s” ja/tai ”%s*bin/%s%s” saadaan niitä vastaava " - "toiminta." - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "Hakusanalla %s ei löytynyt pakettia" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "Siivotaan kaikki" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" - msgstr "Siivotaan otsakkeet" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "Siivotaan paketit" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "Siivotaan XML-metadata" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" - msgstr "Siivotaan tiedokannan välimuisti" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" - msgstr "Siivotaan välimuistin vanhentumiseen liittyvä metadata" - --#: ../cli.py:912 -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "Siivotaan välimuistissa oleva rpm-tietokannan data" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" - msgstr "Siivotaan liitännäiset" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "Asennetut ryhmät:" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "Saatavilla olevat ryhmät:" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "Valmis" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2787 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "Varoitus: Ryhmää %s ei ole olemassa." - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" - msgstr "" - "Missään pyydetyssä ryhmässä ei ole yhtään asennettavaa tai päivitettävää " - "pakettia" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "%d pakettia asennettavana" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 ../yum/__init__.py:2799 - #, python-format - msgid "No group named %s exists" - msgstr "Ryhmää nimeltä %s ei ole olemassa" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "Ei yhtään poistettavaa pakettia ryhmien perusteella" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" - msgstr "%d poistettavaa pakettia" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" - msgstr "Paketti %s on jo asennettu, ohitetaan" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" - msgstr "Hylätään paketti %s.%s, jota ei voi verrata" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Toista pakettia nimeltä %s ei ole asennettuna, lisätään mahdollisesti " - "asennettavien luetteloon" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" - msgstr "Liitännäisten valitsimet" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" - msgstr "Komentorivivirhe: %s" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -398,110 +407,120 @@ msgstr "" - "\n" - "%s: valitsin %s vaatii argumentin" - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "--color vaatii yhden seuraavista argumenteista: auto, always, never" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" - msgstr "näytä tämä ohjeviesti ja lopeta" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" - msgstr "hyväksy virheet" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" - msgstr "toimi kokonaan välimuistista, älä päivitä sitä" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" - msgstr "asetustiedoston sijainti" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" - msgstr "komennon suurin odotusaika" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "virheenjäljitystulosteiden taso" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" - msgstr "näytä duplikaatit asennuslähteissä ja list/search-komennoissa" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "virhetulostustaso" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "rpm:n virheenjäljitystulosteiden taso" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "hiljainen toiminta" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "yksityiskohtaset tulosteet" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "vastaa kyllä kaikkiin kysymyksiin" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" - msgstr "näytä Yumin versio ja lopeta" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" - msgstr "aseta asennusjuuri" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "" - "ota käyttöön yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" - msgstr "" - "poista käytöstä yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" - msgstr "jätä pois paketteja nimen tai jokerimerkkien perusteella" - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" - msgstr "" - "ota pakettien pois jättäminen pois käytöstä pääasetuksille, jollekin " - "asennuslähteelle tai kaikelle" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "ota käyttöön vanhentuneiden pakettien käsittely päivitysten aikana" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "poista Yumin liitännäiset käytöstä" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "poista GPG-allekirjoitusten tarkistus käytöstä" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "poista liitännäisiä käytöstä nimen perusteella" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "ota liitännäisiä käyttöön nimen perusteella" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" - msgstr "ohita paketit, joilla on riippuvuusongelmia" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" - msgstr "käytetäänkö värejä" - -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "" -+"aseta $releasever-muuttujan arvo yumin asetuksissa ja " -+"asennuslähdetiedostoissa" -+ - #: ../output.py:305 - msgid "Jan" - msgstr "tammi" -@@ -554,105 +573,104 @@ msgstr "joulu" - msgid "Trying other mirror." - msgstr "Kokeillaan toista peilipalvelinta." - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "Nimi : %s%s%s" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "Arkkitehtuuri : %s" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" - msgstr "Epoch : %s" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "Versio : %s" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" - msgstr "Julkaisu : %s" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "Koko : %s" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "Asennuslähde : %s" - --#: ../output.py:547 -+#: ../output.py:543 - #, python-format - msgid "From repo : %s" - msgstr "Asennuslähteestä: %s" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "Tekijä : %s" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "Tekoaika : %s" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "Käännösaika : %s" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "Asennusaika : %s" - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "Yhteenveto : " - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:557 --#, python-format --msgid "License : %s" --msgstr "Lisenssi : %s" -+#: ../output.py:553 -+msgid "License : " -+msgstr "Lisenssi : " - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "Kuvaus: " - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "k" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "kyllä" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "e" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "ei" - --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " - msgstr "Onko tämä ok [k/E]: " - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" -@@ -661,150 +679,151 @@ msgstr "" - "\n" - "Ryhmä: %s" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr " Ryhmätunnus: %s" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr " Kuvaus: %s" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr " Pakolliset paketit:" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr " Oletuspaketit:" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" - msgstr " Valinnaiset paketit:" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr " Ehdolliset paketit:" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "paketti: %s" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr " Tällä paketilla ei ole riippuvuuksia" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr " riippuvuus: %s" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr " Toteutumaton riippuvuus" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "Asennuslähde: %s" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "Vastaavuus :" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " - msgstr "Kuvaus : " - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "Lisenssi : %s" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" - msgstr "Tiedostonimi: %s" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "Muuta : " - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" - msgstr "Kokonaislatausmäärää laskettaessa tapahtui virhe" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "Koko yhteensä: %s" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "Latausmäärä yhteensä: %s" - --#: ../output.py:942 -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "Koko asennettuna: %s" -+ -+#: ../output.py:949 - msgid "Reinstalling" - msgstr "Asennetaan uudelleen" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" - msgstr "Varhennetaan" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" - msgstr "Asennetaan riippuvuuksien vuoksi" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" - msgstr "Päivitetään riippuvuuksien vuoksi" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "Poistetaan riippuvuuksien vuoksi" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 ../output.py:1072 - msgid "Skipped (dependency problems)" - msgstr "Ohitettiin (riippuvuusongelmia)" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" - msgstr "Paketti" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" - msgstr "Arkkitehtuuri" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" - msgstr "Versio" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" - msgstr "Asennuslähde" - --#: ../output.py:978 -+#: ../output.py:985 - msgid "Size" - msgstr "Koko" - --#: ../output.py:990 -+#: ../output.py:997 - #, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" --msgstr "" --" korvaa %s%s%s.%s %s\n" --"\n" -+msgid " replacing %s%s%s.%s %s\n" -+msgstr " korvaa %s%s%s.%s %s\n" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" -@@ -815,7 +834,7 @@ msgstr "" - "Transaktion yhteenveto\n" - "%s\n" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" -@@ -824,7 +843,7 @@ msgstr "" - "Asennetaan %5.5s paketti(a)\n" - "Päivitetään %5.5s paketti(a)\n" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" -@@ -835,32 +854,32 @@ msgstr "" - "Asennetaan uudelleen %5.5s paketti(a)\n" - "Varhennetaan %5.5s paketti(a)\n" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" - msgstr "Poistettu" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "Poistettu riippuvuuksia" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "Asennettu riippuvuuksia" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "Päivitetty riippuvuuksia" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "Korvattu" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "Epäonnistui" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" - msgstr "kahden" - -@@ -868,7 +887,7 @@ msgstr "kahden" - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 -+#: ../output.py:1151 - #, python-format - msgid "" - "\n" -@@ -881,209 +900,365 @@ msgstr "" - "aikana\n" - "ohjelman lopettamiseksi.\n" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "käyttäjä keskeytti" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "Yhteensä" - -+#: ../output.py:1202 -+msgid "I" -+msgstr "A" -+ - #: ../output.py:1203 -+msgid "O" -+msgstr "Vanh." -+ -+#: ../output.py:1204 -+msgid "E" -+msgstr "P" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "U" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "Varh." -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "P" -+ -+#: ../output.py:1217 - msgid "" - msgstr "" - --#: ../output.py:1204 -+#: ../output.py:1218 - msgid "System" - msgstr "Järjestelmä" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" - msgstr "Annettu virheellinen transaktiotunnus tai paketit" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." --msgstr "" --"Varoitus: RPM-tietokantaa on muutettu edellisen yum-transaktion jälkeen." -+#: ../output.py:1266 -+msgid "ID" -+msgstr "Tunniste" -+ -+#: ../output.py:1267 ../output.py:1520 -+msgid "Login user" -+msgstr "Kirjautunut käyttäjä" - --#: ../output.py:1289 -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "Päivämäärä ja kellonaika" -+ -+#: ../output.py:1269 ../output.py:1522 -+msgid "Action(s)" -+msgstr "Toiminnot" -+ -+#: ../output.py:1270 ../output.py:1523 -+msgid "Altered" -+msgstr "Muutettu" -+ -+#: ../output.py:1310 - msgid "No transaction ID given" - msgstr "Transaktiotunnusta ei annettu" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" - msgstr "Annettiin virheellinen transaktiotunnus" - --#: ../output.py:1302 -+#: ../output.py:1341 - msgid "Not found given transaction ID" - msgstr "Annettua transaktiotunnusta ei löytynyt" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" - msgstr "Löytyi useampi kuin yksi transaktiotunnus!" - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" - msgstr "Transaktiotunnusta tai pakettia ei annettu" - --#: ../output.py:1357 -+#: ../output.py:1396 - msgid "Transaction ID :" - msgstr "Transaktiotunnus :" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" - msgstr "Aloitusaika :" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 ../output.py:1403 - msgid "Begin rpmdb :" - msgstr "RPM-tietokanta alussa :" - --#: ../output.py:1378 -+#: ../output.py:1417 - #, python-format - msgid "(%s seconds)" - msgstr "(%s sekuntia)" - --#: ../output.py:1379 -+#: ../output.py:1418 - msgid "End time :" - msgstr "Lopetusaika :" - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 ../output.py:1423 - msgid "End rpmdb :" - msgstr "RPM-tietokanta lopussa:" - --#: ../output.py:1385 -+#: ../output.py:1424 - msgid "User :" - msgstr "Käyttäjä :" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 -+#: ../output.py:1426 ../output.py:1428 ../output.py:1430 - msgid "Return-Code :" - msgstr "Lopetuskoodi :" - --#: ../output.py:1387 -+#: ../output.py:1426 - msgid "Aborted" - msgstr "Keskeytetty" - --#: ../output.py:1389 -+#: ../output.py:1428 - msgid "Failure:" - msgstr "Epäonnistui:" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" - msgstr "Onnistui" - --#: ../output.py:1392 -+#: ../output.py:1431 - msgid "Transaction performed with:" - msgstr "Transaktio suoritettiin:" - --#: ../output.py:1405 -+#: ../output.py:1444 ../output.py:1489 - msgid "Downgraded" - msgstr "Varhennettu" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" - msgstr "Omituinen" - --#: ../output.py:1409 -+#: ../output.py:1448 - msgid "Packages Altered:" - msgstr "Muutetut paketit:" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" - msgstr "Sovelman tuloste:" - --#: ../output.py:1418 -+#: ../output.py:1457 - msgid "Errors:" - msgstr "Virheet:" - --#: ../output.py:1489 -+#: ../output.py:1481 ../output.py:1482 -+msgid "Install" -+msgstr "Asennus" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "Riippuvuuden asennus" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "Vanhentava" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "Poisto" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "Uudelleenasennus" -+ -+#: ../output.py:1488 -+msgid "Downgrade" -+msgstr "Varhennus" -+ -+#: ../output.py:1490 -+msgid "Update" -+msgstr "Päivitys" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "Aika" -+ -+#: ../output.py:1547 - msgid "Last day" - msgstr "Eilen" - --#: ../output.py:1490 -+#: ../output.py:1548 - msgid "Last week" - msgstr "Viime viikolla" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" - msgstr "Viimeisen kahden viikon aikana" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" - msgstr "Viimeisen kolmen kuukauden aikana" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" - msgstr "Viimeisen kuuden kuukauden aikana" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" - msgstr "Viime vuonna" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" - msgstr "Yli vuosi sitten" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "asennettavaksi" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "päivitettäväksi" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "vanhennettavaksi" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" - msgstr "poistettavaksi" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> Paketti %s.%s %s:%s-%s asetettu %s" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "--> Suoritetaan transaktiotarkistusta" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." - msgstr "" - "--> Aloitetaan riippuvuuksien tarkistus uudelleen uusien muutosten kanssa." - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" - msgstr "--> Riippuvuuksien tarkistus valmistui" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" - msgstr "--> Käsitellään riipuvuutta: %s paketille: %s" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" - msgstr "--> Ratkaisematon riippuvuus: %s" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "Paketti: %s" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+"\n" -+" Vaatii: %s" -+ -+#: ../output.py:1649 ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+"\n" -+" %s: %s (%s)" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "Saatavilla" -+ -+#: ../output.py:1665 ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> Käsitellään ristiriitaa: %s on ristiriidassa paketin %s kanssa" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "--> Täytetään transaktiojoukkoa valituilla paketeilla. Odota hetki." - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." - msgstr "---> Ladataan paketin %s otsaketta transaktiojoukkoon lisäämseksi." - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:93 -+msgid "Running" -+msgstr "Suoritetaan" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "Unessa" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "Ei voi keskeyttää" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "Zombi" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "Jäljitetään/Pysäytetty" -+ -+#: ../utils.py:98 ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "Tuntematon" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr " Toinen ohjelma on: PackageKit" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr " Toinen ohjelma on: %s" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " Muisti : %5s RSS (%5sB VSZ)" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " Aloitettu : %s - %s sitten" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " Tila : %s, pid: %d" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "PluginExit-virhe: %s" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "Yum-virhe: %s" -+ -+#: ../utils.py:235 ../yummain.py:42 - msgid "" - "\n" - "\n" -@@ -1093,7 +1268,7 @@ msgstr "" - "\n" - "Lopetetaan käyttäjän peruttua" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 ../yummain.py:48 - msgid "" - "\n" - "\n" -@@ -1103,7 +1278,7 @@ msgstr "" - "\n" - "Lopetetaan putken katkettua" - --#: ../utils.py:145 ../yummain.py:50 -+#: ../utils.py:243 ../yummain.py:50 - #, python-format - msgid "" - "\n" -@@ -1114,15 +1289,15 @@ msgstr "" - "\n" - "%s" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 ../yummain.py:211 - msgid "Complete!" - msgstr "Valmis!" - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." - msgstr "Vain pääkäyttäjä voi suorittaa tämän komennon." - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1152,336 +1327,336 @@ msgstr "" - "\n" - "Lisätietoja saattaa olla jakelun tai pakettien tarjoajan ohjeissa.\n" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" - msgstr "Virhe: komennolle %s on annettava luettelo paketeista" - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" - msgstr "Virhe: Tarvitaan vastaava kohta" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" - msgstr "Virhe: Tarvitaan ryhmä tai ryhmäluettelo" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "Virhe: clean vaatii valitsimen: %s" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "Virhe: virheellinen clean-argumentti: %r" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "shellille ei annettu argumenttia" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "Tiedostonimi välitettiin shellille: %s" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "" - "Tiedosto %s annettiin argumenttina shellille, mutta sitä ei ole olemassa." - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "Virhe: useampi kuin yksi tiedosto annettiin argumenttina shellille." - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "PAKETTI..." - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "Asenna paketti tai paketteja järjestelmään" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" - msgstr "Aloitetaan asennusprosessi" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "[PAKETTI...]" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "Päivitä paketti tai paketteja järjestelmään" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" - msgstr "Aloitetaan päivitysprosessi" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" - msgstr "Näytä tietoja paketista tai pakettiryhmästä" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "Asennetut paketit" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "Saatavilla olevat paketit" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "Lisäpaketit" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" - msgstr "Päivitetyt paketit" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "Vanhentavat paketit" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "Äskettäin lisätyt paketit" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "Ei yhtään vastaavaa pakettia lueteltavaksi" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "Luettele paketti tai pakettiryhmä" - --#: ../yumcommands.py:361 -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" - msgstr "Poista paketti tai paketteja järjestelmästä" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" - msgstr "Aloitetaan poistoprosessi" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" - msgstr "Aloitetaan ryhmäprosessi" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" - msgstr "Ei ryhmiä joille suorittaa komentoa" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "Luettele saatavilla olevat pakettiryhmät" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" - msgstr "Asenna ryhmään kuuluvat paketit järjestelmään" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" - msgstr "Poista ryhmään kuuluvat paketit järjestelmästä" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "Näytä tietoja pakettiryhmästä" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "Luo metadatavälimuisti" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "Luodaan välimuistitiedostoja kaikille metadatatiedostoille" - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" - msgstr "Tämä voi kestää jonkin aikaa riippuen tietokoneen nopeudesta" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "Metadatavälimuisti on luotu" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" - msgstr "Poista välimuistissa oleva data" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" - msgstr "Etsi annetun arvon tarjoava paketti" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "Etsi saatavilla olevia pakettipäivityksiä" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "Etsi pakettitiedoista annettua merkkijonoa" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "Etsitään paketteja: " - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" - msgstr "Päivitä paketit ottaen vanhennukset huomioon" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" - msgstr "Aloitetaan päivitysprosessi" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" - msgstr "Asenna paikallinen RPM-tiedosto" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" - msgstr "Aloitetaan paikallinen pakettiprosessi" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" - msgstr "Selvitä mikä paketti tarjoaa annetun riippuvuuden" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "Etsitään riippuvuutta paketeista:" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" - msgstr "Suorita interaktiivinen yum-komentorivi" - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "Asetetaan Yum-komentoriviä" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" - msgstr "Luettele paketin riippuvuudet" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "Etsitään riippuvuuksia: " - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "Näytä asetetut asennuslähteet" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 ../yumcommands.py:823 - msgid "enabled" - msgstr "käytössä" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 ../yumcommands.py:850 - msgid "disabled" - msgstr "poissa käytöstä" - --#: ../yumcommands.py:834 -+#: ../yumcommands.py:866 - msgid "Repo-id : " - msgstr "Lähdetunnus : " - --#: ../yumcommands.py:835 -+#: ../yumcommands.py:867 - msgid "Repo-name : " - msgstr "Lähdenimi : " - --#: ../yumcommands.py:836 -+#: ../yumcommands.py:870 - msgid "Repo-status : " - msgstr "Lähteen tila : " - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "Lähderevisio : " - --#: ../yumcommands.py:842 -+#: ../yumcommands.py:877 - msgid "Repo-tags : " - msgstr "Lähteen tagit : " - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "Lähteen jakelutagit: " - --#: ../yumcommands.py:853 -+#: ../yumcommands.py:888 - msgid "Repo-updated : " - msgstr "Lähde päivitetty : " - --#: ../yumcommands.py:855 -+#: ../yumcommands.py:890 - msgid "Repo-pkgs : " - msgstr "Lähteen paketit : " - --#: ../yumcommands.py:856 -+#: ../yumcommands.py:891 - msgid "Repo-size : " - msgstr "Lähteen koko : " - --#: ../yumcommands.py:863 -+#: ../yumcommands.py:898 - msgid "Repo-baseurl : " - msgstr "Lähteen baseurl : " - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " - msgstr "Lähteen metalink : " - --#: ../yumcommands.py:875 -+#: ../yumcommands.py:910 - msgid " Updated : " - msgstr " Päivitetty : " - --#: ../yumcommands.py:878 -+#: ../yumcommands.py:913 - msgid "Repo-mirrors : " - msgstr "Lähteen peilit : " - --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "Tuntematon" -- --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" - msgstr "Ei koskaan (viimeksi: %s)" - --#: ../yumcommands.py:890 -+#: ../yumcommands.py:925 - #, python-format - msgid "Instant (last: %s)" - msgstr "Heti (viimeksi: %s)" - --#: ../yumcommands.py:893 -+#: ../yumcommands.py:928 - #, python-format - msgid "%s second(s) (last: %s)" - msgstr "%s sekunti(a) (viimeksi: %s)" - --#: ../yumcommands.py:895 -+#: ../yumcommands.py:930 - msgid "Repo-expire : " - msgstr "Lähde vanhentuu : " - --#: ../yumcommands.py:898 -+#: ../yumcommands.py:933 - msgid "Repo-exclude : " - msgstr "Lähde ohittaa : " - --#: ../yumcommands.py:902 -+#: ../yumcommands.py:937 - msgid "Repo-include : " - msgstr "Lähde sisältää : " - -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "Lähde ohitettu : " -+ - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 ../yumcommands.py:980 - msgid "repo id" - msgstr "lähdetunnus" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 - msgid "status" - msgstr "tila" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "lähdenimi" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" - msgstr "Näytä käyttöohjeviesti" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "Ei ohjeita komennolle %s" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" -@@ -1491,7 +1666,7 @@ msgstr "" - "\n" - "muut nimet: " - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" -@@ -1501,145 +1676,100 @@ msgstr "" - "\n" - "toinen nimi: " - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" - msgstr "Aloitetaan uudelleenasennusprosessi" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" - msgstr "asenna paketti uudelleen" - --#: ../yumcommands.py:1060 -+#: ../yumcommands.py:1113 - msgid "Setting up Downgrade Process" - msgstr "Aloitetaan varhennusprosessi" - --#: ../yumcommands.py:1067 -+#: ../yumcommands.py:1120 - msgid "downgrade a package" - msgstr "varhenna paketti" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." - msgstr "" - "Näytä koneella ja/tai käytettävissä olevissa asennuslähteissä oleva versio" - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" - msgstr " Yum-versioryhmät:" - --#: ../yumcommands.py:1121 -+#: ../yumcommands.py:1183 - msgid " Group :" - msgstr " Ryhmä:" - --#: ../yumcommands.py:1122 -+#: ../yumcommands.py:1184 - msgid " Packages:" - msgstr " Paketit:" - --#: ../yumcommands.py:1152 -+#: ../yumcommands.py:1213 - msgid "Installed:" - msgstr "Asennettu:" - --#: ../yumcommands.py:1157 -+#: ../yumcommands.py:1218 - msgid "Group-Installed:" - msgstr "Asennettu ryhmässä:" - --#: ../yumcommands.py:1166 -+#: ../yumcommands.py:1227 - msgid "Available:" - msgstr "Saatavilla:" - --#: ../yumcommands.py:1172 -+#: ../yumcommands.py:1233 - msgid "Group-Available:" - msgstr "Saatavilla ryhmässä:" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" - msgstr "Näytä tai käytä transaktiohistoriaa" - --#: ../yumcommands.py:1239 -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." - msgstr "Virheellinen historyn alikomento, käytä: %s." - --#: ../yummain.py:128 --msgid "Running" --msgstr "Suoritetaan" -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" -+msgstr "Etsi ongelmia rpm-tietokannasta" - --#: ../yummain.py:129 --msgid "Sleeping" --msgstr "Unessa" -- --#: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "Ei voi keskeyttää" -- --#: ../yummain.py:131 --msgid "Zombie" --msgstr "Zombi" -- --#: ../yummain.py:132 --msgid "Traced/Stopped" --msgstr "Jäljitetään/Pysäytetty" -- --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr " Toinen ohjelma on: PackageKit" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr " Toinen ohjelma on: %s" -- --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr " Muisti : %5s RSS (%5sB VSZ)" -- --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr " Aloitettu : %s - %s sitten" -- --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr " Tila : %s, pid: %d" -- --#: ../yummain.py:173 -+#: ../yummain.py:102 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "Toinen ohjelma pitää tällä hetkellä yumin lukkoa, odotetaan että se " - "lopettaa..." - --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:130 ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "Virhe: %s" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" - msgstr "Tuntematon virhe: lopetuskoodi: %d:" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "Ratkaistaan riippuvuuksia" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" - msgstr " Ongelman pystyy ehkä kiertämään valitsimella --skip-broken" - --#: ../yummain.py:243 --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+#: ../yummain.py:175 ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" - msgstr "" --" Kokeile komentoja: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+" Kannattaa myös kokeilla komennon rpm -Va --nofiles --nodigest suorittamista" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" -@@ -1647,7 +1777,7 @@ msgstr "" - "\n" - "Riippuvuudet on ratkaistu" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1685,171 +1815,166 @@ msgstr "Mahdollinen vastaavuus haulle %s paketissa %s" - msgid "Matched %s to require for %s" - msgstr "%s vastaa vaatimusta %s" - --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:225 - #, python-format - msgid "Member: %s" - msgstr "Jäsen: %s" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 - #, python-format - msgid "%s converted to install" - msgstr "%s muutettu asennukseksi" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:246 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "Lisätään paketti %s tilassa %s" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:256 - #, python-format - msgid "Removing Package %s" - msgstr "Poistetaan paketti %s" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:278 - #, python-format - msgid "%s requires: %s" - msgstr "%s vaatii: %s" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:319 -+#, python-format -+msgid "%s requires %s" -+msgstr "%s vaatii %s" -+ -+#: ../yum/depsolve.py:346 - msgid "Needed Require has already been looked up, cheating" - msgstr "Tarvittava vaatimus on jo etsitty, huijataan" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:356 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" - msgstr "Tarvittava vaatimus ei ole pakettinimi. Etsitään: %s" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Potential Provider: %s" - msgstr "Mahdollinen tarjoaja: %s" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:386 - #, python-format - msgid "Mode is %s for provider of %s: %s" - msgstr "Tila %s riippuvuuden %s: %s tarjoajalla" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:390 - #, python-format - msgid "Mode for pkg providing %s: %s" - msgstr "Riippuvuuden %s: %s tarjoavan paketin tila" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:394 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "" - "TSINFO: paketti %s, joka vaatii riippuvuuden %s on merkitty poistettavaksi" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:407 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - "TSINFO: Vanhennetaan paketti %s paketilla %s riippuvuuden ratkaisemiseksi." - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:410 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "TSINFO: Päivitetään paketti %s riippuvuuden ratkaisemiseksi." - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:418 - #, python-format - msgid "Cannot find an update path for dep for: %s" - msgstr "Päivityspolkua ei löydetty riippuvuudelle: %s" - --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "Ratkaisematon riippuvuus %s paketille %s" -- --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:449 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "Pikavastaavuus %s vaatimukselle %s" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:491 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." - msgstr "%s on tarjoavissa paketeissa, mutta se on jo asennettuna, poistetaan." - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:507 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." - msgstr "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi ts:ssä." - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:518 - #, python-format - msgid "Potential resolving package %s has newer instance installed." - msgstr "" - "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi asennettuna." - --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "Puuttuva riippuvuus: %s tarvitaan paketille %s" -- --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:536 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "paketti %s on jo ts:ssä, ohitetaan" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:578 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: Merkitään paketti %s päivitykseksi paketille %s" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:586 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: Merkitään %s asennukseksi paketille %s" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 - msgid "Success - empty transaction" - msgstr "Onnistui - tyhjä transaktio" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 - msgid "Restarting Loop" - msgstr "Käynnistetään silmukka uudelleen" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:760 - msgid "Dependency Process ending" - msgstr "Riippuvuuksien käsittely päättyy" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:774 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "paketilla %s asennuslähteestä %s on riippuvuusongelmia" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:782 - msgid "Success - deps resolved" - msgstr "Onnistui – riippuvuudet on ratkaistu" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:796 - #, python-format - msgid "Checking deps for %s" - msgstr "Tarkistetaan paketin %s riippuvuuksia" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:874 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "etsitään riippuvuutta %s paketille %s" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1090 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "Suoritetaan compare_providers() paketeille %s" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 - #, python-format - msgid "better arch in po %s" - msgstr "po:ssa %s on parempi arkkitehtuuri" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1218 - #, python-format - msgid "%s obsoletes %s" - msgstr "paketti %s vanhentaa paketin %s" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1230 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" -@@ -1858,103 +1983,122 @@ msgstr "" - "archdist vertasi paketteja %s ja %s arkkitehtuurilla %s\n" - " Voittaja: %s" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1237 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "paketeilla %s ja %s on yhteinen lähde-RPM" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1241 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "peruspaketti %s on asennettu paketille %s" -+ -+#: ../yum/depsolve.py:1247 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "yhteinen %s merkin mittainen etuliite paketeilla %s ja %s" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1256 - #, python-format - msgid "Best Order: %s" - msgstr "Paras järjestys %s" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "doConfigSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" - msgstr "Asennuslähteen %r asetuksista puuttuu nimi, käytetään tunnistetta" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "liitännäiset on jo alustettu" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "doRpmSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "Luetaan paikallista RPM-tietokantaa" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "Asetetaan pakettisäkkejä" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" - msgstr "asennuslähteen %s oliosta puuttuu _resetSack-metodi\n" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "siksi tätä asennuslähdettä ei voi palauttaa alkutilaan.\n" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "doUpdateSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "Rakennetaan päivitysoliota" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "Haetaan ryhmien metadataa" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "Lisätään ryhmätiedosto asennuslähteestä: %s" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "Ryhmätiedoston lisääminen asennuslähteelle epäonnistui: %s - %s" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "Yhtään ryhmää ei ole saatavilla mistään asennuslähteestä" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "Haetaan pakettitagien metadataa" -+ -+#: ../yum/__init__.py:740 -+#, python-format -+msgid "Adding tags from repository: %s" -+msgstr "Lisätään tagit asennuslähteestä: %s" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "Pakettitagien lisääminen asennuslähteelle epäonnistui: %s - %s" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" - msgstr "Tuodaan lisää tiedostoluettelotietoa" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." - msgstr "Ohjelma %s%s%s on paketissa yum-utils." - --#: ../yum/__init__.py:785 -+#: ../yum/__init__.py:849 - msgid "" - "There are unfinished transactions remaining. You might consider running yum-" - "complete-transaction first to finish them." -@@ -1962,17 +2106,18 @@ msgstr "" - "Keskeneräisiä transaktioita on jäljellä. Niiden päättämiseksi on suositeltua " - "suorittaa ensin yum-complete-transaction." - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "Skip-broken, kierros %i" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "Skip-broken vaati %i kierrosta" - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" -@@ -1980,79 +2125,91 @@ msgstr "" - "\n" - "Riippuvuusongelmien vuoksi ohitetut paketit:" - --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr " %s asennuslähteestä %s" - --#: ../yum/__init__.py:1083 -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "Varoitus: RPM-tietokantaa on muutettu yumin ulkopuolella." -+ -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "puuttuvia riippuvuuksia" -+ -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "asennettu konflikti" -+ -+#: ../yum/__init__.py:1180 - msgid "" - "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Varoitus: sovelmien virheitä tai muita virheitä, jotka eivät ole vakavia, " - "tapahtui transaktion aikana." - --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" - msgstr "Transaktiotiedoston %s poistaminen epäonnistui" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" - msgstr "%s piti olla asennettuna, mutta se ei ole!" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 - #, python-format - msgid "%s was supposed to be removed but is not!" - msgstr "%s piti olla poistettu, mutta se ei ole!" - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Ei voida tarkistaa onko PID %s aktiivinen" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 - #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "Lukko %s on olemassa: toinen kopio on suorituksessa pidillä %s." - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 -+#: ../yum/__init__.py:1425 - #, python-format - msgid "Could not create lock at %s: %s " - msgstr "Ei voitu luoda lukkoa sijaintiin %s: %s" - --#: ../yum/__init__.py:1373 -+#: ../yum/__init__.py:1470 - msgid "Package does not match intended download" - msgstr "Paketti ei vastaa aiottua latausta" - --#: ../yum/__init__.py:1388 -+#: ../yum/__init__.py:1485 - msgid "Could not perform checksum" - msgstr "Ei voitu laskea tarkistussummaa" - --#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1488 - msgid "Package does not match checksum" - msgstr "Paketti ei vastaa tarkistussummaa" - --#: ../yum/__init__.py:1433 -+#: ../yum/__init__.py:1530 - #, python-format - msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "paketti ei vastaa tarkistussummaa, mutta välimuisti on käytössä kohteelle %s" - --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 -+#: ../yum/__init__.py:1533 ../yum/__init__.py:1562 - #, python-format - msgid "using local copy of %s" - msgstr "käytetään paikallista kopiota paketista %s" - --#: ../yum/__init__.py:1477 -+#: ../yum/__init__.py:1574 - #, python-format - msgid "" - "Insufficient space in download directory %s\n" -@@ -2063,11 +2220,11 @@ msgstr "" - " * vapaana %s\n" - " * tarvitaan %s" - --#: ../yum/__init__.py:1526 -+#: ../yum/__init__.py:1623 - msgid "Header is not complete." - msgstr "Otsake ei ole täydellinen." - --#: ../yum/__init__.py:1563 -+#: ../yum/__init__.py:1660 - #, python-format - msgid "" - "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2075,62 +2232,62 @@ msgstr "" - "Otsake ei ole paikallisessa välimuistissa ja pelkästä välimuistista toimiva " - "tila on käytössä. Ei voida ladata otsaketta %s" - --#: ../yum/__init__.py:1618 -+#: ../yum/__init__.py:1715 - #, python-format - msgid "Public key for %s is not installed" - msgstr "Julkista avainta pakettia %s varten ei ole asennettu" - --#: ../yum/__init__.py:1622 -+#: ../yum/__init__.py:1719 - #, python-format - msgid "Problem opening package %s" - msgstr "Ongelma paketin %s avaamisessa" - --#: ../yum/__init__.py:1630 -+#: ../yum/__init__.py:1727 - #, python-format - msgid "Public key for %s is not trusted" - msgstr "Paketin %s julkiseen avaimeen ei luoteta" - --#: ../yum/__init__.py:1634 -+#: ../yum/__init__.py:1731 - #, python-format - msgid "Package %s is not signed" - msgstr "Pakettia %s ei ole allekirjoitettu" - --#: ../yum/__init__.py:1672 -+#: ../yum/__init__.py:1769 - #, python-format - msgid "Cannot remove %s" - msgstr "Ei voida poistaa tiedostoa %s" - --#: ../yum/__init__.py:1676 -+#: ../yum/__init__.py:1773 - #, python-format - msgid "%s removed" - msgstr "tiedosto %s on poistettu" - --#: ../yum/__init__.py:1712 -+#: ../yum/__init__.py:1819 - #, python-format - msgid "Cannot remove %s file %s" - msgstr "Ei voida poistaa %s-tyyppistä tiedostoa %s" - --#: ../yum/__init__.py:1716 -+#: ../yum/__init__.py:1823 - #, python-format - msgid "%s file %s removed" - msgstr "%s-tyyppinen tiedosto %s on poistettu" - --#: ../yum/__init__.py:1718 -+#: ../yum/__init__.py:1825 - #, python-format - msgid "%d %s files removed" - msgstr "%d %s-tyyppistä tiedostoa on poistettu" - --#: ../yum/__init__.py:1787 -+#: ../yum/__init__.py:1894 - #, python-format - msgid "More than one identical match in sack for %s" - msgstr "Säkissä on useampi kuin yksi identtinen vastaavuus haulle %s" - --#: ../yum/__init__.py:1793 -+#: ../yum/__init__.py:1900 - #, python-format - msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "Mikään ei vastaa päivityksen pakettia %s.%s %s:%s-%s" - --#: ../yum/__init__.py:2026 -+#: ../yum/__init__.py:2179 - msgid "" - "searchPackages() will go away in a future version of " - "Yum. Use searchGenerator() instead. \n" -@@ -2138,181 +2295,181 @@ msgstr "" - "searchPackages() poistetaan jossakin Yumin tulevassa versiossa. Käytä sen " - "sijaan searchGenerator()-metodia.\n" - --#: ../yum/__init__.py:2065 -+#: ../yum/__init__.py:2218 - #, python-format - msgid "Searching %d packages" - msgstr "Etsitään %d pakettia" - --#: ../yum/__init__.py:2069 -+#: ../yum/__init__.py:2222 - #, python-format - msgid "searching package %s" - msgstr "etsitään pakettia %s" - --#: ../yum/__init__.py:2081 -+#: ../yum/__init__.py:2234 - msgid "searching in file entries" - msgstr "etsitään tiedostoista" - --#: ../yum/__init__.py:2088 -+#: ../yum/__init__.py:2241 - msgid "searching in provides entries" - msgstr "etsitään tarjoajista" - --#: ../yum/__init__.py:2121 -+#: ../yum/__init__.py:2274 - #, python-format - msgid "Provides-match: %s" - msgstr "Tarjoajavastaavuus: %s" - --#: ../yum/__init__.py:2170 -+#: ../yum/__init__.py:2323 - msgid "No group data available for configured repositories" - msgstr "Asetetuille asennuslähteille ei ole saatavilla ryhmädataa" - --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 -+#: ../yum/__init__.py:2354 ../yum/__init__.py:2373 ../yum/__init__.py:2404 -+#: ../yum/__init__.py:2410 ../yum/__init__.py:2492 ../yum/__init__.py:2496 -+#: ../yum/__init__.py:2813 - #, python-format - msgid "No Group named %s exists" - msgstr "Ryhmää nimeltä %s ei ole olemassa" - --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 -+#: ../yum/__init__.py:2385 ../yum/__init__.py:2512 - #, python-format - msgid "package %s was not marked in group %s" - msgstr "pakettia %s ei ollut merkitty kuuluvaksi ryhmään %s" - --#: ../yum/__init__.py:2279 -+#: ../yum/__init__.py:2432 - #, python-format - msgid "Adding package %s from group %s" - msgstr "Lisätään paketti %s ryhmästä %s" - --#: ../yum/__init__.py:2283 -+#: ../yum/__init__.py:2436 - #, python-format - msgid "No package named %s available to be installed" - msgstr "Pakettia nimeltä %s ei ole saatavilla asennusta varten" - --#: ../yum/__init__.py:2380 -+#: ../yum/__init__.py:2538 - #, python-format - msgid "Package tuple %s could not be found in packagesack" - msgstr "Paketti-tuplea %s ei löytynyt pakettisäkistä" - --#: ../yum/__init__.py:2399 -+#: ../yum/__init__.py:2557 - #, python-format - msgid "Package tuple %s could not be found in rpmdb" - msgstr "Paketti-tuplea %s ei löytynyt RPM-tietokannasta" - --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 -+#: ../yum/__init__.py:2613 ../yum/__init__.py:2663 - msgid "Invalid version flag" - msgstr "Virheellinen versiolippu" - --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2633 ../yum/__init__.py:2638 - #, python-format - msgid "No Package found for %s" - msgstr "Riippuvuudelle %s ei löytynyt pakettia" - --#: ../yum/__init__.py:2696 -+#: ../yum/__init__.py:2854 - msgid "Package Object was not a package object instance" - msgstr "Pakettiolio ei ollutkaan pakettiolioinstanssi" - --#: ../yum/__init__.py:2700 -+#: ../yum/__init__.py:2858 - msgid "Nothing specified to install" - msgstr "Mitään ei määritelty asennettavaksi" - --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 -+#: ../yum/__init__.py:2874 ../yum/__init__.py:3651 - #, python-format - msgid "Checking for virtual provide or file-provide for %s" - msgstr "Etsitään virtuaalista tai tiedostotarjoajaa argumentille %s" - --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 -+#: ../yum/__init__.py:2880 ../yum/__init__.py:3196 ../yum/__init__.py:3364 -+#: ../yum/__init__.py:3657 - #, python-format - msgid "No Match for argument: %s" - msgstr "Mikään ei vastaa argumenttia: %s" - --#: ../yum/__init__.py:2798 -+#: ../yum/__init__.py:2956 - #, python-format - msgid "Package %s installed and not available" - msgstr "Paketti %s on asennettu, mutta ei saatavilla" - --#: ../yum/__init__.py:2801 -+#: ../yum/__init__.py:2959 - msgid "No package(s) available to install" - msgstr "Yhtään pakettia ei ole saatavilla asennettavaksi" - --#: ../yum/__init__.py:2813 -+#: ../yum/__init__.py:2971 - #, python-format - msgid "Package: %s - already in transaction set" - msgstr "Paketti: %s – on jo transaktiojoukossa" - --#: ../yum/__init__.py:2839 -+#: ../yum/__init__.py:2997 - #, python-format - msgid "Package %s is obsoleted by %s which is already installed" - msgstr "Paketin %s vanhentaa paketti %s, joka on jo asennettuna" - --#: ../yum/__init__.py:2842 -+#: ../yum/__init__.py:3000 - #, python-format - msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "Paketin %s vanhentaa paketti %s, yritetään paketti %s sen sijaan" - --#: ../yum/__init__.py:2850 -+#: ../yum/__init__.py:3008 - #, python-format - msgid "Package %s already installed and latest version" - msgstr "Paketti %s on jo asennettuna ja uusin versio" - --#: ../yum/__init__.py:2864 -+#: ../yum/__init__.py:3022 - #, python-format - msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Pakettia %s vastaava paketti on jo asennettuna. Tarkistetaan päivitykset." - - #. update everything (the easy case) --#: ../yum/__init__.py:2966 -+#: ../yum/__init__.py:3125 - msgid "Updating Everything" - msgstr "Päivitetään kaikki" - --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 -+#: ../yum/__init__.py:3146 ../yum/__init__.py:3261 ../yum/__init__.py:3288 -+#: ../yum/__init__.py:3314 - #, python-format - msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "Vanhennettua pakettia ei päivitetä: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 -+#: ../yum/__init__.py:3181 ../yum/__init__.py:3361 - #, python-format - msgid "%s" - msgstr "%s" - --#: ../yum/__init__.py:3093 -+#: ../yum/__init__.py:3252 - #, python-format - msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "Paketti on jo vanhennettu: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3124 -+#: ../yum/__init__.py:3283 - #, python-format - msgid "Not Updating Package that is obsoleted: %s" - msgstr "Ei päivitetä vanhennettua pakettia: %s" - --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 -+#: ../yum/__init__.py:3292 ../yum/__init__.py:3318 - #, python-format - msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "Jo päivitettyä pakettia ei enää päivitetä: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3218 -+#: ../yum/__init__.py:3377 - msgid "No package matched to remove" - msgstr "Yhtään poistopyyntöä vastaavaa pakettia ei ole" - --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 -+#: ../yum/__init__.py:3411 - #, python-format --msgid "Cannot open file: %s. Skipping." --msgstr "Ei voida avata tiedostoa: %s. Ohitetaan." -+msgid "Cannot open: %s. Skipping." -+msgstr "Ei voida avata pakettia: %s. Ohitetaan." - --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 -+#: ../yum/__init__.py:3414 ../yum/__init__.py:3513 ../yum/__init__.py:3597 - #, python-format - msgid "Examining %s: %s" - msgstr "Tutkitaan %s: %s" - --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 -+#: ../yum/__init__.py:3422 ../yum/__init__.py:3516 ../yum/__init__.py:3600 - #, python-format - msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - "Pakettia %s ei voida lisätä transaktioon. Arkkitehtuuri ei ole yhteensopiva: " - "%s" - --#: ../yum/__init__.py:3270 -+#: ../yum/__init__.py:3430 - #, python-format - msgid "" - "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2321,99 +2478,109 @@ msgstr "" - "Pakettia %s ei ole asennettu, sitä ei voida päivittää. Suorita yum install -" - "komento paketin asentamiseksi." - --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 -+#: ../yum/__init__.py:3459 ../yum/__init__.py:3521 ../yum/__init__.py:3605 - #, python-format - msgid "Excluding %s" - msgstr "Ohitetaan paketti %s" - --#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3464 - #, python-format - msgid "Marking %s to be installed" - msgstr "Merkitään paketti %s asennettavaksi" - --#: ../yum/__init__.py:3310 -+#: ../yum/__init__.py:3470 - #, python-format - msgid "Marking %s as an update to %s" - msgstr "Merkitään paketti %s päivitykseksi paketille %s" - --#: ../yum/__init__.py:3317 -+#: ../yum/__init__.py:3477 - #, python-format - msgid "%s: does not update installed package." - msgstr "%s: ei päivitä asennettua pakettia" - --#: ../yum/__init__.py:3379 -+#: ../yum/__init__.py:3510 ../yum/__init__.py:3594 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "Ei voida avata tiedostoa: %s. Ohitetaan." -+ -+#: ../yum/__init__.py:3540 - msgid "Problem in reinstall: no package matched to remove" - msgstr "Ongelma uudelleenasennuksessa: poistopyyntöä vastaavaa pakettia ei ole" - --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 -+#: ../yum/__init__.py:3553 ../yum/__init__.py:3685 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "Paketille %s sallitaan useita asennuksia, ohitetaan." - --#: ../yum/__init__.py:3413 -+#: ../yum/__init__.py:3574 - #, python-format - msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Ongelma uudelleenasennuksessa: asennuspyyntöä vastaavaa pakettia %s ei ole" - --#: ../yum/__init__.py:3515 -+#: ../yum/__init__.py:3677 - msgid "No package(s) available to downgrade" - msgstr "Yhtään pakettia ei ole saatavilla varhennettavaksi" - --#: ../yum/__init__.py:3559 -+#: ../yum/__init__.py:3730 - #, python-format - msgid "No Match for available package: %s" - msgstr "Ei vastaavuutta saatavilla olevalle paketille: %s" - --#: ../yum/__init__.py:3565 -+#: ../yum/__init__.py:3737 - #, python-format - msgid "Only Upgrade available on package: %s" - msgstr "Vain päivitys saatavilla paketille: %s" - --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 -+#: ../yum/__init__.py:3807 ../yum/__init__.py:3844 - #, python-format - msgid "Failed to downgrade: %s" - msgstr "Varhentaminen epäonnistui: %s" - --#: ../yum/__init__.py:3704 -+#: ../yum/__init__.py:3876 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "Noudetaan GPG-avain osoitteesta %s" - --#: ../yum/__init__.py:3724 -+#: ../yum/__init__.py:3896 - msgid "GPG key retrieval failed: " - msgstr "GPG-avaimen nouto epäonnistui: " - --#: ../yum/__init__.py:3735 -+#: ../yum/__init__.py:3902 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "Virheellinen GPG-avain osoitteesta %s: %s" -+ -+#: ../yum/__init__.py:3911 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "GPG-avaimen jäsentäminen epäonnistui: avaimessa ei ole arvoa %s" - --#: ../yum/__init__.py:3767 -+#: ../yum/__init__.py:3943 - #, python-format - msgid "GPG key at %s (0x%s) is already installed" - msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo asennetuna" - - #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 -+#: ../yum/__init__.py:3948 ../yum/__init__.py:4010 - #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "Tuodaan GPG-avain 0x%s ”%s” osoitteesta %s" - --#: ../yum/__init__.py:3789 -+#: ../yum/__init__.py:3965 - msgid "Not installing key" - msgstr "Avainta ei asenneta" - --#: ../yum/__init__.py:3795 -+#: ../yum/__init__.py:3971 - #, python-format - msgid "Key import failed (code %d)" - msgstr "Avaimen tuonti epäonnistui (koodi %d)" - --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 -+#: ../yum/__init__.py:3972 ../yum/__init__.py:4031 - msgid "Key imported successfully" - msgstr "Avaimen tuonti onnistui" - --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 -+#: ../yum/__init__.py:3977 ../yum/__init__.py:4036 - #, python-format - msgid "" - "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2424,41 +2591,46 @@ msgstr "" - "vastaa tätä pakettia.\n" - "Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." - --#: ../yum/__init__.py:3810 -+#: ../yum/__init__.py:3986 - msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "Avainten tuonti ei auttanut, ovatko avaimet vääriä?" - --#: ../yum/__init__.py:3829 -+#: ../yum/__init__.py:4005 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo tuotu" - --#: ../yum/__init__.py:3849 -+#: ../yum/__init__.py:4025 - #, python-format - msgid "Not installing key for repo %s" - msgstr "Ei asenneta avainta asennuslähteelle %s" - --#: ../yum/__init__.py:3854 -+#: ../yum/__init__.py:4030 - msgid "Key import failed" - msgstr "Avaimen tuonti epäonnistui" - --#: ../yum/__init__.py:3976 -+#: ../yum/__init__.py:4156 - msgid "Unable to find a suitable mirror." - msgstr "Sopivaa peilipalvelinta ei löytynyt." - --#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4158 - msgid "Errors were encountered while downloading packages." - msgstr "Paketteja ladatessa tapahtui virheitä." - --#: ../yum/__init__.py:4028 -+#: ../yum/__init__.py:4208 - #, python-format - msgid "Please report this error at %s" - msgstr "Ilmoita tästä ongelmasta: %s" - --#: ../yum/__init__.py:4052 -+#: ../yum/__init__.py:4232 - msgid "Test Transaction Errors: " - msgstr "Testitransaktion virheitä: " - -+#: ../yum/__init__.py:4333 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "Välimuistihakemiston asettaminen epäonnistui %s" -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " -@@ -2517,7 +2689,20 @@ msgstr "Liitännäisen %s asetustiedostoa ei löytynyt" - msgid "registration of commands not supported" - msgstr "komentojen rekisteröintiä ei tueta" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "on puuttuvia riippuvuuksia" -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "on asennettuja konflikteja" -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "paketti %s on paketin %s duplikaatti" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" - msgstr "Paketoidaan uudelleen" - -@@ -2550,6 +2735,24 @@ msgstr "Vioittunut otsake %s" - msgid "Error opening rpm %s - error %s" - msgstr "Virhe avattaessa RPM:ää %s – virhe %s" - -+#~ msgid "Finished Transaction Test" -+#~ msgstr "Transaktiotesti valmistui" -+ -+#~ msgid "" -+#~ " You could try running: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" -+#~ msgstr "" -+#~ " Kokeile komentoja: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" -+ -+#~ msgid "Unresolvable requirement %s for %s" -+#~ msgstr "Ratkaisematon riippuvuus %s paketille %s" -+ -+#~ msgid "Missing Dependency: %s is needed by package %s" -+#~ msgstr "Puuttuva riippuvuus: %s tarvitaan paketille %s" -+ - #~ msgid "" - #~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" - #~ "().\n" -diff --git a/po/it.po b/po/it.po -index a6c8f13..0adee83 100644 ---- a/po/it.po -+++ b/po/it.po -@@ -2,8 +2,8 @@ - # Italian translation of yum. - # Copyright (C) 2008 Red Hat, Inc. - # This file is distributed under the same license as the yum package. --# --# -+# -+# - # Silvio Pierro , 2008. - # Gianluca Busiello , 2008. - # mario_santagiuliana , 2009. -@@ -12,43 +12,44 @@ msgid "" - msgstr "" - "Project-Id-Version: yum-it 3.2.8\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" -+"POT-Creation-Date: 2010-02-11 10:54-0500\n" - "PO-Revision-Date: 2009-03-06 11:41+0100\n" - "Last-Translator: mario_santagiuliana \n" - "Language-Team: Italian \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: Lokalize 0.3\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"X-Generator: Lokalize 0.3\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "Aggiornamento" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 ../yum/rpmtrans.py:73 - msgid "Erasing" - msgstr "Cancellazione" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 -+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "Installazione" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "Reso obsoleto" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 - msgid "Updated" - msgstr "Aggiornato" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 ../output.py:1438 - msgid "Erased" - msgstr "Cancellato" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 -+#: ../output.py:1434 ../output.py:1646 - msgid "Installed" - msgstr "Installato" - -@@ -70,68 +71,73 @@ msgstr "Errore: stato di output non valido: %s per %s" - msgid "Erased: %s" - msgstr "Cancellato: %s" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 ../output.py:948 ../output.py:1648 - msgid "Removing" - msgstr "Rimozione in corso" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "Pulizia" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "Comando \"%s\" già definito" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "Settaggio repository" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "Lettura dei metadati dei repository dai file locali" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "Errore di configurazione: %s" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "Errore opzioni: %s" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr " Installato: %s-%s da %s" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" - msgstr " Costruito : %s da %s" - --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" - msgstr " Committed: %s da %s" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" - msgstr "È necessario dare qualche comando" - --#: ../cli.py:309 -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "" -+ -+#: ../cli.py:314 - msgid "Disk Requirements:\n" - msgstr "Requisiti su disco:\n" - --#: ../cli.py:311 --#, python-format --msgid " At least %dMB needed on the %s filesystem.\n" -+#: ../cli.py:316 -+#, fuzzy, python-format -+msgid " At least %dMB more space needed on the %s filesystem.\n" - msgstr " Almeno %dMB necessari sul filesystem %s.\n" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" -@@ -139,258 +145,259 @@ msgstr "" - "Riepilogo errori\n" - "-------------\n" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "La transazione non contiene alcuna operazione da eseguire." - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" - msgstr "Uscita richiesta dall'utente" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "Download dei pacchetti:" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "Errore nel download dei pacchetti:\n" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 ../yum/__init__.py:4195 - msgid "Running rpm_check_debug" - msgstr "Esecuzione rpm_check_debug" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 ../yum/__init__.py:4204 - msgid "ERROR You need to update rpm to handle:" --msgstr "" -+msgstr "ERRORE Occorre aggiornare rpm per gestire:" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 ../yum/__init__.py:4207 - msgid "ERROR with rpm_check_debug vs depsolve:" --msgstr "ERRORE con rpm_check_debug su depsolve:" -+msgstr "ERRORE tra rpm_check_debug e depsolve:" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" --msgstr "" -+msgstr "RPM deve essere aggiornato" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" - msgstr "Riportare questo errore in %s" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "Test di transazione in corso" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "Test di transazione terminato" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "Errore nel controllo transazione:\n" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "Test di transazione eseguito con successo" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "Transazione in corso" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." - msgstr "" --"L'importazione automatica delle chiavi è disabilitata in modalità non " --"interattiva.\n" -+"L'importazione automatica delle chiavi è disabilitata in modalità non interattiva.\n" - "Usare \"-y\" per abilitarla." - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 ../cli.py:578 - msgid " * Maybe you meant: " - msgstr " * Forse si intendeva: " - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." - msgstr "Pacchetto(i) %s%s%s disponibili ma non installati." - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 ../cli.py:607 ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "Nessun pacchetto %s%s%s disponibile." - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 ../cli.py:748 - msgid "Package(s) to install" - msgstr "Pacchetto(i) da installare" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "Niente da fare" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "%d pacchetti marcati per l'aggiornamento" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "Nessun pacchetto marcato per l'aggiornamento" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "%d pacchetti marcati per la rimozione" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "Nessun pacchetto marcato per la rimozione" - --#: ../cli.py:683 -+#: ../cli.py:692 - #, fuzzy - msgid "Package(s) to downgrade" - msgstr "Pacchetto(i) da installare" - --#: ../cli.py:707 -+#: ../cli.py:717 - #, fuzzy, python-format - msgid " (from %s)" - msgstr " %s da %s" - --#: ../cli.py:709 -+#: ../cli.py:719 - #, fuzzy, python-format - msgid "Installed package %s%s%s%s not available." - msgstr "Nessun pacchetto %s%s%s disponibile." - --#: ../cli.py:716 -+#: ../cli.py:726 - #, fuzzy - msgid "Package(s) to reinstall" - msgstr "Pacchetto(i) da installare" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" - msgstr "Nessun pacchetto fornito" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, fuzzy, python-format -+msgid "Matched: %s" -+msgstr "Cancellato: %s" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" - msgstr "Attenzione: Nessun pacchetto trovato per %s" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "Nessuna corrispondenza trovata" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" - " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" - msgstr "" --"Attenzione: la versione 3.0.x di yum non fa match correttamente sui " --"filenames.\n" -+"Attenzione: la versione 3.0.x di yum non fa match correttamente sui filenames.\n" - " Si può usare \"%s*/%s%s\" e/o \"%s*bin/%s%s\" per avere questo comportamento" - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "Nessun pacchetto trovato per %s" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "Pulizia completa" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" - msgstr "Pulizia headers" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "Pulizia pacchetti" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "Pulizia metadati xml" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" - msgstr "Pulizia database cache" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" - msgstr "Pulizia metadati expire-cache" - --#: ../cli.py:912 -+#: ../cli.py:927 -+#, fuzzy -+msgid "Cleaning up cached rpmdb data" -+msgstr "Pulizia metadati expire-cache" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" - msgstr "Pulizia plugins" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "Gruppi installati:" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "Gruppi disponibili:" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "Fatto" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "Attenzione: Il gruppo %s non esiste." - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" --msgstr "" --"Nessun pacchetto in alcun gruppo richiesto è disponibile per l'installazione " --"o l'aggiornamento" -+msgstr "Nessun pacchetto in alcun gruppo richiesto è disponibile per l'installazione o l'aggiornamento" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "%d pacchetto(i) da installare" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 ../yum/__init__.py:2800 - #, python-format - msgid "No group named %s exists" - msgstr "Non esiste nessun gruppo di nome %s" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "Nessun pacchetto da rimuovere dai gruppi" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" - msgstr "%d pacchetto(i) da rimuovere" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" - msgstr "Il pacchetto %s è già installato, lo salto" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" - msgstr "Escludendo il pacchetto non comparabile %s.%s" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" --msgstr "" --"Nessun altro %s installato, inserimento in lista per potenziale installazione" -+msgstr "Nessun altro %s installato, inserimento in lista per potenziale installazione" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" - msgstr "" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" - msgstr "Errore di linea di comando: %s" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -401,106 +408,116 @@ msgstr "" - "\n" - "%s: l'opzione %s richiede un argomento" - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "--color deve specificare uno tra: auto, always, never" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" - msgstr "mostra questo messaggio di aiuto ed esce" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" - msgstr "tollera gli errori" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" -+#: ../cli.py:1326 -+#, fuzzy -+msgid "run entirely from system cache, don't update cache" - msgstr "esecuzione esclusivamente in cache, senza aggiornarla" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" - msgstr "configurazione locazione dei file" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" - msgstr "tempo di attesa comando massima" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "livello output di debug" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" - msgstr "Mostra comandi duplicati, nei repo, in lista/cerca" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "livello output per gli errori" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+#, fuzzy -+msgid "debugging output level for rpm" -+msgstr "livello output di debug" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "modalità silenziosa" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "mostra più messaggi di log" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "risponde si a tutte le domande" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" - msgstr "mostra la versione di Yum e esce" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" - msgstr "imposta il percorso d'installazione" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "abilita uno o più repository (wildcard consentite)" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" - msgstr "disabilita uno o più repository (wildcard·consentite)" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" - msgstr "esclude pacchetto(i) per nome o glob" - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" - msgstr "disabilita l'esclusione dal main, per un repo o per tutto" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "abilita l'elaborazione degli obsoleti durante l'aggiornamento" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "disabilita i plugin di Yum" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "disabilita il controllo della firma gpg" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "disabilita i plugin per nome" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "abilita i plugin per nome" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" - msgstr "Salto pacchetti con problemi di risoluzione dipendenze" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" - msgstr "controlla se il colore è usato" - -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "" -+ - #: ../output.py:305 - msgid "Jan" - msgstr "Gen" -@@ -553,106 +570,105 @@ msgstr "Dic" - msgid "Trying other mirror." - msgstr "Connessione ad un altro mirror in corso." - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "Nome : %s%s%s" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "Arch : %s" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" - msgstr "Periodo : %s" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "Versione : %s" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" - msgstr "Release : %s" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "Dimensione : %s" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "Repo : %s" - --#: ../output.py:547 -+#: ../output.py:543 - #, fuzzy, python-format - msgid "From repo : %s" - msgstr "Versione : %s" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "Committer : %s" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "Data commit: %s" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "Data build : %s" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "Data inst. : %s" - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "Sommario : " - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:557 --#, python-format --msgid "License : %s" -+#: ../output.py:553 -+#, fuzzy -+msgid "License : " - msgstr "Licenza : %s" - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "Descrizione: " - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "s" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "si" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "n" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "no" - --# --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " - msgstr "È corretto [s/N]: " - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" -@@ -661,152 +677,154 @@ msgstr "" - "\n" - "Gruppo: %s" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr " Id-Gruppo: %s" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr " Descrizione: %s" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr " Pacchetti necessari:" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr " Pacchetti di default:" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" - msgstr "Pacchetti opzionali:" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr " Pacchetti condizionali:" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "pacchetto: %s" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr " Nessuna dipendenza per questo pacchetto" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr " dipendenze: %s" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr " Dipendenza non soddisfatte" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "Repo : %s" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "Corrispondenza trovata in:" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " - msgstr "Descrizione: " - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "Licenza : %s" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" - msgstr "Nome file : %s" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "Altro : " - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" --msgstr "" --"Si è verificato un errore nel calcolo della dimensione totale di download" -+msgstr "Si è verificato un errore nel calcolo della dimensione totale di download" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "Dimensione totale: %s" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "Dimensione totale del download: %s" - --#: ../output.py:942 -+#: ../output.py:908 -+#, fuzzy, python-format -+msgid "Installed size: %s" -+msgstr "Data inst. : %s" -+ -+#: ../output.py:949 - #, fuzzy - msgid "Reinstalling" - msgstr "Installazione" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" - msgstr "" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" - msgstr "Installazioni per dipendenze" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" - msgstr "Aggiornamenti per dipendenze" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "Rimozioni per dipendenze" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 ../output.py:1072 - msgid "Skipped (dependency problems)" - msgstr "Saltato (problemi di dipendenze):" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" - msgstr "Pacchetto" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" - msgstr "Arch" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" - msgstr "Versione" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" - msgstr "Repository" - --#: ../output.py:978 -+#: ../output.py:985 - msgid "Size" - msgstr "Dim." - --#: ../output.py:990 --#, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" -+#: ../output.py:997 -+#, fuzzy, python-format -+msgid " replacing %s%s%s.%s %s\n" - msgstr "" - " in sostituzione di %s%s%s.%s %s\n" - "\n" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" -@@ -814,14 +832,14 @@ msgid "" - "%s\n" - msgstr "" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" - "Upgrade %5.5s Package(s)\n" - msgstr "" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" -@@ -829,32 +847,32 @@ msgid "" - "Downgrade %5.5s Package(s)\n" - msgstr "" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" - msgstr "Rimosso" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "Dipendenza rimossa" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "Dipendenza installata" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "Dipendenza aggiornata" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "Sostituito" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "Fallito" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" - msgstr "due" - -@@ -862,233 +880,391 @@ msgstr "due" - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 -+#: ../output.py:1151 - #, fuzzy, python-format - msgid "" - "\n" --" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " --"seconds\n" -+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" - "to exit.\n" - msgstr "" - "\n" --" Download in corso interrotto, %spremi (ctrl-c) nuovamente%s entro %s%s%s " --"secondi per uscire\n" -+" Download in corso interrotto, %spremi (ctrl-c) nuovamente%s entro %s%s%s secondi per uscire\n" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "interruzione utente" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "Totale" - -+#: ../output.py:1202 -+msgid "I" -+msgstr "" -+ - #: ../output.py:1203 --msgid "" -+msgid "O" - msgstr "" - - #: ../output.py:1204 -+msgid "E" -+msgstr "" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "" -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "" -+ -+#: ../output.py:1217 -+msgid "" -+msgstr "" -+ -+#: ../output.py:1218 - msgid "System" - msgstr "" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" - msgstr "" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." -+#: ../output.py:1266 -+msgid "ID" - msgstr "" - --#: ../output.py:1289 -+#: ../output.py:1267 ../output.py:1520 -+msgid "Login user" -+msgstr "" -+ -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "" -+ -+#: ../output.py:1269 ../output.py:1522 -+msgid "Action(s)" -+msgstr "" -+ -+#: ../output.py:1270 ../output.py:1523 -+#, fuzzy -+msgid "Altered" -+msgstr "cancellato" -+ -+#: ../output.py:1310 - msgid "No transaction ID given" - msgstr "" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" - msgstr "" - --#: ../output.py:1302 -+#: ../output.py:1341 - #, fuzzy - msgid "Not found given transaction ID" - msgstr "Transazione in corso" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" - msgstr "" - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" - msgstr "" - --#: ../output.py:1357 -+#: ../output.py:1396 - #, fuzzy - msgid "Transaction ID :" - msgstr "Errore nel controllo transazione:\n" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" - msgstr "" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 ../output.py:1403 - msgid "Begin rpmdb :" - msgstr "" - --#: ../output.py:1378 -+#: ../output.py:1417 - #, python-format - msgid "(%s seconds)" - msgstr "" - --#: ../output.py:1379 -+#: ../output.py:1418 - #, fuzzy - msgid "End time :" - msgstr "Altro : " - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 ../output.py:1423 - msgid "End rpmdb :" - msgstr "" - --#: ../output.py:1385 -+#: ../output.py:1424 - #, fuzzy - msgid "User :" - msgstr "URL : %s" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 -+#: ../output.py:1426 ../output.py:1428 ../output.py:1430 - #, fuzzy - msgid "Return-Code :" - msgstr "Id-Repo : " - --#: ../output.py:1387 -+#: ../output.py:1426 - #, fuzzy - msgid "Aborted" - msgstr "Reso obsoleto" - --#: ../output.py:1389 -+#: ../output.py:1428 - #, fuzzy - msgid "Failure:" - msgstr "Fallito" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" - msgstr "" - --#: ../output.py:1392 -+#: ../output.py:1431 - #, fuzzy - msgid "Transaction performed with:" - msgstr "Errore nel controllo transazione:\n" - --#: ../output.py:1405 -+#: ../output.py:1444 ../output.py:1489 - msgid "Downgraded" - msgstr "" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" - msgstr "" - --#: ../output.py:1409 -+#: ../output.py:1448 - #, fuzzy - msgid "Packages Altered:" - msgstr "Nessun pacchetto fornito" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" - msgstr "" - --#: ../output.py:1418 -+#: ../output.py:1457 - #, fuzzy - msgid "Errors:" - msgstr "Errore: %s" - --#: ../output.py:1489 -+#: ../output.py:1481 ../output.py:1482 -+#, fuzzy -+msgid "Install" -+msgstr "Installato" -+ -+#: ../output.py:1483 -+#, fuzzy -+msgid "Dep-Install" -+msgstr "Installato" -+ -+#: ../output.py:1485 -+#, fuzzy -+msgid "Obsoleting" -+msgstr "Reso obsoleto" -+ -+#: ../output.py:1486 -+#, fuzzy -+msgid "Erase" -+msgstr "Cancellato" -+ -+#: ../output.py:1487 -+#, fuzzy -+msgid "Reinstall" -+msgstr "Installazione" -+ -+#: ../output.py:1488 -+#, fuzzy -+msgid "Downgrade" -+msgstr "Fatto" -+ -+#: ../output.py:1490 -+#, fuzzy -+msgid "Update" -+msgstr "Aggiornato" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "" -+ -+#: ../output.py:1547 - msgid "Last day" - msgstr "" - --#: ../output.py:1490 -+#: ../output.py:1548 - msgid "Last week" - msgstr "" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" - msgstr "" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" - msgstr "" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" - msgstr "" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" - msgstr "" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" - msgstr "" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "installato" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "aggiornato" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "reso obsoleto" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" - msgstr "cancellato" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> Pacchetto %s.%s %s:%s-%s settato per essere %s" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "--> Esecuzione del controllo di transazione" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." --msgstr "" --"--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti." -+msgstr "--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti." - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" - msgstr "--> Risoluzione delle dipendenze terminata" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" - msgstr "--> Esame delle dipendenze: %s per il pacchetto: %s" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" - msgstr "--> Dipendenze non risolte: %s" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1634 -+#, fuzzy, python-format -+msgid "Package: %s" -+msgstr "pacchetto: %s" -+ -+#: ../output.py:1636 -+#, fuzzy, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "%s richiede: %s" -+ -+#: ../output.py:1649 ../output.py:1660 -+#, fuzzy, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr " %s da %s" -+ -+#: ../output.py:1657 -+#, fuzzy -+msgid "Available" -+msgstr "Gruppi disponibili:" -+ -+#: ../output.py:1665 ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> Controllo conflitto: %s va in conflitto con %s" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." --msgstr "" --"--> Inizializzazione della transazione con i pacchetti selezionati. " --"Attendere prego." -+msgstr "--> Inizializzazione della transazione con i pacchetti selezionati. Attendere prego." - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." --msgstr "" --"---> Download degli header per %s per impacchettarli nel set di transazione." -+msgstr "---> Download degli header per %s per impacchettarli nel set di transazione." -+ -+#: ../utils.py:93 -+msgid "Running" -+msgstr "In esecuzione" -+ -+#: ../utils.py:94 -+#, fuzzy -+msgid "Sleeping" -+msgstr "Addormentato" -+ -+#: ../utils.py:95 -+#, fuzzy -+msgid "Uninterruptible" -+msgstr "Non interrompibile" - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "Zombie" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "Tracciato/Fermato" -+ -+#: ../utils.py:98 ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "Sconosciuto" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr " L'altra applicazione è: PackageKit" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr " L'altra applicazione è: %s" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " Memoria : %5s RSS (%5sB VSZ)" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " Partito: %s - %s fa" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " Stato : %s, pid: %d" -+ -+#: ../utils.py:199 -+#, fuzzy, python-format -+msgid "PluginExit Error: %s" -+msgstr "Errore di configurazione: %s" -+ -+#: ../utils.py:202 -+#, fuzzy, python-format -+msgid "Yum Error: %s" -+msgstr "Errore: %s" -+ -+#: ../utils.py:235 ../yummain.py:42 - msgid "" - "\n" - "\n" -@@ -1098,7 +1274,7 @@ msgstr "" - "\n" - "Uscita forzata da utente" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 ../yummain.py:48 - msgid "" - "\n" - "\n" -@@ -1108,7 +1284,7 @@ msgstr "" - "\n" - "Uscita per broken pipe" - --#: ../utils.py:145 ../yummain.py:50 -+#: ../utils.py:243 ../yummain.py:50 - #, fuzzy, python-format - msgid "" - "\n" -@@ -1116,20 +1292,19 @@ msgid "" - "%s" - msgstr "%s" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 ../yummain.py:211 - msgid "Complete!" - msgstr "Completo!" - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." - msgstr "Occorre avere i privilegi di root per eseguire questo comando" - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" --"However, you do not have any GPG public keys installed. You need to " --"download\n" -+"However, you do not have any GPG public keys installed. You need to download\n" - "the keys for packages you wish to install and install them.\n" - "You can do that by running the command:\n" - " rpm --import public.gpg.key\n" -@@ -1142,365 +1317,359 @@ msgid "" - "For more information contact your distribution or package provider.\n" - msgstr "" - "\n" --"Il controllo dei pacchetti tramite chiavi GPG è abilitato. Questa è una " --"buona cosa. \n" --"Comunque, non ci sono chiavi pubbliche GPG installate: è necessario " --"scaricare le chiavi dei repository che si desidera utilizzare ed " --"installarle.\n" -+"Il controllo dei pacchetti tramite chiavi GPG è abilitato. Questa è una buona cosa. \n" -+"Comunque, non ci sono chiavi pubbliche GPG installate: è necessario scaricare le chiavi dei repository che si desidera utilizzare ed installarle.\n" - "Per importare una chiave pubblica GPG eseguire il comando:\n" - " rpm --import public.gpg.key\n" - "\n" - "\n" --"In alternativa è possibile specificare gli indirizzi delle chiavi dei " --"repository nell'opzione 'gpgkey' dei relativi file di configurazione; yum la " --"installerà automaticamente.\n" -+"In alternativa è possibile specificare gli indirizzi delle chiavi dei repository nell'opzione 'gpgkey' dei relativi file di configurazione; yum la installerà automaticamente.\n" - "\n" --"Per maggiori informazioni contattare il provider della distribuzione o del " --"pacchetto.\n" -+"Per maggiori informazioni contattare il provider della distribuzione o del pacchetto.\n" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" - msgstr "Errore: Bisogna passare una lista di pkg a %s" - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" - msgstr "Errore: richiesto un elemento di corrispondenza" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" - msgstr "Errore: Necessario un gruppo o una lista di gruppi" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "Errore: il comando clean richiede l'opzione: %s" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "Errore: argomento per il comando clean non valido: %r" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "Nessun argomento per la shell" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "Nome file passato alla shell: %s" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "Il file %s dato come argomento per la shell non esiste." - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "Errore: più di un file passato come argomento alla shell." - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "PACCHETTO..." - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "Installa uno o più pacchetti nel sistema" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" - msgstr "Impostazione Processo di Installazione" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "[PACCHETTO...]" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "Aggiorna uno o più pacchetti nel sistema" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" - msgstr "Impostazione Processo di Aggiornamento" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" - msgstr "Visualizza dettagli su un pacchetto o gruppi di pacchetti" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "Pacchetti installati" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "Pacchetti disponibili" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "Pacchetti extra" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" - msgstr "Pacchetti aggiornati" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "Pacchetti resi obsoleti" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "Pacchetti aggiunti di recente" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "Nessun pacchetto presente in lista" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "Elenca un pacchetto o un gruppo di pacchetti" - --#: ../yumcommands.py:361 -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" - msgstr "Rimuove uno o più pacchetti dal sistema" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" - msgstr "Impostazione Processo di Rimozione" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" - msgstr "Settaggio dei processi di gruppo" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" - msgstr "Nessun gruppo sul quale eseguire il comando" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "Elenca i gruppi di pacchetti disponibili" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" - msgstr "Installa i pacchetti di un gruppo nel sistema" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" - msgstr "Rimuove i pacchetti di un gruppo dal sistema" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "Visualizza i dettagli di un gruppo di pacchetti" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "Genera la cache dei metadati" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "Creazione dei file di cache per i metadati." - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" --msgstr "" --"L'operazione impiegherà del tempo che dipende dalla velocità del computer" -+msgstr "L'operazione impiegherà del tempo che dipende dalla velocità del computer" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "Cache dei metadata creata" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" - msgstr "Rimuovere i dati nella cache" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" - msgstr "Cerca quale pacchetto fornisce il valore dato" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "Cerca il termine passato nei dettagli dei pacchetti" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "Ricerca dei pacchetti: " - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" - msgstr "Aggiornamento pacchetti tenendo conto degli obsoleti" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" - msgstr "Impostazione Processo di Aggiornamento del sistema" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" - msgstr "Installa un RPM locale" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" - msgstr "Settaggio processamento pacchetti locali" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" - msgstr "Determina quale pacchetto soddisfa la dipendenza" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "Ricerca dei pacchetti per dipendenze:" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" - msgstr "Esegui una shell di yum interattiva" - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "Impostazione della shell di yum" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" - msgstr "Elenca le dipendenze del pacchetto" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "Ricerca delle dipendenze: " - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "Mostra i repository di software configurati" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 ../yumcommands.py:823 - msgid "enabled" - msgstr "abilitato" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 ../yumcommands.py:850 - msgid "disabled" - msgstr "disabilitato" - --#: ../yumcommands.py:834 -+#: ../yumcommands.py:866 - #, fuzzy - msgid "Repo-id : " - msgstr "Id-Repo : " - --#: ../yumcommands.py:835 -+#: ../yumcommands.py:867 - #, fuzzy - msgid "Repo-name : " - msgstr "Nome-Repo : " - --#: ../yumcommands.py:836 -+#: ../yumcommands.py:870 - #, fuzzy - msgid "Repo-status : " - msgstr "Stato-Repo : " - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "Revisione-Repo: " - --#: ../yumcommands.py:842 -+#: ../yumcommands.py:877 - #, fuzzy - msgid "Repo-tags : " - msgstr "Repo-tags : " - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "Repo-distro-tags: " - --#: ../yumcommands.py:853 -+#: ../yumcommands.py:888 - #, fuzzy - msgid "Repo-updated : " - msgstr "Repo-aggiornato: " - --#: ../yumcommands.py:855 -+#: ../yumcommands.py:890 - #, fuzzy - msgid "Repo-pkgs : " - msgstr "Repo-pkgs : " - --#: ../yumcommands.py:856 -+#: ../yumcommands.py:891 - #, fuzzy - msgid "Repo-size : " - msgstr "Dim.-Repo : " - --#: ../yumcommands.py:863 -+#: ../yumcommands.py:898 - #, fuzzy - msgid "Repo-baseurl : " - msgstr "Repo-baseurl: " - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " - msgstr "Repo-metalink: " - --#: ../yumcommands.py:875 -+#: ../yumcommands.py:910 - #, fuzzy - msgid " Updated : " - msgstr "Aggiornato" - --#: ../yumcommands.py:878 -+#: ../yumcommands.py:913 - #, fuzzy - msgid "Repo-mirrors : " - msgstr "Repo-mirrors: " - --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "Sconosciuto" -- --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" - msgstr "" - --#: ../yumcommands.py:890 -+#: ../yumcommands.py:925 - #, fuzzy, python-format - msgid "Instant (last: %s)" - msgstr "Data inst. : %s" - --#: ../yumcommands.py:893 -+#: ../yumcommands.py:928 - #, fuzzy, python-format - msgid "%s second(s) (last: %s)" - msgstr "Conflitti di %s: %s" - --#: ../yumcommands.py:895 -+#: ../yumcommands.py:930 - #, fuzzy - msgid "Repo-expire : " - msgstr "Dim.-Repo : " - --#: ../yumcommands.py:898 -+#: ../yumcommands.py:933 - #, fuzzy - msgid "Repo-exclude : " - msgstr "Repo-exclude: " - --#: ../yumcommands.py:902 -+#: ../yumcommands.py:937 - #, fuzzy - msgid "Repo-include : " - msgstr "Repo-include:" - -+#: ../yumcommands.py:941 -+#, fuzzy -+msgid "Repo-excluded: " -+msgstr "Repo-exclude: " -+ - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 ../yumcommands.py:980 - msgid "repo id" - msgstr "repo id" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 - msgid "status" - msgstr "stato" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "nome repo" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" - msgstr "Mostra un messaggio utile per l'uso" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "Nessun aiuto disponibile per %s" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" -@@ -1510,7 +1679,7 @@ msgstr "" - "\n" - "alias: " - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" -@@ -1520,153 +1689,103 @@ msgstr "" - "\n" - "alias: " - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" - msgstr "Impostazione Processo di Reinstallazione" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" - msgstr "reinstalla un pacchetto" - --#: ../yumcommands.py:1060 -+#: ../yumcommands.py:1113 - #, fuzzy - msgid "Setting up Downgrade Process" - msgstr "Impostazione Processo di Aggiornamento del sistema" - --#: ../yumcommands.py:1067 -+#: ../yumcommands.py:1120 - #, fuzzy - msgid "downgrade a package" - msgstr "reinstalla un pacchetto" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." - msgstr "" - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" - msgstr "" - --#: ../yumcommands.py:1121 -+#: ../yumcommands.py:1183 - #, fuzzy - msgid " Group :" - msgstr " Id-Gruppo: %s" - --#: ../yumcommands.py:1122 -+#: ../yumcommands.py:1184 - #, fuzzy - msgid " Packages:" - msgstr "Pacchetto" - --#: ../yumcommands.py:1152 -+#: ../yumcommands.py:1213 - #, fuzzy - msgid "Installed:" - msgstr "Installato" - --#: ../yumcommands.py:1157 -+#: ../yumcommands.py:1218 - #, fuzzy - msgid "Group-Installed:" - msgstr "Installato" - --#: ../yumcommands.py:1166 -+#: ../yumcommands.py:1227 - #, fuzzy - msgid "Available:" - msgstr "Gruppi disponibili:" - --#: ../yumcommands.py:1172 -+#: ../yumcommands.py:1233 - #, fuzzy - msgid "Group-Available:" - msgstr "Gruppi disponibili:" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" - msgstr "" - --#: ../yumcommands.py:1239 -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." - msgstr "" - --#: ../yummain.py:128 --msgid "Running" --msgstr "In esecuzione" -- --#: ../yummain.py:129 --#, fuzzy --msgid "Sleeping" --msgstr "Addormentato" -- --#: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "Non interrompibile" -- --#: ../yummain.py:131 --msgid "Zombie" --msgstr "Zombie" -- --#: ../yummain.py:132 --msgid "Traced/Stopped" --msgstr "Tracciato/Fermato" -- --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr " L'altra applicazione è: PackageKit" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr " L'altra applicazione è: %s" -- --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr " Memoria : %5s RSS (%5sB VSZ)" -- --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr " Partito: %s - %s fa" -- --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr " Stato : %s, pid: %d" -- --#: ../yummain.py:173 --msgid "" --"Another app is currently holding the yum lock; waiting for it to exit..." -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" - msgstr "" --"Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che " --"esca..." - --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:102 -+msgid "Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che esca..." -+ -+#: ../yummain.py:130 ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "Errore: %s" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" - msgstr "Errore(i) sconosciuto: Codice di uscita: %d:" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "Risoluzione dipendenze" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" - msgstr " Si può provare ad usare --skip-broken per aggirare il problema" - --#: ../yummain.py:243 --#, fuzzy --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+#: ../yummain.py:175 ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" - msgstr "" --" Provare a lanciare: package-cleanup --problems\n" --" package-cleanup --dupes" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" -@@ -1674,7 +1793,7 @@ msgstr "" - "\n" - "Dipendenze risolte" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1712,174 +1831,163 @@ msgstr "Corrispondenza potenziale per %s da %s" - msgid "Matched %s to require for %s" - msgstr "Individuato %s come requisito per %s" - --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:225 - #, python-format - msgid "Member: %s" - msgstr "Membro: %s" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 - #, python-format - msgid "%s converted to install" - msgstr "%s convertito in installa" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:246 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "Aggiunto il pacchetto %s in modo %s" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:256 - #, python-format - msgid "Removing Package %s" - msgstr "Rimozione pacchetto %s" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:278 - #, python-format - msgid "%s requires: %s" - msgstr "%s richiede: %s" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:319 -+#, fuzzy, python-format -+msgid "%s requires %s" -+msgstr "%s richiede: %s" -+ -+#: ../yum/depsolve.py:346 - msgid "Needed Require has already been looked up, cheating" - msgstr "Il requisito necessario è già stato controllato, imbroglio" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:356 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" - msgstr "Il requisito necessario non è il nome di un pacchetto. Guardando: %s" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Potential Provider: %s" - msgstr "Provider potenziale: %s" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:386 - #, python-format - msgid "Mode is %s for provider of %s: %s" - msgstr "La modalità è %s per il provider di %s: %s" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:390 - #, python-format - msgid "Mode for pkg providing %s: %s" - msgstr "Modalità per la fornitura del pacchetto %s: %s" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:394 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "TSINFO: il pacchetto %s richiede che %s sia marcato per la rimozione" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:407 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." --msgstr "" --"TSINFO: Verrà reso obsoleto %s, sostituendolo con %s per risolvere una " --"dipendenza." -+msgstr "TSINFO: Verrà reso obsoleto %s, sostituendolo con %s per risolvere una dipendenza." - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:410 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "TSINFO: Aggiornamento di %s per risolvere dip." - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:418 - #, python-format - msgid "Cannot find an update path for dep for: %s" --msgstr "" --"Impossibile trovare un percorso di aggiornamento per dipendenze per: %s" -- --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "Requisito %s non risolvibile per %s" -+msgstr "Impossibile trovare un percorso di aggiornamento per dipendenze per: %s" - --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:449 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "Individuato %s come requisito per %s" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:491 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." - msgstr "%s è nei pacchetti forniti ma è già installato, Rimozione." - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:507 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." --msgstr "" --"Potenziale risoluzione del pacchetto %s ha una instanza piu nuova in ts." -+msgstr "Potenziale risoluzione del pacchetto %s ha una instanza piu nuova in ts." - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:518 - #, python-format - msgid "Potential resolving package %s has newer instance installed." --msgstr "" --"Potenziale risoluzione del pacchetto %s ha una istanza piu aggiornata " --"installata." -+msgstr "Potenziale risoluzione del pacchetto %s ha una istanza piu aggiornata installata." - --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "Dipendenza mancante: %s è necessario per il pacchetto %s" -- --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:536 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "%s è gia nel set delle transazioni (ts), verrà saltato" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:578 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: %s marcato come update per %s" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:586 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: %s marcato come installa per %s" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 - msgid "Success - empty transaction" - msgstr "Successo - transazione vuota" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 - msgid "Restarting Loop" - msgstr "Riavvio del ciclo" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:760 - msgid "Dependency Process ending" - msgstr "Processo delle dipendenze terminato" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:774 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "%s appartenente a %s ha problemi di dipendenze" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:782 - msgid "Success - deps resolved" - msgstr "Successo - dipendenze risolte" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:796 - #, python-format - msgid "Checking deps for %s" - msgstr "Controllo delle dipendenze per %s" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:874 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "ricerca di %s come un requisito di %s" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1090 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "Esecuzione di compare_providers() per %s" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 - #, python-format - msgid "better arch in po %s" - msgstr "migliore architettura in po %s" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1218 - #, python-format - msgid "%s obsoletes %s" - msgstr "%s rende obsoleto %s" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1230 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" -@@ -1888,122 +1996,138 @@ msgstr "" - "archdist ha comparato %s a %s su %s\n" - " Vincitore: %s" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1237 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "sourcerpm comune %s e %s" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1241 -+#, fuzzy, python-format -+msgid "base package %s is installed for %s" -+msgstr "TSINFO: %s marcato come installa per %s" -+ -+#: ../yum/depsolve.py:1247 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "prefisso comune di %s tra %s e %s" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1256 - #, python-format - msgid "Best Order: %s" - msgstr "Ordine migliore: %s" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "doConfigSetup() verrà eliminato in una futura versione di yum.\n" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" - msgstr "Non è presente il nome nel repository %r, utilizzo l'id" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "plugin già inizializzato" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "doRpmDBSetup() verrà eliminato in una futura versione di yum.\n" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "Lettura del RPMDB locale" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() verrà eliminato in una futura versione di yum.\n" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() verrà eliminato in una futura versione di yum.\n" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "Settaggio pacchetti sack" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" --msgstr "" --"l'oggetto repository per il repository %s manca del metodo _resetSack\n" -+msgstr "l'oggetto repository per il repository %s manca del metodo _resetSack\n" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "quindi questo repository non può essere resettato.\n" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "doUpdateSetup() verrà eliminato in una futura versione di yum.\n" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "Costruzione oggetto aggiornamenti" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() verrà eliminato in una futura versione di Yum.\n" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "Scaricamento metadati del gruppo" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "Aggiunta file di gruppo dal repository: %s" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "Fallita l'aggiunta di file di gruppi per repository: %s - %s" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "Nessun gruppo disponibile in alcun repository" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+#, fuzzy -+msgid "Getting pkgtags metadata" -+msgstr "Scaricamento metadati del gruppo" -+ -+#: ../yum/__init__.py:740 -+#, fuzzy, python-format -+msgid "Adding tags from repository: %s" -+msgstr "Aggiunta file di gruppo dal repository: %s" -+ -+#: ../yum/__init__.py:749 -+#, fuzzy, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "Fallita l'aggiunta di file di gruppi per repository: %s - %s" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" - msgstr "Import di informazioni addizionali sulla lista di file" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." - msgstr "" - --#: ../yum/__init__.py:785 --msgid "" --"There are unfinished transactions remaining. You might consider running yum-" --"complete-transaction first to finish them." --msgstr "" --"Ci sono transazioni non completate. Considerare di lanciare prima yum-" --"complete-transaction per portarle a termine." -+#: ../yum/__init__.py:849 -+msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them." -+msgstr "Ci sono transazioni non completate. Considerare di lanciare prima yum-complete-transaction per portarle a termine." - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "Ciclo skip-broken %i" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "Raggiunti %i cicli skip-broken" - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" -@@ -2011,78 +2135,90 @@ msgstr "" - "\n" - "Pacchetti saltati a causa di problemi di dipendenza:" - --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr " %s da %s" - --#: ../yum/__init__.py:1083 --msgid "" --"Warning: scriptlet or other non-fatal errors occurred during transaction." -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." - msgstr "" --"Attenzione: errori in scriptlet o altri errori non fatali sono avvenuti " --"durante la transazione." - --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1126 -+#, fuzzy -+msgid "missing requires" -+msgstr "%s richiede: %s" -+ -+#: ../yum/__init__.py:1127 -+#, fuzzy -+msgid "installed conflict" -+msgstr "installato" -+ -+#: ../yum/__init__.py:1180 -+msgid "Warning: scriptlet or other non-fatal errors occurred during transaction." -+msgstr "Attenzione: errori in scriptlet o altri errori non fatali sono avvenuti durante la transazione." -+ -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" - msgstr "Rimozione del file di transazione %s fallita" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" - msgstr "" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 - #, python-format - msgid "%s was supposed to be removed but is not!" - msgstr "" - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Non è possibile controllare se il PID %s è attivo" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 - #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "Lock %s attivo: altro processo in esecuzione con pid %s." - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 -+#: ../yum/__init__.py:1425 - #, fuzzy, python-format - msgid "Could not create lock at %s: %s " - msgstr "Impossibile trovare una corrispondenza per l'aggiornamento di %s" - --#: ../yum/__init__.py:1373 --msgid "Package does not match intended download" -+#: ../yum/__init__.py:1470 -+#, fuzzy -+msgid "Package does not match intended download. Suggestion: run yum clean metadata" - msgstr "Il pacchetto non corrisponde al download desiderato" - --#: ../yum/__init__.py:1388 -+#: ../yum/__init__.py:1486 - msgid "Could not perform checksum" - msgstr "Non è possibile calcolare il checksum" - --#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1489 - msgid "Package does not match checksum" - msgstr "Il pacchetto non corrisponde al checksum" - --#: ../yum/__init__.py:1433 -+#: ../yum/__init__.py:1531 - #, python-format - msgid "package fails checksum but caching is enabled for %s" - msgstr "il pacchetto ha fallito il checksum ma la cache è abilitata per %s" - --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 -+#: ../yum/__init__.py:1534 ../yum/__init__.py:1563 - #, python-format - msgid "using local copy of %s" - msgstr "utilizzo di una copia locale di %s" - --#: ../yum/__init__.py:1477 -+#: ../yum/__init__.py:1575 - #, python-format - msgid "" - "Insufficient space in download directory %s\n" -@@ -2093,410 +2229,401 @@ msgstr "" - " * libero %s\n" - " * necessario %s" - --#: ../yum/__init__.py:1526 -+#: ../yum/__init__.py:1624 - msgid "Header is not complete." - msgstr "L'header non è completo." - --#: ../yum/__init__.py:1563 -+#: ../yum/__init__.py:1661 - #, python-format --msgid "" --"Header not in local cache and caching-only mode enabled. Cannot download %s" --msgstr "" --"Header non presente in cache locale e modalita solo-cache abilitata. " --"Impossibile scaricare %s" -+msgid "Header not in local cache and caching-only mode enabled. Cannot download %s" -+msgstr "Header non presente in cache locale e modalita solo-cache abilitata. Impossibile scaricare %s" - --#: ../yum/__init__.py:1618 -+#: ../yum/__init__.py:1716 - #, python-format - msgid "Public key for %s is not installed" - msgstr "La chiave pubblica per %s non è installata" - --#: ../yum/__init__.py:1622 -+#: ../yum/__init__.py:1720 - #, python-format - msgid "Problem opening package %s" - msgstr "Problemi nell'apertura di %s" - --#: ../yum/__init__.py:1630 -+#: ../yum/__init__.py:1728 - #, python-format - msgid "Public key for %s is not trusted" - msgstr "La chiave pubblica per %s non è sicura" - --#: ../yum/__init__.py:1634 -+#: ../yum/__init__.py:1732 - #, python-format - msgid "Package %s is not signed" - msgstr "Il pacchetto %s non è firmato" - --#: ../yum/__init__.py:1672 -+#: ../yum/__init__.py:1770 - #, python-format - msgid "Cannot remove %s" - msgstr "Non posso rimuovere %s" - --#: ../yum/__init__.py:1676 -+#: ../yum/__init__.py:1774 - #, python-format - msgid "%s removed" - msgstr "%s rimosso" - --#: ../yum/__init__.py:1712 -+#: ../yum/__init__.py:1820 - #, python-format - msgid "Cannot remove %s file %s" - msgstr "Impossibile rimuovere %s file %s" - --#: ../yum/__init__.py:1716 -+#: ../yum/__init__.py:1824 - #, python-format - msgid "%s file %s removed" - msgstr "%s file %s rimosso" - --#: ../yum/__init__.py:1718 -+#: ../yum/__init__.py:1826 - #, python-format - msgid "%d %s files removed" - msgstr "%d %s file rimossi" - --#: ../yum/__init__.py:1787 -+#: ../yum/__init__.py:1895 - #, python-format - msgid "More than one identical match in sack for %s" - msgstr "Piu di una corrispondenza ugualein sack per %s" - --#: ../yum/__init__.py:1793 -+#: ../yum/__init__.py:1901 - #, python-format - msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "Nessuna corrispondenza %s.%s %s:%s-%s dall'aggiornamento" - --#: ../yum/__init__.py:2026 --msgid "" --"searchPackages() will go away in a future version of " --"Yum. Use searchGenerator() instead. \n" --msgstr "" --"searchPackages() verrà eliminato in una futura versione di yum.In " --"sostituzione usare searchGenerator(). \n" -+#: ../yum/__init__.py:2180 -+msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n" -+msgstr "searchPackages() verrà eliminato in una futura versione di yum.In sostituzione usare searchGenerator(). \n" - --#: ../yum/__init__.py:2065 -+#: ../yum/__init__.py:2219 - #, python-format - msgid "Searching %d packages" - msgstr "Ricerca dei pacchetti %d" - --#: ../yum/__init__.py:2069 -+#: ../yum/__init__.py:2223 - #, python-format - msgid "searching package %s" - msgstr "Ricerca del pacchetto %s" - --#: ../yum/__init__.py:2081 -+#: ../yum/__init__.py:2235 - msgid "searching in file entries" - msgstr "ricerca nelle voci dei file" - --#: ../yum/__init__.py:2088 -+#: ../yum/__init__.py:2242 - msgid "searching in provides entries" - msgstr "ricerca nelle voci fornite" - --#: ../yum/__init__.py:2121 -+#: ../yum/__init__.py:2275 - #, python-format - msgid "Provides-match: %s" - msgstr "Corrispondenza tra i forniti: %s" - --#: ../yum/__init__.py:2170 -+#: ../yum/__init__.py:2324 - msgid "No group data available for configured repositories" - msgstr "Nessun gruppo disponibile in alcun repository" - --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 -+#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405 -+#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497 -+#: ../yum/__init__.py:2814 - #, python-format - msgid "No Group named %s exists" - msgstr "Il gruppo %s non esiste" - --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 -+#: ../yum/__init__.py:2386 ../yum/__init__.py:2513 - #, python-format - msgid "package %s was not marked in group %s" - msgstr "Il pacchetto %s non è marcato nel gruppo %s" - --#: ../yum/__init__.py:2279 -+#: ../yum/__init__.py:2433 - #, python-format - msgid "Adding package %s from group %s" - msgstr "Aggiunta del pacchetto %s dal gruppo %s" - --#: ../yum/__init__.py:2283 -+#: ../yum/__init__.py:2437 - #, python-format - msgid "No package named %s available to be installed" - msgstr "Nessun pacchetto di nome %s disponibile per l'installazione" - --#: ../yum/__init__.py:2380 -+#: ../yum/__init__.py:2539 - #, python-format - msgid "Package tuple %s could not be found in packagesack" - msgstr "La tupla del pacchetto %s non può essere trovata nel pacchetto sack" - --#: ../yum/__init__.py:2399 -+#: ../yum/__init__.py:2558 - #, fuzzy, python-format - msgid "Package tuple %s could not be found in rpmdb" - msgstr "La tupla del pacchetto %s non può essere trovata nel pacchetto sack" - --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 -+#: ../yum/__init__.py:2614 ../yum/__init__.py:2664 - msgid "Invalid version flag" - msgstr "Flag di versione non valido" - --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2634 ../yum/__init__.py:2639 - #, python-format - msgid "No Package found for %s" - msgstr "Nessun pacchetto trovato per %s" - --#: ../yum/__init__.py:2696 -+#: ../yum/__init__.py:2855 - msgid "Package Object was not a package object instance" - msgstr "L'oggetto pacchetto non era un'istanza dell'oggetto pacchetto" - --#: ../yum/__init__.py:2700 -+#: ../yum/__init__.py:2859 - msgid "Nothing specified to install" - msgstr "Non è specificato niente da installare" - --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 -+#: ../yum/__init__.py:2875 ../yum/__init__.py:3652 - #, python-format - msgid "Checking for virtual provide or file-provide for %s" - msgstr "Controllo per provide virtuale o file-provide per %s" - --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 -+#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365 -+#: ../yum/__init__.py:3658 - #, python-format - msgid "No Match for argument: %s" - msgstr "Nessuna corrispondenza per l'argomento: %s" - --#: ../yum/__init__.py:2798 -+#: ../yum/__init__.py:2957 - #, python-format - msgid "Package %s installed and not available" - msgstr "Il pacchetto %s è installato e non disponibile." - --#: ../yum/__init__.py:2801 -+#: ../yum/__init__.py:2960 - msgid "No package(s) available to install" - msgstr "Nessun pacchetto disponibile per l'installazione" - --#: ../yum/__init__.py:2813 -+#: ../yum/__init__.py:2972 - #, python-format - msgid "Package: %s - already in transaction set" - msgstr "Pacchetto: %s - già nel set di transizione" - --#: ../yum/__init__.py:2839 -+#: ../yum/__init__.py:2998 - #, fuzzy, python-format - msgid "Package %s is obsoleted by %s which is already installed" --msgstr "" --"Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo " --"posto" -+msgstr "Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo posto" - --#: ../yum/__init__.py:2842 -+#: ../yum/__init__.py:3001 - #, python-format - msgid "Package %s is obsoleted by %s, trying to install %s instead" --msgstr "" --"Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo " --"posto" -+msgstr "Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo posto" - --#: ../yum/__init__.py:2850 -+#: ../yum/__init__.py:3009 - #, python-format - msgid "Package %s already installed and latest version" - msgstr "Il pacchetto %s è già aggiornato all'ultima versione" - --#: ../yum/__init__.py:2864 -+#: ../yum/__init__.py:3023 - #, python-format - msgid "Package matching %s already installed. Checking for update." --msgstr "" --"Corrispondenza del pacchetto %s già installato. Controllo aggiornamenti." -+msgstr "Corrispondenza del pacchetto %s già installato. Controllo aggiornamenti." - - #. update everything (the easy case) --#: ../yum/__init__.py:2966 -+#: ../yum/__init__.py:3126 - msgid "Updating Everything" - msgstr "Aggiornamento Sistema" - --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 -+#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289 -+#: ../yum/__init__.py:3315 - #, python-format - msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "I pacchetti già resi obsoleti non verranno aggiornati: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 -+#: ../yum/__init__.py:3182 ../yum/__init__.py:3362 - #, python-format - msgid "%s" - msgstr "%s" - --#: ../yum/__init__.py:3093 -+#: ../yum/__init__.py:3253 - #, python-format - msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "Il pacchetto è gia obsoleto: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3124 -+#: ../yum/__init__.py:3284 - #, fuzzy, python-format - msgid "Not Updating Package that is obsoleted: %s" - msgstr "I pacchetti già resi obsoleti non verranno aggiornati: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 -+#: ../yum/__init__.py:3293 ../yum/__init__.py:3319 - #, python-format - msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" --msgstr "" --"Aggiornamento non necessario per il pacchetto già aggiornato: %s.%s %s:%s-%s" -+msgstr "Aggiornamento non necessario per il pacchetto già aggiornato: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3218 -+#: ../yum/__init__.py:3378 - msgid "No package matched to remove" - msgstr "Nessun pacchetto corrispondente per la rimozione" - --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 --#, python-format --msgid "Cannot open file: %s. Skipping." -+#: ../yum/__init__.py:3412 -+#, fuzzy, python-format -+msgid "Cannot open: %s. Skipping." - msgstr "Non posso aprire il file %s. Lo salto." - --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 -+#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598 - #, python-format - msgid "Examining %s: %s" - msgstr "Esame di %s: %s" - --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 -+#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601 - #, python-format - msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" --msgstr "" --"Impossibile aggiungere il pacchetto %s alla transazione. Architettura non " --"compatibile: %s" -+msgstr "Impossibile aggiungere il pacchetto %s alla transazione. Architettura non compatibile: %s" - --#: ../yum/__init__.py:3270 -+#: ../yum/__init__.py:3431 - #, python-format --msgid "" --"Package %s not installed, cannot update it. Run yum install to install it " --"instead." --msgstr "" --"Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire " --"yum install per installarlo." -+msgid "Package %s not installed, cannot update it. Run yum install to install it instead." -+msgstr "Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire yum install per installarlo." - --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 -+#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606 - #, python-format - msgid "Excluding %s" - msgstr "Esclusione di %s" - --#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3465 - #, python-format - msgid "Marking %s to be installed" - msgstr "Marco %s per l'installazione" - --#: ../yum/__init__.py:3310 -+#: ../yum/__init__.py:3471 - #, python-format - msgid "Marking %s as an update to %s" - msgstr "%s marcato come aggiornamento di %s" - --#: ../yum/__init__.py:3317 -+#: ../yum/__init__.py:3478 - #, python-format - msgid "%s: does not update installed package." - msgstr "%s: non aggiornare il pacchetto installato" - --#: ../yum/__init__.py:3379 -+#: ../yum/__init__.py:3511 ../yum/__init__.py:3595 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "Non posso aprire il file %s. Lo salto." -+ -+#: ../yum/__init__.py:3541 - msgid "Problem in reinstall: no package matched to remove" --msgstr "" --"Problema nella reinstallazione: nessun pacchetto marcato per la rimozione" -+msgstr "Problema nella reinstallazione: nessun pacchetto marcato per la rimozione" - --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 -+#: ../yum/__init__.py:3554 ../yum/__init__.py:3686 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "Il pacchetto %s permette installazioni multiple, lo salto" - --#: ../yum/__init__.py:3413 -+#: ../yum/__init__.py:3575 - #, fuzzy, python-format - msgid "Problem in reinstall: no package %s matched to install" --msgstr "" --"Problema nella reinstallazione: nessun pacchetto marcato per l'installazione" -+msgstr "Problema nella reinstallazione: nessun pacchetto marcato per l'installazione" - --#: ../yum/__init__.py:3515 -+#: ../yum/__init__.py:3678 - #, fuzzy - msgid "No package(s) available to downgrade" - msgstr "Nessun pacchetto disponibile per l'installazione" - --#: ../yum/__init__.py:3559 -+#: ../yum/__init__.py:3731 - #, fuzzy, python-format - msgid "No Match for available package: %s" - msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti" - --#: ../yum/__init__.py:3565 -+#: ../yum/__init__.py:3738 - #, fuzzy, python-format - msgid "Only Upgrade available on package: %s" - msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti" - --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 -+#: ../yum/__init__.py:3808 ../yum/__init__.py:3845 - #, fuzzy, python-format - msgid "Failed to downgrade: %s" - msgstr "Dimensione totale del download: %s" - --#: ../yum/__init__.py:3704 -+#: ../yum/__init__.py:3877 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "Recupero chiavi GPG da %s" - --#: ../yum/__init__.py:3724 -+#: ../yum/__init__.py:3897 - msgid "GPG key retrieval failed: " - msgstr "Recupero chiavi GPG fallito: " - --#: ../yum/__init__.py:3735 -+#: ../yum/__init__.py:3903 -+#, fuzzy, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "Recupero chiavi GPG da %s" -+ -+#: ../yum/__init__.py:3912 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "Analisi chiave GPG fallita: la chiave non ha valore %s" - --#: ../yum/__init__.py:3767 -+#: ../yum/__init__.py:3944 - #, python-format - msgid "GPG key at %s (0x%s) is already installed" - msgstr "Chiave GPG in %s (0x%s) è già installata" - - #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 -+#: ../yum/__init__.py:3949 ../yum/__init__.py:4011 - #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "Importazione chiave GPG 0x%s \"%s\" da %s" - --#: ../yum/__init__.py:3789 -+#: ../yum/__init__.py:3966 - msgid "Not installing key" - msgstr "Non installo le chiavi" - --#: ../yum/__init__.py:3795 -+#: ../yum/__init__.py:3972 - #, python-format - msgid "Key import failed (code %d)" - msgstr "Importazione chiave fallita (codice %d)" - --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 -+#: ../yum/__init__.py:3973 ../yum/__init__.py:4032 - msgid "Key imported successfully" - msgstr "Chiave importata correttamente" - --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 -+#: ../yum/__init__.py:3978 ../yum/__init__.py:4037 - #, python-format - msgid "" --"The GPG keys listed for the \"%s\" repository are already installed but they " --"are not correct for this package.\n" -+"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" - "Check that the correct key URLs are configured for this repository." - msgstr "" --"Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate " --"ma non sono corrette per il pacchetto.\n" --"Controllare che le URL delle chiavi di questo repository siano configurate " --"correttamente." -+"Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette per il pacchetto.\n" -+"Controllare che le URL delle chiavi di questo repository siano configurate correttamente." - --#: ../yum/__init__.py:3810 -+#: ../yum/__init__.py:3987 - msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "Importazione della chiave(i) non utile, chiave(i) sbagliata?" - --#: ../yum/__init__.py:3829 -+#: ../yum/__init__.py:4006 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "Chiave GPG in %s (0x%s) è già stata importata" - --#: ../yum/__init__.py:3849 -+#: ../yum/__init__.py:4026 - #, python-format - msgid "Not installing key for repo %s" - msgstr "La chiave per il repo %s non verrà installata" - --#: ../yum/__init__.py:3854 -+#: ../yum/__init__.py:4031 - msgid "Key import failed" - msgstr "Importazione chiave fallita" - --#: ../yum/__init__.py:3976 -+#: ../yum/__init__.py:4157 - msgid "Unable to find a suitable mirror." - msgstr "Impossibile trovare un mirror adatto." - --#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4159 - msgid "Errors were encountered while downloading packages." - msgstr "Sono stati riscontrati degli errori durante il download dei pacchetti." - --#: ../yum/__init__.py:4028 -+#: ../yum/__init__.py:4209 - #, python-format - msgid "Please report this error at %s" - msgstr "Riportare questo errore in %s" - --#: ../yum/__init__.py:4052 -+#: ../yum/__init__.py:4233 - msgid "Test Transaction Errors: " - msgstr "Errori nel test di transazione: " - -+#: ../yum/__init__.py:4334 -+#, fuzzy, python-format -+msgid "Could not set cachedir: %s" -+msgstr "Impossibile trovare una corrispondenza per l'aggiornamento di %s" -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " -@@ -2535,10 +2662,8 @@ msgstr "Caricamento del plugin \"%s\"" - - #: ../yum/plugins.py:316 - #, python-format --msgid "" --"Two or more plugins with the name \"%s\" exist in the plugin search path" --msgstr "" --"Esistono due o più plugin con il nome \"%s\" nel percorso di ricerca plugin" -+msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" -+msgstr "Esistono due o più plugin con il nome \"%s\" nel percorso di ricerca plugin" - - #: ../yum/plugins.py:336 - #, python-format -@@ -2556,7 +2681,21 @@ msgstr "Non posso trovare il file di configurazione per il plugin %s" - msgid "registration of commands not supported" - msgstr "registrazione dei comandi non supportata" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "" -+ -+#: ../yum/rpmsack.py:105 -+#, fuzzy -+msgid "has installed conflicts" -+msgstr "imposta il percorso d'installazione" -+ -+#: ../yum/rpmsack.py:114 -+#, fuzzy, python-format -+msgid "%s is a duplicate with %s" -+msgstr "%s è in conflitto con %s" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" - msgstr "Reimpacchetto" - -@@ -2589,10 +2728,25 @@ msgstr "Header danneggiato %s" - msgid "Error opening rpm %s - error %s" - msgstr "Errore nell'apertura dell'rpm %s - errore %s" - --#~ msgid "Matching packages for package list to user args" -+#~ msgid "Finished Transaction Test" -+#~ msgstr "Test di transazione terminato" -+ -+#~ msgid "" -+#~ " You could try running: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" - #~ msgstr "" --#~ "Ricerca corrispondenza degli argomenti dell'utente nella lista dei " --#~ "pacchetti" -+#~ " Provare a lanciare: package-cleanup --problems\n" -+#~ " package-cleanup --dupes" -+ -+#~ msgid "Unresolvable requirement %s for %s" -+#~ msgstr "Requisito %s non risolvibile per %s" -+ -+#~ msgid "Missing Dependency: %s is needed by package %s" -+#~ msgstr "Dipendenza mancante: %s è necessario per il pacchetto %s" -+ -+#~ msgid "Matching packages for package list to user args" -+#~ msgstr "Ricerca corrispondenza degli argomenti dell'utente nella lista dei pacchetti" - - #~ msgid "" - #~ "\n" -@@ -2630,21 +2784,14 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s" - #~ msgid "Finished" - #~ msgstr "Finito" - --#~ msgid "" --#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" --#~ "().\n" --#~ msgstr "" --#~ "getInstalledPackageObject() è deprecato, usare self.rpmdb.searchPkgTuple" --#~ "().\n" -+#~ msgid "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n" -+#~ msgstr "getInstalledPackageObject() è deprecato, usare self.rpmdb.searchPkgTuple().\n" - - #~ msgid "Parsing package install arguments" - #~ msgstr "Analisi degli argomenti di installazione dei pacchetti" - --#~ msgid "" --#~ "Failure finding best provider of %s for %s, exceeded maximum loop length" --#~ msgstr "" --#~ "Ricerca di un provider migliore di %s fallita per %s, superata la massima " --#~ "lunghezza del ciclo" -+#~ msgid "Failure finding best provider of %s for %s, exceeded maximum loop length" -+#~ msgstr "Ricerca di un provider migliore di %s fallita per %s, superata la massima lunghezza del ciclo" - - #~ msgid "Comparing best: %s to po: %s" - #~ msgstr "Comparando meglio: %s in po: %s" -@@ -2671,9 +2818,7 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s" - #~ msgstr "bestpkg %s condivide piu del prefisso del nome con %s" - - #~ msgid "Invalid versioned dependency string, try quoting it." --#~ msgstr "" --#~ "Stringa di versione della dipendenza non valida, provare a metterla tra " --#~ "virgolette." -+#~ msgstr "Stringa di versione della dipendenza non valida, provare a metterla tra virgolette." - - #~ msgid "Package %s conflicts with %s." - #~ msgstr "Il pacchetto %s va in conflitto con %s." -@@ -2686,6 +2831,3 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s" - - #~ msgid "TSINFO: Updating %s to resolve conflict." - #~ msgstr "TSINFO: %s aggiornato per risolvere conflitti." -- --#~ msgid "%s conflicts with %s" --#~ msgstr "%s è in conflitto con %s" -diff --git a/po/pl.po b/po/pl.po -index 087f8fb..b7b128c 100644 ---- a/po/pl.po -+++ b/po/pl.po -@@ -5,41 +5,42 @@ msgid "" - msgstr "" - "Project-Id-Version: pl\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" --"PO-Revision-Date: 2009-12-19 09:43+0100\n" -+"POT-Creation-Date: 2010-02-11 10:54-0500\n" -+"PO-Revision-Date: 2010-02-11 21:38+0100\n" - "Last-Translator: Piotr Drąg \n" --"Language-Team: Polish \n" -+"Language-Team: Polish \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "Aktualizowanie" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 ../yum/rpmtrans.py:73 - msgid "Erasing" - msgstr "Usuwanie" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 -+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "Instalowanie" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "Przestarzałe" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 - msgid "Updated" - msgstr "Zaktualizowano" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 ../output.py:1438 - msgid "Erased" - msgstr "Usunięto" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 -+#: ../output.py:1434 ../output.py:1646 - msgid "Installed" - msgstr "Zainstalowano" - -@@ -61,68 +62,74 @@ msgstr "Błąd: nieprawidłowy stan wyjścia: %s dla %s" - msgid "Erased: %s" - msgstr "Usunięto: %s" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 ../output.py:948 ../output.py:1648 - msgid "Removing" - msgstr "Usuwanie" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "Czyszczenie" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "Polecenie \"%s\" zostało już określone" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "Ustawianie repozytoriów" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "Odczytywanie metadanych repozytoriów z lokalnych plików" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "Błąd konfiguracji: %s" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "Błąd opcji: %s" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr " Zainstalowane: %s-%s o %s" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" - msgstr " Zbudowane : %s o %s" - --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" - msgstr " Wysłane: %s o %s" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" - msgstr "Należy podać polecenie" - --#: ../cli.py:309 -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "Nie ma takiego polecenia: %s. Proszę użyć %s --help" -+ -+#: ../cli.py:314 - msgid "Disk Requirements:\n" - msgstr "Wymagane miejsce na dysku:\n" - --#: ../cli.py:311 -+#: ../cli.py:316 - #, python-format --msgid " At least %dMB needed on the %s filesystem.\n" --msgstr " Wymagane jest co najmniej %d MB w systemie plików %s.\n" -+msgid " At least %dMB more space needed on the %s filesystem.\n" -+msgstr "" -+" Wymagane jest co najmniej %d MB więcej miejsca w systemie plików %s.\n" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" -@@ -130,65 +137,62 @@ msgstr "" - "Podsumowanie błędów\n" - "-------------------\n" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" --"Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie pracy." -+"Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie " -+"działania." - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" --msgstr "Kończenie pracy na polecenie użytkownika" -+msgstr "Kończenie działania na polecenie użytkownika" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "Pobieranie pakietów:" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "Błąd podczas pobierania pakietów:\n" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 ../yum/__init__.py:4195 - msgid "Running rpm_check_debug" - msgstr "Wykonywanie rpm_check_debug" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 ../yum/__init__.py:4204 - msgid "ERROR You need to update rpm to handle:" - msgstr "BŁĄD należy zaktualizować pakiet RPM, aby obsłużyć:" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 ../yum/__init__.py:4207 - msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "BŁĄD rpm_check_debug i rozwiązywania zależności:" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" - msgstr "Pakiet RPM musi zostać zaktualizowany" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" - msgstr "Proszę zgłosić ten błąd na %s" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "Wykonywanie testu transakcji" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "Ukończono test transakcji" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "Błąd podczas sprawdzania transakcji:\n" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "Test transakcji został ukończony powodzeniem" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "Wykonywanie transakcji" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." -@@ -197,79 +201,84 @@ msgstr "" - "uruchomienia.\n" - "Należy użyć \"-y\", aby wymusić." - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 ../cli.py:578 - msgid " * Maybe you meant: " - msgstr " * Czy chodziło o: " - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." - msgstr "Pakiety %s%s%s są dostępne, ale nie są zainstalowane." - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 ../cli.py:607 ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "Nie ma pakietu %s%s%s." - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 ../cli.py:748 - msgid "Package(s) to install" - msgstr "Pakiety do zainstalowania" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "Nie ma niczego do zrobienia" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "%d pakietów oznaczonych do aktualizacji" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "Brak pakietów oznaczonych do aktualizacji" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "%d pakietów oznaczonych do usunięcia" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "Brak pakietów oznaczonych do usunięcia" - --#: ../cli.py:683 -+#: ../cli.py:692 - msgid "Package(s) to downgrade" --msgstr "Pakiety do instalacji starszej wersji" -+msgstr "Pakiety do instalacji poprzedniej wersji" - --#: ../cli.py:707 -+#: ../cli.py:717 - #, python-format - msgid " (from %s)" - msgstr " (z %s)" - --#: ../cli.py:709 -+#: ../cli.py:719 - #, python-format - msgid "Installed package %s%s%s%s not available." - msgstr "Zainstalowany pakiet %s%s%s%s jest niedostępny." - --#: ../cli.py:716 -+#: ../cli.py:726 - msgid "Package(s) to reinstall" - msgstr "Pakiety do ponownego zainstalowania" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" - msgstr "Nie podano pakietów" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "Pasujące: %s" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" - msgstr "Ostrzeżenie: nie odnaleziono wyników dla: %s" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "Brak wyników" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" -@@ -278,108 +287,112 @@ msgstr "" - "Ostrzeżenie: wersje 3.0.x programu yum błędnie dopasowują nazwy plików.\n" - " Można użyć \"%s*/%s%s\" i/lub \"%s*bin/%s%s\", aby uzyskać to zachowanie" - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "Nie odnaleziono pakietów dla %s" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "Czyszczenie wszystkiego" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" - msgstr "Czyszczenie nagłówków" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "Czyszczenie pakietów" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "Czytanie metadanych XML" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" --msgstr "Czyszczenie pamięci podręcznej bazy danych" -+msgstr "Czyszczenie bazy danych w pamięci podręcznej" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" --msgstr "Czytanie metadanych wygasłej pamięci podręcznej" -+msgstr "Czyszczenie metadanych wygasłej pamięci podręcznej" - --#: ../cli.py:912 -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "Czyszczenie bazy danych RPM w pamięci podręcznej" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" - msgstr "Czyszczenie wtyczek" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "Zainstalowane grupy:" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "Dostępne grupy:" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "Ukończono" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "Ostrzeżenie: grupa %s nie istnieje." - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" - msgstr "" - "Brak pakietów dostępnych do instalacji lub aktualizacji w żadnej z żądanych " - "grup" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "%d pakietów do instalacji" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 ../yum/__init__.py:2800 - #, python-format - msgid "No group named %s exists" - msgstr "Grupa o nazwie %s nie istnieje" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "Brak pakietów do usunięcia z grup" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" - msgstr "%d pakietów do usunięcia" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" - msgstr "Pakiet %s jest już zainstalowany, pomijanie" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" - msgstr "Odrzucanie pakietu %s.%s, którego nie można porównać" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Inne %s nie są zainstalowane, dodawanie do listy potencjalnie instalowanych" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" - msgstr "Opcje wtyczki" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" - msgstr "Błąd wiersza poleceń: %s" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -390,106 +403,116 @@ msgstr "" - "\n" - "%s: opcja %s wymaga parametru" - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "--color przyjmuje jedną z: auto, always, never" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" - msgstr "wyświetla ten komunikat pomocy i kończy pracę" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" - msgstr "toleruje błędy" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" --msgstr "uruchamia wyłącznie z pamięci podręcznej i nie aktualizuje jej" -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" -+msgstr "uruchamia wyłącznie z pamięci podręcznej systemu i nie aktualizuje jej" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" - msgstr "położenie pliku konfiguracji" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" - msgstr "maksymalny czas oczekiwania na polecenie" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "poziom wyjścia debugowania" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" - msgstr "wyświetla duplikaty w repozytoriach w poleceniach list/search" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "poziom wyjścia błędów" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "poziom wyjścia debugowania dla programu RPM" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "mało komunikatów" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "dużo komunikatów" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "odpowiada tak na wszystkie pytania" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" - msgstr "wyświetla wersję programu yum i kończy pracę" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" - msgstr "ustawia roota instalacji" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "włącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" - msgstr "wyłącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" - msgstr "wyklucza pakiety po nazwie lub wyrażeniu regularnym" - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" - msgstr "wyłącza wykluczanie z głównego, dla repozytorium lub wszystkiego" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "włącza przetwarzanie przestarzałych pakietów podczas aktualizacji" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "wyłącza wtyczki programu yum" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "wyłącza sprawdzanie podpisu GPG" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "wyłącza wtyczki po nazwie" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "włącza wtyczki po nazwie" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" - msgstr "pomija pakiety mające problemy z rozwiązaniem zależności" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" - msgstr "kontroluje użycie kolorów" - -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "" -+"ustawia wartość zmiennej $releasever w konfiguracji programu yum i plikach " -+"repozytoriów" -+ - #: ../output.py:305 - msgid "Jan" - msgstr "sty" -@@ -542,105 +565,104 @@ msgstr "gru" - msgid "Trying other mirror." - msgstr "Próbowanie innego serwera lustrzanego." - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "Nazwa : %s%s%s" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "Architektura : %s" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" - msgstr "Epoka : %s" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "Wersja : %s" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" - msgstr "Wydanie : %s" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "Rozmiar : %s" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "Repozytorium : %s" - --#: ../output.py:547 -+#: ../output.py:543 - #, python-format - msgid "From repo : %s" - msgstr "Z repozytorium : %s" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "Twórca : %s" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "Czas wysłania : %s" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "Czas zbudowania : %s" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "Czas zainstalowania: %s" - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "Podsumowanie : " - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "Adres URL : %s" - --#: ../output.py:557 --#, python-format --msgid "License : %s" --msgstr "Licencja : %s" -+#: ../output.py:553 -+msgid "License : " -+msgstr "Licencja : " - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "Opis : " - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "t" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "tak" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "n" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "nie" - --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " - msgstr "W porządku? [t/N]: " - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" -@@ -649,150 +671,151 @@ msgstr "" - "\n" - "Grupa: %s" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr " Identyfikator grupy: %s" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr " Opis: %s" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr " Pakiety obowiązkowe:" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr " Domyślne pakiety:" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" - msgstr " Pakiety opcjonalne:" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr " Pakiety warunkowe:" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "pakiet: %s" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr " Brak zależności dla tego pakietu" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr " zależność: %s" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr " Nierozwiązana zależność" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "Repozytorium: %s" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "Dopasowano z:" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " - msgstr "Opis : " - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "Adres URL : %s" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "Licencja : %s" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" - msgstr "Nazwa pliku : %s" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "Inne : " - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" - msgstr "Wystąpił błąd podczas obliczania całkowitego rozmiaru pobierania" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "Całkowity rozmiar: %s" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "Całkowity rozmiar pobierania: %s" - --#: ../output.py:942 -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "Rozmiar po zainstalowaniu: %s" -+ -+#: ../output.py:949 - msgid "Reinstalling" - msgstr "Ponowne instalowanie" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" --msgstr "Instalowanie starszej wersji" -+msgstr "Instalowanie poprzedniej wersji" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" - msgstr "Instalowanie, aby rozwiązać zależności" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" - msgstr "Aktualizowanie, aby rozwiązać zależności" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "Usuwanie, aby rozwiązać zależności" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 ../output.py:1072 - msgid "Skipped (dependency problems)" - msgstr "Pominięto (problemy z zależnościami)" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" - msgstr "Pakiet" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" - msgstr "Architektura" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" - msgstr "Wersja" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" - msgstr "Repozytorium" - --#: ../output.py:978 -+#: ../output.py:985 - msgid "Size" - msgstr "Rozmiar" - --#: ../output.py:990 -+#: ../output.py:997 - #, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" --msgstr "" --" zastępuje %s%s%s.%s %s\n" --"\n" -+msgid " replacing %s%s%s.%s %s\n" -+msgstr " zastępuje %s%s%s.%s %s\n" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" -@@ -803,7 +826,7 @@ msgstr "" - "Podsumowanie transakcji\n" - "%s\n" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" -@@ -812,43 +835,43 @@ msgstr "" - "Instalacja %5.5s pakiet(y)\n" - "Aktualizacja %5.5s pakiet(y)\n" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" - "Reinstall %5.5s Package(s)\n" - "Downgrade %5.5s Package(s)\n" - msgstr "" --"Usunięcie %5.5s pakiet(y)\n" --"Ponowna instalacja %5.5s pakiet(y)\n" --"Instalacja starszej wersji %5.5s pakiet(y)\n" -+"Usunięcie %5.5s pakiet(y)\n" -+"Ponowna instalacja %5.5s pakiet(y)\n" -+"Instalacja poprzedniej wersji %5.5s pakiet(y)\n" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" - msgstr "Usunięto" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "Usunięto zależność" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "Zainstalowano zależność" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "Zaktualizowano zależność" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "Zastąpiono" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "Nie powiodło się" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" - msgstr "dwóch" - -@@ -856,7 +879,7 @@ msgstr "dwóch" - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 -+#: ../output.py:1151 - #, python-format - msgid "" - "\n" -@@ -868,209 +891,364 @@ msgstr "" - " Obecne pobieranie zostało anulowane, należy %sprzerwać (Ctrl-C) ponownie%s " - "w ciągu %s%s%s sekund, aby zakończyć pracę.\n" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "przerwane przez użytkownika" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "Razem" - -+#: ../output.py:1202 -+msgid "I" -+msgstr "I" -+ - #: ../output.py:1203 --msgid "" --msgstr "" -+msgid "O" -+msgstr "O" - - #: ../output.py:1204 -+msgid "E" -+msgstr "E" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "R" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "D" -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "U" -+ -+#: ../output.py:1217 -+msgid "" -+msgstr "" -+ -+#: ../output.py:1218 - msgid "System" - msgstr "System" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" - msgstr "Podano błędne identyfikatory transakcji lub pakietów" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." --msgstr "" --"Ostrzeżenie: baza danych RPM została zmieniona od ostatniej transakcji " --"programu yum." -+#: ../output.py:1266 -+msgid "ID" -+msgstr "Identyfikator" - --#: ../output.py:1289 -+#: ../output.py:1267 ../output.py:1520 -+msgid "Login user" -+msgstr "Zalogowany użytkownik" -+ -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "Data i czas" -+ -+#: ../output.py:1269 ../output.py:1522 -+msgid "Action(s)" -+msgstr "Czynności" -+ -+#: ../output.py:1270 ../output.py:1523 -+msgid "Altered" -+msgstr "Zmieniono" -+ -+#: ../output.py:1310 - msgid "No transaction ID given" - msgstr "Nie podano identyfikatora transakcji" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" - msgstr "Podano błędny identyfikator transakcji" - --#: ../output.py:1302 -+#: ../output.py:1341 - msgid "Not found given transaction ID" - msgstr "Nie odnaleziono podanego identyfikatora transakcji" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" - msgstr "Odnaleziono więcej niż jeden identyfikator transakcji." - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" - msgstr "Podano błędny identyfikator transakcji lub pakietu" - --#: ../output.py:1357 -+#: ../output.py:1396 - msgid "Transaction ID :" - msgstr "Identyfikator transakcji :" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" - msgstr "Czas rozpoczęcia :" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 ../output.py:1403 - msgid "Begin rpmdb :" - msgstr "Rozpoczęcie bazy danych RPM:" - --#: ../output.py:1378 -+#: ../output.py:1417 - #, python-format - msgid "(%s seconds)" - msgstr "%s sekundy)" - --#: ../output.py:1379 -+#: ../output.py:1418 - msgid "End time :" - msgstr "Czas ukończenia :" - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 ../output.py:1423 - msgid "End rpmdb :" - msgstr "Ukończenie bazy danych RPM :" - --#: ../output.py:1385 -+#: ../output.py:1424 - msgid "User :" - msgstr "Użytkownik :" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 -+#: ../output.py:1426 ../output.py:1428 ../output.py:1430 - msgid "Return-Code :" - msgstr "Kod zwrotny :" - --#: ../output.py:1387 -+#: ../output.py:1426 - msgid "Aborted" - msgstr "Przerwano" - --#: ../output.py:1389 -+#: ../output.py:1428 - msgid "Failure:" - msgstr "Niepowodzenie:" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" - msgstr "Powodzenie" - --#: ../output.py:1392 -+#: ../output.py:1431 - msgid "Transaction performed with:" - msgstr "Wykonano transakcję za pomocą:" - --#: ../output.py:1405 -+#: ../output.py:1444 ../output.py:1489 - msgid "Downgraded" --msgstr "Zainstalowano starszą wersję" -+msgstr "Zainstalowano poprzednią wersję" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" - msgstr "Dziwne" - --#: ../output.py:1409 -+#: ../output.py:1448 - msgid "Packages Altered:" - msgstr "Zmienione pakiety:" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" - msgstr "Wyjście skryptu:" - --#: ../output.py:1418 -+#: ../output.py:1457 - msgid "Errors:" - msgstr "Błędy:" - --#: ../output.py:1489 -+#: ../output.py:1481 ../output.py:1482 -+msgid "Install" -+msgstr "Instalacja" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "Instalacja zależności" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "Zastępowanie" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "Usunięcie" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "Ponowna instalacja" -+ -+#: ../output.py:1488 -+msgid "Downgrade" -+msgstr "Instalacja poprzedniej wersji" -+ -+#: ../output.py:1490 -+msgid "Update" -+msgstr "Aktualizacja" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "Czas" -+ -+#: ../output.py:1547 - msgid "Last day" - msgstr "Ostatni dzień" - --#: ../output.py:1490 -+#: ../output.py:1548 - msgid "Last week" - msgstr "Ostatni tydzień" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" - msgstr "Ostatnie dwa tygodnie" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" - msgstr "Ostatnie trzy miesiące" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" - msgstr "Ostatnie pół roku" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" - msgstr "Ostatni rok" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" - msgstr "Ponad rok temu" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "zainstalowany" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "zaktualizowany" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "zastąpiony" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" - msgstr "usunięty" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> Pakiet %s.%s %s:%s-%s zostanie %s" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "--> Wykonywanie sprawdzania transakcji" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." - msgstr "--> Ponowne uruchamianie rozwiązywania zależności z nowymi zmianami." - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" - msgstr "--> Ukończono rozwiązywanie zależności" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" - msgstr "--> Przetwarzanie zależności: %s dla pakietu: %s" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" - msgstr "--> Nierozwiązana zależność: %s" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "Pakiet: %s" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+"\n" -+" Wymaga: %s" -+ -+#: ../output.py:1649 ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+"\n" -+" %s: %s (%s)" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "Dostępne" -+ -+#: ../output.py:1665 ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> Przetwarzanie konfliktów: %s jest w konflikcie z %s" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać." - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." - msgstr "---> Pobieranie nagłówka dla %s do umieszczenia w zestawie transakcji." - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:93 -+msgid "Running" -+msgstr "Wykonywanie" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "Zasypianie" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "Nie można przerywać" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "Zombie" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "Śledzone/zatrzymane" -+ -+#: ../utils.py:98 ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "Nieznane" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr " Inna aplikacja to PackageKit" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr " Inna aplikacja to: %s" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " Pamięć: %5s RSS (%5sB VSZ)" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " Uruchomiono: %s - %s temu" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " Stan: %s, PID: %d" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "Błąd wyjścia wtyczki: %s" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "Błąd programu yum: %s" -+ -+#: ../utils.py:235 ../yummain.py:42 - msgid "" - "\n" - "\n" -@@ -1078,9 +1256,9 @@ msgid "" - msgstr "" - "\n" - "\n" --"Kończenie pracy na polecenie użytkownika" -+"Kończenie działania na polecenie użytkownika" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 ../yummain.py:48 - msgid "" - "\n" - "\n" -@@ -1088,9 +1266,9 @@ msgid "" - msgstr "" - "\n" - "\n" --"Kończenie pracy z powodu przerwanego potoku" -+"Kończenie działania z powodu przerwanego potoku" - --#: ../utils.py:145 ../yummain.py:50 -+#: ../utils.py:243 ../yummain.py:50 - #, python-format - msgid "" - "\n" -@@ -1101,15 +1279,15 @@ msgstr "" - "\n" - "%s" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 ../yummain.py:211 - msgid "Complete!" - msgstr "Ukończono." - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." - msgstr "Należy być zalogowanym jako root, aby wykonać to polecenie." - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1140,335 +1318,335 @@ msgstr "" - "Aby dowiedzieć się więcej, proszę skontaktować się z dostawcą dystrybucji\n" - "lub pakietu.\n" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" - msgstr "Błąd: wymagane jest przekazanie listy pakietów do %s" - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" - msgstr "Błąd: wymagany jest parametr do dopasowania" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" - msgstr "Błąd: wymagana jest grupa lub lista grup" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "Błąd: czyszczenie wymaga opcji: %s" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "Błąd: nieprawidłowy parametr czyszczenia: %r" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "Brak parametrów dla powłoki" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "Przekazano nazwę pliku do powłoki: %s" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "Plik %s podany powłoce jako parametr nie istnieje." - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "Błąd: podano powłoce więcej niż jeden plik jako parametr." - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "PAKIET..." - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "Instaluje pakiet lub pakiety w systemie" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" - msgstr "Ustawianie procesu instalacji" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "[PAKIET...]" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "Aktualizuje pakiet lub pakiety w systemie" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" - msgstr "Ustawianie procesu aktualizacji" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" - msgstr "Wyświetla szczegóły o pakiecie lub grupie pakietów" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "Zainstalowane pakiety" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "Dostępne pakiety" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "Dodatkowe pakiety" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" - msgstr "Zaktualizowane pakiety" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "Zastępowanie przestarzałych pakietów" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "Ostatnio dodane pakiety" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "Brak pakietów pasujących do listy" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "Wyświetla listę pakietów lub grup pakietów" - --#: ../yumcommands.py:361 -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" - msgstr "Usuwa pakiet lub pakiety z systemu" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" - msgstr "Ustawianie procesu usuwania" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" - msgstr "Ustawianie procesu grup" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" - msgstr "Brak grup, na których można wykonać polecenie" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "Wyświetla listę dostępnych grup pakietów" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" - msgstr "Instaluje pakiety z grupy w systemie" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" - msgstr "Usuwa pakiety z grupy z systemu" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "Wyświetla szczegóły o grupie pakietów" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "Utworzy pamięć podręczną metadanych" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "Tworzenie plików pamięci podręcznej ze wszystkich plików metadanych." - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" - msgstr "Może to chwilę zająć, z zależności od prędkości komputera" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "Utworzono pamięć podręczną metadanych" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" - msgstr "Usuwa dane z pamięci podręcznej" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" - msgstr "Wyszukuje pakiet dostarczający podaną wartość" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "Sprawdza dostępne aktualizacje pakietów" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "Wyszukuje szczegóły pakietów dla podanego ciągu" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "Wyszukiwanie pakietów: " - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" - msgstr "Aktualizuje pakiety, w tym przestarzałe" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" - msgstr "Ustawianie procesu aktualizacji" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" - msgstr "Instaluje lokalny pakiet RPM" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" - msgstr "Ustawianie procesu lokalnego pakietu" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" - msgstr "Określa, który pakiet dostarcza podaną zależność" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "Wyszukiwanie pakietów dla zależności:" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" - msgstr "Uruchamia interaktywną powłokę programu yum" - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "Ustawianie powłoki programu yum" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" - msgstr "Wyświetla listę zależności pakietu" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "Wyszukiwanie zależności: " - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "Wyświetla skonfigurowane repozytoria oprogramowania" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 ../yumcommands.py:823 - msgid "enabled" - msgstr "włączone" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 ../yumcommands.py:850 - msgid "disabled" - msgstr "wyłączone" - --#: ../yumcommands.py:834 -+#: ../yumcommands.py:866 - msgid "Repo-id : " - msgstr "Identyfikator repozytorium : " - --#: ../yumcommands.py:835 -+#: ../yumcommands.py:867 - msgid "Repo-name : " - msgstr "Nazwa repozytorium : " - --#: ../yumcommands.py:836 -+#: ../yumcommands.py:870 - msgid "Repo-status : " - msgstr "Stan repozytorium : " - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "Wersja repozytorium : " - --#: ../yumcommands.py:842 -+#: ../yumcommands.py:877 - msgid "Repo-tags : " - msgstr "Znaczniki repozytorium : " - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "Znaczniki dystrybucji repozytorium: " - --#: ../yumcommands.py:853 -+#: ../yumcommands.py:888 - msgid "Repo-updated : " - msgstr "Aktualizacje repozytorium : " - --#: ../yumcommands.py:855 -+#: ../yumcommands.py:890 - msgid "Repo-pkgs : " - msgstr "Pakiety repozytorium : " - --#: ../yumcommands.py:856 -+#: ../yumcommands.py:891 - msgid "Repo-size : " - msgstr "Rozmiar repozytorium : " - --#: ../yumcommands.py:863 -+#: ../yumcommands.py:898 - msgid "Repo-baseurl : " - msgstr "Podstawowy adres URL repozytorium : " - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " - msgstr "Metaodnośnik repozytorium : " - --#: ../yumcommands.py:875 -+#: ../yumcommands.py:910 - msgid " Updated : " - msgstr " Zaktualizowano : " - --#: ../yumcommands.py:878 -+#: ../yumcommands.py:913 - msgid "Repo-mirrors : " - msgstr "Serwery lustrzane repozytorium : " - --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "Nieznane" -- --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" - msgstr "Nigdy (ostatnio: %s)" - --#: ../yumcommands.py:890 -+#: ../yumcommands.py:925 - #, python-format - msgid "Instant (last: %s)" - msgstr "Natychmiast (ostatnio: %s)" - --#: ../yumcommands.py:893 -+#: ../yumcommands.py:928 - #, python-format - msgid "%s second(s) (last: %s)" - msgstr "%s sekundy (ostatnio: %s)" - --#: ../yumcommands.py:895 -+#: ../yumcommands.py:930 - msgid "Repo-expire : " - msgstr "Wygaszenie repozytorium : " - --#: ../yumcommands.py:898 -+#: ../yumcommands.py:933 - msgid "Repo-exclude : " - msgstr "Wykluczenia z repozytorium : " - --#: ../yumcommands.py:902 -+#: ../yumcommands.py:937 - msgid "Repo-include : " - msgstr "Dołączone z repozytorium : " - -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "Wykluczenia z repozytorium : " -+ - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 ../yumcommands.py:980 - msgid "repo id" - msgstr "identyfikator repozytorium" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 - msgid "status" - msgstr "stan" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "nazwa repozytorium" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" - msgstr "Wyświetla pomocny komunikat o używaniu" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "Brak dostępnej pomocy dla %s" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" -@@ -1478,7 +1656,7 @@ msgstr "" - "\n" - "aliasy: " - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" -@@ -1488,143 +1666,97 @@ msgstr "" - "\n" - "alias: " - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" - msgstr "Ustawianie procesu ponownej instalacji" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" - msgstr "Ponownie instaluje pakiet" - --#: ../yumcommands.py:1060 -+#: ../yumcommands.py:1113 - msgid "Setting up Downgrade Process" --msgstr "Ustawianie procesu instalacji starszej wersji pakietu" -+msgstr "Ustawianie procesu instalacji poprzedniej wersji pakietu" - --#: ../yumcommands.py:1067 -+#: ../yumcommands.py:1120 - msgid "downgrade a package" --msgstr "Instaluje starszą wersję pakietu" -+msgstr "Instaluje poprzednią wersję pakietu" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." - msgstr "Wyświetla wersję dla komputera i/lub dostępnych repozytoriów." - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" - msgstr " Grupy wersji programu yum:" - --#: ../yumcommands.py:1121 -+#: ../yumcommands.py:1183 - msgid " Group :" - msgstr " Grupa :" - --#: ../yumcommands.py:1122 -+#: ../yumcommands.py:1184 - msgid " Packages:" - msgstr " Pakiety:" - --#: ../yumcommands.py:1152 -+#: ../yumcommands.py:1213 - msgid "Installed:" - msgstr "Zainstalowano:" - --#: ../yumcommands.py:1157 -+#: ../yumcommands.py:1218 - msgid "Group-Installed:" - msgstr "Zainstalowana grupa:" - --#: ../yumcommands.py:1166 -+#: ../yumcommands.py:1227 - msgid "Available:" - msgstr "Dostępne:" - --#: ../yumcommands.py:1172 -+#: ../yumcommands.py:1233 - msgid "Group-Available:" - msgstr "Dostępne grupy:" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" - msgstr "Wyświetla lub używa historii transakcji" - --#: ../yumcommands.py:1239 -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." - msgstr "Nieprawidłowe podpolecenie historii, należy użyć: %s." - --#: ../yummain.py:128 --msgid "Running" --msgstr "Wykonywanie" -- --#: ../yummain.py:129 --msgid "Sleeping" --msgstr "Zasypianie" -- --#: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "Nie można przerywać" -- --#: ../yummain.py:131 --msgid "Zombie" --msgstr "Zombie" -- --#: ../yummain.py:132 --msgid "Traced/Stopped" --msgstr "Śledzone/zatrzymane" -- --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr " Inna aplikacja to PackageKit" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr " Inna aplikacja to: %s" -- --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr " Pamięć: %5s RSS (%5sB VSZ)" -- --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr " Uruchomiono: %s - %s temu" -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" -+msgstr "Proszę sprawdzić, czy występują problemy w bazie danych RPM" - --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr " Stan: %s, PID: %d" -- --#: ../yummain.py:173 -+#: ../yummain.py:102 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "Inna aplikacja obecnie blokuje program yum. Oczekiwanie na jej zakończenie..." - --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:130 ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "Błąd: %s" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" - msgstr "Nieznane błędy: kod wyjścia: %d:" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "Rozwiązywanie zależności" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" - msgstr " Można spróbować użyć --skip-broken, aby obejść problem" - --#: ../yummain.py:243 --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" --msgstr "" --" Można spróbować wykonać: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+#: ../yummain.py:175 ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" -+msgstr " Można spróbować wykonać polecenie: rpm -Va --nofiles --nodigest" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" -@@ -1632,7 +1764,7 @@ msgstr "" - "\n" - "Rozwiązano zależności" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1640,7 +1772,7 @@ msgid "" - msgstr "" - "\n" - "\n" --"Kończenie pracy na polecenie użytkownika." -+"Kończenie działania na polecenie użytkownika." - - #: ../yum/depsolve.py:82 - msgid "doTsSetup() will go away in a future version of Yum.\n" -@@ -1670,172 +1802,167 @@ msgstr "Potencjalny wynik dla %s z %s" - msgid "Matched %s to require for %s" - msgstr "%s pasuje jako wymaganie dla %s" - --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:225 - #, python-format - msgid "Member: %s" - msgstr "Element: %s" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 - #, python-format - msgid "%s converted to install" - msgstr "%s przekonwertowano do zainstalowania" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:246 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "Dodawanie pakietu %s w trybie %s" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:256 - #, python-format - msgid "Removing Package %s" - msgstr "Usuwanie pakietu %s" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:278 - #, python-format - msgid "%s requires: %s" - msgstr "%s wymaga: %s" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:319 -+#, python-format -+msgid "%s requires %s" -+msgstr "%s wymaga %s" -+ -+#: ../yum/depsolve.py:346 - msgid "Needed Require has already been looked up, cheating" - msgstr "Wymagana zależność została już odnaleziona, oszukiwanie" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:356 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" - msgstr "Wymagana zależność nie jest nazwą pakietu. Wyszukiwanie: %s" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Potential Provider: %s" - msgstr "Potencjalny dostawca: %s" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:386 - #, python-format - msgid "Mode is %s for provider of %s: %s" - msgstr "Tryb to %s dla dostawcy %s: %s" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:390 - #, python-format - msgid "Mode for pkg providing %s: %s" - msgstr "Tryb dla pakietu dostarczającego %s: %s" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:394 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "TSINFO: pakiet %s wymagający %s został oznaczony jako do usunięcia" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:407 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - "TSINFO: zastępowanie przestarzałego pakietu %s pakietem %s, aby rozwiązać " - "zależność." - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:410 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "TSINFO: aktualizowanie %s, aby rozwiązać zależność." - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:418 - #, python-format - msgid "Cannot find an update path for dep for: %s" - msgstr "Nie można odnaleźć ścieżki aktualizacji dla zależności dla: %s" - --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "Nie można rozwiązać wymagania %s dla %s" -- --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:449 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "Szybko dopasowano %s jako wymaganie %s" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:491 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s jest w dostarczających pakietach, ale jest już zainstalowany, usuwanie." - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:507 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." - msgstr "" - "Pakiet %s potencjalnie rozwiązujący ma nowszą wersję w zestawie transakcji." - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:518 - #, python-format - msgid "Potential resolving package %s has newer instance installed." - msgstr "Pakiet %s potencjalnie rozwiązujący ma zainstalowaną nowszą wersję." - --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "Brakująca zależność: %s jest wymagane przez pakiet %s" -- --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:536 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "%s jest już w zestawie transakcji, pomijanie" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:578 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: oznaczanie %s jako aktualizacji dla %s" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:586 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: oznaczanie %s jako do zainstalowania dla %s" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 - msgid "Success - empty transaction" - msgstr "Powodzenie - pusta transakcja" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 - msgid "Restarting Loop" - msgstr "Ponowne uruchamianie pętli" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:760 - msgid "Dependency Process ending" - msgstr "Kończenie procesu zależności" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:774 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "%s z %s ma problemy z rozwiązywaniem zależności" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:782 - msgid "Success - deps resolved" - msgstr "Powodzenie - rozwiązano zależności" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:796 - #, python-format - msgid "Checking deps for %s" - msgstr "Sprawdzanie zależności dla %s" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:874 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "wyszukiwanie %s jako wymagania %s" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1090 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "Wykonywanie compare_providers() dla %s" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 - #, python-format - msgid "better arch in po %s" - msgstr "lepsze arch w po %s" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1218 - #, python-format - msgid "%s obsoletes %s" - msgstr "%s zastępuje %s" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1230 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" -@@ -1844,124 +1971,144 @@ msgstr "" - "archdist porównało %s do %s na %s\n" - " Zwycięzca: %s" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1237 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "wspólny źródłowy pakiet RPM %s i %s" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1241 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "podstawowy pakiet %s jest zainstalowany dla %s" -+ -+#: ../yum/depsolve.py:1247 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "wspólny przedrostek %s dla %s i %s" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1256 - #, python-format - msgid "Best Order: %s" - msgstr "Najlepszy porządek: %s" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "" - "doConfigSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" - msgstr "" - "Repozytorium %r nie posiada nazwy w konfiguracji, używanie identyfikatora" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "wtyczki zostały już zainicjowane" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "doRpmDBSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "Odczytywanie lokalnej bazy danych RPM" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "Ustawianie zestawów pakietów" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" - msgstr "obiekt repozytorium %s nie posiada metody _resetSack\n" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "więc to repozytorium nie może zostać przywrócone.\n" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "" - "doUpdateSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "Budowanie obiektu aktualizacji" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "Pobieranie metadanych grup" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "Dodawanie pliku grup z repozytorium: %s" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "Dodanie pliku grup dla repozytorium nie powiodło się: %s - %s" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "Brak dostępnych grup we wszystkich repozytoriach" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "Pobieranie metadanych znaczników pakietów" -+ -+#: ../yum/__init__.py:740 -+#, python-format -+msgid "Adding tags from repository: %s" -+msgstr "Dodawanie znaczników z repozytorium: %s" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "Dodanie znaczników pakietów dla repozytorium nie powiodło się: %s - %s" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" - msgstr "Importowanie dodatkowych informacji o liście plików" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." - msgstr "Program %s%s%s można odnaleźć w pakiecie yum-utils." - --#: ../yum/__init__.py:785 -+#: ../yum/__init__.py:849 - msgid "" - "There are unfinished transactions remaining. You might consider running yum-" - "complete-transaction first to finish them." - msgstr "" --"Pozostały nieukończone transakcje. Można rozważyć wykonanie yum-complete-" --"transaction, aby najpierw je ukończyć." -+"Pozostały nieukończone transakcje. Można rozważyć wykonanie najpierw " -+"polecenia yum-complete-transaction, aby je ukończyć." - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "Pierwsza runda pomijania uszkodzonych %i" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "Pomijanie uszkodzonych zajęło %i rund " - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" -@@ -1969,79 +2116,94 @@ msgstr "" - "\n" - "Pakiety pominięto z powodu problemów z zależnościami:" - --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr " %s z %s" - --#: ../yum/__init__.py:1083 -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "Ostrzeżenie: baza danych RPM została zmieniona poza programem yum." -+ -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "brak wymaganych" -+ -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "zainstalowano konflikt" -+ -+#: ../yum/__init__.py:1180 - msgid "" - "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie krytyczne błędy." - --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" - msgstr "Usunięcie pliku transakcji %s nie powiodło się" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" - msgstr "%s miało zostać zainstalowane, ale nie zostało." - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 - #, python-format - msgid "%s was supposed to be removed but is not!" - msgstr "%s miało zostać usunięte, ale nie zostało." - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Nie można sprawdzić, czy PID %s jest aktywny" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 - #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "Istnieje blokada %s: inna kopia jest uruchomiona jako PID %s." - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 -+#: ../yum/__init__.py:1425 - #, python-format - msgid "Could not create lock at %s: %s " - msgstr "Nie można utworzyć blokady na %s: %s " - --#: ../yum/__init__.py:1373 --msgid "Package does not match intended download" --msgstr "Pakiet nie zgadza się z zamierzonym pobieraniem" -+#: ../yum/__init__.py:1470 -+msgid "" -+"Package does not match intended download. Suggestion: run yum clean metadata" -+msgstr "" -+"Pakiet nie zgadza się z zamierzonym pobieraniem. Sugestia: proszę wykonać " -+"polecenie yum clean metadata" - --#: ../yum/__init__.py:1388 -+#: ../yum/__init__.py:1486 - msgid "Could not perform checksum" - msgstr "Nie można wykonać sprawdzenia sum kontrolnych" - --#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1489 - msgid "Package does not match checksum" - msgstr "Sumy kontrolne pakietu nie zgadzają się" - --#: ../yum/__init__.py:1433 -+#: ../yum/__init__.py:1531 - #, python-format - msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "sprawdzenie sum kontrolnych pakietu nie powiodło się, ale zapisywanie w " - "pamięci podręcznej dla %s jest włączone" - --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 -+#: ../yum/__init__.py:1534 ../yum/__init__.py:1563 - #, python-format - msgid "using local copy of %s" - msgstr "używanie lokalnej kopii %s" - --#: ../yum/__init__.py:1477 -+#: ../yum/__init__.py:1575 - #, python-format - msgid "" - "Insufficient space in download directory %s\n" -@@ -2052,11 +2214,11 @@ msgstr "" - " * wolne %s\n" - " * wymagane %s" - --#: ../yum/__init__.py:1526 -+#: ../yum/__init__.py:1624 - msgid "Header is not complete." - msgstr "Nagłówek nie jest pełny." - --#: ../yum/__init__.py:1563 -+#: ../yum/__init__.py:1661 - #, python-format - msgid "" - "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2064,62 +2226,62 @@ msgstr "" - "Nagłówek nie jest w lokalnej pamięci podręcznej, a tryb używania tylko " - "pamięci podręcznej jest włączony. Nie można pobrać %s" - --#: ../yum/__init__.py:1618 -+#: ../yum/__init__.py:1716 - #, python-format - msgid "Public key for %s is not installed" - msgstr "Klucz publiczny dla %s nie jest zainstalowany" - --#: ../yum/__init__.py:1622 -+#: ../yum/__init__.py:1720 - #, python-format - msgid "Problem opening package %s" - msgstr "Wystąpił problem podczas otwierania pakietu %s" - --#: ../yum/__init__.py:1630 -+#: ../yum/__init__.py:1728 - #, python-format - msgid "Public key for %s is not trusted" - msgstr "Klucz publiczny dla %s nie jest zaufany" - --#: ../yum/__init__.py:1634 -+#: ../yum/__init__.py:1732 - #, python-format - msgid "Package %s is not signed" - msgstr "Pakiet %s nie jest podpisany" - --#: ../yum/__init__.py:1672 -+#: ../yum/__init__.py:1770 - #, python-format - msgid "Cannot remove %s" - msgstr "Nie można usunąć %s" - --#: ../yum/__init__.py:1676 -+#: ../yum/__init__.py:1774 - #, python-format - msgid "%s removed" - msgstr "Usunięto %s" - --#: ../yum/__init__.py:1712 -+#: ../yum/__init__.py:1820 - #, python-format - msgid "Cannot remove %s file %s" - msgstr "Nie można usunąć %s pliku %s" - --#: ../yum/__init__.py:1716 -+#: ../yum/__init__.py:1824 - #, python-format - msgid "%s file %s removed" - msgstr "Usunięto %s plik %s" - --#: ../yum/__init__.py:1718 -+#: ../yum/__init__.py:1826 - #, python-format - msgid "%d %s files removed" - msgstr "Usunięto %d %s plików" - --#: ../yum/__init__.py:1787 -+#: ../yum/__init__.py:1895 - #, python-format - msgid "More than one identical match in sack for %s" - msgstr "Więcej niż jeden identyczny wynik znajduje się w zestawie dla %s" - --#: ../yum/__init__.py:1793 -+#: ../yum/__init__.py:1901 - #, python-format - msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "Nic nie pasuje do %s.%s %s:%s-%s z aktualizacji" - --#: ../yum/__init__.py:2026 -+#: ../yum/__init__.py:2180 - msgid "" - "searchPackages() will go away in a future version of " - "Yum. Use searchGenerator() instead. \n" -@@ -2127,285 +2289,295 @@ msgstr "" - "searchPackages() zostanie usunięte w przyszłych wersjach programu " - "yum. Zamiast tego należy użyć searchGenerator(). \n" - --#: ../yum/__init__.py:2065 -+#: ../yum/__init__.py:2219 - #, python-format - msgid "Searching %d packages" - msgstr "Wyszukiwanie %d pakietów" - --#: ../yum/__init__.py:2069 -+#: ../yum/__init__.py:2223 - #, python-format - msgid "searching package %s" - msgstr "wyszukiwanie pakietu %s" - --#: ../yum/__init__.py:2081 -+#: ../yum/__init__.py:2235 - msgid "searching in file entries" - msgstr "wyszukiwanie we wpisach plików" - --#: ../yum/__init__.py:2088 -+#: ../yum/__init__.py:2242 - msgid "searching in provides entries" - msgstr "wyszukiwanie we wpisach dostarczania" - --#: ../yum/__init__.py:2121 -+#: ../yum/__init__.py:2275 - #, python-format - msgid "Provides-match: %s" - msgstr "Wyniki dostarczania: %s" - --#: ../yum/__init__.py:2170 -+#: ../yum/__init__.py:2324 - msgid "No group data available for configured repositories" - msgstr "Brak dostępnych danych grup dla skonfigurowanych repozytoriów" - --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 -+#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405 -+#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497 -+#: ../yum/__init__.py:2814 - #, python-format - msgid "No Group named %s exists" - msgstr "Grupa o nazwie %s nie istnieje" - --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 -+#: ../yum/__init__.py:2386 ../yum/__init__.py:2513 - #, python-format - msgid "package %s was not marked in group %s" - msgstr "pakiet %s nie został oznaczony w grupie %s" - --#: ../yum/__init__.py:2279 -+#: ../yum/__init__.py:2433 - #, python-format - msgid "Adding package %s from group %s" - msgstr "Dodawanie pakietu %s z grupy %s" - --#: ../yum/__init__.py:2283 -+#: ../yum/__init__.py:2437 - #, python-format - msgid "No package named %s available to be installed" - msgstr "Brak dostępnego pakietu o nazwie %s do zainstalowania" - --#: ../yum/__init__.py:2380 -+#: ../yum/__init__.py:2539 - #, python-format - msgid "Package tuple %s could not be found in packagesack" - msgstr "Nie można odnaleźć krotki pakietu %s w zestawie pakietów" - --#: ../yum/__init__.py:2399 -+#: ../yum/__init__.py:2558 - #, python-format - msgid "Package tuple %s could not be found in rpmdb" - msgstr "Nie można odnaleźć krotki pakietu %s w bazie danych RPM" - --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 -+#: ../yum/__init__.py:2614 ../yum/__init__.py:2664 - msgid "Invalid version flag" - msgstr "Nieprawidłowa flaga wersji" - --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2634 ../yum/__init__.py:2639 - #, python-format - msgid "No Package found for %s" - msgstr "Nie odnaleziono pakietu %s" - --#: ../yum/__init__.py:2696 -+#: ../yum/__init__.py:2855 - msgid "Package Object was not a package object instance" - msgstr "Obiekt pakietu nie był instancją obiektu pakietu" - --#: ../yum/__init__.py:2700 -+#: ../yum/__init__.py:2859 - msgid "Nothing specified to install" - msgstr "Nie podano nic do zainstalowania" - --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 -+#: ../yum/__init__.py:2875 ../yum/__init__.py:3652 - #, python-format - msgid "Checking for virtual provide or file-provide for %s" - msgstr "Sprawdzanie wirtualnych zależności lub plików dla %s" - --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 -+#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365 -+#: ../yum/__init__.py:3658 - #, python-format - msgid "No Match for argument: %s" - msgstr "Brak wyników dla parametru: %s" - --#: ../yum/__init__.py:2798 -+#: ../yum/__init__.py:2957 - #, python-format - msgid "Package %s installed and not available" - msgstr "Pakiet %s jest zainstalowany, ale nie jest dostępny" - --#: ../yum/__init__.py:2801 -+#: ../yum/__init__.py:2960 - msgid "No package(s) available to install" - msgstr "Brak pakietów dostępnych do instalacji" - --#: ../yum/__init__.py:2813 -+#: ../yum/__init__.py:2972 - #, python-format - msgid "Package: %s - already in transaction set" - msgstr "Pakiet: %s - jest już w zestawie transakcji" - --#: ../yum/__init__.py:2839 -+#: ../yum/__init__.py:2998 - #, python-format - msgid "Package %s is obsoleted by %s which is already installed" - msgstr "Pakiet %s został zastąpiony przez %s, który jest już zainstalowany" - --#: ../yum/__init__.py:2842 -+#: ../yum/__init__.py:3001 - #, python-format - msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "Pakiet %s został zastąpiony przez %s, próbowanie instalacji %s zamiast niego" - --#: ../yum/__init__.py:2850 -+#: ../yum/__init__.py:3009 - #, python-format - msgid "Package %s already installed and latest version" - msgstr "Pakiet %s jest już zainstalowany w najnowszej wersji" - --#: ../yum/__init__.py:2864 -+#: ../yum/__init__.py:3023 - #, python-format - msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Pakiet pasujący do %s jest już zainstalowany. Sprawdzanie aktualizacji." - - #. update everything (the easy case) --#: ../yum/__init__.py:2966 -+#: ../yum/__init__.py:3126 - msgid "Updating Everything" - msgstr "Aktualizowanie wszystkiego" - --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 -+#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289 -+#: ../yum/__init__.py:3315 - #, python-format - msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 -+#: ../yum/__init__.py:3182 ../yum/__init__.py:3362 - #, python-format - msgid "%s" - msgstr "%s" - --#: ../yum/__init__.py:3093 -+#: ../yum/__init__.py:3253 - #, python-format - msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "Pakiet został już zastąpiony: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3124 -+#: ../yum/__init__.py:3284 - #, python-format - msgid "Not Updating Package that is obsoleted: %s" - msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s" - --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 -+#: ../yum/__init__.py:3293 ../yum/__init__.py:3319 - #, python-format - msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "Już zaktualizowany pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3218 -+#: ../yum/__init__.py:3378 - msgid "No package matched to remove" - msgstr "Brak pasujących pakietów do usunięcia" - --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 -+#: ../yum/__init__.py:3412 - #, python-format --msgid "Cannot open file: %s. Skipping." --msgstr "Nie można otworzyć pliku: %s. Pomijanie." -+msgid "Cannot open: %s. Skipping." -+msgstr "Nie można otworzyć: %s. Pomijanie." - --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 -+#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598 - #, python-format - msgid "Examining %s: %s" - msgstr "Sprawdzanie %s: %s" - --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 -+#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601 - #, python-format - msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "Nie można dodać pakietu %s do transakcji. Niezgodna architektura: %s" - --#: ../yum/__init__.py:3270 -+#: ../yum/__init__.py:3431 - #, python-format - msgid "" - "Package %s not installed, cannot update it. Run yum install to install it " - "instead." - msgstr "" --"Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Należy wykonać " -+"Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Proszę wykonać " - "polecenie yum install, aby go zainstalować." - --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 -+#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606 - #, python-format - msgid "Excluding %s" - msgstr "Wykluczanie %s" - --#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3465 - #, python-format - msgid "Marking %s to be installed" - msgstr "Oznaczanie %s do zainstalowania" - --#: ../yum/__init__.py:3310 -+#: ../yum/__init__.py:3471 - #, python-format - msgid "Marking %s as an update to %s" - msgstr "Oznaczanie %s jako aktualizacji %s" - --#: ../yum/__init__.py:3317 -+#: ../yum/__init__.py:3478 - #, python-format - msgid "%s: does not update installed package." - msgstr "%s: nie aktualizuj zainstalowanego pakietu." - --#: ../yum/__init__.py:3379 -+#: ../yum/__init__.py:3511 ../yum/__init__.py:3595 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "Nie można otworzyć pliku: %s. Pomijanie." -+ -+#: ../yum/__init__.py:3541 - msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Podczas ponownego instalowania wystąpił problem: brak pasujących pakietów do " - "usunięcia" - --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 -+#: ../yum/__init__.py:3554 ../yum/__init__.py:3686 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "Pakiet %s może być wielokrotnie instalowany, pomijanie" - --#: ../yum/__init__.py:3413 -+#: ../yum/__init__.py:3575 - #, python-format - msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Podczas ponownego instalowania wystąpił problem: brak pakietu %s pasującego " - "do zainstalowania" - --#: ../yum/__init__.py:3515 -+#: ../yum/__init__.py:3678 - msgid "No package(s) available to downgrade" --msgstr "Brak pakietów dostępnych do instalacji starszej wersji" -+msgstr "Brak pakietów dostępnych do instalacji poprzedniej wersji" - --#: ../yum/__init__.py:3559 -+#: ../yum/__init__.py:3731 - #, python-format - msgid "No Match for available package: %s" - msgstr "Brak wyników dla dostępnych pakietów: %s" - --#: ../yum/__init__.py:3565 -+#: ../yum/__init__.py:3738 - #, python-format - msgid "Only Upgrade available on package: %s" - msgstr "Dla pakietu dostępna jest tylko aktualizacja: %s" - --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 -+#: ../yum/__init__.py:3808 ../yum/__init__.py:3845 - #, python-format - msgid "Failed to downgrade: %s" --msgstr "Zainstalowanie starszej wersji nie powiodło się: %s" -+msgstr "Zainstalowanie poprzedniej wersji nie powiodło się: %s" - --#: ../yum/__init__.py:3704 -+#: ../yum/__init__.py:3877 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "Pobieranie klucza GPG z %s" - --#: ../yum/__init__.py:3724 -+#: ../yum/__init__.py:3897 - msgid "GPG key retrieval failed: " - msgstr "Pobranie klucza GPG nie powiodło się: " - --#: ../yum/__init__.py:3735 -+#: ../yum/__init__.py:3903 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "Nieprawidłowy klucz GPG z %s: %s" -+ -+#: ../yum/__init__.py:3912 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "" - "Przetworzenie klucza GPG nie powiodło się: klucz nie posiada wartości %s" - --#: ../yum/__init__.py:3767 -+#: ../yum/__init__.py:3944 - #, python-format - msgid "GPG key at %s (0x%s) is already installed" - msgstr "Klucz GPG %s (0x%s) jest już zainstalowany" - - #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 -+#: ../yum/__init__.py:3949 ../yum/__init__.py:4011 - #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "Importowanie klucza GPG 0x%s \"%s\" z %s" - --#: ../yum/__init__.py:3789 -+#: ../yum/__init__.py:3966 - msgid "Not installing key" - msgstr "Klucz nie zostanie zainstalowany" - --#: ../yum/__init__.py:3795 -+#: ../yum/__init__.py:3972 - #, python-format - msgid "Key import failed (code %d)" - msgstr "Zaimportowanie klucza nie powiodło się (kod %d)" - --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 -+#: ../yum/__init__.py:3973 ../yum/__init__.py:4032 - msgid "Key imported successfully" - msgstr "Klucz został pomyślnie zaimportowany" - --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 -+#: ../yum/__init__.py:3978 ../yum/__init__.py:4037 - #, python-format - msgid "" - "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2417,41 +2589,46 @@ msgstr "" - "Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne " - "adresy URL do kluczy." - --#: ../yum/__init__.py:3810 -+#: ../yum/__init__.py:3987 - msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "Zaimportowanie kluczy nie pomogło, błędne klucze?" - --#: ../yum/__init__.py:3829 -+#: ../yum/__init__.py:4006 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "Klucz GPG %s (0x%s) został już zaimportowany" - --#: ../yum/__init__.py:3849 -+#: ../yum/__init__.py:4026 - #, python-format - msgid "Not installing key for repo %s" - msgstr "Klucz dla repozytorium %s nie zostanie zainstalowany" - --#: ../yum/__init__.py:3854 -+#: ../yum/__init__.py:4031 - msgid "Key import failed" - msgstr "Zaimportowanie klucza nie powiodło się" - --#: ../yum/__init__.py:3976 -+#: ../yum/__init__.py:4157 - msgid "Unable to find a suitable mirror." - msgstr "Nie można odnaleźć odpowiedniego serwera lustrzanego." - --#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4159 - msgid "Errors were encountered while downloading packages." - msgstr "Wystąpiły błędy podczas pobierania pakietów." - --#: ../yum/__init__.py:4028 -+#: ../yum/__init__.py:4209 - #, python-format - msgid "Please report this error at %s" - msgstr "Proszę zgłosić ten błąd na %s" - --#: ../yum/__init__.py:4052 -+#: ../yum/__init__.py:4233 - msgid "Test Transaction Errors: " - msgstr "Błędy testu transakcji: " - -+#: ../yum/__init__.py:4334 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "Nie można ustawić katalogu pamięci podręcznej: %s " -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " -@@ -2512,7 +2689,20 @@ msgstr "Nie można odnaleźć pliku konfiguracji dla wtyczki %s" - msgid "registration of commands not supported" - msgstr "rejestracja poleceń nie jest obsługiwana" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "posiada brakujące wymagania" -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "posiada zainstalowane konflikty" -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "%s jest duplikatem %s" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" - msgstr "Ponowne tworzenie pakietu" - -diff --git a/po/yum.pot b/po/yum.pot -index eaeb80c..f9a1d35 100644 ---- a/po/yum.pot -+++ b/po/yum.pot -@@ -8,7 +8,7 @@ msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" -+"POT-Creation-Date: 2010-02-11 10:54-0500\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -16,33 +16,34 @@ msgstr "" - "Content-Type: text/plain; charset=CHARSET\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 ../yum/rpmtrans.py:73 - msgid "Erasing" - msgstr "" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 -+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 - msgid "Updated" - msgstr "" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 ../output.py:1438 - msgid "Erased" - msgstr "" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 -+#: ../output.py:1434 ../output.py:1646 - msgid "Installed" - msgstr "" - -@@ -64,314 +65,324 @@ msgstr "" - msgid "Erased: %s" - msgstr "" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 ../output.py:948 ../output.py:1648 - msgid "Removing" - msgstr "" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr "" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" - msgstr "" - --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" - msgstr "" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" - msgstr "" - --#: ../cli.py:309 -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "" -+ -+#: ../cli.py:314 - msgid "Disk Requirements:\n" - msgstr "" - --#: ../cli.py:311 -+#: ../cli.py:316 - #, python-format --msgid " At least %dMB needed on the %s filesystem.\n" -+msgid " At least %dMB more space needed on the %s filesystem.\n" - msgstr "" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" - msgstr "" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" - msgstr "" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 ../yum/__init__.py:4195 - msgid "Running rpm_check_debug" - msgstr "" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 ../yum/__init__.py:4204 - msgid "ERROR You need to update rpm to handle:" - msgstr "" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 ../yum/__init__.py:4207 - msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" - msgstr "" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" - msgstr "" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." - msgstr "" - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 ../cli.py:578 - msgid " * Maybe you meant: " - msgstr "" - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." - msgstr "" - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 ../cli.py:607 ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "" - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 ../cli.py:748 - msgid "Package(s) to install" - msgstr "" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "" - --#: ../cli.py:683 -+#: ../cli.py:692 - msgid "Package(s) to downgrade" - msgstr "" - --#: ../cli.py:707 -+#: ../cli.py:717 - #, python-format - msgid " (from %s)" - msgstr "" - --#: ../cli.py:709 -+#: ../cli.py:719 - #, python-format - msgid "Installed package %s%s%s%s not available." - msgstr "" - --#: ../cli.py:716 -+#: ../cli.py:726 - msgid "Package(s) to reinstall" - msgstr "" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" - msgstr "" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" - msgstr "" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" - " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" - msgstr "" - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" - msgstr "" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" - msgstr "" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" - msgstr "" - --#: ../cli.py:912 -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" - msgstr "" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "" - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" - msgstr "" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 ../yum/__init__.py:2800 - #, python-format - msgid "No group named %s exists" - msgstr "" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" - msgstr "" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" - msgstr "" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" - msgstr "" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" - msgstr "" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" - msgstr "" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" - msgstr "" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -379,106 +390,114 @@ msgid "" - "%s: %s option requires an argument" - msgstr "" - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" - msgstr "" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" - msgstr "" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" - msgstr "" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" - msgstr "" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" - msgstr "" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" - msgstr "" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" - msgstr "" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" - msgstr "" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" - msgstr "" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" - msgstr "" - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" - msgstr "" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" - msgstr "" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" - msgstr "" - -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "" -+ - #: ../output.py:305 - msgid "Jan" - msgstr "" -@@ -531,253 +550,255 @@ msgstr "" - msgid "Trying other mirror." - msgstr "" - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" - msgstr "" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" - msgstr "" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "" - --#: ../output.py:547 -+#: ../output.py:543 - #, python-format - msgid "From repo : %s" - msgstr "" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "" - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "" - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "" - --#: ../output.py:557 --#, python-format --msgid "License : %s" -+#: ../output.py:553 -+msgid "License : " - msgstr "" - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "" - --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " - msgstr "" - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" - "Group: %s" - msgstr "" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr "" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr "" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr "" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr "" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" - msgstr "" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr "" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr "" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr "" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr "" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " - msgstr "" - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" - msgstr "" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "" - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" - msgstr "" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "" - --#: ../output.py:942 -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "" -+ -+#: ../output.py:949 - msgid "Reinstalling" - msgstr "" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" - msgstr "" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" - msgstr "" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" - msgstr "" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 ../output.py:1072 - msgid "Skipped (dependency problems)" - msgstr "" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" - msgstr "" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" - msgstr "" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" - msgstr "" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" - msgstr "" - --#: ../output.py:978 -+#: ../output.py:985 - msgid "Size" - msgstr "" - --#: ../output.py:990 -+#: ../output.py:997 - #, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" -+msgid " replacing %s%s%s.%s %s\n" - msgstr "" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" -@@ -785,14 +806,14 @@ msgid "" - "%s\n" - msgstr "" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" - "Upgrade %5.5s Package(s)\n" - msgstr "" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" -@@ -800,32 +821,32 @@ msgid "" - "Downgrade %5.5s Package(s)\n" - msgstr "" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" - msgstr "" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" - msgstr "" - -@@ -833,7 +854,7 @@ msgstr "" - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 -+#: ../output.py:1151 - #, python-format - msgid "" - "\n" -@@ -842,221 +863,374 @@ msgid "" - "to exit.\n" - msgstr "" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "" - -+#: ../output.py:1202 -+msgid "I" -+msgstr "" -+ - #: ../output.py:1203 --msgid "" -+msgid "O" - msgstr "" - - #: ../output.py:1204 -+msgid "E" -+msgstr "" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "" -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "" -+ -+#: ../output.py:1217 -+msgid "" -+msgstr "" -+ -+#: ../output.py:1218 - msgid "System" - msgstr "" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" - msgstr "" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." -+#: ../output.py:1266 -+msgid "ID" -+msgstr "" -+ -+#: ../output.py:1267 ../output.py:1520 -+msgid "Login user" - msgstr "" - --#: ../output.py:1289 -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "" -+ -+#: ../output.py:1269 ../output.py:1522 -+msgid "Action(s)" -+msgstr "" -+ -+#: ../output.py:1270 ../output.py:1523 -+msgid "Altered" -+msgstr "" -+ -+#: ../output.py:1310 - msgid "No transaction ID given" - msgstr "" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" - msgstr "" - --#: ../output.py:1302 -+#: ../output.py:1341 - msgid "Not found given transaction ID" - msgstr "" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" - msgstr "" - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" - msgstr "" - --#: ../output.py:1357 -+#: ../output.py:1396 - msgid "Transaction ID :" - msgstr "" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" - msgstr "" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 ../output.py:1403 - msgid "Begin rpmdb :" - msgstr "" - --#: ../output.py:1378 -+#: ../output.py:1417 - #, python-format - msgid "(%s seconds)" - msgstr "" - --#: ../output.py:1379 -+#: ../output.py:1418 - msgid "End time :" - msgstr "" - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 ../output.py:1423 - msgid "End rpmdb :" - msgstr "" - --#: ../output.py:1385 -+#: ../output.py:1424 - msgid "User :" - msgstr "" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 -+#: ../output.py:1426 ../output.py:1428 ../output.py:1430 - msgid "Return-Code :" - msgstr "" - --#: ../output.py:1387 -+#: ../output.py:1426 - msgid "Aborted" - msgstr "" - --#: ../output.py:1389 -+#: ../output.py:1428 - msgid "Failure:" - msgstr "" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" - msgstr "" - --#: ../output.py:1392 -+#: ../output.py:1431 - msgid "Transaction performed with:" - msgstr "" - --#: ../output.py:1405 -+#: ../output.py:1444 ../output.py:1489 - msgid "Downgraded" - msgstr "" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" - msgstr "" - --#: ../output.py:1409 -+#: ../output.py:1448 - msgid "Packages Altered:" - msgstr "" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" - msgstr "" - --#: ../output.py:1418 -+#: ../output.py:1457 - msgid "Errors:" - msgstr "" - --#: ../output.py:1489 --msgid "Last day" -+#: ../output.py:1481 ../output.py:1482 -+msgid "Install" -+msgstr "" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "" -+ -+#: ../output.py:1488 -+msgid "Downgrade" - msgstr "" - - #: ../output.py:1490 -+msgid "Update" -+msgstr "" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "" -+ -+#: ../output.py:1547 -+msgid "Last day" -+msgstr "" -+ -+#: ../output.py:1548 - msgid "Last week" - msgstr "" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" - msgstr "" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" - msgstr "" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" - msgstr "" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" - msgstr "" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" - msgstr "" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" - msgstr "" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." - msgstr "" - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" - msgstr "" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" - msgstr "" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" - msgstr "" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+ -+#: ../output.py:1649 ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "" -+ -+#: ../output.py:1665 ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." - msgstr "" - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:93 -+msgid "Running" -+msgstr "" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "" -+ -+#: ../utils.py:98 ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr "" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr "" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr "" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr "" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr "" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "" -+ -+#: ../utils.py:235 ../yummain.py:42 - msgid "" - "\n" - "\n" - "Exiting on user cancel" - msgstr "" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 ../yummain.py:48 - msgid "" - "\n" - "\n" - "Exiting on Broken Pipe" - msgstr "" - --#: ../utils.py:145 ../yummain.py:50 -+#: ../utils.py:243 ../yummain.py:50 - #, python-format - msgid "" - "\n" -@@ -1064,15 +1238,15 @@ msgid "" - "%s" - msgstr "" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 ../yummain.py:211 - msgid "Complete!" - msgstr "" - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." - msgstr "" - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1090,487 +1264,444 @@ msgid "" - "For more information contact your distribution or package provider.\n" - msgstr "" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" - msgstr "" - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" - msgstr "" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" - msgstr "" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "" - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "" - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "" - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" - msgstr "" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" - msgstr "" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" - msgstr "" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" - msgstr "" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "" - --#: ../yumcommands.py:361 -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" - msgstr "" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" - msgstr "" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" - msgstr "" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" - msgstr "" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" - msgstr "" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" - msgstr "" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "" - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" - msgstr "" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" - msgstr "" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" - msgstr "" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "" - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" - msgstr "" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" - msgstr "" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" - msgstr "" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" - msgstr "" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" - msgstr "" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" - msgstr "" - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" - msgstr "" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "" - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 ../yumcommands.py:823 - msgid "enabled" - msgstr "" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 ../yumcommands.py:850 - msgid "disabled" - msgstr "" - --#: ../yumcommands.py:834 -+#: ../yumcommands.py:866 - msgid "Repo-id : " - msgstr "" - --#: ../yumcommands.py:835 -+#: ../yumcommands.py:867 - msgid "Repo-name : " - msgstr "" - --#: ../yumcommands.py:836 -+#: ../yumcommands.py:870 - msgid "Repo-status : " - msgstr "" - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "" - --#: ../yumcommands.py:842 -+#: ../yumcommands.py:877 - msgid "Repo-tags : " - msgstr "" - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "" - --#: ../yumcommands.py:853 -+#: ../yumcommands.py:888 - msgid "Repo-updated : " - msgstr "" - --#: ../yumcommands.py:855 -+#: ../yumcommands.py:890 - msgid "Repo-pkgs : " - msgstr "" - --#: ../yumcommands.py:856 -+#: ../yumcommands.py:891 - msgid "Repo-size : " - msgstr "" - --#: ../yumcommands.py:863 -+#: ../yumcommands.py:898 - msgid "Repo-baseurl : " - msgstr "" - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " - msgstr "" - --#: ../yumcommands.py:875 -+#: ../yumcommands.py:910 - msgid " Updated : " - msgstr "" - --#: ../yumcommands.py:878 -+#: ../yumcommands.py:913 - msgid "Repo-mirrors : " - msgstr "" - --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "" -- --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" - msgstr "" - --#: ../yumcommands.py:890 -+#: ../yumcommands.py:925 - #, python-format - msgid "Instant (last: %s)" - msgstr "" - --#: ../yumcommands.py:893 -+#: ../yumcommands.py:928 - #, python-format - msgid "%s second(s) (last: %s)" - msgstr "" - --#: ../yumcommands.py:895 -+#: ../yumcommands.py:930 - msgid "Repo-expire : " - msgstr "" - --#: ../yumcommands.py:898 -+#: ../yumcommands.py:933 - msgid "Repo-exclude : " - msgstr "" - --#: ../yumcommands.py:902 -+#: ../yumcommands.py:937 - msgid "Repo-include : " - msgstr "" - -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "" -+ - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 ../yumcommands.py:980 - msgid "repo id" - msgstr "" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 - msgid "status" - msgstr "" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" - msgstr "" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" - "aliases: " - msgstr "" - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" - "alias: " - msgstr "" - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" - msgstr "" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" - msgstr "" - --#: ../yumcommands.py:1060 -+#: ../yumcommands.py:1113 - msgid "Setting up Downgrade Process" - msgstr "" - --#: ../yumcommands.py:1067 -+#: ../yumcommands.py:1120 - msgid "downgrade a package" - msgstr "" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." - msgstr "" - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" - msgstr "" - --#: ../yumcommands.py:1121 -+#: ../yumcommands.py:1183 - msgid " Group :" - msgstr "" - --#: ../yumcommands.py:1122 -+#: ../yumcommands.py:1184 - msgid " Packages:" - msgstr "" - --#: ../yumcommands.py:1152 -+#: ../yumcommands.py:1213 - msgid "Installed:" - msgstr "" - --#: ../yumcommands.py:1157 -+#: ../yumcommands.py:1218 - msgid "Group-Installed:" - msgstr "" - --#: ../yumcommands.py:1166 -+#: ../yumcommands.py:1227 - msgid "Available:" - msgstr "" - --#: ../yumcommands.py:1172 -+#: ../yumcommands.py:1233 - msgid "Group-Available:" - msgstr "" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" - msgstr "" - --#: ../yumcommands.py:1239 -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." - msgstr "" - --#: ../yummain.py:128 --msgid "Running" --msgstr "" -- --#: ../yummain.py:129 --msgid "Sleeping" --msgstr "" -- --#: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "" -- --#: ../yummain.py:131 --msgid "Zombie" -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" - msgstr "" - --#: ../yummain.py:132 --msgid "Traced/Stopped" --msgstr "" -- --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr "" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr "" -- --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr "" -- --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr "" -- --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr "" -- --#: ../yummain.py:173 -+#: ../yummain.py:102 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:130 ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" - msgstr "" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" - msgstr "" - --#: ../yummain.py:243 --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+#: ../yummain.py:175 ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" - msgstr "" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" - msgstr "" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1605,362 +1736,390 @@ msgstr "" - msgid "Matched %s to require for %s" - msgstr "" - --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:225 - #, python-format - msgid "Member: %s" - msgstr "" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 - #, python-format - msgid "%s converted to install" - msgstr "" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:246 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:256 - #, python-format - msgid "Removing Package %s" - msgstr "" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:278 - #, python-format - msgid "%s requires: %s" - msgstr "" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:319 -+#, python-format -+msgid "%s requires %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:346 - msgid "Needed Require has already been looked up, cheating" - msgstr "" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:356 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" - msgstr "" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Potential Provider: %s" - msgstr "" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:386 - #, python-format - msgid "Mode is %s for provider of %s: %s" - msgstr "" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:390 - #, python-format - msgid "Mode for pkg providing %s: %s" - msgstr "" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:394 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:407 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:410 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "" - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:418 - #, python-format - msgid "Cannot find an update path for dep for: %s" - msgstr "" - --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "" -- --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:449 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:491 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:507 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." - msgstr "" - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:518 - #, python-format - msgid "Potential resolving package %s has newer instance installed." - msgstr "" - --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "" -- --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:536 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:578 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:586 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 - msgid "Success - empty transaction" - msgstr "" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 - msgid "Restarting Loop" - msgstr "" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:760 - msgid "Dependency Process ending" - msgstr "" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:774 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:782 - msgid "Success - deps resolved" - msgstr "" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:796 - #, python-format - msgid "Checking deps for %s" - msgstr "" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:874 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1090 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 - #, python-format - msgid "better arch in po %s" - msgstr "" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1218 - #, python-format - msgid "%s obsoletes %s" - msgstr "" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1230 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" - " Winner: %s" - msgstr "" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1237 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1241 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:1247 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1256 - #, python-format - msgid "Best Order: %s" - msgstr "" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" - msgstr "" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" - msgstr "" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "" -+ -+#: ../yum/__init__.py:740 -+#, python-format -+msgid "Adding tags from repository: %s" -+msgstr "" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" - msgstr "" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." - msgstr "" - --#: ../yum/__init__.py:785 -+#: ../yum/__init__.py:849 - msgid "" - "There are unfinished transactions remaining. You might consider running yum-" - "complete-transaction first to finish them." - msgstr "" - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "" - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" - msgstr "" - --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr "" - --#: ../yum/__init__.py:1083 -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "" -+ -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "" -+ -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "" -+ -+#: ../yum/__init__.py:1180 - msgid "" - "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" - msgstr "" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" - msgstr "" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 - #, python-format - msgid "%s was supposed to be removed but is not!" - msgstr "" - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 - #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "" - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 -+#: ../yum/__init__.py:1425 - #, python-format - msgid "Could not create lock at %s: %s " - msgstr "" - --#: ../yum/__init__.py:1373 --msgid "Package does not match intended download" -+#: ../yum/__init__.py:1470 -+msgid "" -+"Package does not match intended download. Suggestion: run yum clean metadata" - msgstr "" - --#: ../yum/__init__.py:1388 -+#: ../yum/__init__.py:1486 - msgid "Could not perform checksum" - msgstr "" - --#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1489 - msgid "Package does not match checksum" - msgstr "" - --#: ../yum/__init__.py:1433 -+#: ../yum/__init__.py:1531 - #, python-format - msgid "package fails checksum but caching is enabled for %s" - msgstr "" - --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 -+#: ../yum/__init__.py:1534 ../yum/__init__.py:1563 - #, python-format - msgid "using local copy of %s" - msgstr "" - --#: ../yum/__init__.py:1477 -+#: ../yum/__init__.py:1575 - #, python-format - msgid "" - "Insufficient space in download directory %s\n" -@@ -1968,347 +2127,357 @@ msgid "" - " * needed %s" - msgstr "" - --#: ../yum/__init__.py:1526 -+#: ../yum/__init__.py:1624 - msgid "Header is not complete." - msgstr "" - --#: ../yum/__init__.py:1563 -+#: ../yum/__init__.py:1661 - #, python-format - msgid "" - "Header not in local cache and caching-only mode enabled. Cannot download %s" - msgstr "" - --#: ../yum/__init__.py:1618 -+#: ../yum/__init__.py:1716 - #, python-format - msgid "Public key for %s is not installed" - msgstr "" - --#: ../yum/__init__.py:1622 -+#: ../yum/__init__.py:1720 - #, python-format - msgid "Problem opening package %s" - msgstr "" - --#: ../yum/__init__.py:1630 -+#: ../yum/__init__.py:1728 - #, python-format - msgid "Public key for %s is not trusted" - msgstr "" - --#: ../yum/__init__.py:1634 -+#: ../yum/__init__.py:1732 - #, python-format - msgid "Package %s is not signed" - msgstr "" - --#: ../yum/__init__.py:1672 -+#: ../yum/__init__.py:1770 - #, python-format - msgid "Cannot remove %s" - msgstr "" - --#: ../yum/__init__.py:1676 -+#: ../yum/__init__.py:1774 - #, python-format - msgid "%s removed" - msgstr "" - --#: ../yum/__init__.py:1712 -+#: ../yum/__init__.py:1820 - #, python-format - msgid "Cannot remove %s file %s" - msgstr "" - --#: ../yum/__init__.py:1716 -+#: ../yum/__init__.py:1824 - #, python-format - msgid "%s file %s removed" - msgstr "" - --#: ../yum/__init__.py:1718 -+#: ../yum/__init__.py:1826 - #, python-format - msgid "%d %s files removed" - msgstr "" - --#: ../yum/__init__.py:1787 -+#: ../yum/__init__.py:1895 - #, python-format - msgid "More than one identical match in sack for %s" - msgstr "" - --#: ../yum/__init__.py:1793 -+#: ../yum/__init__.py:1901 - #, python-format - msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "" - --#: ../yum/__init__.py:2026 -+#: ../yum/__init__.py:2180 - msgid "" - "searchPackages() will go away in a future version of " - "Yum. Use searchGenerator() instead. \n" - msgstr "" - --#: ../yum/__init__.py:2065 -+#: ../yum/__init__.py:2219 - #, python-format - msgid "Searching %d packages" - msgstr "" - --#: ../yum/__init__.py:2069 -+#: ../yum/__init__.py:2223 - #, python-format - msgid "searching package %s" - msgstr "" - --#: ../yum/__init__.py:2081 -+#: ../yum/__init__.py:2235 - msgid "searching in file entries" - msgstr "" - --#: ../yum/__init__.py:2088 -+#: ../yum/__init__.py:2242 - msgid "searching in provides entries" - msgstr "" - --#: ../yum/__init__.py:2121 -+#: ../yum/__init__.py:2275 - #, python-format - msgid "Provides-match: %s" - msgstr "" - --#: ../yum/__init__.py:2170 -+#: ../yum/__init__.py:2324 - msgid "No group data available for configured repositories" - msgstr "" - --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 -+#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405 -+#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497 -+#: ../yum/__init__.py:2814 - #, python-format - msgid "No Group named %s exists" - msgstr "" - --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 -+#: ../yum/__init__.py:2386 ../yum/__init__.py:2513 - #, python-format - msgid "package %s was not marked in group %s" - msgstr "" - --#: ../yum/__init__.py:2279 -+#: ../yum/__init__.py:2433 - #, python-format - msgid "Adding package %s from group %s" - msgstr "" - --#: ../yum/__init__.py:2283 -+#: ../yum/__init__.py:2437 - #, python-format - msgid "No package named %s available to be installed" - msgstr "" - --#: ../yum/__init__.py:2380 -+#: ../yum/__init__.py:2539 - #, python-format - msgid "Package tuple %s could not be found in packagesack" - msgstr "" - --#: ../yum/__init__.py:2399 -+#: ../yum/__init__.py:2558 - #, python-format - msgid "Package tuple %s could not be found in rpmdb" - msgstr "" - --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 -+#: ../yum/__init__.py:2614 ../yum/__init__.py:2664 - msgid "Invalid version flag" - msgstr "" - --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2634 ../yum/__init__.py:2639 - #, python-format - msgid "No Package found for %s" - msgstr "" - --#: ../yum/__init__.py:2696 -+#: ../yum/__init__.py:2855 - msgid "Package Object was not a package object instance" - msgstr "" - --#: ../yum/__init__.py:2700 -+#: ../yum/__init__.py:2859 - msgid "Nothing specified to install" - msgstr "" - --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 -+#: ../yum/__init__.py:2875 ../yum/__init__.py:3652 - #, python-format - msgid "Checking for virtual provide or file-provide for %s" - msgstr "" - --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 -+#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365 -+#: ../yum/__init__.py:3658 - #, python-format - msgid "No Match for argument: %s" - msgstr "" - --#: ../yum/__init__.py:2798 -+#: ../yum/__init__.py:2957 - #, python-format - msgid "Package %s installed and not available" - msgstr "" - --#: ../yum/__init__.py:2801 -+#: ../yum/__init__.py:2960 - msgid "No package(s) available to install" - msgstr "" - --#: ../yum/__init__.py:2813 -+#: ../yum/__init__.py:2972 - #, python-format - msgid "Package: %s - already in transaction set" - msgstr "" - --#: ../yum/__init__.py:2839 -+#: ../yum/__init__.py:2998 - #, python-format - msgid "Package %s is obsoleted by %s which is already installed" - msgstr "" - --#: ../yum/__init__.py:2842 -+#: ../yum/__init__.py:3001 - #, python-format - msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - --#: ../yum/__init__.py:2850 -+#: ../yum/__init__.py:3009 - #, python-format - msgid "Package %s already installed and latest version" - msgstr "" - --#: ../yum/__init__.py:2864 -+#: ../yum/__init__.py:3023 - #, python-format - msgid "Package matching %s already installed. Checking for update." - msgstr "" - - #. update everything (the easy case) --#: ../yum/__init__.py:2966 -+#: ../yum/__init__.py:3126 - msgid "Updating Everything" - msgstr "" - --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 -+#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289 -+#: ../yum/__init__.py:3315 - #, python-format - msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "" - --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 -+#: ../yum/__init__.py:3182 ../yum/__init__.py:3362 - #, python-format - msgid "%s" - msgstr "" - --#: ../yum/__init__.py:3093 -+#: ../yum/__init__.py:3253 - #, python-format - msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "" - --#: ../yum/__init__.py:3124 -+#: ../yum/__init__.py:3284 - #, python-format - msgid "Not Updating Package that is obsoleted: %s" - msgstr "" - --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 -+#: ../yum/__init__.py:3293 ../yum/__init__.py:3319 - #, python-format - msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "" - --#: ../yum/__init__.py:3218 -+#: ../yum/__init__.py:3378 - msgid "No package matched to remove" - msgstr "" - --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 -+#: ../yum/__init__.py:3412 - #, python-format --msgid "Cannot open file: %s. Skipping." -+msgid "Cannot open: %s. Skipping." - msgstr "" - --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 -+#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598 - #, python-format - msgid "Examining %s: %s" - msgstr "" - --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 -+#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601 - #, python-format - msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - --#: ../yum/__init__.py:3270 -+#: ../yum/__init__.py:3431 - #, python-format - msgid "" - "Package %s not installed, cannot update it. Run yum install to install it " - "instead." - msgstr "" - --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 -+#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606 - #, python-format - msgid "Excluding %s" - msgstr "" - --#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3465 - #, python-format - msgid "Marking %s to be installed" - msgstr "" - --#: ../yum/__init__.py:3310 -+#: ../yum/__init__.py:3471 - #, python-format - msgid "Marking %s as an update to %s" - msgstr "" - --#: ../yum/__init__.py:3317 -+#: ../yum/__init__.py:3478 - #, python-format - msgid "%s: does not update installed package." - msgstr "" - --#: ../yum/__init__.py:3379 -+#: ../yum/__init__.py:3511 ../yum/__init__.py:3595 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "" -+ -+#: ../yum/__init__.py:3541 - msgid "Problem in reinstall: no package matched to remove" - msgstr "" - --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 -+#: ../yum/__init__.py:3554 ../yum/__init__.py:3686 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "" - --#: ../yum/__init__.py:3413 -+#: ../yum/__init__.py:3575 - #, python-format - msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - --#: ../yum/__init__.py:3515 -+#: ../yum/__init__.py:3678 - msgid "No package(s) available to downgrade" - msgstr "" - --#: ../yum/__init__.py:3559 -+#: ../yum/__init__.py:3731 - #, python-format - msgid "No Match for available package: %s" - msgstr "" - --#: ../yum/__init__.py:3565 -+#: ../yum/__init__.py:3738 - #, python-format - msgid "Only Upgrade available on package: %s" - msgstr "" - --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 -+#: ../yum/__init__.py:3808 ../yum/__init__.py:3845 - #, python-format - msgid "Failed to downgrade: %s" - msgstr "" - --#: ../yum/__init__.py:3704 -+#: ../yum/__init__.py:3877 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "" - --#: ../yum/__init__.py:3724 -+#: ../yum/__init__.py:3897 - msgid "GPG key retrieval failed: " - msgstr "" - --#: ../yum/__init__.py:3735 -+#: ../yum/__init__.py:3903 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "" -+ -+#: ../yum/__init__.py:3912 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "" - --#: ../yum/__init__.py:3767 -+#: ../yum/__init__.py:3944 - #, python-format - msgid "GPG key at %s (0x%s) is already installed" - msgstr "" - - #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 -+#: ../yum/__init__.py:3949 ../yum/__init__.py:4011 - #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "" - --#: ../yum/__init__.py:3789 -+#: ../yum/__init__.py:3966 - msgid "Not installing key" - msgstr "" - --#: ../yum/__init__.py:3795 -+#: ../yum/__init__.py:3972 - #, python-format - msgid "Key import failed (code %d)" - msgstr "" - --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 -+#: ../yum/__init__.py:3973 ../yum/__init__.py:4032 - msgid "Key imported successfully" - msgstr "" - --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 -+#: ../yum/__init__.py:3978 ../yum/__init__.py:4037 - #, python-format - msgid "" - "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2316,41 +2485,46 @@ msgid "" - "Check that the correct key URLs are configured for this repository." - msgstr "" - --#: ../yum/__init__.py:3810 -+#: ../yum/__init__.py:3987 - msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "" - --#: ../yum/__init__.py:3829 -+#: ../yum/__init__.py:4006 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "" - --#: ../yum/__init__.py:3849 -+#: ../yum/__init__.py:4026 - #, python-format - msgid "Not installing key for repo %s" - msgstr "" - --#: ../yum/__init__.py:3854 -+#: ../yum/__init__.py:4031 - msgid "Key import failed" - msgstr "" - --#: ../yum/__init__.py:3976 -+#: ../yum/__init__.py:4157 - msgid "Unable to find a suitable mirror." - msgstr "" - --#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4159 - msgid "Errors were encountered while downloading packages." - msgstr "" - --#: ../yum/__init__.py:4028 -+#: ../yum/__init__.py:4209 - #, python-format - msgid "Please report this error at %s" - msgstr "" - --#: ../yum/__init__.py:4052 -+#: ../yum/__init__.py:4233 - msgid "Test Transaction Errors: " - msgstr "" - -+#: ../yum/__init__.py:4334 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "" -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " -@@ -2409,7 +2583,20 @@ msgstr "" - msgid "registration of commands not supported" - msgstr "" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "" -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "" -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" - msgstr "" - -diff --git a/utils.py b/utils.py -index 2b0f655..dd6b642 100644 ---- a/utils.py -+++ b/utils.py -@@ -92,7 +92,7 @@ def get_process_info(pid): - ps['start_time'] = boot_time + jiffies_to_seconds(ps_stat[21]) - ps['state'] = {'R' : _('Running'), - 'S' : _('Sleeping'), -- 'D' : _('Uninteruptable'), -+ 'D' : _('Uninterruptible'), - 'Z' : _('Zombie'), - 'T' : _('Traced/Stopped') - }.get(ps_stat[2], _('Unknown')) +diff --git a/docs/yum.conf.5 b/docs/yum.conf.5 +index 49d98c6..25b2c7d 100644 +--- a/docs/yum.conf.5 ++++ b/docs/yum.conf.5 +@@ -134,9 +134,13 @@ an i686 package to update an i386 package. Default is `1'. + + .IP + \fBinstallonlypkgs \fR +-List of packages that should only ever be installed, never updated. Kernels +-in particular fall into this category. Defaults to kernel, kernel-smp, +-kernel-bigmem, kernel-enterprise, kernel-debug, kernel-unsupported. ++List of package provides that should only ever be installed, never updated. ++Kernels in particular fall into this category. Defaults to kernel, ++kernel-bigmem, kernel-enterprise, kernel-smp, kernel-modules, kernel-debug, ++kernel-unsupported, kernel-source, kernel-devel, kernel-PAE, kernel-PAE-debug. ++ ++Note that because these are provides, and not just package names, kernel-devel ++will also apply to kernel-debug-devel, etc. + + .IP + \fBinstallonly_limit \fR diff --git a/yum/__init__.py b/yum/__init__.py -index d0bd4cc..06f6156 100644 +index 2ea9f20..0304fea 100644 --- a/yum/__init__.py +++ b/yum/__init__.py -@@ -1467,7 +1467,8 @@ class YumBase(depsolve.Depsolve): - os.unlink(fo) +@@ -294,6 +294,11 @@ class YumBase(depsolve.Depsolve): + startupconf.syslog_facility = syslog_facility + if syslog_device != None: + startupconf.syslog_device = syslog_device ++ if releasever == '/': ++ if startupconf.installroot == '/': ++ releasever = None ++ else: ++ releasever = yum.config._getsysver("/",startupconf.distroverpkg) + if releasever != None: + startupconf.releasever = releasever - if raiseError: -- raise URLGrabError(-1, _('Package does not match intended download')) -+ msg = _('Package does not match intended download. Suggestion: run yum clean metadata') -+ raise URLGrabError(-1, msg) - else: - return False +@@ -442,7 +447,11 @@ class YumBase(depsolve.Depsolve): + @return: YumRepository instance. + ''' + repo = yumRepo.YumRepository(section) +- repo.populate(parser, section, self.conf) ++ try: ++ repo.populate(parser, section, self.conf) ++ except ValueError, e: ++ msg = _('Repository %r: Error parsing config: %s' % (section,e)) ++ raise Errors.ConfigError, msg -@@ -2591,30 +2592,7 @@ class YumBase(depsolve.Depsolve): - """Pass in a generic [build]require string and this function will - pass back the packages it finds providing that dep.""" - -- results = [] -- # parse the string out -- # either it is 'dep (some operator) e:v-r' -- # or /file/dep -- # or packagename -- # or a full dep tuple -- if type(depstring) == types.TupleType: -- (depname, depflags, depver) = depstring -- else: -- depname = depstring -- depflags = None -- depver = None -- -- if depstring[0] != '/': -- # not a file dep - look at it for being versioned -- dep_split = depstring.split() -- if len(dep_split) == 3: -- depname, flagsymbol, depver = dep_split -- if not flagsymbol in SYMBOLFLAGS: -- raise Errors.YumBaseError, _('Invalid version flag') -- depflags = SYMBOLFLAGS[flagsymbol] -- -- sack = self.whatProvides(depname, depflags, depver) -- results = sack.returnPackages() -+ results = self.pkgSack.searchProvides(depstring) - return results - - -@@ -4101,7 +4079,7 @@ class YumBase(depsolve.Depsolve): - numleft -= 1 - - for po,rel in toremove: -- txmbr = self.tsInfo.addErase(toremove) -+ txmbr = self.tsInfo.addErase(po) - # Add a dep relation to the new version of the package, causing this one to be erased - # this way skipbroken, should clean out the old one, if the new one is skipped - txmbr.depends_on.append(rel) -diff --git a/yum/depsolve.py b/yum/depsolve.py -index c1e90c5..11c9f29 100644 ---- a/yum/depsolve.py -+++ b/yum/depsolve.py -@@ -158,30 +158,7 @@ class Depsolve(object): - - self.verbose_logger.log(logginglevels.DEBUG_1, _('Searching pkgSack for dep: %s'), - name) -- pkgs = self.pkgSack.searchProvides(name) -- -- -- if flags == 0: -- flags = None -- if type(version) in (types.StringType, types.NoneType, types.UnicodeType): -- (r_e, r_v, r_r) = rpmUtils.miscutils.stringToVersion(version) -- elif type(version) in (types.TupleType, types.ListType): # would this ever be a ListType? -- (r_e, r_v, r_r) = version -- -- defSack = ListPackageSack() # holder for items definitely providing this dep -- -- for po in pkgs: -- self.verbose_logger.log(logginglevels.DEBUG_2, -- _('Potential match for %s from %s'), name, po) -- if misc.re_filename(name) and r_v is None: -- # file dep add all matches to the defSack -- defSack.addPackage(po) -- continue + # Ensure that the repo name is set + if not repo.name: +@@ -1403,7 +1412,8 @@ class YumBase(depsolve.Depsolve): + # that there is not also an install of this pkg in the tsInfo (reinstall) + # for any kind of install add from_repo to the yumdb, and the cmdline + # and the install reason - -- if po.checkPrco('provides', (name, flags, (r_e, r_v, r_r))): -- defSack.addPackage(po) -- self.verbose_logger.debug(_('Matched %s to require for %s'), po, name) -- -+ defSack = ListPackageSack(self.pkgSack.searchProvides((name, flags, version))) - return defSack - - def allowedMultipleInstalls(self, po): ++ ++ vt_st = time.time() + self.rpmdb.dropCachedData() + self.plugins.run('preverifytrans') + for txmbr in self.tsInfo: +@@ -1489,6 +1499,7 @@ class YumBase(depsolve.Depsolve): + self.plugins.run('historyend') + self.history.end(self.rpmdb.simpleVersion(main_only=True)[0], ret) + self.rpmdb.dropCachedData() ++ self.verbose_logger.debug('VerifyTransaction time: %0.3f' % (time.time() - vt_st)) + + def costExcludePackages(self): + """ Create an excluder for repos. with higher cost. Eg. +@@ -3669,6 +3680,7 @@ class YumBase(depsolve.Depsolve): + self.logger.critical(_('%s') % e) + + if not depmatches: ++ arg = to_unicode(arg) + self.logger.critical(_('No Match for argument: %s') % arg) + else: + pkgs.extend(depmatches) diff --git a/yum/history.py b/yum/history.py -index 8de7459..2707cac 100644 +index 502b908..6bc767a 100644 --- a/yum/history.py +++ b/yum/history.py -@@ -22,7 +22,7 @@ import os, os.path - import glob - from weakref import proxy as weakref - --from sqlutils import sqlite, executeSQL -+from sqlutils import sqlite, executeSQL, sql_esc, sql_esc_glob - import yum.misc as misc +@@ -27,7 +27,7 @@ import yum.misc as misc import yum.constants from yum.constants import * -@@ -56,30 +56,6 @@ _sttxt2stcode = {'Update' : TS_UPDATE, - 'Obsoleting' : TS_OBSOLETING} + from yum.packages import YumInstalledPackage, YumAvailablePackage, PackageObject +-from yum.i18n import to_unicode ++from yum.i18n import to_unicode, to_utf8 - # ---- horrible Copy and paste from sqlitesack ---- --def _sql_esc(pattern): -- """ Apply SQLite escaping, if needed. Returns pattern and esc. """ -- esc = '' -- if "_" in pattern or "%" in pattern: -- esc = ' ESCAPE "!"' -- pattern = pattern.replace("!", "!!") -- pattern = pattern.replace("%", "!%") -- pattern = pattern.replace("_", "!_") -- return (pattern, esc) -- --def _sql_esc_glob(patterns): -- """ Converts patterns to SQL LIKE format, if required (or gives up if -- not possible). """ -- ret = [] -- for pattern in patterns: -- if '[' in pattern: # LIKE only has % and _, so [abc] can't be done. -- return [] # So Load everything -- -- # Convert to SQL LIKE format -- (pattern, esc) = _sql_esc(pattern) -- pattern = pattern.replace("*", "%") -- pattern = pattern.replace("?", "_") -- ret.append((pattern, esc)) -- return ret - def _setupHistorySearchSQL(patterns=None, ignore_case=False): - """Setup need_full and patterns for _yieldSQLDataList, also see if -@@ -104,7 +80,7 @@ def _setupHistorySearchSQL(patterns=None, ignore_case=False): - if len(patterns) > pat_max: - patterns = [] - if ignore_case: -- patterns = _sql_esc_glob(patterns) -+ patterns = sql_esc_glob(patterns) - else: - tmp = [] - need_glob = False -diff --git a/yum/i18n.py b/yum/i18n.py -index 6b9eab5..9889bf6 100755 ---- a/yum/i18n.py -+++ b/yum/i18n.py -@@ -452,7 +452,16 @@ def to_str(obj): - obj = str(obj) - return obj + _history_dir = '/var/lib/yum/history' +@@ -425,12 +425,15 @@ class YumHistory: + cur = self._get_cursor() + if cur is None or not self._update_db_file_2(): + return None ++ # str(problem) doesn't work if problem contains unicode(), ++ # unicode(problem) doesn't work in python 2.4.x ... *sigh*. ++ uproblem = to_unicode(problem.__str__()) + res = executeSQL(cur, + """INSERT INTO trans_rpmdb_problems + (tid, problem, msg) + VALUES (?, ?, ?)""", (self._tid, + problem.problem, +- to_unicode(str(problem)))) ++ uproblem)) + rpid = cur.lastrowid -- -+def str_eq(a, b): -+ """ convert between unicode and not and compare them, w/o warning or being annoying""" -+ if isinstance(a, unicode) == isinstance(b, unicode): -+ if a == b: # stupid python... -+ return True -+ elif to_utf8(a) == to_utf8(b): -+ return True -+ -+ return False -+ - try: - ''' - Setup the yum translation domain and make _() and P_() translation wrappers -diff --git a/yum/misc.py b/yum/misc.py -index d63993b..66b0653 100644 ---- a/yum/misc.py -+++ b/yum/misc.py -@@ -11,6 +11,7 @@ import struct - import re - import errno - import Errors -+import constants - import pgpmsg - import tempfile - import glob -@@ -18,6 +19,7 @@ import pwd - import fnmatch - import bz2 - import gzip -+from rpmUtils.miscutils import stringToVersion, flagToString - from stat import * - try: - import gpgme -@@ -77,6 +79,8 @@ def unshare_data(): - _re_compiled_glob_match = None - def re_glob(s): - """ Tests if a string is a shell wildcard. """ -+ # TODO/FIXME maybe consider checking if it is a stringsType before going on - otherwise -+ # returning None - global _re_compiled_glob_match - if _re_compiled_glob_match is None: - _re_compiled_glob_match = re.compile('[*?]|\[.+\]').search -@@ -628,7 +632,40 @@ def prco_tuple_to_string(prcoTuple): - return name + if not rpid: +@@ -610,7 +613,7 @@ class YumHistory: + # open file in append + fo = open(data_fn, 'w+') + # write data +- fo.write(data) ++ fo.write(to_utf8(data)) + # flush data + fo.flush() + fo.close() +@@ -914,17 +917,19 @@ class YumHistory: + version || '-' || release || '.' || arch AS nevra + FROM trans_skip_pkgs JOIN pkgtups USING(pkgtupid) + ORDER BY name; +-''', # NOTE: Old versions of sqlite don't like this next view, they are only +- # there for debugging anyway ... but it's worth remembering. ++''', # NOTE: Old versions of sqlite don't like the normal way to do the next ++ # view. So we do it with the select. It's for debugging only, so ++ # no big deal. + '''\ + \ +- CREATE VIEW vtrans_prob_pkgs AS ++ CREATE VIEW vtrans_prob_pkgs2 AS + SELECT tid,rpid,name,epoch,version,release,arch,pkgtups.pkgtupid, +- main, ++ main,problem,msg, + name || '-' || epoch || ':' || + version || '-' || release || '.' || arch AS nevra +- FROM (trans_prob_pkgs JOIN trans_rpmdb_problems USING(rpid)) +- JOIN pkgtups USING(pkgtupid) ++ FROM (SELECT * FROM trans_prob_pkgs,trans_rpmdb_problems WHERE ++ trans_prob_pkgs.rpid=trans_rpmdb_problems.rpid) ++ JOIN pkgtups USING(pkgtupid) + ORDER BY name; + '''] + +diff --git a/yum/pgpmsg.py b/yum/pgpmsg.py +index 9cf8217..9f58fad 100644 +--- a/yum/pgpmsg.py ++++ b/yum/pgpmsg.py +@@ -1186,7 +1186,7 @@ def decode(msg) : + idx = idx + pkt_len + return pkt_list + +-def decode_msg(msg) : ++def decode_msg(msg, multi=False) : + """decode_msg(msg) ==> list of OpenPGP "packet" objects + Takes an ascii-armored PGP block and returns a list of objects each of which + corresponds to a PGP "packets". +@@ -1242,11 +1242,17 @@ a PGP "certificate" includes a public key, user id(s), and signature. + pkt_idx = cert.load(pkt_list) + cert_list.append(cert) + pkt_list[0:pkt_idx] = [] ++ if not multi: ++ if not cert_list: ++ return None ++ return cert_list[0] + return cert_list + + # add the data to our buffer then + block_buf.write(l) + ++ if not multi: ++ return None + return [] + + def decode_multiple_keys(msg): +diff --git a/yumcommands.py b/yumcommands.py +index a7f5d9e..9c6fc75 100644 +--- a/yumcommands.py ++++ b/yumcommands.py +@@ -122,6 +122,25 @@ def checkShellArg(base, basecmd, extcmds): + base.usage() + raise cli.CliError + ++def checkEnabledRepo(base, possible_local_files=[]): ++ """ ++ Verify that there is at least one enabled repo. ++ ++ @param base: a YumBase object. ++ """ ++ if base.repos.listEnabled(): ++ return ++ ++ for lfile in possible_local_files: ++ if lfile.endswith(".rpm") and os.path.exists(lfile): ++ return ++ ++ msg = _('There are no enabled repos.\n' ++ ' Run "yum repolist all" to see the repos you have.\n' ++ ' You can enable repos with yum-config-manager --enable ') ++ base.logger.critical(msg) ++ raise cli.CliError ++ + class YumCommand: + + def __init__(self): +@@ -176,6 +195,7 @@ class InstallCommand(YumCommand): + checkRootUID(base) + checkGPGKey(base) + checkPackageArg(base, basecmd, extcmds) ++ checkEnabledRepo(base, extcmds) + + def doCommand(self, base, basecmd, extcmds): + self.doneCommand(base, _("Setting up Install Process")) +@@ -197,6 +217,7 @@ class UpdateCommand(YumCommand): + def doCheck(self, base, basecmd, extcmds): + checkRootUID(base) + checkGPGKey(base) ++ checkEnabledRepo(base, extcmds) + + def doCommand(self, base, basecmd, extcmds): + self.doneCommand(base, _("Setting up Update Process")) +@@ -218,6 +239,7 @@ class DistroSyncCommand(YumCommand): + def doCheck(self, base, basecmd, extcmds): + checkRootUID(base) + checkGPGKey(base) ++ checkEnabledRepo(base, extcmds) + + def doCommand(self, base, basecmd, extcmds): + self.doneCommand(base, _("Setting up Distribution Synchronization Process")) +@@ -420,6 +442,9 @@ class GroupListCommand(GroupCommand): + def getSummary(self): + return _("List available package groups") - return '%s %s %s' % (name, flags[flag], version_tuple_to_string(evr)) ++ def doCheck(self, base, basecmd, extcmds): ++ checkEnabledRepo(base) + -+def string_to_prco_tuple(prcoString): -+ """returns a prco tuple (name, flags, (e, v, r)) for a string""" -+ -+ if type(prcoString) == types.TupleType: -+ (n, f, v) = prcoString -+ else: -+ n = prcoString -+ f = v = None -+ -+ if n[0] != '/': -+ # not a file dep - look at it for being versioned -+ prco_split = n.split() -+ if len(prco_split) == 3: -+ n, f, v = prco_split - -+ # now we have 'n, f, v' where f and v could be None and None -+ if f is not None and f not in constants.LETTERFLAGS: -+ if f not in constants.SYMBOLFLAGS: -+ try: -+ f = flagToString(int(f)) -+ except (ValueError,TypeError), e: -+ raise Errors.MiscError, 'Invalid version flag: %s' % f -+ else: -+ f = constants.SYMBOLFLAGS[f] -+ -+ if type(v) in (types.StringType, types.NoneType, types.UnicodeType): -+ (prco_e, prco_v, prco_r) = stringToVersion(v) -+ elif type(v) in (types.TupleType, types.ListType): -+ (prco_e, prco_v, prco_r) = v -+ -+ #now we have (n, f, (e, v, r)) for the thing specified -+ return (n, f, (prco_e, prco_v, prco_r)) -+ - def refineSearchPattern(arg): - """Takes a search string from the cli for Search or Provides - and cleans it up so it doesn't make us vomit""" -diff --git a/yum/packageSack.py b/yum/packageSack.py -index 95b278a..6e986a4 100644 ---- a/yum/packageSack.py -+++ b/yum/packageSack.py -@@ -702,42 +702,50 @@ class PackageSack(PackageSackBase): - result[po] = hits - return result + def doCommand(self, base, basecmd, extcmds): + GroupCommand.doCommand(self, base, basecmd, extcmds) + return base.returnGroupLists(extcmds) +@@ -441,6 +466,7 @@ class GroupInstallCommand(GroupCommand): + checkRootUID(base) + checkGPGKey(base) + checkGroupArg(base, basecmd, extcmds) ++ checkEnabledRepo(base) -+ def searchPrco(self, name, prcotype): -+ self._checkIndexes(failure='build') -+ prcodict = getattr(self, prcotype) -+ (n,f,(e,v,r)) = misc.string_to_prco_tuple(name) -+ -+ basic_results = [] -+ results = [] -+ if n in prcodict: -+ basic_results.extend(prcodict[n]) -+ -+ for po in basic_results: -+ if po.checkPrco(prcotype, (n, f, (e,v,r))): -+ results.append(po) -+ -+ if prcotype != "provides": -+ return results -+ -+ if not misc.re_filename(n): -+ return results -+ -+ results.extend(self.searchFiles(n)) -+ return misc.unique(results) -+ -+ - def searchRequires(self, name): -- """return list of package requiring the name (any evr and flag)""" -- self._checkIndexes(failure='build') -- if self.requires.has_key(name): -- return self.requires[name] -- else: -- return [] -+ """return list of package requiring the item requested""" -+ -+ return self.searchPrco(name, 'requires') + def doCommand(self, base, basecmd, extcmds): + GroupCommand.doCommand(self, base, basecmd, extcmds) +@@ -462,6 +488,7 @@ class GroupRemoveCommand(GroupCommand): + def doCheck(self, base, basecmd, extcmds): + checkRootUID(base) + checkGroupArg(base, basecmd, extcmds) ++ checkEnabledRepo(base) - def searchProvides(self, name): -- """return list of package providing the name (any evr and flag)""" -- # FIXME - should this do a pkgobj.checkPrco((name, flag, (e,v,r,))?? -- # has to do a searchFiles and a searchProvides for things starting with / -- self._checkIndexes(failure='build') -- returnList = [] -- if name[0] == '/': -- returnList.extend(self.searchFiles(name)) -- if self.provides.has_key(name): -- returnList.extend(self.provides[name]) -- return returnList -+ """return list of package providing the item requested""" -+ -+ return self.searchPrco(name, 'provides') + def doCommand(self, base, basecmd, extcmds): + GroupCommand.doCommand(self, base, basecmd, extcmds) +@@ -488,6 +515,7 @@ class GroupInfoCommand(GroupCommand): - def searchConflicts(self, name): -- """return list of package conflicting with the name (any evr and flag)""" -- self._checkIndexes(failure='build') -- if self.conflicts.has_key(name): -- return self.conflicts[name] -- else: -- return [] -- -+ """return list of package conflicting with item requested""" -+ -+ return self.searchPrco(name, 'conflicts') -+ - def searchObsoletes(self, name): -- """return list of package obsoleting the name (any evr and flag)""" -- self._checkIndexes(failure='build') -- if self.obsoletes.has_key(name): -- return self.obsoletes[name] -- else: -- return [] -+ """return list of package obsoleting the item requested""" + def doCheck(self, base, basecmd, extcmds): + checkGroupArg(base, basecmd, extcmds) ++ checkEnabledRepo(base) -+ return self.searchPrco(name, 'obsoletes') -+ - def returnObsoletes(self, newest=False): - """returns a dict of obsoletes dict[obsoleting pkgtuple] = [list of obs]""" - obs = {} -diff --git a/yum/packages.py b/yum/packages.py -index ba10136..c473ece 100644 ---- a/yum/packages.py -+++ b/yum/packages.py -@@ -23,6 +23,7 @@ import rpm - import os - import os.path - import misc -+import i18n - import re - import fnmatch - import stat -@@ -414,7 +415,7 @@ class RpmBase(object): - return self.inPrcoRange(prcotype, prcotuple) - else: - for (n, f, (e, v, r)) in self.returnPrco(prcotype): -- if reqn == n: -+ if i18n.str_eq(reqn, n): - return 1 + def doCommand(self, base, basecmd, extcmds): + GroupCommand.doCommand(self, base, basecmd, extcmds) +@@ -511,7 +539,7 @@ class MakeCacheCommand(YumCommand): + return _("Generate the metadata cache") - return 0 -@@ -430,10 +431,7 @@ class RpmBase(object): - # find the named entry in pkgobj, do the comparsion - result = [] - for (n, f, (e, v, r)) in self.returnPrco(prcotype): -- if isinstance(reqn, unicode) == isinstance(n, unicode): -- if reqn != n: # stupid python... -- continue -- elif misc.to_utf8(reqn) != misc.to_utf8(n): -+ if not i18n.str_eq(reqn, n): - continue + def doCheck(self, base, basecmd, extcmds): +- pass ++ checkEnabledRepo(base) - if f == '=': -diff --git a/yum/pkgtag_db.py b/yum/pkgtag_db.py -index eddf175..e72fd05 100644 ---- a/yum/pkgtag_db.py -+++ b/yum/pkgtag_db.py -@@ -18,7 +18,7 @@ - # parse sqlite tag database - # return pkgnames and tag that was matched - import sqlite3 as sqlite --from sqlutils import executeSQL -+from sqlutils import executeSQL, sql_esc, sql_esc_glob - from Errors import PkgTagsError - import sqlutils - import sys -@@ -68,8 +68,9 @@ class PackageTagDB(object): - """Search by tag name/glob - Return dict of dict[packagename] = [stringmatched, stringmatched, ...]""" - res = {} -- tag = '%%%s%%' % tag -- query = "SELECT name, tag, score FROM packagetags where tag like ?" -+ (tag, esc) = sql_esc(tag) -+ query = "SELECT name, tag, score FROM packagetags where tag like ? %s" % esc -+ tag = '%' + tag + '%' - rows = self._sql_exec(query, (tag,)) - for (name, tag, score) in rows: - if name not in res: -@@ -82,8 +83,9 @@ class PackageTagDB(object): - """Search by package name/glob. - Return dict of dict[packagename] = [tag1, tag2, tag3, tag4, ...]""" - res = {} -- name = '%%%s%%' % name -- query = "SELECT name, tag, score FROM packagetags where name like ?" -+ (name, esc) = sql_esc(tag) -+ query = "SELECT name, tag, score FROM packagetags where name like ?%s " % esc -+ name = '%' + name + '%' - rows = self._sql_exec(query, (name,)) - for (name, tag, score) in rows: - if name not in res: -diff --git a/yum/rpmsack.py b/yum/rpmsack.py -index b45f315..83b684e 100644 ---- a/yum/rpmsack.py -+++ b/yum/rpmsack.py -@@ -282,18 +282,28 @@ class RPMDBPackageSack(PackageSackBase): - result = self._cache[prcotype].get(name) - if result is not None: - return result -- -+ (n,f,(e,v,r)) = misc.string_to_prco_tuple(name) -+ glob = False -+ -+ if misc.re_glob(n): -+ glob = True -+ - ts = self.readOnlyTS() - result = {} - tag = self.DEP_TABLE[prcotype][0] -- mi = ts.dbMatch(tag, misc.to_utf8(name)) -+ mi = ts.dbMatch(tag, misc.to_utf8(n)) - for hdr in mi: - if hdr['name'] == 'gpg-pubkey': - continue - po = self._makePackageObject(hdr, mi.instance()) -- result[po.pkgid] = po -+ if not glob: -+ if po.checkPrco(prcotype, (n, f, (e,v,r))): -+ result[po.pkgid] = po -+ else: -+ result[po.pkgid] = po - del mi + def doCommand(self, base, basecmd, extcmds): + base.logger.debug(_("Making cache files for all metadata files.")) +@@ -554,6 +582,7 @@ class CleanCommand(YumCommand): -+ - # If it's not a provides or filename, we are done - if prcotype == 'provides' and name[0] == '/': - fileresults = self.searchFiles(name) -diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py -index bf0cea9..1d6c764 100644 ---- a/yum/sqlitesack.py -+++ b/yum/sqlitesack.py -@@ -28,7 +28,7 @@ from packages import PackageObject, RpmBase, YumAvailablePackage, parsePackages - import Errors - import misc - --from sqlutils import executeSQL -+from sqlutils import executeSQL, sql_esc, sql_esc_glob - import rpmUtils.miscutils - import sqlutils - import constants -@@ -812,32 +812,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - pkgs.append(pkg) - return pkgs - -- @staticmethod -- def _sql_esc(pattern): -- """ Apply SQLite escaping, if needed. Returns pattern and esc. """ -- esc = '' -- if "_" in pattern or "%" in pattern: -- esc = ' ESCAPE "!"' -- pattern = pattern.replace("!", "!!") -- pattern = pattern.replace("%", "!%") -- pattern = pattern.replace("_", "!_") -- return (pattern, esc) -- -- def _sql_esc_glob(self, patterns): -- """ Converts patterns to SQL LIKE format, if required (or gives up if -- not possible). """ -- ret = [] -- for pattern in patterns: -- if '[' in pattern: # LIKE only has % and _, so [abc] can't be done. -- return [] # So Load everything -- -- # Convert to SQL LIKE format -- (pattern, esc) = self._sql_esc(pattern) -- pattern = pattern.replace("*", "%") -- pattern = pattern.replace("?", "_") -- ret.append((pattern, esc)) -- return ret -- - def _skip_all(self): - """ Are we going to skip every package in all our repos? """ - skip_all = True -@@ -917,12 +891,12 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - sql_params = [] - dirname_check = "" - if not glob: -- (pattern, esc) = self._sql_esc(filename) -+ (pattern, esc) = sql_esc(filename) - dirname_check = "dirname = ? and filenames LIKE ? %s and " % esc - sql_params.append(dirname) - sql_params.append('%' + pattern + '%') - elif not file_glob: -- (pattern, esc) = self._sql_esc(filename) -+ (pattern, esc) = sql_esc(filename) - dirname_check = "dirname GLOB ? and filenames LIKE ? %s and " % esc - sql_params.append(dirname) - sql_params.append('%' + pattern + '%') -@@ -996,7 +970,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - return result + def doCheck(self, base, basecmd, extcmds): + checkCleanArg(base, basecmd, extcmds) ++ checkEnabledRepo(base) - searchstring = searchstring.replace("'", "''") -- (searchstring, esc) = self._sql_esc(searchstring) -+ (searchstring, esc) = sql_esc(searchstring) - sql = "select DISTINCT pkgKey from packages where %s like '%%%s%%'%s " % (fields[0], searchstring, esc) - - for f in fields[1:]: -@@ -1042,7 +1016,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - - for s in searchstrings: - s = s.replace("'", "''") -- (s, esc) = self._sql_esc(s) -+ (s, esc) = sql_esc(s) - sql="select pkgKey,1 AS cumul from packages where %s like '%%%s%%'%s " % (fields[0], s, esc) - for f in fields[1:]: - sql = "%s or %s like '%%%s%%'%s " % (sql, f, s, esc) -@@ -1289,38 +1263,61 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - - @catchSqliteException - def searchPrco(self, name, prcotype): -- """return list of packages having prcotype name (any evr and flag)""" -+ """return list of packages matching name and prcotype """ -+ # we take name to be a string of some kind -+ # we parse the string to see if it is a foo > 1.1 or if it is just 'foo' -+ # or what - so we can answer correctly -+ - if self._skip_all(): - return [] -+ try: -+ (n,f,(e,v,r)) = misc.string_to_prco_tuple(name) -+ except Errors.MiscError, e: -+ raise Errors.PackageSackError, to_unicode(e) - -- name = to_unicode(name) -+ n = to_unicode(n) + def doCommand(self, base, basecmd, extcmds): + base.conf.cache = 1 +@@ -592,6 +621,9 @@ class CheckUpdateCommand(YumCommand): + def getSummary(self): + return _("Check for available package updates") + ++ def doCheck(self, base, basecmd, extcmds): ++ checkEnabledRepo(base) + - glob = True - querytype = 'glob' -- if not misc.re_glob(name): -+ if not misc.re_glob(n): - glob = False - querytype = '=' + def doCommand(self, base, basecmd, extcmds): + base.extcmds.insert(0, 'updates') + result = 0 +@@ -668,6 +700,7 @@ class UpgradeCommand(YumCommand): + def doCheck(self, base, basecmd, extcmds): + checkRootUID(base) + checkGPGKey(base) ++ checkEnabledRepo(base, extcmds) -+ basic_results = [] - results = [] - for (rep,cache) in self.primarydb.items(): - cur = cache.cursor() -- executeSQL(cur, "select DISTINCT pkgKey from %s where name %s ?" % (prcotype,querytype), (name,)) -- self._sql_pkgKey2po(rep, cur, results) -+ executeSQL(cur, "select DISTINCT pkgKey from %s where name %s ?" % (prcotype,querytype), (n,)) -+ self._sql_pkgKey2po(rep, cur, basic_results) - -+ # now we have a list of items matching just the name - let's match them out -+ for po in basic_results: -+ if misc.re_filename(n) and v is None: -+ # file dep add all matches to the results -+ results.append(po) -+ continue -+ -+ if not glob: -+ if po.checkPrco(prcotype, (n, f, (e,v,r))): -+ results.append(po) -+ else: -+ # if it is a glob we can't really get any closer to checking it -+ results.append(po) - # If it's not a provides or a filename, we are done - if prcotype != "provides": - return results -- if not misc.re_filename(name): -+ if not misc.re_filename(n): - return results + def doCommand(self, base, basecmd, extcmds): + base.conf.obsoletes = 1 +@@ -1104,6 +1137,7 @@ class ReInstallCommand(YumCommand): + checkRootUID(base) + checkGPGKey(base) + checkPackageArg(base, basecmd, extcmds) ++ checkEnabledRepo(base, extcmds) - # If it is a filename, search the primary.xml file info -- results.extend(self._search_primary_files(name)) -+ results.extend(self._search_primary_files(n)) + def doCommand(self, base, basecmd, extcmds): + self.doneCommand(base, _("Setting up Reinstall Process")) +@@ -1130,6 +1164,7 @@ class DowngradeCommand(YumCommand): + checkRootUID(base) + checkGPGKey(base) + checkPackageArg(base, basecmd, extcmds) ++ checkEnabledRepo(base, extcmds) - # if its in the primary.xml files then skip the other check -- if misc.re_primary_filename(name) and not glob: -+ if misc.re_primary_filename(n) and not glob: - return misc.unique(results) - - # If it is a filename, search the files.xml file info -- results.extend(self.searchFiles(name)) -+ results.extend(self.searchFiles(n)) - return misc.unique(results) - - -@@ -1516,7 +1513,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - if len(patterns) > pat_max: - patterns = [] - if ignore_case: -- patterns = self._sql_esc_glob(patterns) -+ patterns = sql_esc_glob(patterns) - else: - tmp = [] - need_glob = False -diff --git a/yum/sqlutils.py b/yum/sqlutils.py -index 4326910..4d7e36e 100644 ---- a/yum/sqlutils.py -+++ b/yum/sqlutils.py -@@ -173,3 +173,27 @@ else: - executeSQL = executeSQLPyFormat - - -+def sql_esc(pattern): -+ """ Apply SQLite escaping, if needed. Returns pattern and esc. """ -+ esc = '' -+ if "_" in pattern or "%" in pattern: -+ esc = ' ESCAPE "!"' -+ pattern = pattern.replace("!", "!!") -+ pattern = pattern.replace("%", "!%") -+ pattern = pattern.replace("_", "!_") -+ return (pattern, esc) -+ -+def sql_esc_glob(patterns): -+ """ Converts patterns to SQL LIKE format, if required (or gives up if -+ not possible). """ -+ ret = [] -+ for pattern in patterns: -+ if '[' in pattern: # LIKE only has % and _, so [abc] can't be done. -+ return [] # So Load everything -+ -+ # Convert to SQL LIKE format -+ (pattern, esc) = sql_esc(pattern) -+ pattern = pattern.replace("*", "%") -+ pattern = pattern.replace("?", "_") -+ ret.append((pattern, esc)) -+ return ret + def doCommand(self, base, basecmd, extcmds): + self.doneCommand(base, _("Setting up Downgrade Process")) diff --git a/yum.spec b/yum.spec index b91cbdc..9ab635f 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.28 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -15,7 +15,7 @@ Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch - +Patch6: yum-HEAD.patch Patch20: yum-manpage-files.patch @@ -68,7 +68,7 @@ can notify you when they are available via email, syslog or dbus. %patch3 -p0 %patch4 -p0 %patch5 -p1 - +%patch6 -p1 %patch20 -p1 %build @@ -120,6 +120,11 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Mon Aug 9 2010 Seth Vidal - 3.2.28-2 +- fixes sqlite historydb conversion bug +- patches up some unicide issues + + * Fri Jul 30 2010 Seth Vidal - 3.2.28-1 - 3.2.28 From 2eeaa70f5f00ee2482ac72ae4db8c3b9c3e55f07 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Thu, 12 Aug 2010 12:35:20 -0400 Subject: [PATCH 17/21] latest head sync up spec file --- yum-HEAD.patch | 106 +++++++++++++++++++++++++++++++++++++++++++++++-- yum.spec | 32 ++++++++++++--- 2 files changed, 129 insertions(+), 9 deletions(-) diff --git a/yum-HEAD.patch b/yum-HEAD.patch index b1666fa..e7fde27 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -19,8 +19,75 @@ index 49d98c6..25b2c7d 100644 .IP \fBinstallonly_limit \fR +diff --git a/output.py b/output.py +index 3a90995..10c7442 100755 +--- a/output.py ++++ b/output.py +@@ -1882,10 +1882,12 @@ class DepSolveProgressCallBack: + msg += _('\n Not found') + return msg + +- ipkgs = set() +- for pkg in sorted(yb.rpmdb.getProvides(needname)): ++ def _run_inst_pkg(pkg, msg): + nevr = (pkg.name, pkg.epoch, pkg.version, pkg.release) +- ipkgs.add(nevr) ++ if nevr in seen_pkgs or (pkg.verEQ(last) and pkg.arch == last.arch): ++ return msg ++ ++ seen_pkgs.add(nevr) + action = _('Installed') + rmed = yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_REMOVE_STATES) + if rmed: +@@ -1901,21 +1903,40 @@ class DepSolveProgressCallBack: + if rtype not in relmap: + continue + nevr = (rpkg.name, rpkg.epoch, rpkg.version, rpkg.release) +- ipkgs.add(nevr) ++ seen_pkgs.add(nevr) + msg += _msg_pkg(relmap[rtype], rpkg, needname) ++ return msg + +- last = None +- for pkg in sorted(yb.pkgSack.getProvides(needname)): ++ def _run_avail_pkg(pkg, msg): + # We don't want to see installed packages, or N packages of the + # same version, from different repos. + nevr = (pkg.name, pkg.epoch, pkg.version, pkg.release) +- if nevr in ipkgs or (pkg.verEQ(last) and pkg.arch == last.arch): +- continue +- last = pkg ++ if nevr in seen_pkgs or (pkg.verEQ(last) and pkg.arch == last.arch): ++ return False, last, msg ++ seen_pkgs.add(nevr) + action = _('Available') + if yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_INSTALL_STATES): + action = _('Installing') + msg += _msg_pkg(action, pkg, needname) ++ return True, pkg, msg ++ ++ last = None ++ seen_pkgs = set() ++ for pkg in sorted(yb.rpmdb.getProvides(needname)): ++ msg = _run_inst_pkg(pkg, msg) ++ ++ available_names = set() ++ for pkg in sorted(yb.pkgSack.getProvides(needname)): ++ tst, last, msg = _run_avail_pkg(pkg, msg) ++ if tst: ++ available_names.add(pkg.name) ++ ++ last = None ++ for pkg in sorted(yb.rpmdb.searchNames(available_names)): ++ msg = _run_inst_pkg(pkg, msg) ++ last = None ++ for pkg in sorted(yb.pkgSack.searchNames(available_names)): ++ tst, last, msg = _run_avail_pkg(pkg, msg) + return msg + + def procConflict(self, name, confname): diff --git a/yum/__init__.py b/yum/__init__.py -index 2ea9f20..0304fea 100644 +index 2ea9f20..3a9ef88 100644 --- a/yum/__init__.py +++ b/yum/__init__.py @@ -294,6 +294,11 @@ class YumBase(depsolve.Depsolve): @@ -74,8 +141,23 @@ index 2ea9f20..0304fea 100644 self.logger.critical(_('No Match for argument: %s') % arg) else: pkgs.extend(depmatches) +@@ -3690,6 +3702,14 @@ class YumBase(depsolve.Depsolve): + if self.conf.protected_packages and po.pkgtup == kern_pkgtup: + self.logger.warning(_("Skipping the running kernel: %s") % po) + continue ++ ++ if self.tsInfo.getMembers(po.pkgtup): ++ # This allows multiple reinstalls and update/downgrade "cancel" ++ for txmbr in self.tsInfo.matchNaevr(po.name): ++ self.logger.warning(_("Removing %s from the transaction") % ++ txmbr) ++ self.tsInfo.remove(txmbr.pkgtup) ++ # Now start the remove/reinstall + txmbr = self.tsInfo.addErase(po) + tx_return.append(txmbr) + diff --git a/yum/history.py b/yum/history.py -index 502b908..6bc767a 100644 +index 502b908..014bdab 100644 --- a/yum/history.py +++ b/yum/history.py @@ -27,7 +27,7 @@ import yum.misc as misc @@ -104,6 +186,15 @@ index 502b908..6bc767a 100644 rpid = cur.lastrowid if not rpid: +@@ -467,7 +470,7 @@ class YumHistory: + res = executeSQL(cur, + """INSERT INTO trans_cmdline + (tid, cmdline) +- VALUES (?, ?)""", (self._tid, cmdline)) ++ VALUES (?, ?)""", (self._tid, to_unicode(cmdline))) + return cur.lastrowid + + def beg(self, rpmdb_version, using_pkgs, txmbrs, skip_packages=[], @@ -610,7 +613,7 @@ class YumHistory: # open file in append fo = open(data_fn, 'w+') @@ -140,7 +231,7 @@ index 502b908..6bc767a 100644 '''] diff --git a/yum/pgpmsg.py b/yum/pgpmsg.py -index 9cf8217..9f58fad 100644 +index 9cf8217..b23eabc 100644 --- a/yum/pgpmsg.py +++ b/yum/pgpmsg.py @@ -1186,7 +1186,7 @@ def decode(msg) : @@ -170,6 +261,15 @@ index 9cf8217..9f58fad 100644 return [] def decode_multiple_keys(msg): +@@ -1266,7 +1272,7 @@ def decode_multiple_keys(msg): + block += '%s\n' % l + if l == '-----END PGP PUBLIC KEY BLOCK-----': + in_block = 0 +- thesecerts = decode_msg(block) ++ thesecerts = decode_msg(block, multi=True) + if thesecerts: + certs.extend(thesecerts) + block = '' diff --git a/yumcommands.py b/yumcommands.py index a7f5d9e..9c6fc75 100644 --- a/yumcommands.py diff --git a/yum.spec b/yum.spec index 9ab635f..6a1611a 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.28 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -11,13 +11,12 @@ Source1: yum.conf.fedora Source2: yum-updatesd.conf.fedora Patch0: installonlyn-enable.patch Patch1: yum-mirror-priority.patch -Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch Patch6: yum-HEAD.patch -Patch20: yum-manpage-files.patch +Patch20: yum-manpage-files.patch URL: http://yum.baseurl.org/ BuildArch: noarch @@ -34,17 +33,20 @@ Requires: pygpgme Obsoletes: yum-skip-broken <= 1.1.18 Obsoletes: yum-basearchonly <= 1.1.9 Obsoletes: yum-allow-downgrade < 1.1.20-0 -Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0 +Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0 +Obsoletes: yum-plugin-protect-packages < 1.1.27-0 Provides: yum-skip-broken Provides: yum-basearchonly Provides: yum-allow-downgrade Provides: yum-plugin-allow-downgrade +Provides: yum-protect-packages +Provides: yum-plugin-protect-packages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Yum is a utility that can check for and automatically download and install updated RPM packages. Dependencies are obtained and downloaded -automatically prompting the user as necessary. +automatically, prompting the user for permission as necessary. %package updatesd Summary: Update notification daemon @@ -64,7 +66,6 @@ can notify you when they are available via email, syslog or dbus. %prep %setup -q %patch1 -p0 -#%%%patch2 -p0 %patch3 -p0 %patch4 -p0 %patch5 -p1 @@ -92,6 +93,12 @@ rm -f $RPM_BUILD_ROOT/%{_sbindir}/yum-updatesd rm -f $RPM_BUILD_ROOT/%{_mandir}/man*/yum-updatesd* rm -f $RPM_BUILD_ROOT/%{_datadir}/yum-cli/yumupd.py* +# Ghost files: +mkdir -p $RPM_BUILD_ROOT/var/lib/yum/history +mkdir -p $RPM_BUILD_ROOT/var/lib/yum/plugins +mkdir -p $RPM_BUILD_ROOT/var/lib/yum/yumdb +touch $RPM_BUILD_ROOT/var/lib/yum/uuid + %find_lang %name %clean @@ -103,7 +110,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/yum.conf %dir %{_sysconfdir}/yum %config(noreplace) %{_sysconfdir}/yum/version-groups.conf +%dir %{_sysconfdir}/yum/protected.d %dir %{_sysconfdir}/yum.repos.d +%dir %{_sysconfdir}/yum/vars %config(noreplace) %{_sysconfdir}/logrotate.d/yum %{_sysconfdir}/bash_completion.d %dir %{_datadir}/yum-cli @@ -113,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/rpmUtils %dir /var/cache/yum %dir /var/lib/yum +%ghost /var/lib/yum/uuid +%ghost /var/lib/yum/history +%ghost /var/lib/yum/plugins +%ghost /var/lib/yum/yumdb %{_mandir}/man*/yum.* %{_mandir}/man*/yum-shell* # plugin stuff @@ -120,6 +133,13 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Thu Aug 12 2010 Seth Vidal - 3.2.28-3 +- latest head +- fix gpg key import +- more unicode fixes +- output slightly more clear depsovling error msgs +- sync up spec file with f13,f14 + * Mon Aug 9 2010 Seth Vidal - 3.2.28-2 - fixes sqlite historydb conversion bug - patches up some unicide issues From b036e5ca822cd5fce704f5ed81ee07eaebe075eb Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Fri, 27 Aug 2010 13:51:37 -0400 Subject: [PATCH 18/21] obsoleted download-order --- yum.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yum.spec b/yum.spec index 6a1611a..33b3a2d 100644 --- a/yum.spec +++ b/yum.spec @@ -35,6 +35,7 @@ Obsoletes: yum-basearchonly <= 1.1.9 Obsoletes: yum-allow-downgrade < 1.1.20-0 Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0 Obsoletes: yum-plugin-protect-packages < 1.1.27-0 +Obsoletes: yum-plugin-download-order <= 0.2-2 Provides: yum-skip-broken Provides: yum-basearchonly Provides: yum-allow-downgrade @@ -133,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Fri Aug 27 2010 Seth Vidal +- obsoleted yum-plugin-download-order + * Thu Aug 12 2010 Seth Vidal - 3.2.28-3 - latest head - fix gpg key import From 3e1c478b65657627dca1d1715a3c546c2436af2a Mon Sep 17 00:00:00 2001 From: James Antill Date: Tue, 14 Sep 2010 10:20:47 -0400 Subject: [PATCH 19/21] Fix auto-close bug with GPG key installs. --- yum-PK-auto-close-fix.patch | 39 +++++++++++++++++++++++++++++++++++++ yum.spec | 8 +++++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 yum-PK-auto-close-fix.patch diff --git a/yum-PK-auto-close-fix.patch b/yum-PK-auto-close-fix.patch new file mode 100644 index 0000000..e6dfc81 --- /dev/null +++ b/yum-PK-auto-close-fix.patch @@ -0,0 +1,39 @@ +commit 3e05536ef876fc761553b632495449fd96bb4b9e +Author: James Antill +Date: Tue Sep 14 09:48:23 2010 -0400 + + Can't keep ts around, due to rpmdb.auto_close. BZ 622179. + This kind of sucks as we have to remember in all future code not to + keep a ts over any .rpmdb call, it's even better because almost nobody + will hit it. It works though, and is simple. + + We could maybe fix this "better" by using a weakref in rpmdb, and doing + it that way. Or having some manual way to mark auto_close as off. Or + just rm'ing auto_close as a bad idea. + +diff --git a/yum/__init__.py b/yum/__init__.py +index b5e9213..5c689e5 100644 +--- a/yum/__init__.py ++++ b/yum/__init__.py +@@ -4301,12 +4301,11 @@ class YumBase(depsolve.Depsolve): + keyurls = repo.gpgkey + key_installed = False + +- ts = self.rpmdb.readOnlyTS() +- + for keyurl in keyurls: + keys = self._retrievePublicKey(keyurl, repo) + + for info in keys: ++ ts = self.rpmdb.readOnlyTS() + # Check if key is already installed + if misc.keyInstalled(ts, info['keyid'], info['timestamp']) >= 0: + self.logger.info(_('GPG key at %s (0x%s) is already installed') % ( +@@ -4331,6 +4330,7 @@ class YumBase(depsolve.Depsolve): + raise Errors.YumBaseError, _("Not installing key") + + # Import the key ++ ts = self.rpmdb.readOnlyTS() + result = ts.pgpImportPubkey(misc.procgpgkey(info['raw_key'])) + if result != 0: + raise Errors.YumBaseError, \ diff --git a/yum.spec b/yum.spec index 33b3a2d..4f69ca4 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.28 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -15,6 +15,7 @@ Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch Patch6: yum-HEAD.patch +Patch7: yum-PK-auto-close-fix.patch Patch20: yum-manpage-files.patch @@ -71,6 +72,7 @@ can notify you when they are available via email, syslog or dbus. %patch4 -p0 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %patch20 -p1 %build @@ -134,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Tue Sep 14 2010 James Antill - 3.2.28-4 +- Fix auto-close bug with GPG key installs. +- Resolves: bug#622179 + * Fri Aug 27 2010 Seth Vidal - obsoleted yum-plugin-download-order From 745109712dcc4a1295ed5f40a8323669cdad37a1 Mon Sep 17 00:00:00 2001 From: James Antill Date: Tue, 14 Sep 2010 10:25:40 -0400 Subject: [PATCH 20/21] Also obsolete yum-plugin-basearchonly. BZ 629138 --- yum.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/yum.spec b/yum.spec index 4f69ca4..75b5726 100644 --- a/yum.spec +++ b/yum.spec @@ -33,6 +33,7 @@ Requires: yum-metadata-parser >= 1.1.0 Requires: pygpgme Obsoletes: yum-skip-broken <= 1.1.18 Obsoletes: yum-basearchonly <= 1.1.9 +Obsoletes: yum-plugin-basearchonly <= 1.1.24 Obsoletes: yum-allow-downgrade < 1.1.20-0 Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0 Obsoletes: yum-plugin-protect-packages < 1.1.27-0 From 42ef2cc506ab2ce9d5781bc937688258f1399717 Mon Sep 17 00:00:00 2001 From: James Antill Date: Tue, 14 Sep 2010 10:32:17 -0400 Subject: [PATCH 21/21] Forgot to add obsoletes bug to changelog. --- yum.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yum.spec b/yum.spec index 75b5726..5926c13 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.28 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -140,6 +140,8 @@ rm -rf $RPM_BUILD_ROOT * Tue Sep 14 2010 James Antill - 3.2.28-4 - Fix auto-close bug with GPG key installs. - Resolves: bug#622179 +- Fix obsoletes on basearchonly. +- Resolves: bug#629138 * Fri Aug 27 2010 Seth Vidal - obsoleted yum-plugin-download-order