diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index eeb7f9c..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -yum-3.2.26.tar.gz diff --git a/0001-check-reqpo-exists-in-compare_providers.patch b/0001-check-reqpo-exists-in-compare_providers.patch deleted file mode 100644 index 3ca0c39..0000000 --- a/0001-check-reqpo-exists-in-compare_providers.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 63540521709205dd601994e2b05b7ddd3712b3a1 -Author: Seth Vidal -Date: Thu Jul 10 12:21:29 2008 -0400 - - make sure the reqpo exists before we compare it - -diff --git a/yum/depsolve.py b/yum/depsolve.py -index 8bb2cf1..2577cef 100644 ---- a/yum/depsolve.py -+++ b/yum/depsolve.py -@@ -986,8 +986,13 @@ class Depsolve(object): - if obsoleted: - pkgresults[po] -= 1024 - break -- -- for thisarch in (reqpo.arch, getBestArch()): -+ -+ if reqpo: -+ arches = (reqpo.arch, getBestArch()) -+ else: -+ arches = (getBestArch()) -+ -+ for thisarch in arches: - res = _compare_arch_distance(po, nextpo, thisarch) - if not res: - continue -@@ -1001,13 +1006,13 @@ class Depsolve(object): - self.verbose_logger.log(logginglevels.DEBUG_4, - _('common sourcerpm %s and %s' % (po, reqpo))) - pkgresults[po] += 20 -- -- cpl = _common_prefix_len(po.name, reqpo.name) -- if cpl > 2: -- self.verbose_logger.log(logginglevels.DEBUG_4, -- _('common prefix of %s between %s and %s' % (cpl, po, reqpo))) -- -- pkgresults[po] += cpl*2 -+ if reqpo: -+ cpl = _common_prefix_len(po.name, reqpo.name) -+ if cpl > 2: -+ self.verbose_logger.log(logginglevels.DEBUG_4, -+ _('common prefix of %s between %s and %s' % (cpl, po, reqpo))) -+ -+ pkgresults[po] += cpl*2 - - pkgresults[po] += (len(po.name)*-1) - diff --git a/0001-gotta-check-both-not-either-otherwise-filedeps-do.patch b/0001-gotta-check-both-not-either-otherwise-filedeps-do.patch deleted file mode 100644 index 2853e48..0000000 --- a/0001-gotta-check-both-not-either-otherwise-filedeps-do.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7a99a04d7f121a547d9af82738cd64b2fa8b04ca Mon Sep 17 00:00:00 2001 -From: Seth Vidal -Date: Sat, 17 May 2008 07:43:42 -0400 -Subject: [PATCH] gotta check both, not either - otherwise filedeps don't work :( - ---- - yum/sqlitesack.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py -index c9fc26c..0b5d3e1 100644 ---- a/yum/sqlitesack.py -+++ b/yum/sqlitesack.py -@@ -766,7 +766,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - # If it's not a provides or a filename, we are done - if prcotype != "provides": - return results -- if not glob or name[0] != '/': -+ if not glob and name[0] != '/': - return results - - # If it is a filename, search the primary.xml file info --- -1.5.5.1 - 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/dead.package b/dead.package new file mode 100644 index 0000000..85a5025 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Superseded by DNF. For details, see: https://fedoraproject.org/wiki/Changes/Retire_YUM_3 diff --git a/fix-kernel-updates.patch b/fix-kernel-updates.patch deleted file mode 100644 index 7338052..0000000 --- a/fix-kernel-updates.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/geode-arch.patch b/geode-arch.patch deleted file mode 100644 index 3e333c0..0000000 --- a/geode-arch.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py -index b493b6a..27c6d53 100644 ---- a/rpmUtils/arch.py -+++ b/rpmUtils/arch.py -@@ -15,7 +15,7 @@ arches = { - # ia32 - "athlon": "i686", - "i686": "i586", -- "geode": "i586", -+ "geode": "i686", - "i586": "i486", - "i486": "i386", - "i386": "noarch", --- -1.6.2.5 - diff --git a/installonlyn-enable.patch b/installonlyn-enable.patch deleted file mode 100644 index b42be9a..0000000 --- a/installonlyn-enable.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- yum/config.py~ 2008-02-08 16:22:27.000000000 -0500 -+++ yum/config.py 2008-02-08 16:22:28.000000000 -0500 -@@ -593,7 +593,7 @@ - # NOTE: If you set this to 2, then because it keeps the current kernel it - # means if you ever install an "old" kernel it'll get rid of the newest one - # so you probably want to use 3 as a minimum ... if you turn it on. -- installonly_limit = PositiveIntOption(0, range_min=2, -+ installonly_limit = PositiveIntOption(3, range_min=2, - names_of_0=["0", ""]) - kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise', - 'kernel-bigmem', 'kernel-BOOT', 'kernel-PAE', 'kernel-PAE-debug']) - ---- docs/yum.conf.5~ 2009-05-11 11:55:25.000000000 -0400 -+++ docs/yum.conf.5 2009-05-11 11:55:25.000000000 -0400 -@@ -108,7 +108,7 @@ - - .IP \fBinstallonly_limit \fR - 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 -+time. Setting to 0 disables this feature. Default is '3'. Note that this - functionality used to be in the "installonlyn" plugin, where this option was - altered via. tokeep. - diff --git a/installonlyn.py b/installonlyn.py deleted file mode 100644 index 8646b3a..0000000 --- a/installonlyn.py +++ /dev/null @@ -1,69 +0,0 @@ -# A plugin for yum which only leaves n 'kernel' packages installed instead -# of infinitely doing installonly -# -# Copyright 2005 Red Hat, Inc. -# Jeremy Katz -# -# 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 General Public License for more details. -# -# version 0.93 - -import os -from rpmUtils import miscutils -from yum.plugins import TYPE_CORE -from yum.packages import YumInstalledPackage, comparePoEVR - -requires_api_version = '2.4' -plugin_type = TYPE_CORE - -def get_running_kernel_version_release(): - """This takes the output of uname and figures out the (version, release) - tuple for the running kernel.""" - ver = os.uname()[2] - for s in ("bigmem", "enterprise", "smp", "hugemem", "PAE", "rt", - "guest", "hypervisor", "xen0", "xenU", "xen", "debug"): - if ver.endswith(s): - ver = ver.replace(s, "") - if ver.find("-") != -1: - (v, r) = ver.split("-", 1) - return (v, r) - return (None, None) - -def config_hook(conduit): - global num_tokeep - num_tokeep = conduit.confInt('main', 'tokeep', default=2) - -def postresolve_hook(conduit): - ts = conduit.getTsInfo() - rpmdb = conduit.getRpmDB() - conf = conduit.getConf() - mems = ts.getMembers() - toremove = [] - for instpkg in conf.installonlypkgs: - for m in mems: - if (m.name == instpkg or instpkg in m.po.provides_names) \ - and m.ts_state in ('i', 'u'): - installed = rpmdb.searchNevra(name=m.name) - if len(installed) >= num_tokeep - 1: # since we're adding one - numleft = len(installed) - num_tokeep + 1 - (curv, curr) = get_running_kernel_version_release() - - installed.sort(comparePoEVR) - for po in installed: - if (po.version, po.release) == (curv, curr): - # don't remove running - continue - if numleft == 0: - break - toremove.append(po) - numleft -= 1 - - map(lambda x: ts.addErase(x), toremove) diff --git a/no-more-exactarchlist.patch b/no-more-exactarchlist.patch deleted file mode 100644 index 23572c6..0000000 --- a/no-more-exactarchlist.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- yum/config.py~ 2009-07-22 12:47:52.000000000 -0400 -+++ yum/config.py 2009-07-22 12:48:39.000000000 -0400 -@@ -631,9 +631,7 @@ - names_of_0=["0", ""]) - kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise', - 'kernel-bigmem', 'kernel-BOOT', 'kernel-PAE', 'kernel-PAE-debug']) -- exactarchlist = ListOption(['kernel', 'kernel-smp', -- 'kernel-hugemem', 'kernel-enterprise', 'kernel-bigmem', -- 'kernel-devel', 'kernel-PAE', 'kernel-PAE-debug']) -+ exactarchlist = ListOption([]) - tsflags = ListOption() - - assumeyes = BoolOption(False) diff --git a/plugin.conf b/plugin.conf deleted file mode 100644 index 8e4d76c..0000000 --- a/plugin.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -enabled=1 diff --git a/revert-yum-dot-import.patch b/revert-yum-dot-import.patch deleted file mode 100644 index 37bab84..0000000 --- a/revert-yum-dot-import.patch +++ /dev/null @@ -1,159 +0,0 @@ -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 - diff --git a/rpmdb-cache-BIG-post-releasever.path b/rpmdb-cache-BIG-post-releasever.path deleted file mode 100644 index 6b6f95b..0000000 --- a/rpmdb-cache-BIG-post-releasever.path +++ /dev/null @@ -1,1041 +0,0 @@ -diff --git a/cli.py b/cli.py -index 8f50541..f93a706 100644 ---- a/cli.py -+++ b/cli.py -@@ -894,10 +894,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput): - hdrcode, hdrresults = self.cleanHeaders() - xmlcode, xmlresults = self.cleanMetadata() - dbcode, dbresults = self.cleanSqlite() -+ rpmcode, rpmresults = self.cleanRpmDB() - self.plugins.run('clean') - -- code = hdrcode + pkgcode + xmlcode + dbcode -- results = hdrresults + pkgresults + xmlresults + dbresults -+ code = hdrcode + pkgcode + xmlcode + dbcode + rpmdb -+ results = (hdrresults + pkgresults + xmlresults + dbresults + -+ rpmresults) - for msg in results: - self.logger.debug(msg) - return code, [] -@@ -917,6 +919,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput): - if 'expire-cache' in userlist or 'metadata' in userlist: - self.logger.debug(_('Cleaning up expire-cache metadata')) - expccode, expcresults = self.cleanExpireCache() -+ if 'rpmdb' in userlist: -+ self.logger.debug(_('Cleaning up cached rpmdb data')) -+ expccode, expcresults = self.cleanRpmDB() - if 'plugins' in userlist: - self.logger.debug(_('Cleaning up plugins')) - self.plugins.run('clean') -diff --git a/docs/yum.8 b/docs/yum.8 -index 4158453..9472a82 100644 ---- a/docs/yum.8 -+++ b/docs/yum.8 -@@ -35,7 +35,7 @@ gnome\-packagekit application\&. - .br - .I \fR * provides | whatprovides feature1 [feature2] [\&.\&.\&.] - .br --.I \fR * clean [ packages | headers | metadata | dbcache | all ] -+.I \fR * clean [ packages | metadata | expire-cache | rpmdb | plugins | all ] - .br - .I \fR * makecache - .br -@@ -424,7 +424,8 @@ Eliminate the local data saying when the metadata and mirrorlists were downloade - Eliminate any cached packages from the system. Note that packages are not automatically deleted after they are downloaded. - - .IP "\fByum clean headers\fP" --Eliminate all of the header files which yum uses for dependency resolution. -+Eliminate all of the header files, which old versions of yum used for -+dependency resolution. - - .IP "\fByum clean metadata\fP" - Eliminate all of the files which yum uses to determine the remote -@@ -433,11 +434,22 @@ metadata the next time it is run. - - .IP "\fByum clean dbcache\fP" - Eliminate the sqlite cache used for faster access to metadata. --Using this option will force yum to recreate the cache the next time --it is run. -+Using this option will force yum to download the sqlite metadata the next time -+it is run, or recreate the sqlite metadata if using an older repo. -+ -+.IP "\fByum clean dbcache\fP" -+Eliminate the sqlite cache used for faster access to metadata. -+Using this option will force yum to download the sqlite metadata the next time -+it is run, or recreate the sqlite metadata if using an older repo. -+ -+.IP "\fByum clean rpmdb\fP" -+Eliminate any cached data from the local rpmdb. -+ -+.IP "\fByum clean plugins\fP" -+Tell any enabled plugins to eliminate their cached data. - - .IP "\fByum clean all\fP" --Runs \fByum clean packages\fP and \fByum clean headers\fP, \fByum clean metadata\fP and \fByum clean dbcache\fP as above. -+Does all of the above. - - .PP - .SH "MISC" -diff --git a/test/rpmdb-cache.py b/test/rpmdb-cache.py -new file mode 100755 -index 0000000..7768a93 ---- /dev/null -+++ b/test/rpmdb-cache.py -@@ -0,0 +1,87 @@ -+#! /usr/bin/python -tt -+ -+import sys -+import yum -+ -+__provides_of_requires_exact__ = False -+ -+yb1 = yum.YumBase() -+yb1.conf.cache = True -+yb2 = yum.YumBase() -+yb2.conf.cache = True -+ -+if len(sys.argv) > 1 and sys.argv[1].lower() == 'full': -+ print "Doing full test" -+ __provides_of_requires_exact__ = True -+ -+assert hasattr(yb1.rpmdb, '__cache_rpmdb__') -+yb1.rpmdb.__cache_rpmdb__ = False -+yb2.setCacheDir() -+ -+# Version -+ver1 = yb1.rpmdb.simpleVersion(main_only=True)[0] -+ver2 = yb2.rpmdb.simpleVersion(main_only=True)[0] -+if ver1 != ver2: -+ print >>sys.stderr, "Error: Version mismatch:", ver1, ver2 -+ -+# Conflicts -+cpkgs1 = yb1.rpmdb.returnConflictPackages() -+cpkgs2 = yb2.rpmdb.returnConflictPackages() -+if len(cpkgs1) != len(cpkgs2): -+ print >>sys.stderr, "Error: Conflict len mismatch:", len(cpkgs1),len(cpkgs2) -+for pkg in cpkgs1: -+ if pkg not in cpkgs2: -+ print >>sys.stderr, "Error: Conflict cache missing", pkg -+for pkg in cpkgs2: -+ if pkg not in cpkgs1: -+ print >>sys.stderr, "Error: Conflict cache extra", pkg -+ -+# File Requires -+frd1, blah, fpd1 = yb1.rpmdb.fileRequiresData() -+frd2, blah, fpd2 = yb2.rpmdb.fileRequiresData() -+if len(frd1) != len(frd2): -+ print >>sys.stderr, "Error: FileReq len mismatch:", len(frd1), len(frd2) -+for pkgtup in frd1: -+ if pkgtup not in frd2: -+ print >>sys.stderr, "Error: FileReq cache missing", pkgtup -+ continue -+ if len(set(frd1[pkgtup])) != len(set(frd2[pkgtup])): -+ print >>sys.stderr, ("Error: FileReq[%s] len mismatch:" % (pkgtup,), -+ len(frd1[pkgtup]), len(frd2[pkgtup])) -+ for name in frd1[pkgtup]: -+ if name not in frd2[pkgtup]: -+ print >>sys.stderr, ("Error: FileReq[%s] cache missing" % (pkgtup,), -+ name) -+for pkgtup in frd2: -+ if pkgtup not in frd1: -+ print >>sys.stderr, "Error: FileReq cache extra", pkgtup -+ continue -+ for name in frd2[pkgtup]: -+ if name not in frd1[pkgtup]: -+ print >>sys.stderr, ("Error: FileReq[%s] cache extra" % (pkgtup,), -+ name) -+ -+# File Provides (of requires) -- not exact -+if len(fpd1) != len(fpd2): -+ print >>sys.stderr, "Error: FileProv len mismatch:", len(fpd1), len(fpd2) -+for name in fpd1: -+ if name not in fpd2: -+ print >>sys.stderr, "Error: FileProv cache missing", name -+ continue -+ -+ if not __provides_of_requires_exact__: -+ continue # We might be missing some providers -+ -+ if len(fpd1[name]) != len(fpd2[name]): -+ print >>sys.stderr, ("Error: FileProv[%s] len mismatch:" % (pkgtup,), -+ len(fpd1[name]), len(fpd2[name])) -+ for pkgtup in fpd1[name]: -+ if pkgtup not in fpd2[name]: -+ print >>sys.stderr,"Error: FileProv[%s] cache missing" % name,pkgtup -+for name in fpd2: -+ if name not in fpd1: -+ print >>sys.stderr, "Error: FileProv cache extra", name -+ continue -+ for pkgtup in fpd2[name]: -+ if pkgtup not in fpd1[name]: -+ print >>sys.stderr,"Error: FileProv[%s] cache extra" % name,pkgtup -diff --git a/test/testbase.py b/test/testbase.py -index 3edfe57..c7a1ffe 100644 ---- a/test/testbase.py -+++ b/test/testbase.py -@@ -14,6 +14,7 @@ from yum import packages - from yum import packageSack - from yum.constants import TS_INSTALL_STATES, TS_REMOVE_STATES - from cli import YumBaseCli -+from yum.rpmsack import RPMDBPackageSack as _rpmdbsack - import inspect - from rpmUtils import arch - -@@ -233,6 +234,50 @@ class FakeRpmDb(packageSack.PackageSack): - def __init__(self): - packageSack.PackageSack.__init__(self) - -+ # Need to mock out rpmdb caching... copy&paste. Gack. -+ def returnConflictPackages(self): -+ ret = [] -+ for pkg in self.returnPackages(): -+ if len(pkg.conflicts): -+ ret.append(pkg) -+ return ret -+ def fileRequiresData(self): -+ installedFileRequires = {} -+ installedUnresolvedFileRequires = set() -+ resolved = set() -+ for pkg in self.returnPackages(): -+ for name, flag, evr in pkg.requires: -+ if not name.startswith('/'): -+ continue -+ installedFileRequires.setdefault(pkg.pkgtup, []).append(name) -+ if name not in resolved: -+ dep = self.getProvides(name, flag, evr) -+ resolved.add(name) -+ if not dep: -+ installedUnresolvedFileRequires.add(name) -+ -+ fileRequires = set() -+ for fnames in installedFileRequires.itervalues(): -+ fileRequires.update(fnames) -+ installedFileProviders = {} -+ for fname in fileRequires: -+ pkgtups = [pkg.pkgtup for pkg in self.getProvides(fname)] -+ installedFileProviders[fname] = pkgtups -+ -+ ret = (installedFileRequires, installedUnresolvedFileRequires, -+ installedFileProviders) -+ -+ return ret -+ def transactionCacheFileRequires(self, installedFileRequires, -+ installedUnresolvedFileRequires, -+ installedFileProvides, -+ problems): -+ return -+ def transactionCacheConflictPackages(self, pkgs): -+ return -+ def transactionResultVersion(self, rpmdbv): -+ return -+ - def getProvides(self, name, flags=None, version=(None, None, None)): - """return dict { packages -> list of matching provides }""" - self._checkIndexes(failure='build') -diff --git a/yum/__init__.py b/yum/__init__.py -index 2aaa66a..affa92b 100644 ---- a/yum/__init__.py -+++ b/yum/__init__.py -@@ -469,7 +469,8 @@ class YumBase(depsolve.Depsolve): - self.verbose_logger.log(logginglevels.DEBUG_4, - _('Reading Local RPMDB')) - self._rpmdb = rpmsack.RPMDBPackageSack(root=self.conf.installroot, -- releasever=self.yumvar['releasever']) -+ releasever=self.yumvar['releasever'], -+ cachedir=self.conf.cachedir) - self.verbose_logger.debug('rpmdb time: %0.3f' % (time.time() - rpmdb_st)) - return self._rpmdb - -@@ -1072,6 +1073,13 @@ class YumBase(depsolve.Depsolve): - if self.conf.history_record: - self.history.beg(rpmdbv, using_pkgs, list(self.tsInfo)) - -+ # Just before we update the transaction, update what we think the -+ # rpmdb will look like. This needs to be done before the run, so that if -+ # "something" happens and the rpmdb is different from what we think it -+ # will be we store what we thought, not what happened (so it'll be an -+ # invalid cache). -+ self.rpmdb.transactionResultVersion(self.tsInfo.futureRpmDBVersion()) -+ - 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 -@@ -1699,6 +1707,11 @@ class YumBase(depsolve.Depsolve): - exts = ['cachecookie', 'mirrorlist.txt'] - return self._cleanFiles(exts, 'cachedir', 'metadata') - -+ def cleanRpmDB(self): -+ cachedir = self.conf.cachedir + "/rpmdb-cache/" -+ filelist = misc.getFileList(cachedir, '', []) -+ return self._cleanFilelist('rpmdb', filelist) -+ - def _cleanFiles(self, exts, pathattr, filetype): - filelist = [] - removed = 0 -@@ -1707,7 +1720,9 @@ class YumBase(depsolve.Depsolve): - path = getattr(repo, pathattr) - if os.path.exists(path) and os.path.isdir(path): - filelist = misc.getFileList(path, ext, filelist) -+ self._cleanFilelist(filetype, filelist) - -+ def _cleanFilelist(self, filetype, filelist): - for item in filelist: - try: - misc.unlink_f(item) -@@ -4163,7 +4178,9 @@ class YumBase(depsolve.Depsolve): - if cachedir is None: - return False # Tried, but failed, to get a "user" cachedir - -- self.repos.setCacheDir(cachedir + varReplace(suffix, self.yumvar)) -+ cachedir += varReplace(suffix, self.yumvar) -+ self.repos.setCacheDir(cachedir) -+ self.rpmdb.setCacheDir(cachedir) - - return True # We got a new cache dir - -diff --git a/yum/depsolve.py b/yum/depsolve.py -index 7871e98..b5953c2 100644 ---- a/yum/depsolve.py -+++ b/yum/depsolve.py -@@ -918,31 +918,27 @@ class Depsolve(object): - - def _checkFileRequires(self): - fileRequires = set() -+ nfileRequires = set() # These need to be looked up in the rpmdb. - reverselookup = {} - ret = [] - - # generate list of file requirement in rpmdb - if self.installedFileRequires is None: -- self.installedFileRequires = {} -- self.installedUnresolvedFileRequires = set() -- resolved = set() -- for pkg in self.rpmdb.returnPackages(): -- for name, flag, evr in pkg.requires: -- if not name.startswith('/'): -- continue -- self.installedFileRequires.setdefault(pkg, []).append(name) -- if name not in resolved: -- dep = self.rpmdb.getProvides(name, flag, evr) -- resolved.add(name) -- if not dep: -- self.installedUnresolvedFileRequires.add(name) -+ self.installedFileRequires, \ -+ self.installedUnresolvedFileRequires, \ -+ self.installedFileProviders = self.rpmdb.fileRequiresData() - - # get file requirements from packages not deleted -- for po, files in self.installedFileRequires.iteritems(): -- if not self._tsInfo.getMembersWithState(po.pkgtup, output_states=TS_REMOVE_STATES): -+ todel = [] -+ for pkgtup, files in self.installedFileRequires.iteritems(): -+ if self._tsInfo.getMembersWithState(pkgtup, output_states=TS_REMOVE_STATES): -+ todel.append(pkgtup) -+ else: - fileRequires.update(files) - for filename in files: -- reverselookup.setdefault(filename, []).append(po) -+ reverselookup.setdefault(filename, []).append(pkgtup) -+ for pkgtup in todel: -+ del self.installedFileRequires[pkgtup] - - fileRequires -= self.installedUnresolvedFileRequires - -@@ -950,6 +946,8 @@ class Depsolve(object): - for txmbr in self._tsInfo.getMembersWithState(output_states=TS_INSTALL_STATES): - for name, flag, evr in txmbr.po.requires: - if name.startswith('/'): -+ pt = txmbr.po.pkgtup -+ self.installedFileRequires.setdefault(pt, []).append(name) - # check if file requires was already unresolved in update - if name in self.installedUnresolvedFileRequires: - already_broken = False -@@ -959,23 +957,75 @@ class Depsolve(object): - break - if already_broken: - continue -+ if name not in fileRequires: -+ nfileRequires.add(name) - fileRequires.add(name) -- reverselookup.setdefault(name, []).append(txmbr.po) -+ reverselookup.setdefault(name, []).append(txmbr.po.pkgtup) -+ -+ todel = [] -+ for fname in self.installedFileProviders: -+ niFP_fname = [] -+ for pkgtup in self.installedFileProviders[fname]: -+ if self._tsInfo.getMembersWithState(pkgtup, output_states=TS_REMOVE_STATES): -+ continue -+ niFP_fname.append(pkgtup) -+ -+ if not niFP_fname: -+ todel.append(fname) -+ continue -+ -+ self.installedFileProviders[fname] = niFP_fname -+ for fname in todel: -+ del self.installedFileProviders[fname] - - # check the file requires -+ iFP = self.installedFileProviders - for filename in fileRequires: -- if not self.tsInfo.getOldProvides(filename) and not self.tsInfo.getNewProvides(filename): -- for po in reverselookup[filename]: -- ret.append( (po, (filename, 0, '')) ) -+ # In theory we need this to be: -+ # -+ # nprov, filename in iFP (or new), oprov -+ # -+ # ...this keeps the cache exactly the same as the non-cached data. -+ # However that also means that we'll always need the filelists, so -+ # we do: -+ # -+ # filename in iFP (if found return), oprov (if found return), -+ # nprov -+ # -+ # ...this means we'll always get the same _result_ (as we only need -+ # to know if _something_ provides), but our cache will be off on -+ # what does/doesn't provide the file. -+ if filename in self.installedFileProviders: -+ continue - -- return ret -+ oprov = self.tsInfo.getOldProvides(filename) -+ if oprov: -+ iFP.setdefault(filename, []).extend([po.pkgtup for po in oprov]) -+ continue -+ -+ nprov = self.tsInfo.getNewProvides(filename) -+ if nprov: -+ iFP.setdefault(filename, []).extend([po.pkgtup for po in nprov]) -+ continue -+ -+ for pkgtup in reverselookup[filename]: -+ po = self.getInstalledPackageObject(pkgtup) -+ ret.append( (po, (filename, 0, '')) ) - -+ self.rpmdb.transactionCacheFileRequires(self.installedFileRequires, -+ self.installedUnresolvedFileRequires, -+ self.installedFileProviders, -+ ret) -+ -+ return ret - - def _checkConflicts(self): - ret = [ ] -- for po in self.rpmdb.returnPackages(): -+ cpkgs = [] -+ for po in self.rpmdb.returnConflictPackages(): - if self.tsInfo.getMembersWithState(po.pkgtup, output_states=TS_REMOVE_STATES): - continue -+ cpkgs.append(po) - for conflict in po.returnPrco('conflicts'): - (r, f, v) = conflict - for conflicting_po in self.tsInfo.getNewProvides(r, f, v): -@@ -985,16 +1035,20 @@ class Depsolve(object): - conflicting_po) ) - for txmbr in self.tsInfo.getMembersWithState(output_states=TS_INSTALL_STATES): - po = txmbr.po -+ done = False - for conflict in txmbr.po.returnPrco('conflicts'): -+ if not done: -+ cpkgs.append(txmbr.po) -+ done = True - (r, f, v) = conflict - for conflicting_po in self.tsInfo.getProvides(r, f, v): - if conflicting_po.pkgtup[0] == po.pkgtup[0] and conflicting_po.pkgtup[2:] == po.pkgtup[2:]: - continue - ret.append( (po, self._prco_req_nfv2req(r, f, v), - conflicting_po) ) -+ self.rpmdb.transactionCacheConflictPackages(cpkgs) - return ret - -- - def isPackageInstalled(self, pkgname): - lst = self.tsInfo.matchNaevr(name = pkgname) - for txmbr in lst: -diff --git a/yum/rpmsack.py b/yum/rpmsack.py -index 151e33e..a5f4042 100644 ---- a/yum/rpmsack.py -+++ b/yum/rpmsack.py -@@ -97,7 +97,10 @@ class RPMDBPackageSack(PackageSackBase): - rpm.RPMTAG_OBSOLETEFLAGS) - } - -- def __init__(self, root='/', releasever=None): -+ # Do we want to cache rpmdb data in a file, for later use? -+ __cache_rpmdb__ = True -+ -+ def __init__(self, root='/', releasever=None, cachedir=None): - self.root = root - self._idx2pkg = {} - self._name2pkg = {} -@@ -107,6 +110,13 @@ class RPMDBPackageSack(PackageSackBase): - self._get_pro_cache = {} - self._get_req_cache = {} - self._loaded_gpg_keys = False -+ if cachedir is None: -+ cachedir = misc.getCacheDir() -+ self.setCacheDir(cachedir) -+ self._have_cached_rpmdbv_data = None -+ self._cached_conflicts_data = None -+ # Store the result of what happens, if a transaction completes. -+ self._trans_cache_store = {} - self.ts = None - self.releasever = releasever - self.auto_close = False # this forces a self.ts.close() after -@@ -153,6 +163,13 @@ class RPMDBPackageSack(PackageSackBase): - 'conflicts' : { }, - 'obsoletes' : { }, - } -+ self._have_cached_rpmdbv_data = None -+ self._cached_conflicts_data = None -+ -+ def setCacheDir(self, cachedir): -+ """ Sets the internal cachedir value for the rpmdb, to be the -+ "rpmdb-cache" directory from this parent. """ -+ self._cachedir = cachedir + "/rpmdb-cache/" - - def readOnlyTS(self): - if not self.ts: -@@ -367,6 +384,103 @@ class RPMDBPackageSack(PackageSackBase): - pkgobjlist = pkgobjlist[0] + pkgobjlist[1] - return pkgobjlist - -+ def _uncached_returnConflictPackages(self): -+ if self._cached_conflicts_data is None: -+ ret = [] -+ for pkg in self.returnPackages(): -+ if len(pkg.conflicts): -+ ret.append(pkg) -+ self._cached_conflicts_data = ret -+ return self._cached_conflicts_data -+ -+ def _write_conflicts_new(self, pkgs, rpmdbv): -+ if not os.access(self._cachedir, os.W_OK): -+ return -+ -+ conflicts_fname = self._cachedir + '/conflicts' -+ fo = open(conflicts_fname + '.tmp', 'w') -+ fo.write("%s\n" % rpmdbv) -+ fo.write("%u\n" % len(pkgs)) -+ for pkg in sorted(pkgs): -+ for var in pkg.pkgtup: -+ fo.write("%s\n" % var) -+ fo.close() -+ os.rename(conflicts_fname + '.tmp', conflicts_fname) -+ -+ def _write_conflicts(self, pkgs): -+ rpmdbv = self.simpleVersion(main_only=True)[0] -+ self._write_conflicts_new(pkgs, rpmdbv) -+ -+ def _read_conflicts(self): -+ if not self.__cache_rpmdb__: -+ return None -+ -+ def _read_str(fo): -+ return fo.readline()[:-1] -+ -+ conflict_fname = self._cachedir + '/conflicts' -+ if not os.path.exists(conflict_fname): -+ return None -+ -+ fo = open(conflict_fname) -+ frpmdbv = fo.readline() -+ rpmdbv = self.simpleVersion(main_only=True)[0] -+ if not frpmdbv or rpmdbv != frpmdbv[:-1]: -+ return None -+ -+ ret = [] -+ try: -+ # Read the conflicts... -+ pkgtups_num = int(_read_str(fo)) -+ while pkgtups_num > 0: -+ pkgtups_num -= 1 -+ -+ # n, a, e, v, r -+ pkgtup = (_read_str(fo), _read_str(fo), -+ _read_str(fo), _read_str(fo), _read_str(fo)) -+ int(pkgtup[2]) # Check epoch is valid -+ ret.extend(self.searchPkgTuple(pkgtup)) -+ if fo.readline() != '': # Should be EOF -+ return None -+ except ValueError: -+ return None -+ -+ self._cached_conflicts_data = ret -+ return self._cached_conflicts_data -+ -+ def transactionCacheConflictPackages(self, pkgs): -+ if self.__cache_rpmdb__: -+ self._trans_cache_store['conflicts'] = pkgs -+ -+ def returnConflictPackages(self): -+ """ Return a list of packages that have conflicts. """ -+ pkgs = self._read_conflicts() -+ if pkgs is None: -+ pkgs = self._uncached_returnConflictPackages() -+ if self.__cache_rpmdb__: -+ self._write_conflicts(pkgs) -+ -+ return pkgs -+ -+ def transactionResultVersion(self, rpmdbv): -+ """ We are going to do a transaction, and the parameter will be the -+ rpmdb version when we finish. The idea being we can update all -+ our rpmdb caches for that rpmdb version. """ -+ -+ if not self.__cache_rpmdb__: -+ self._trans_cache_store = {} -+ return -+ -+ if 'conflicts' in self._trans_cache_store: -+ pkgs = self._trans_cache_store['conflicts'] -+ self._write_conflicts_new(pkgs, rpmdbv) -+ -+ if 'file-requires' in self._trans_cache_store: -+ data = self._trans_cache_store['file-requires'] -+ self._write_file_requires(rpmdbv, data) -+ -+ self._trans_cache_store = {} -+ - def returnGPGPubkeyPackages(self): - """ Return packages of the gpg-pubkeys ... hacky. """ - ts = self.readOnlyTS() -@@ -377,6 +491,198 @@ class RPMDBPackageSack(PackageSackBase): - ret.append(self._makePackageObject(hdr, mi.instance())) - return ret - -+ def _read_file_requires(self): -+ def _read_str(fo): -+ return fo.readline()[:-1] -+ -+ assert self.__cache_rpmdb__ -+ if not os.path.exists(self._cachedir + '/file-requires'): -+ return None, None -+ -+ rpmdbv = self.simpleVersion(main_only=True)[0] -+ fo = open(self._cachedir + '/file-requires') -+ frpmdbv = fo.readline() -+ if not frpmdbv or rpmdbv != frpmdbv[:-1]: -+ return None, None -+ -+ iFR = {} -+ iFP = {} -+ try: -+ # Read the requires... -+ pkgtups_num = int(_read_str(fo)) -+ while pkgtups_num > 0: -+ pkgtups_num -= 1 -+ -+ # n, a, e, v, r -+ pkgtup = (_read_str(fo), _read_str(fo), -+ _read_str(fo), _read_str(fo), _read_str(fo)) -+ int(pkgtup[2]) # Check epoch is valid -+ -+ files_num = int(_read_str(fo)) -+ while files_num > 0: -+ files_num -= 1 -+ -+ fname = _read_str(fo) -+ -+ iFR.setdefault(pkgtup, []).append(fname) -+ -+ # Read the provides... -+ files_num = int(_read_str(fo)) -+ while files_num > 0: -+ files_num -= 1 -+ fname = _read_str(fo) -+ pkgtups_num = int(_read_str(fo)) -+ while pkgtups_num > 0: -+ pkgtups_num -= 1 -+ -+ # n, a, e, v, r -+ pkgtup = (_read_str(fo), _read_str(fo), -+ _read_str(fo), _read_str(fo), _read_str(fo)) -+ int(pkgtup[2]) # Check epoch is valid -+ -+ iFP.setdefault(fname, []).append(pkgtup) -+ -+ if fo.readline() != '': # Should be EOF -+ return None, None -+ except ValueError: -+ return None, None -+ -+ return iFR, iFP -+ -+ def fileRequiresData(self): -+ """ Get a cached copy of the fileRequiresData for -+ depsolving/checkFileRequires, note the giant comment in that -+ function about how we don't keep this perfect for the providers of -+ the requires. """ -+ if self.__cache_rpmdb__: -+ iFR, iFP = self._read_file_requires() -+ if iFR is not None: -+ return iFR, set(), iFP -+ -+ installedFileRequires = {} -+ installedUnresolvedFileRequires = set() -+ resolved = set() -+ for pkg in self.returnPackages(): -+ for name, flag, evr in pkg.requires: -+ if not name.startswith('/'): -+ continue -+ installedFileRequires.setdefault(pkg.pkgtup, []).append(name) -+ if name not in resolved: -+ dep = self.getProvides(name, flag, evr) -+ resolved.add(name) -+ if not dep: -+ installedUnresolvedFileRequires.add(name) -+ -+ fileRequires = set() -+ for fnames in installedFileRequires.itervalues(): -+ fileRequires.update(fnames) -+ installedFileProviders = {} -+ for fname in fileRequires: -+ pkgtups = [pkg.pkgtup for pkg in self.getProvides(fname)] -+ installedFileProviders[fname] = pkgtups -+ -+ ret = (installedFileRequires, installedUnresolvedFileRequires, -+ installedFileProviders) -+ if self.__cache_rpmdb__: -+ rpmdbv = self.simpleVersion(main_only=True)[0] -+ self._write_file_requires(rpmdbv, ret) -+ -+ return ret -+ -+ def transactionCacheFileRequires(self, installedFileRequires, -+ installedUnresolvedFileRequires, -+ installedFileProvides, -+ problems): -+ if not self.__cache_rpmdb__: -+ return -+ -+ if installedUnresolvedFileRequires or problems: -+ return -+ -+ data = (installedFileRequires, -+ installedUnresolvedFileRequires, -+ installedFileProvides) -+ -+ self._trans_cache_store['file-requires'] = data -+ -+ def _write_file_requires(self, rpmdbversion, data): -+ if not os.access(self._cachedir, os.W_OK): -+ return -+ -+ (installedFileRequires, -+ installedUnresolvedFileRequires, -+ installedFileProvides) = data -+ -+ fo = open(self._cachedir + '/file-requires.tmp', 'w') -+ fo.write("%s\n" % rpmdbversion) -+ -+ fo.write("%u\n" % len(installedFileRequires)) -+ for pkgtup in sorted(installedFileRequires): -+ for var in pkgtup: -+ fo.write("%s\n" % var) -+ filenames = set(installedFileRequires[pkgtup]) -+ fo.write("%u\n" % len(filenames)) -+ for fname in sorted(filenames): -+ fo.write("%s\n" % fname) -+ -+ fo.write("%u\n" % len(installedFileProvides)) -+ for fname in sorted(installedFileProvides): -+ fo.write("%s\n" % fname) -+ -+ pkgtups = set(installedFileProvides[fname]) -+ fo.write("%u\n" % len(pkgtups)) -+ for pkgtup in sorted(pkgtups): -+ for var in pkgtup: -+ fo.write("%s\n" % var) -+ fo.close() -+ os.rename(self._cachedir + '/file-requires.tmp', -+ self._cachedir + '/file-requires') -+ -+ def _get_cached_simpleVersion_main(self): -+ """ Return the cached string of the main rpmdbv. """ -+ if self._have_cached_rpmdbv_data is not None: -+ return self._have_cached_rpmdbv_data -+ -+ if not self.__cache_rpmdb__: -+ return None -+ -+ # This test is "obvious" and the only thing to come out of: -+ # http://lists.rpm.org/pipermail/rpm-maint/2007-November/001719.html -+ # ...if anything gets implemented, we should change. -+ rpmdbvfname = self._cachedir + "/version" -+ rpmdbfname = "/var/lib/rpm/Packages" -+ -+ if os.path.exists(rpmdbvfname) and os.path.exists(rpmdbfname): -+ # See if rpmdb has "changed" ... -+ nmtime = os.path.getmtime(rpmdbvfname) -+ omtime = os.path.getmtime(rpmdbfname) -+ if omtime <= nmtime: -+ rpmdbv = open(rpmdbvfname).readline()[:-1] -+ self._have_cached_rpmdbv_data = rpmdbv -+ return self._have_cached_rpmdbv_data -+ -+ def _put_cached_simpleVersion_main(self, rpmdbv): -+ self._have_cached_rpmdbv_data = str(rpmdbv) -+ -+ if not self.__cache_rpmdb__: -+ return -+ -+ rpmdbvfname = self._cachedir + "/version" -+ if not os.access(self._cachedir, os.W_OK): -+ if os.path.exists(self._cachedir): -+ return -+ -+ try: -+ os.makedirs(self._cachedir) -+ except (IOError, OSError), e: -+ return -+ -+ fo = open(rpmdbvfname + ".tmp", "w") -+ fo.write(self._have_cached_rpmdbv_data) -+ fo.write('\n') -+ fo.close() -+ os.rename(rpmdbvfname + ".tmp", rpmdbvfname) -+ - def simpleVersion(self, main_only=False, groups={}): - """ Return a simple version for all installed packages. """ - def _up_revs(irepos, repoid, rev, pkg, csum): -@@ -387,6 +693,11 @@ class RPMDBPackageSack(PackageSackBase): - rpsv = irevs.setdefault(rev, PackageSackVersion()) - rpsv.update(pkg, csum) - -+ if main_only and not groups: -+ rpmdbv = self._get_cached_simpleVersion_main() -+ if rpmdbv is not None: -+ return [rpmdbv, {}] -+ - main = PackageSackVersion() - irepos = {} - main_grps = {} -@@ -420,6 +731,9 @@ class RPMDBPackageSack(PackageSackBase): - if pkg.name in groups[group]: - _up_revs(irepos_grps[group], repoid, rev, pkg, csum) - -+ if self._have_cached_rpmdbv_data is None: -+ self._put_cached_simpleVersion_main(main) -+ - if groups: - return [main, irepos, main_grps, irepos_grps] - return [main, irepos] -diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py -index c2fc804..c7d5b8c 100644 ---- a/yum/transactioninfo.py -+++ b/yum/transactioninfo.py -@@ -26,7 +26,7 @@ to rpm. - """ - - from constants import * --from packageSack import PackageSack -+from packageSack import PackageSack, PackageSackVersion - from packages import YumInstalledPackage - from sqlitesack import YumAvailablePackageSqlite - import Errors -@@ -558,6 +558,42 @@ class TransactionData: - result.update(self.getNewRequires(name, flag, version)) - return result - -+ def futureRpmDBVersion(self): -+ """ Return a simple version for the future rpmdb. Works like -+ rpmdb.simpleVersion(main_only=True)[0], but for the state the rpmdb -+ will be in after the transaction. """ -+ pkgs = self.rpmdb.returnPackages() -+ _reinstalled_pkgtups = {} -+ for txmbr in self.getMembersWithState(None, TS_INSTALL_STATES): -+ # reinstalls have to use their "new" checksum data, in case it's -+ # different. -+ if hasattr(txmbr, 'reinstall') and txmbr.reinstall: -+ _reinstalled_pkgtups[txmbr.po.pkgtup] = txmbr.po -+ pkgs.append(txmbr.po) -+ -+ main = PackageSackVersion() -+ for pkg in sorted(pkgs): -+ if pkg.repoid != 'installed': -+ # Paste from PackageSackBase.simpleVersion() -+ csum = pkg.returnIdSum() -+ main.update(pkg, csum) -+ continue -+ -+ # Installed pkg, see if it's about to die -+ if self.getMembersWithState(pkg.pkgtup, TS_REMOVE_STATES): -+ continue -+ # ...or die and be risen again (Zombie!) -+ if pkg.pkgtup in _reinstalled_pkgtups: -+ continue -+ -+ # Paste from rpmdb.simpleVersion() -+ ydbi = pkg.yumdb_info -+ csum = None -+ if 'checksum_type' in ydbi and 'checksum_data' in ydbi: -+ csum = (ydbi.checksum_type, ydbi.checksum_data) -+ main.update(pkg, csum) -+ return main -+ - class ConditionalTransactionData(TransactionData): - """A transaction data implementing conditional package addition""" - def __init__(self): -@@ -615,6 +651,7 @@ class SortableTransactionData(TransactionData): - self._sorted.reverse() - return self._sorted - -+ - class TransactionMember: - """Class to describe a Transaction Member (a pkg to be installed/ - updated/erased).""" -diff --git a/yumcommands.py b/yumcommands.py -index b809216..f123c16 100644 ---- a/yumcommands.py -+++ b/yumcommands.py -@@ -1099,20 +1099,29 @@ class VersionCommand(YumCommand): - - verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) - groups = {} -- gconf = yum.config.readVersionGroupsConfig() -+ if vcmd in ('nogroups', 'nogroups-installed', 'nogroups-available', -+ 'nogroups-all'): -+ gconf = [] -+ if vcmd == 'nogroups': -+ vcmd = 'installed' -+ else: -+ vcmd = vcmd[len('nogroups-'):] -+ else: -+ 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'): -+ if vcmd == 'grouplist': - print _(" Yum version groups:") - for group in sorted(groups): - print " ", group - - return 0, ['version grouplist'] - -- if vcmd in ('groupinfo'): -+ if vcmd == 'groupinfo': - for group in groups: - if group not in extcmds[1:]: - continue -commit 366c3e6bb9ebd7ad3f121bdf2c089b0132d51604 -Author: James Antill -Date: Fri Dec 4 08:27:01 2009 -0500 - - Fixes for clean functions, BZ 544173 - - When nothing to be done, set removed. - When doing "clean all" fix the var. name. - When doing anything but clean rpmdb, fix the return. - Allow rpmdb as a valid arg. - Fix getFileList() with ext == '' - -diff --git a/cli.py b/cli.py -index f93a706..2c6c9a4 100644 ---- a/cli.py -+++ b/cli.py -@@ -897,7 +897,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): - rpmcode, rpmresults = self.cleanRpmDB() - self.plugins.run('clean') - -- code = hdrcode + pkgcode + xmlcode + dbcode + rpmdb -+ code = hdrcode + pkgcode + xmlcode + dbcode + rpmcode - results = (hdrresults + pkgresults + xmlresults + dbresults + - rpmresults) - for msg in results: -diff --git a/yum/__init__.py b/yum/__init__.py -index affa92b..1c82144 100644 ---- a/yum/__init__.py -+++ b/yum/__init__.py -@@ -1714,15 +1714,15 @@ class YumBase(depsolve.Depsolve): - - def _cleanFiles(self, exts, pathattr, filetype): - filelist = [] -- removed = 0 - for ext in exts: - for repo in self.repos.listEnabled(): - path = getattr(repo, pathattr) - if os.path.exists(path) and os.path.isdir(path): - filelist = misc.getFileList(path, ext, filelist) -- self._cleanFilelist(filetype, filelist) -+ return self._cleanFilelist(filetype, filelist) - - def _cleanFilelist(self, filetype, filelist): -+ removed = 0 - for item in filelist: - try: - misc.unlink_f(item) -diff --git a/yum/misc.py b/yum/misc.py -index 642f9a2..f221f1d 100644 ---- a/yum/misc.py -+++ b/yum/misc.py -@@ -336,7 +336,7 @@ def getFileList(path, ext, filelist): - if os.path.isdir(path + '/' + d): - filelist = getFileList(path + '/' + d, ext, filelist) - else: -- if d[-extlen:].lower() == '%s' % (ext): -+ if not ext or d[-extlen:].lower() == '%s' % (ext): - newpath = os.path.normpath(path + '/' + d) - filelist.append(newpath) - -diff --git a/yumcommands.py b/yumcommands.py -index 83d9d00..4fe2fe1 100644 ---- a/yumcommands.py -+++ b/yumcommands.py -@@ -85,7 +85,7 @@ def checkGroupArg(base, basecmd, extcmds): - - def checkCleanArg(base, basecmd, extcmds): - VALID_ARGS = ('headers', 'packages', 'metadata', 'dbcache', 'plugins', -- 'expire-cache', 'all') -+ 'expire-cache', 'rpmdb', 'all') - - if len(extcmds) == 0: - base.logger.critical(_('Error: clean requires an option: %s') % ( -commit dbcdcd605d233c555f3ce3861152a2378bf9e622 -Author: James Antill -Date: Thu Dec 10 09:46:00 2009 -0500 - - Fix when we have file require(s) from just to be installed pkgs. The mash bug - -diff --git a/yum/depsolve.py b/yum/depsolve.py -index b5953c2..d46452c 100644 ---- a/yum/depsolve.py -+++ b/yum/depsolve.py -@@ -1009,7 +1009,11 @@ class Depsolve(object): - continue - - for pkgtup in reverselookup[filename]: -- po = self.getInstalledPackageObject(pkgtup) -+ po = self.tsInfo.getMembersWithState(pkgtup, TS_INSTALL_STATES) -+ if po: -+ po = po[0] # Should only have one -+ else: -+ po = self.getInstalledPackageObject(pkgtup) - ret.append( (po, (filename, 0, '')) ) - - self.rpmdb.transactionCacheFileRequires(self.installedFileRequires, -commit 67882783e6add4c5c9b717872554c23fc0ade913 -Author: James Antill -Date: Thu Dec 10 18:28:28 2009 -0500 - - getMembers returns txmbrs not POs ... *sigh* - -diff --git a/yum/depsolve.py b/yum/depsolve.py -index d46452c..a09bd4b 100644 ---- a/yum/depsolve.py -+++ b/yum/depsolve.py -@@ -1011,7 +1011,7 @@ class Depsolve(object): - for pkgtup in reverselookup[filename]: - po = self.tsInfo.getMembersWithState(pkgtup, TS_INSTALL_STATES) - if po: -- po = po[0] # Should only have one -+ po = po[0].po # Should only have one - else: - po = self.getInstalledPackageObject(pkgtup) - ret.append( (po, (filename, 0, '')) ) diff --git a/sources b/sources deleted file mode 100644 index de9bf69..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -84eede25288772f38719d5c9e13ae75e yum-3.2.26.tar.gz diff --git a/yum-2.6-stdout-trick.patch b/yum-2.6-stdout-trick.patch deleted file mode 100644 index 140f910..0000000 --- a/yum-2.6-stdout-trick.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- yum/logginglevels.py~ 2009-01-20 16:56:19.000000000 -0500 -+++ yum/logginglevels.py 2009-01-20 16:56:19.000000000 -0500 -@@ -141,7 +141,7 @@ - plainformatter = logging.Formatter("%(message)s") - syslogformatter = logging.Formatter("yum: %(message)s") - -- console_stdout = logging.StreamHandler(sys.stdout) -+ console_stdout = logging.StreamHandler(sys.__stdout__) - console_stdout.setFormatter(plainformatter) - verbose = logging.getLogger("yum.verbose") - verbose.propagate = False diff --git a/yum-3.2.20-listTrans-skip-broken.patch b/yum-3.2.20-listTrans-skip-broken.patch deleted file mode 100644 index 4e73716..0000000 --- a/yum-3.2.20-listTrans-skip-broken.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 5e405ec2e6651dc828c9b47075b6867a7e145536 -Author: James Antill -Date: Mon Oct 27 23:59:37 2008 -0400 - - Iterate skipped_packages properly as they are pos not txmbrs, fixes BZ 468785 - -diff --git a/output.py b/output.py -index 502aa4b..3c2795c 100644 ---- a/output.py -+++ b/output.py -@@ -789,8 +789,7 @@ class YumOutput: - (_('Removing'), self.tsInfo.removed), - (_('Installing for dependencies'), self.tsInfo.depinstalled), - (_('Updating for dependencies'), self.tsInfo.depupdated), -- (_('Removing for dependencies'), self.tsInfo.depremoved), -- (_('Skipped (dependency problems)'), self.skipped_packages),]: -+ (_('Removing for dependencies'), self.tsInfo.depremoved)]: - lines = [] - for txmbr in pkglist: - (n,a,e,v,r) = txmbr.pkgtup -@@ -813,6 +812,30 @@ class YumOutput: - - pkglist_lines.append((action, lines)) - -+ for (action, pkglist) in [(_('Skipped (dependency problems)'), -+ self.skipped_packages),]: -+ lines = [] -+ for po in pkglist: -+ (n,a,e,v,r) = po.pkgtup -+ evr = po.printVer() -+ repoid = po.repoid -+ pkgsize = float(po.size) -+ size = self.format_number(pkgsize) -+ -+ if a is None: # gpgkeys are weird -+ a = 'noarch' -+ -+ lines.append((n, a, evr, repoid, size, [])) -+ # Create a dict of field_length => number of packages, for -+ # each field. -+ for (d, v) in (("n",len(n)), ("v",len(evr)), ("r",len(repoid))): -+ data[d].setdefault(v, 0) -+ data[d][v] += 1 -+ if a_wid < len(a): # max() is only in 2.5.z -+ a_wid = len(a) -+ -+ pkglist_lines.append((action, lines)) -+ - if data['n']: - data = [data['n'], {}, data['v'], data['r'], {}] - columns = [1, a_wid, 1, 1, 5] diff --git a/yum-3.2.20-obsoletes-dict-fix.patch b/yum-3.2.20-obsoletes-dict-fix.patch deleted file mode 100644 index 282d70f..0000000 --- a/yum-3.2.20-obsoletes-dict-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit a59165490ebc236f7682ebc157bf069497958b42 -Author: James Antill -Date: Thu Dec 4 18:58:59 2008 -0500 - - Always have an obsoletes dict, so we can always call getObsoletesTuples() etc. - -diff --git a/rpmUtils/updates.py b/rpmUtils/updates.py -index f348ae9..16f733b 100644 ---- a/rpmUtils/updates.py -+++ b/rpmUtils/updates.py -@@ -54,6 +54,7 @@ class Updates: - self.updating_dict = {} - #debug, ignore me - self.debug = 0 -+ self.obsoletes = {} - - def _delFromDict(self, dict_, keys, value): - for key in keys: diff --git a/yum-6hr-metadata_expire.patch b/yum-6hr-metadata_expire.patch deleted file mode 100644 index 9b7f060..0000000 --- a/yum-6hr-metadata_expire.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/yum/config.py b/yum/config.py -index 2219605..13efd9e 100644 ---- a/yum/config.py -+++ b/yum/config.py -@@ -653,7 +653,7 @@ class YumConf(StartupConf): - # Time in seconds (1.5h), yum-updatesd runs once per. hour by default - # this time means we don't do interactive network checks/updates if - # yum-updatesd is running. -- metadata_expire = SecondsOption(60 * 90) -+ metadata_expire = SecondsOption(60 * 60 * 6) # 6 hours - mirrorlist_expire = SecondsOption(86400) # time in seconds (1 day) - rpm_check_debug = BoolOption(True) - disable_excludes = ListOption() diff --git a/yum-HEAD.patch b/yum-HEAD.patch deleted file mode 100644 index 83ff577..0000000 --- a/yum-HEAD.patch +++ /dev/null @@ -1,16460 +0,0 @@ -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/yum/__init__.py b/yum/__init__.py -index d0bd4cc..06f6156 100644 ---- a/yum/__init__.py -+++ b/yum/__init__.py -@@ -1467,7 +1467,8 @@ class YumBase(depsolve.Depsolve): - os.unlink(fo) - - 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 - -@@ -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 -- -- 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): -diff --git a/yum/history.py b/yum/history.py -index 8de7459..2707cac 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 - 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/misc.py b/yum/misc.py -index d63993b..70ccb0a 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 -@@ -628,7 +630,40 @@ def prco_tuple_to_string(prcoTuple): - return name - - return '%s %s %s' % (name, flags[flag], version_tuple_to_string(evr)) -+ -+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: -+ 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 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 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/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..4ab20e9 100644 ---- a/yum/rpmsack.py -+++ b/yum/rpmsack.py -@@ -282,18 +282,21 @@ 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) -+ - 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 po.checkPrco(prcotype, (n, f, (e,v,r))): -+ 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..6b9acfc 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,58 @@ 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 po.checkPrco(prcotype, (n, f, (e,v,r))): -+ 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 +1510,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 diff --git a/yum-close-rpmdb-really.patch b/yum-close-rpmdb-really.patch deleted file mode 100644 index 54b3f6e..0000000 --- a/yum-close-rpmdb-really.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/yum/__init__.py b/yum/__init__.py -index 6378cdc..cc57e98 100644 ---- a/yum/__init__.py -+++ b/yum/__init__.py -@@ -427,6 +427,9 @@ class YumBase(depsolve.Depsolve): - - def closeRpmDB(self): - """closes down the instances of the rpmdb we have wangling around""" -+ if self._rpmdb is not None: -+ self._rpmdb.ts = None -+ self._rpmdb.dropCachedData() - self._rpmdb = None - self._ts = None - self._tsInfo = None -@@ -1008,6 +1011,7 @@ class YumBase(depsolve.Depsolve): - # for any kind of install add from_repo to the yumdb, and the cmdline - # and the install reason - -+ self.rpmdb.dropCachedData() - for txmbr in self.tsInfo: - if txmbr.output_state in TS_INSTALL_STATES: - if not self.rpmdb.contains(po=txmbr.po): -@@ -1037,7 +1041,7 @@ class YumBase(depsolve.Depsolve): - else: - self.verbose_logger.log(logginglevels.DEBUG_2, 'What is this? %s' % txmbr.po) - -- -+ self.rpmdb.dropCachedData() - - def costExcludePackages(self): - """exclude packages if they have an identical package in another repo - -diff --git a/yum/rpmsack.py b/yum/rpmsack.py -index 5189b18..8556e9a 100644 ---- a/yum/rpmsack.py -+++ b/yum/rpmsack.py -@@ -140,7 +140,10 @@ class RPMDBPackageSack(PackageSackBase): - self._simple_pkgtup_list = [] - self._get_pro_cache = {} - self._get_req_cache = {} -- misc.unshare_data() -+ # We can be called on python shutdown (due to yb.__del__), at which -+ # point other modules might not be available. -+ if misc is not None: -+ misc.unshare_data() - self._cache = { - 'provides' : { }, - 'requires' : { }, diff --git a/yum-manpage-files.patch b/yum-manpage-files.patch deleted file mode 100644 index 4681ac5..0000000 --- a/yum-manpage-files.patch +++ /dev/null @@ -1,65 +0,0 @@ -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 @@ - .PP - .SH "FILES" - .nf --/etc/yum/yum.conf --/etc/yum/repos.d/ -+/etc/yum.conf -+/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 -@@ -4,10 +4,10 @@ - \fByum.conf\fR \- Configuration file for \fByum(8)\fR. - .SH "DESCRIPTION" - .LP --Yum uses a configuration file at \fB/etc/yum/yum.conf\fR. -+Yum uses a configuration file at \fB/etc/yum.conf\fR. - .LP - Additional configuration files are also read from the directories set by the --\fBreposdir\fR option (default is `/etc/yum/repos.d'). -+\fBreposdir\fR option (default is `/etc/yum.repos.d'). - See the \fBreposdir\fR option below for further details. - - .SH "PARAMETERS" -@@ -38,10 +38,10 @@ - - .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 - file in this directory should contain one or more repository sections as - documented in \fB[repository] options\fR below. These will be merged with the --repositories defined in /etc/yum/yum.conf to form the complete set of -+repositories defined in /etc/yum.conf to form the complete set of - repositories that yum will use. - - .IP \fBdebuglevel\fR -@@ -511,8 +511,8 @@ - - .SH "URL INCLUDE SYNTAX" - .LP --The inclusion of external configuration files is supported for /etc/yum/yum.conf --and the .repo files in the /etc/yum/repos.d directory. To include a URL, use a -+The inclusion of external configuration files is supported for /etc/yum.conf -+and the .repo files in the /etc/yum.repos.d directory. To include a URL, use a - line of the following format: - - include=url://to/some/location -@@ -549,8 +549,8 @@ - - .SH "FILES" - .nf --/etc/yum/yum.conf --/etc/yum/repos.d/ -+/etc/yum.conf -+/etc/yum.repos.d/ - /etc/yum/pluginconf.d/ - - .SH "SEE ALSO" diff --git a/yum-mirror-priority.patch b/yum-mirror-priority.patch deleted file mode 100644 index 259a365..0000000 --- a/yum-mirror-priority.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- yum/config.py~ 2008-03-04 16:21:49.000000000 -0500 -+++ yum/config.py 2008-03-04 16:21:49.000000000 -0500 -@@ -582,7 +582,7 @@ - - commands = ListOption() - exclude = ListOption() -- failovermethod = Option('roundrobin') -+ failovermethod = Option('priority') - proxy = UrlOption(schemes=('http', 'ftp', 'https'), allow_none=True) - proxy_username = Option() - proxy_password = Option() diff --git a/yum-multilib-policy-best.patch b/yum-multilib-policy-best.patch deleted file mode 100644 index 065047b..0000000 --- a/yum-multilib-policy-best.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - # best == use the 'best arch' for the system - diff --git a/yum-updatesd.conf.fedora b/yum-updatesd.conf.fedora deleted file mode 100644 index 2088753..0000000 --- a/yum-updatesd.conf.fedora +++ /dev/null @@ -1,15 +0,0 @@ -[main] -# how often to check for new updates (in seconds) -run_interval = 3600 -# how often to allow checking on request (in seconds) -updaterefresh = 600 - -# how to send notifications (valid: dbus, email, syslog) -emit_via = dbus - -# automatically install updates -do_update = no -# automatically download updates -do_download = no -# automatically download deps of updates -do_download_deps = no diff --git a/yum.conf.fedora b/yum.conf.fedora deleted file mode 100644 index f43aa06..0000000 --- a/yum.conf.fedora +++ /dev/null @@ -1,24 +0,0 @@ -[main] -cachedir=/var/cache/yum/$basearch/$releasever -keepcache=0 -debuglevel=2 -logfile=/var/log/yum.log -exactarch=1 -obsoletes=1 -gpgcheck=1 -plugins=1 -installonly_limit=3 -color=never - -# This is the default, if you make this bigger yum won't see if the metadata -# is newer on the remote and so you'll "gain" the bandwidth of not having to -# download the new metadata and "pay" for it by yum not having correct -# information. -# It is esp. important, to have correct metadata, for distributions like -# Fedora which don't keep old packages around. If you don't like this checking -# interupting your command line usage, it's much better to have something -# manually check the metadata once an hour (yum-updatesd will do this). -# metadata_expire=90m - -# PUT YOUR REPOS HERE OR IN separate files named file.repo -# in /etc/yum.repos.d diff --git a/yum.spec b/yum.spec deleted file mode 100644 index 8c12e9d..0000000 --- a/yum.spec +++ /dev/null @@ -1,420 +0,0 @@ -%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -Summary: RPM installer/updater -Name: yum -Version: 3.2.26 -Release: 3%{?dist} -License: GPLv2+ -Group: System Environment/Base -Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz -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 - -URL: http://yum.baseurl.org/ -BuildArch: noarch -BuildRequires: python -BuildRequires: gettext -BuildRequires: intltool -Conflicts: pirut < 1.1.4 -Requires: python >= 2.4, rpm-python, rpm >= 0:4.4.2 -Requires: python-iniparse -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 -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. - -%package updatesd -Summary: Update notification daemon -Group: Applications/System -Requires: yum = %{version}-%{release} -Requires: dbus-python -Requires: pygobject2 -Requires(preun): /sbin/chkconfig -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(post): /sbin/service - -%description updatesd -yum-updatesd provides a daemon which checks for available updates and -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 -%patch6 -p1 - -%build -make - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/yum.conf -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d $RPM_BUILD_ROOT/usr/lib/yum-plugins - -# for now, move repodir/yum.conf back -mv $RPM_BUILD_ROOT/%{_sysconfdir}/yum/repos.d $RPM_BUILD_ROOT/%{_sysconfdir}/yum.repos.d -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum.conf - -# yum-updatesd has moved to the separate source version -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-updatesd.conf -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-updatesd -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/yum-updatesd.conf -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* - -%find_lang %name - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f %{name}.lang -%defattr(-, root, 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 -%{_sysconfdir}/bash_completion.d -%dir %{_datadir}/yum-cli -%{_datadir}/yum-cli/* -%{_bindir}/yum -%{python_sitelib}/yum -%{python_sitelib}/rpmUtils -%dir /var/cache/yum -%dir /var/lib/yum -%{_mandir}/man*/yum.* -%{_mandir}/man*/yum-shell* -# plugin stuff -%dir %{_sysconfdir}/yum/pluginconf.d -%dir /usr/lib/yum-plugins - -%changelog -* Tue Feb 16 2010 Seth Vidal - 3.2.26-3 -- latest head - including fixes to searchPrcos - -* 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 - -* Mon Feb 8 2010 Seth Vidal - 3.2.25-14 -- $uuid, pkgtags searching, latest HEAD patch - pre 3.2.26 - -* Fri Jan 28 2010 James Antill - 3.2.25-13 -- A couple of bugfixes, most notably: -- you can now install gpg keys again! -- bad installed file requires don't get cached. - -* Fri Jan 22 2010 Seth Vidal - 3.2.25-12 -- someone forgot to push their changes - -* Fri Jan 22 2010 Seth Vidal - 3.2.25-11 -- more fixes, more fun - -* Fri Jan 15 2010 James Antill - 3.2.25-10 -- latest head -- Fixes for pungi, rpmdb caching and kernel-PAE-devel duplicates finding -- among others. - -* Mon Jan 4 2010 Seth Vidal - 3.2.25-8 -- latest head - -* Thu Dec 10 2009 James Antill - 3.2.25-7 -- Fixes the mash bug, lookup in the tsInfo too. :( -- And fix the txmbr/po confusion ... third build the charm. - -* Fri Dec 4 2009 James Antill - 3.2.25-4 -- Fixes for yum clean all, BZ 544173 -- Also allow "yum clean rpmdb" to work, bad tester, bad. - -* Thu Dec 3 2009 Seth Vidal - 3.2.25-2 -- rebuild yum with latest HEAD patch -- add rpmdb caching patch james wrote to see if it breaks everyone :) - - -* 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 - -* 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 - -* Wed Sep 23 2009 Seth Vidal - 3.2.24-6 -- new head patch - fixes some issues with history and chroots - -* Mon Sep 21 2009 Seth Vidal - 3.2.24-5 -- latest head patch - includes yum history feature. - -* Tue Sep 15 2009 Seth Vidal - 3.2.24-4 -- new head patch - translation updates and a few bug fixes - -* Wed Sep 9 2009 Seth Vidal - 3.2.24-3 -- add geode arch patch for https://bugzilla.redhat.com/show_bug.cgi?id=518415 - - -* Thu Sep 3 2009 Seth Vidal - 3.2.24-2 -- modify cachedir to include variables - -* Thu Sep 3 2009 Seth Vidal - 3.2.24-1 -- 3.2.24 - -* Wed Sep 2 2009 Seth Vidal - 3.2.23-16 -- fix globbing issue 520810 - -* Mon Aug 31 2009 Seth Vidal - 3.2.23-15 -- one more head update - fixes some fairly ugly but kind of minor bugs - -* Tue Aug 18 2009 Seth Vidal - 3.2.23-14 -- update to latest head pre 3.2.24 -- add requirement on python-urlgrabber 3.9.0 and up - -* Wed Aug 5 2009 Seth Vidal - 3.2.23-13 -- latest head - right after freeze - -* Tue Aug 4 2009 Seth Vidal - 3.2.23-12 -- latest head - right before freeze :) - -* Mon Jul 27 2009 Fedora Release Engineering - 3.2.23-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Seth Vidal - 3.2.23-10 -- remove exactarchlist by request for rawhide - -* Thu Jul 2 2009 Seth Vidal - 3.2.23-9 -- update to latest head - make livecd creation work again in rawhide -- disable one of the man page patches until after 3.2.24 is released b/c - of the changes to the man page in the head patch - - -* Mon Jun 22 2009 James Antill - 3.2.23-8 -- Update to latest head: -- Fix old recursion bug, found by new code. -- Resolves: bug#507220 - -* Sun Jun 21 2009 James Antill - 3.2.23-6 -- Update to latest head: -- Unbreak delPackage() excludes. -- Other fixes/etc. - -* Fri Jun 19 2009 James Antill - 3.2.23-5 -- Actually apply the HEAD patch included yesterday :). - -* Thu Jun 18 2009 Seth Vidal - 3.2.23-4 -- update to latest head - -* Mon Jun 8 2009 Seth Vidal -- truncate changelog - -* Wed May 20 2009 Seth Vidal - 3.2.23-2 -- add patch to close rpmdb completely - -* Tue May 19 2009 Seth Vidal - 3.2.23-1 -- 3.2.23 - -* Mon May 11 2009 Seth Vidal - 3.2.22-5 -- jump up to almost 3.2.23. -- had to move patch0 around a bit until we rebase to 3.2.23 - -* Thu Apr 9 2009 James Antill - 3.2.22-4 -- fix typo for yum-complete-transaction message. - -* Wed Apr 8 2009 Seth Vidal - 3.2.22-3 -- fix for file:// urls which makes things in pungi/mash work - -* Tue Apr 7 2009 Seth Vidal - 3.2.22-2 -- yum-HEAD minus the yumdb patches - -* Tue Mar 24 2009 Seth Vidal - 3.2.22-1 -- 3.2.22 - 3 patches beyond 3.2.21-16 - -* Mon Mar 16 2009 Seth Vidal - 3.2.21-16 -- fix for 490490 - -* Fri Mar 13 2009 Seth Vidal - 3.2.21-15 -- update to upstream git to fix conditionals problem on anaconda installs - -* Thu Mar 12 2009 Seth Vidal - 3.2.21-14 -- latest HEAD - -* Tue Mar 10 2009 Seth Vidal - 3.2.21-13 -- f11beta build - -* Wed Mar 4 2009 Seth Vidal - 3.2.21-12 -- second verse, same as the first - -* Fri Feb 27 2009 Seth Vidal - 3.2.21-10 -- merge up a lot of fixes from latest HEAD - -* Wed Feb 25 2009 Fedora Release Engineering - 3.2.21-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 10 2009 Seth Vidal - 3.2.21-9 -- merge up to latest yum head - sort of a pre 3.2.22 - -* Wed Feb 4 2009 Seth Vidal - 3.2.21-8 -- fix for YumHeaderPackages so it plays nicely w/createrepo and mergerepo, etc - -* Thu Jan 29 2009 Seth Vidal - 3.2.21-7 -- update HEAD patch to fix repodiff (and EVR comparisons in certain cases) - -* Tue Jan 27 2009 Seth Vidal - 3.2.21-6 -- patch to keep anaconda (and other callers) happy -- remove old 6hr patch which is now upstream - -* Mon Jan 26 2009 Seth Vidal - 3.2.21-4 -- patch to latest HEAD to test a number of fixes for alpha - -* Tue Jan 20 2009 Seth Vidal - 3.2.21-3 -- add a small patch to make things play a bit nicer with the logging module - in 2.6 - - -* Wed Jan 7 2009 Seth Vidal - 3.2.21-1 -- bump to 3.2.21 - -* Thu Dec 18 2008 James Antill - 3.2.20-8 -- merge latest from upstream -- move to 6hr metadata - -* Mon Dec 8 2008 Seth Vidal - 3.2.20-7 -- merge patch from upstream and remove now old obsoletes patch - -* Thu Dec 04 2008 Jesse Keating - 3.2.20-6 -- Add patch from upstream to fix cases where obsoletes are disabled. (jantill) - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 3.2.20-5 -- Rebuild for Python 2.6 - -* Wed Nov 26 2008 Seth Vidal - 3.2.20-4 -- update head patch - -* Wed Oct 29 2008 Seth Vidal - 3.2.20-3 -- full patch against HEAD for skipbroken fixes (among others) - -* Mon Oct 27 2008 James Antill - 3.2.20-2 -- Fix listTransaction for skipped packages. - -* Mon Oct 27 2008 Seth Vidal - 3.2.20-1 -- 3.2.20 - -* Thu Oct 23 2008 Seth Vidal - 3.2.19-6 -- update HEAD patch - -* Wed Oct 15 2008 Seth Vidal - 3.2.19-5 -- rebase against 3.2.X HEAD - -* Tue Oct 14 2008 Seth Vidal - 3.2.19-4 -- pull patch from git to bring us up to current(ish) - -* Wed Sep 3 2008 Seth Vidal - 3.2.19-3 -- add patch to fix yum install name.arch matching - -* Thu Aug 28 2008 Seth Vidal - 3.2.19-2 -- add patch to fix mash's parser use. - -* Wed Aug 27 2008 Seth Vidal - 3.2.19-1 -- 3.2.19 - -* Thu Aug 7 2008 Seth Vidal - 3.2.18-1 -- 3.2.18 - -* Wed Jul 10 2008 Seth Vidal - 3.2.17-2 -- add patch from upstream for bug in compare_providers - -* Wed Jul 9 2008 Seth Vidal - 3.2.17-1 -- 3.2.17 - -* Tue Jun 24 2008 Jesse Keating - 3.2.16-4 -- Add a couple more upstream patches for even more multilib fixes - -* Tue Jun 24 2008 Jesse Keating - 3.2.16-3 -- Add another patch from upstream for multilib policy and noarch - -* Sun May 18 2008 Seth Vidal 3.2.16-2 -- stupid, stupid, stupid - - -* Fri May 16 2008 Seth Vidal 3.2.16-1 -- 3.2.16 - -* Tue Apr 15 2008 Seth Vidal 3.2.14-9 -- nine is the luckiest number that there will ever be - -* Tue Apr 15 2008 Seth Vidal 3.2.14-8 -- after many tries - this one fixes translations AND pungi - -* Thu Apr 10 2008 Seth Vidal 3.2.14-5 -- once more, with feeling - -* Thu Apr 10 2008 Seth Vidal 3.2.14-4 -- another big-head-patch - -* Wed Apr 9 2008 Seth Vidal 3.2.14-3 -- apply patch to bring this up to where HEAD is now. - -* Tue Apr 8 2008 Seth Vidal 3.2.14-1 -- remove committed patch -- obsoletes yum-basearchonly - -* Tue Apr 1 2008 Seth Vidal 3.2.13-2 -- fix minor typo in comps.py for jkeating - -* Thu Mar 20 2008 Seth Vidal 3.2.13-1 -- 3.2.13 - -* Mon Mar 17 2008 Seth Vidal 3.2.12-5 -- update manpage patch to close bug 437703. Thakns to Kulbir Saini for the patch - - -* Fri Mar 14 2008 Seth Vidal 3.2.12-4 -- multilib_policy=best is now the default - -* Thu Mar 13 2008 Seth Vidal -- add jeff sheltren's patch to close rh bug 428825 - -* Tue Mar 4 2008 Seth Vidal 3.2.12-3 -- set failovermethod to 'priority' to make jkeating happy - -* Tue Mar 4 2008 Seth Vidal 3.2.12-2 -- fix mutually obsoleting providers (like glibc!) - -* Mon Mar 3 2008 Seth Vidal - 3.2.12-1 -- 3.2.12 - -* Fri Feb 8 2008 Seth Vidal - 3.2.11-1 -- 3.2.11 - -* Sun Jan 27 2008 James Bowes 3.2.10-3 -- Remove yumupd.py - -* Fri Jan 25 2008 Seth Vidal - 3.2.10-1 -- 3.2.10 -- add pygpgme dep -