diff --git a/installonlyn-enable.patch b/installonlyn-enable.patch index d17a88a..ee5c4c6 100644 --- a/installonlyn-enable.patch +++ b/installonlyn-enable.patch @@ -1,15 +1,3 @@ ---- 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.orig 2010-06-21 17:39:17.000000000 -0400 +++ docs/yum.conf.5 2010-09-14 12:11:40.897615896 -0400 @@ -141,7 +141,7 @@ diff --git a/yum-HEAD.patch b/yum-HEAD.patch index d611bc9..b01f268 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -12,7 +12,7 @@ index 911da19..85decd5 100644 .pydevproject asthelper.completions diff --git a/Makefile b/Makefile -index 740b616..0622bbe 100644 +index 740b616..f73239b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ @@ -21,7 +21,7 @@ index 740b616..0622bbe 100644 PYFILES = $(wildcard *.py) PYLINT_MODULES = *.py yum rpmUtils PYLINT_IGNORE = oldUtils.py -@@ -38,6 +38,19 @@ install: +@@ -38,6 +38,25 @@ install: for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done @@ -38,6 +38,12 @@ index 740b616..0622bbe 100644 + tx push -s -t + @echo "You can now git commit -a -m 'Transfix push, yum.pot update'" + ++transifex: ++ make transifex-pull ++ git commit -a -m 'Transfix pull, *.po update' ++ make transifex-push ++ git commit -a -m 'Transfix push, yum.pot update' ++ .PHONY: docs test DOCS = yum rpmUtils callback.py yumcommands.py shell.py output.py cli.py utils.py\ @@ -82,7 +88,7 @@ index 2f6154e..2e5a052 100644 diff --git a/cli.py b/cli.py old mode 100644 new mode 100755 -index 6056d38..bbe8e55 +index 6056d38..919120c --- a/cli.py +++ b/cli.py @@ -25,7 +25,7 @@ import sys @@ -94,7 +100,7 @@ index 6056d38..bbe8e55 import rpm from weakref import proxy as weakref -@@ -43,7 +43,7 @@ from yum.rpmtrans import RPMTransaction +@@ -43,31 +43,34 @@ from yum.rpmtrans import RPMTransaction import signal import yumcommands @@ -103,8 +109,10 @@ index 6056d38..bbe8e55 # This is for yum-utils/yumdownloader in RHEL-5, where it isn't importing this # directly but did do "from cli import *", and we did have this in 3.2.22. I -@@ -51,23 +51,24 @@ from yum.i18n import to_unicode, to_utf8 + # just _love_ how python re-exports these by default. ++# pylint: disable-msg=W0611 from yum.packages import parsePackages ++# pylint: enable-msg=W0611 def sigquit(signum, frame): - """ SIGQUIT handler for the yum cli. """ @@ -135,7 +143,7 @@ index 6056d38..bbe8e55 def __init__(self): # handle sigquit early on -@@ -106,15 +107,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -106,15 +109,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput): self.registerCommand(yumcommands.LoadTransactionCommand()) def registerCommand(self, command): @@ -163,7 +171,7 @@ index 6056d38..bbe8e55 if self._repos and thisrepo is None: return self._repos -@@ -163,8 +173,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -163,8 +175,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput): mainopts = yum.misc.GenericHolder() mainopts.items = [] @@ -183,7 +191,7 @@ index 6056d38..bbe8e55 period = k.find('.') if period != -1: repo = k[:period] -@@ -180,13 +200,15 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -180,13 +202,15 @@ class YumBaseCli(yum.YumBase, output.YumOutput): self.main_setopts = mainopts self.repo_setopts = repoopts @@ -204,7 +212,7 @@ index 6056d38..bbe8e55 self.optparser = YumOptionParser(base=self, usage=self._makeUsage()) # Parse only command line options that affect basic yum setup -@@ -199,7 +221,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -199,7 +223,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): opts.verbose = False # go through all the setopts and set the global ones @@ -213,7 +221,7 @@ index 6056d38..bbe8e55 if self.main_setopts: for opt in self.main_setopts.items: -@@ -229,6 +251,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -229,6 +253,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput): pc.releasever = opts.releasever self.conf @@ -226,7 +234,7 @@ index 6056d38..bbe8e55 # now set all the non-first-start opts from main from our setopts if self.main_setopts: for opt in self.main_setopts.items: -@@ -240,6 +268,10 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -240,6 +270,10 @@ class YumBaseCli(yum.YumBase, output.YumOutput): except yum.Errors.ConfigError, e: self.logger.critical(_('Config Error: %s'), e) sys.exit(1) @@ -237,7 +245,7 @@ index 6056d38..bbe8e55 except ValueError, e: self.logger.critical(_('Options Error: %s'), e) sys.exit(1) -@@ -318,9 +350,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -318,9 +352,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput): time.sleep(sleeptime) def parseCommands(self): @@ -252,7 +260,7 @@ index 6056d38..bbe8e55 self.verbose_logger.debug('Yum Version: %s', yum.__version__) self.verbose_logger.log(yum.logginglevels.DEBUG_4, 'COMMAND: %s', self.cmdstring) -@@ -365,7 +399,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -365,7 +401,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput): self.history.write_addon_data('shell-cmds', data) def doShell(self): @@ -265,7 +273,7 @@ index 6056d38..bbe8e55 yumshell = shell.YumShell(base=self) -@@ -382,8 +420,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -382,8 +422,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return yumshell.result, yumshell.resultmsgs def errorSummary(self, errstring): @@ -280,7 +288,7 @@ index 6056d38..bbe8e55 summary = '' # do disk space report first p = re.compile('needs (\d+)MB on the (\S+) filesystem') -@@ -408,16 +450,17 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -408,16 +452,17 @@ class YumBaseCli(yum.YumBase, output.YumOutput): def doCommands(self): @@ -308,7 +316,7 @@ index 6056d38..bbe8e55 # at this point we know the args are valid - we don't know their meaning # but we know we're not being sent garbage -@@ -435,14 +478,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -435,14 +480,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput): try: self._getTs(needTsRemove) except yum.Errors.YumBaseError, e: @@ -331,7 +339,7 @@ index 6056d38..bbe8e55 # just make sure there's not, well, nothing to do if len(self.tsInfo) == 0: self.verbose_logger.info(_('Trying to run the transaction but nothing to do. Exiting.')) -@@ -453,7 +500,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -453,7 +502,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): lsts = self.listTransaction() if self.verbose_logger.isEnabledFor(yum.logginglevels.INFO_1): self.verbose_logger.log(yum.logginglevels.INFO_1, lsts) @@ -340,7 +348,7 @@ index 6056d38..bbe8e55 # If we are in quiet, and assumeyes isn't on we want to output # at least the transaction list anyway. self.logger.warn(lsts) -@@ -491,7 +538,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -491,7 +540,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): # confirm with user if self._promptWanted(): @@ -349,7 +357,7 @@ index 6056d38..bbe8e55 self.verbose_logger.info(_('Exiting on user Command')) return -1 -@@ -609,12 +656,14 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -609,12 +658,14 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return resultobject.return_code def gpgsigcheck(self, pkgs): @@ -369,7 +377,7 @@ index 6056d38..bbe8e55 for po in pkgs: result, errmsg = self.sigCheckPkg(po) -@@ -623,7 +672,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -623,7 +674,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput): continue elif result == 1: @@ -379,7 +387,7 @@ index 6056d38..bbe8e55 raise yum.Errors.YumBaseError, \ _('Refusing to automatically import keys when running ' \ 'unattended.\nUse "-y" to override.') -@@ -691,12 +741,62 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -691,12 +743,62 @@ class YumBaseCli(yum.YumBase, output.YumOutput): ", ".join(matches)) self.verbose_logger.log(yum.logginglevels.INFO_2, msg) @@ -447,7 +455,7 @@ index 6056d38..bbe8e55 # get the list of available packages # iterate over the user's list # add packages to Transaction holding class if they match. -@@ -710,11 +810,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -710,11 +812,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput): for arg in userlist: if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or os.path.exists(arg))): @@ -462,7 +470,7 @@ index 6056d38..bbe8e55 except yum.Errors.InstallError: self.verbose_logger.log(yum.logginglevels.INFO_2, _('No package %s%s%s available.'), -@@ -723,6 +824,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -723,6 +826,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): self._maybeYouMeant(arg) else: done = True @@ -470,7 +478,7 @@ index 6056d38..bbe8e55 if len(self.tsInfo) > oldcount: change = len(self.tsInfo) - oldcount return 2, [P_('%d package to install', '%d packages to install', change) % change] -@@ -732,9 +834,27 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -732,9 +836,27 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [_('Nothing to do')] def updatePkgs(self, userlist, quiet=0, update_to=False): @@ -501,7 +509,7 @@ index 6056d38..bbe8e55 # if there is no userlist, then do global update below # this is probably 90% of the calls # if there is a userlist then it's for updating pkgs, not obsoleting -@@ -745,21 +865,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -745,21 +867,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): else: # go through the userlist - look for items that are local rpms. If we find them @@ -532,7 +540,7 @@ index 6056d38..bbe8e55 if len(self.tsInfo) > oldcount: change = len(self.tsInfo) - oldcount -@@ -770,9 +888,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -770,9 +890,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput): # Note that we aren't in __init__ yet for a couple of reasons, but we # probably will get there for 3.2.28. def distroSyncPkgs(self, userlist): @@ -560,7 +568,15 @@ index 6056d38..bbe8e55 level = 'diff' if userlist and userlist[0] in ('full', 'diff', 'different'): -@@ -866,9 +999,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -831,6 +966,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): + continue + + nayi = napkg.yumdb_info ++ found = False + for apkg in self.pkgSack.searchPkgTuple(napkg.pkgtup): + if ('checksum_type' in nayi and + 'checksum_data' in nayi and +@@ -866,9 +1002,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [_('No Packages marked for Distribution Synchronization')] def erasePkgs(self, userlist): @@ -583,7 +599,7 @@ index 6056d38..bbe8e55 oldcount = len(self.tsInfo) all_rms = [] -@@ -884,9 +1027,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -884,9 +1030,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [_('No Packages marked for removal')] def downgradePkgs(self, userlist): @@ -607,7 +623,7 @@ index 6056d38..bbe8e55 oldcount = len(self.tsInfo) -@@ -911,20 +1065,32 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -911,20 +1068,32 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [_('Nothing to do')] def reinstallPkgs(self, userlist): @@ -644,7 +660,7 @@ index 6056d38..bbe8e55 except yum.Errors.ReinstallRemoveError: self._checkMaybeYouMeant(arg, always_output=False) except yum.Errors.ReinstallInstallError, e: -@@ -940,15 +1106,27 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -940,15 +1109,27 @@ class YumBaseCli(yum.YumBase, output.YumOutput): except yum.Errors.ReinstallError, e: assert False, "Shouldn't happen, but just in case" self.verbose_logger.log(yum.logginglevels.INFO_2, e) @@ -675,7 +691,7 @@ index 6056d38..bbe8e55 # read in each package into a YumLocalPackage Object # append it to self.localPackages # check if it can be installed or updated based on nevra versus rpmdb -@@ -972,20 +1150,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -972,20 +1153,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [_('Nothing to do')] def returnPkgLists(self, extcmds, installed_available=False): @@ -715,7 +731,7 @@ index 6056d38..bbe8e55 special = ['available', 'installed', 'all', 'extras', 'updates', 'recent', 'obsoletes'] -@@ -1017,8 +1200,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1017,8 +1203,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return ypl def search(self, args): @@ -743,7 +759,7 @@ index 6056d38..bbe8e55 # call the yum module search function with lists of tags to search # and what to search for -@@ -1108,9 +1308,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1108,9 +1311,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, matching def deplist(self, args): @@ -766,7 +782,7 @@ index 6056d38..bbe8e55 pkgs = [] for arg in args: if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or -@@ -1131,10 +1342,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1131,10 +1345,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [] def provides(self, args): @@ -790,7 +806,7 @@ index 6056d38..bbe8e55 old_sdup = self.conf.showdupesfromrepos # For output, as searchPackageProvides() is always in showdups mode self.conf.showdupesfromrepos = True -@@ -1163,20 +1383,68 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1163,20 +1386,68 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [] def resolveDepCli(self, args): @@ -864,7 +880,7 @@ index 6056d38..bbe8e55 hdrcode = pkgcode = xmlcode = dbcode = expccode = 0 pkgresults = hdrresults = xmlresults = dbresults = expcresults = [] msg = self.fmtKeyValFill(_('Cleaning repos: '), -@@ -1228,7 +1496,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1228,7 +1499,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return code, [] def returnGroupLists(self, userlist): @@ -884,7 +900,7 @@ index 6056d38..bbe8e55 uservisible=1 if len(userlist) > 0: -@@ -1283,7 +1563,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1283,7 +1566,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [_('Done')] def returnGroupSummary(self, userlist): @@ -905,7 +921,7 @@ index 6056d38..bbe8e55 uservisible=1 if len(userlist) > 0: -@@ -1327,7 +1620,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1327,7 +1623,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [_('Done')] def returnGroupInfo(self, userlist): @@ -926,7 +942,7 @@ index 6056d38..bbe8e55 for strng in userlist: group_matched = False for group in self.comps.return_groups(strng): -@@ -1340,8 +1645,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1340,8 +1648,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [] def installGroups(self, grouplist): @@ -947,7 +963,7 @@ index 6056d38..bbe8e55 pkgs_used = [] for group_string in grouplist: -@@ -1368,8 +1683,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1368,8 +1686,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 2, [P_('%d package to Install', '%d packages to Install', len(pkgs_used)) % len(pkgs_used)] def removeGroups(self, grouplist): @@ -967,7 +983,7 @@ index 6056d38..bbe8e55 pkgs_used = [] for group_string in grouplist: try: -@@ -1389,7 +1714,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1389,7 +1717,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): def _promptWanted(self): # shortcut for the always-off/always-on options @@ -976,7 +992,7 @@ index 6056d38..bbe8e55 return False if self.conf.alwaysprompt: return True -@@ -1400,7 +1725,6 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1400,7 +1728,6 @@ class YumBaseCli(yum.YumBase, output.YumOutput): # package wasn't explictly given on the command line for txmbr in self.tsInfo.getMembers(): if txmbr.isDep or \ @@ -984,7 +1000,7 @@ index 6056d38..bbe8e55 txmbr.name not in self.extcmds: return True -@@ -1408,11 +1732,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1408,11 +1735,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return False def usage(self): @@ -998,7 +1014,7 @@ index 6056d38..bbe8e55 sys.stdout.write(self.optparser.get_usage()) def _installable(self, pkg, ematch=False): -@@ -1468,9 +1792,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1468,9 +1795,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return False class YumOptionParser(OptionParser): @@ -1010,7 +1026,7 @@ index 6056d38..bbe8e55 def __init__(self,base, **kwargs): # check if this is called with a utils=True/False parameter -@@ -1488,13 +1812,23 @@ class YumOptionParser(OptionParser): +@@ -1488,13 +1815,23 @@ class YumOptionParser(OptionParser): self._addYumBasicOptions() def error(self, msg): @@ -1036,7 +1052,7 @@ index 6056d38..bbe8e55 try: args = _filtercmdline( ('--noplugins','--version','-q', '-v', "--quiet", "--verbose"), -@@ -1521,7 +1855,15 @@ class YumOptionParser(OptionParser): +@@ -1521,7 +1858,15 @@ class YumOptionParser(OptionParser): return ret def setupYumConfig(self, args=None): @@ -1053,7 +1069,7 @@ index 6056d38..bbe8e55 if not args: (opts, cmds) = self.parse_args() else: -@@ -1536,7 +1878,9 @@ class YumOptionParser(OptionParser): +@@ -1536,7 +1881,9 @@ class YumOptionParser(OptionParser): # Handle remaining options if opts.assumeyes: @@ -1064,7 +1080,7 @@ index 6056d38..bbe8e55 # Instead of going cache-only for a non-root user, try to use a # user writable cachedir. If that fails fall back to cache-only. -@@ -1640,6 +1984,14 @@ class YumOptionParser(OptionParser): +@@ -1640,6 +1987,14 @@ class YumOptionParser(OptionParser): sys.exit(1) def getRoot(self,opts): @@ -1079,7 +1095,7 @@ index 6056d38..bbe8e55 self._checkAbsInstallRoot(opts) # If the conf file is inside the installroot - use that. # otherwise look for it in the normal root -@@ -1713,6 +2065,10 @@ class YumOptionParser(OptionParser): +@@ -1713,6 +2068,10 @@ class YumOptionParser(OptionParser): help=_("verbose operation")) group.add_option("-y", "--assumeyes", dest="assumeyes", action="store_true", help=_("answer yes for all questions")) @@ -2260,7 +2276,7 @@ index c60fa08..0000000 -ts run -exit diff --git a/etc/yum.bash b/etc/yum.bash -index f1e06e8..8760a9b 100644 +index f1e06e8..c0e9c6b 100644 --- a/etc/yum.bash +++ b/etc/yum.bash @@ -8,7 +8,7 @@ _yum_list() @@ -2272,16 +2288,19 @@ index f1e06e8..8760a9b 100644 # Try to strip in between headings like "Available Packages" - would # be nice if e.g. -d 0 did that for us. This will obviously only work # for English :P -@@ -45,7 +45,7 @@ _yum_grouplist() +@@ -45,8 +45,9 @@ _yum_grouplist() { local IFS=$'\n' # TODO: add -d 0 when http://yum.baseurl.org/ticket/29 is fixed - COMPREPLY=( $( compgen -W "$( ${yum:-yum} -C grouplist $1 "$2*" \ +- 2>/dev/null | sed -ne 's/^[[:space:]]\{1,\}\(.\{1,\}\)/\1/p' )" \ + COMPREPLY=( $( compgen -W "$( ${yum:-yum} -C grouplist $1 \ - 2>/dev/null | sed -ne 's/^[[:space:]]\{1,\}\(.\{1,\}\)/\1/p' )" \ ++ 2>/dev/null | sed -e 's/[[:space:]]\{1,\}\[.*$//' \ ++ -ne 's/^[[:space:]]\{1,\}\(.\{1,\}\)/\1/p' )" \ -- "$2" ) ) } -@@ -56,7 +56,7 @@ _yum_grouplist() + +@@ -56,7 +57,7 @@ _yum_grouplist() _yum_plugins() { local val @@ -2290,7 +2309,7 @@ index f1e06e8..8760a9b 100644 COMPREPLY+=( $( compgen -W '$( command grep -il "^\s*enabled\s*=\s*$val" \ /etc/yum/pluginconf.d/*.conf 2>/dev/null \ | sed -ne "s|^.*/\([^/]\{1,\}\)\.conf$|\1|p" )' -- "$2" ) ) -@@ -75,7 +75,7 @@ _yum_baseopts() +@@ -75,7 +76,7 @@ _yum_baseopts() { local opts='--help --tolerant --cacheonly --config --randomwait --debuglevel --showduplicates --errorlevel --rpmverbosity --quiet @@ -2299,7 +2318,7 @@ index f1e06e8..8760a9b 100644 --disablerepo --exclude --disableexcludes --obsoletes --noplugins --nogpgcheck --skip-broken --color --releasever --setopt' [[ $COMP_LINE == *--noplugins* ]] || \ -@@ -89,6 +89,16 @@ _yum_transactions() +@@ -89,6 +90,16 @@ _yum_transactions() sed -ne 's/^[[:space:]]*\([0-9]\{1,\}\).*/\1/p' )" -- "$cur" ) ) } @@ -2316,7 +2335,7 @@ index f1e06e8..8760a9b 100644 # arguments: # 1 = current word to be completed # 2 = previous word -@@ -184,8 +194,8 @@ _yum() +@@ -184,8 +195,8 @@ _yum() # Commands offered as completions local cmds=( check check-update clean deplist distro-sync downgrade groupinfo groupinstall grouplist groupremove help history info install @@ -2327,7 +2346,7 @@ index f1e06e8..8760a9b 100644 local i c cmd subcmd for (( i=1; i < ${#words[@]}-1; i++ )) ; do -@@ -211,7 +221,7 @@ _yum() +@@ -211,7 +222,7 @@ _yum() ;; clean) @@ -2336,7 +2355,7 @@ index f1e06e8..8760a9b 100644 COMPREPLY=( $( compgen -W 'expire-cache packages headers metadata cache dbcache all' -- "$cur" ) ) return 0 -@@ -224,20 +234,22 @@ _yum() +@@ -224,20 +235,22 @@ _yum() ;; distro-sync|distribution-synchronization) @@ -2363,7 +2382,7 @@ index f1e06e8..8760a9b 100644 return 0 ;; -@@ -247,36 +259,53 @@ _yum() +@@ -247,36 +260,53 @@ _yum() ;; help) @@ -2428,7 +2447,7 @@ index f1e06e8..8760a9b 100644 ;; esac return 0 -@@ -288,13 +317,15 @@ _yum() +@@ -288,13 +318,15 @@ _yum() ;; install) @@ -2447,7 +2466,7 @@ index f1e06e8..8760a9b 100644 COMPREPLY=( $( compgen -W 'all available updates installed extras obsoletes recent' -- "$cur" ) ) return 0 -@@ -306,24 +337,26 @@ _yum() +@@ -306,24 +338,26 @@ _yum() ;; repolist) @@ -2479,8 +2498,21 @@ index f1e06e8..8760a9b 100644 COMPREPLY=( $( compgen -W 'all installed available nogroups grouplist groupinfo' -- "$cur" ) ) return 0 +@@ -337,7 +371,11 @@ _yum() + + $split && return 0 + +- COMPREPLY=( $( compgen -W '$( _yum_baseopts ) ${cmds[@]}' -- "$cur" ) ) ++ if [[ $cur == -* ]] ; then ++ COMPREPLY=( $( compgen -W '$( _yum_baseopts )' -- "$cur" ) ) ++ return 0 ++ fi ++ COMPREPLY=( $( compgen -W '${cmds[@]}' -- "$cur" ) ) + } && + complete -F _yum -o filenames yum yummain.py + diff --git a/output.py b/output.py -index b6aa277..be4e4d9 100755 +index b6aa277..9b2060b 100755 --- a/output.py +++ b/output.py @@ -1,6 +1,6 @@ @@ -2491,16 +2523,29 @@ index b6aa277..be4e4d9 100755 # 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 -@@ -47,6 +47,8 @@ import yum.history +@@ -47,6 +47,21 @@ import yum.history from yum.i18n import utf8_width, utf8_width_fill, utf8_text_fill +import locale + ++try: ++ assert max(2, 4) == 4 ++except: ++ # Python-2.4.x doesn't have min/max ... *sigh* ++ def min(x, *args): ++ for y in args: ++ if x > y: x = y ++ return x ++ def max(x, *args): ++ for y in args: ++ if x < y: x = y ++ return x ++ def _term_width(): """ Simple terminal width, limit to 20 chars. and make 0 == 80. """ if not hasattr(urlgrabber.progress, 'terminal_width_cached'): -@@ -60,17 +62,21 @@ def _term_width(): +@@ -60,17 +75,21 @@ def _term_width(): class YumTextMeter(TextMeter): @@ -2527,7 +2572,7 @@ index b6aa277..be4e4d9 100755 # From initial search for "terminfo and python" got: # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/475116 -@@ -145,6 +151,17 @@ class YumTerm: +@@ -145,6 +164,17 @@ class YumTerm: self.BG_COLOR = self.__ansi_forced_BG_COLOR def reinit(self, term_stream=None, color='auto'): @@ -2545,7 +2590,7 @@ index b6aa277..be4e4d9 100755 self.__enabled = True if not hasattr(urlgrabber.progress, 'terminal_width_cached'): self.columns = 80 -@@ -255,6 +272,37 @@ class YumTerm: +@@ -255,6 +285,37 @@ class YumTerm: return re.sub(r'\$<\d+>[/*]?', '', cap) def sub(self, haystack, beg, end, needles, escape=None, ignore_case=False): @@ -2583,7 +2628,7 @@ index b6aa277..be4e4d9 100755 if not self.__enabled: return haystack -@@ -269,27 +317,106 @@ class YumTerm: +@@ -269,27 +330,106 @@ class YumTerm: haystack = re.sub(pat, render, haystack) return haystack def sub_norm(self, haystack, beg, needles, **kwds): @@ -2694,7 +2739,7 @@ index b6aa277..be4e4d9 100755 def __init__(self): self.logger = logging.getLogger("yum.cli") -@@ -304,6 +431,12 @@ class YumOutput: +@@ -304,6 +444,12 @@ class YumOutput: def printtime(self): @@ -2707,7 +2752,7 @@ index b6aa277..be4e4d9 100755 months = [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'), _('Jul'), _('Aug'), _('Sep'), _('Oct'), _('Nov'), _('Dec')] now = time.localtime(time.time()) -@@ -312,14 +445,27 @@ class YumOutput: +@@ -312,14 +458,27 @@ class YumOutput: return ret def failureReport(self, errobj): @@ -2737,7 +2782,7 @@ index b6aa277..be4e4d9 100755 progressbar(current, total, name) def _highlight(self, highlight): -@@ -368,9 +514,29 @@ class YumOutput: +@@ -368,9 +527,29 @@ class YumOutput: def calcColumns(self, data, columns=None, remainder_column=0, total_width=None, indent=''): @@ -2770,7 +2815,7 @@ index b6aa277..be4e4d9 100755 if total_width is None: total_width = self.term.columns -@@ -473,10 +639,20 @@ class YumOutput: +@@ -473,10 +652,20 @@ class YumOutput: return (val, width, hibeg, hiend) def fmtColumns(self, columns, msg=u'', end=u'', text_width=utf8_width): @@ -2795,7 +2840,7 @@ index b6aa277..be4e4d9 100755 total_width = len(msg) data = [] for col_data in columns[:-1]: -@@ -513,8 +689,18 @@ class YumOutput: +@@ -513,8 +702,18 @@ class YumOutput: def simpleList(self, pkg, ui_overflow=False, indent='', highlight=False, columns=None): @@ -2816,7 +2861,7 @@ index b6aa277..be4e4d9 100755 if columns is None: columns = (-40, -22, -16) # Old default ver = pkg.printVer() -@@ -526,9 +712,19 @@ class YumOutput: +@@ -526,9 +725,19 @@ class YumOutput: def simpleEnvraList(self, pkg, ui_overflow=False, indent='', highlight=False, columns=None): @@ -2839,7 +2884,7 @@ index b6aa277..be4e4d9 100755 if columns is None: columns = (-63, -16) # Old default envra = '%s%s' % (indent, str(pkg)) -@@ -538,7 +734,13 @@ class YumOutput: +@@ -538,7 +747,13 @@ class YumOutput: print self.fmtColumns(columns, text_width=len) def fmtKeyValFill(self, key, val): @@ -2854,7 +2899,7 @@ index b6aa277..be4e4d9 100755 val = to_str(val) keylen = utf8_width(key) cols = self.term.columns -@@ -553,6 +755,15 @@ class YumOutput: +@@ -553,6 +768,15 @@ class YumOutput: return ret def fmtSection(self, name, fill='='): @@ -2870,7 +2915,7 @@ index b6aa277..be4e4d9 100755 name = to_str(name) cols = self.term.columns - 2 name_len = utf8_width(name) -@@ -577,6 +788,12 @@ class YumOutput: +@@ -577,6 +801,12 @@ class YumOutput: return to_unicode(s) def infoOutput(self, pkg, highlight=False): @@ -2883,7 +2928,7 @@ index b6aa277..be4e4d9 100755 (hibeg, hiend) = self._highlight(highlight) print _("Name : %s%s%s") % (hibeg, to_unicode(pkg.name), hiend) print _("Arch : %s") % to_unicode(pkg.arch) -@@ -617,9 +834,22 @@ class YumOutput: +@@ -617,9 +847,22 @@ class YumOutput: print "" def updatesObsoletesList(self, uotup, changetype, columns=None): @@ -2909,7 +2954,7 @@ index b6aa277..be4e4d9 100755 (changePkg, instPkg) = uotup if columns is not None: -@@ -640,12 +870,44 @@ class YumOutput: +@@ -640,12 +883,44 @@ class YumOutput: def listPkgs(self, lst, description, outputType, highlight_na={}, columns=None, highlight_modes={}): @@ -2960,7 +3005,7 @@ index b6aa277..be4e4d9 100755 if outputType in ['list', 'info']: thingslisted = 0 if len(lst) > 0: -@@ -679,8 +941,11 @@ class YumOutput: +@@ -679,8 +954,11 @@ class YumOutput: def userconfirm(self): @@ -2973,7 +3018,7 @@ index b6aa277..be4e4d9 100755 yui = (to_unicode(_('y')), to_unicode(_('yes'))) nui = (to_unicode(_('n')), to_unicode(_('no'))) aui = (yui[0], yui[1], nui[0], nui[1]) -@@ -774,6 +1039,10 @@ class YumOutput: +@@ -774,6 +1052,10 @@ class YumOutput: columns=columns) def displayPkgsInGroups(self, group): @@ -2984,7 +3029,7 @@ index b6aa277..be4e4d9 100755 print _('\nGroup: %s') % group.ui_name verb = self.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) -@@ -807,8 +1076,11 @@ class YumOutput: +@@ -807,8 +1089,11 @@ class YumOutput: columns=columns) def depListOutput(self, results): @@ -2998,7 +3043,7 @@ index b6aa277..be4e4d9 100755 verb = self.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) for pkg in sorted(results): print _("package: %s") % pkg.compactPrint() -@@ -832,7 +1104,18 @@ class YumOutput: +@@ -832,7 +1117,18 @@ class YumOutput: print " provider: %s" % po.compactPrint() def format_number(self, number, SI=0, space=' '): @@ -3018,7 +3063,7 @@ index b6aa277..be4e4d9 100755 symbols = [ ' ', # (none) 'k', # kilo 'M', # mega -@@ -870,16 +1153,31 @@ class YumOutput: +@@ -870,16 +1166,31 @@ class YumOutput: @staticmethod def format_time(seconds, use_hours=0): @@ -3056,7 +3101,7 @@ index b6aa277..be4e4d9 100755 if self.conf.showdupesfromrepos: msg = '%s : ' % po else: -@@ -935,10 +1233,23 @@ class YumOutput: +@@ -935,10 +1246,23 @@ class YumOutput: print '\n\n' def matchcallback_verbose(self, po, values, matchfor=None): @@ -3081,7 +3126,7 @@ index b6aa277..be4e4d9 100755 totsize = 0 locsize = 0 insize = 0 -@@ -982,7 +1293,10 @@ class YumOutput: +@@ -982,7 +1306,10 @@ class YumOutput: self.format_number(insize)) def reportRemoveSize(self, packages): @@ -3093,7 +3138,7 @@ index b6aa277..be4e4d9 100755 totsize = 0 error = False for pkg in packages: -@@ -1002,8 +1316,9 @@ class YumOutput: +@@ -1002,8 +1329,9 @@ class YumOutput: self.format_number(totsize)) def listTransaction(self): @@ -3105,7 +3150,17 @@ index b6aa277..be4e4d9 100755 self.tsInfo.makelists(True, True) pkglist_lines = [] data = {'n' : {}, 'v' : {}, 'r' : {}} -@@ -1102,19 +1417,77 @@ class YumOutput: +@@ -1032,8 +1360,7 @@ class YumOutput: + 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) ++ a_wid = max(a_wid, len(a)) + return a_wid + + for (action, pkglist) in [(_('Installing'), self.tsInfo.installed), +@@ -1102,19 +1429,72 @@ class YumOutput: Transaction Summary %s """) % ('=' * self.term.columns)) @@ -3150,15 +3205,10 @@ index b6aa277..be4e4d9 100755 + else: + len_msg_depcount = 0 + -+ # dito. max() by hand, due to RHEL-5 -+ if len_msg_action > max_msg_action: -+ max_msg_action = len_msg_action -+ if len_msg_count > max_msg_count: -+ max_msg_count = len_msg_count -+ if len_msg_pkgs > max_msg_pkgs: -+ max_msg_pkgs = len_msg_pkgs -+ if len_msg_depcount > max_msg_depcount: -+ max_msg_depcount = len_msg_depcount ++ max_msg_action = max(len_msg_action, max_msg_action) ++ max_msg_count = max(len_msg_count, max_msg_count) ++ max_msg_pkgs = max(len_msg_pkgs, max_msg_pkgs) ++ max_msg_depcount = max(len_msg_depcount, max_msg_depcount) + + for action, count, depcount in summary_data: + msg_pkgs = P_('Package', 'Packages', count) @@ -3193,7 +3243,7 @@ index b6aa277..be4e4d9 100755 out = '' self.tsInfo.makelists() -@@ -1179,9 +1552,9 @@ Transaction Summary +@@ -1179,9 +1559,9 @@ Transaction Summary return out def setupProgressCallbacks(self): @@ -3206,7 +3256,7 @@ index b6aa277..be4e4d9 100755 # if we're below 2 on the debug level we don't need to be outputting # progress bars - this is hacky - I'm open to other options # One of these is a download -@@ -1216,10 +1589,12 @@ Transaction Summary +@@ -1216,10 +1596,12 @@ Transaction Summary self.dsCallback = dscb def setupProgessCallbacks(self): @@ -3220,7 +3270,7 @@ index b6aa277..be4e4d9 100755 confirm_func = self._cli_confirm_gpg_key_import gpg_import_func = self.getKeyForRepo gpgca_import_func = self.getCAKeyForRepo -@@ -1233,14 +1608,12 @@ Transaction Summary +@@ -1233,14 +1615,12 @@ Transaction Summary self.repos.gpgca_import_func = gpgca_import_func def interrupt_callback(self, cbobj): @@ -3240,7 +3290,7 @@ index b6aa277..be4e4d9 100755 ''' delta_exit_chk = 2.0 # Delta between C-c's so we treat as exit delta_exit_str = _("two") # Human readable version of above -@@ -1269,6 +1642,14 @@ to exit. +@@ -1269,6 +1649,14 @@ to exit. def download_callback_total_cb(self, remote_pkgs, remote_size, download_start_timestamp): @@ -3255,7 +3305,7 @@ index b6aa277..be4e4d9 100755 if len(remote_pkgs) <= 1: return if not hasattr(urlgrabber.progress, 'TerminalLine'): -@@ -1434,8 +1815,17 @@ to exit. +@@ -1434,8 +1822,17 @@ to exit. return tids, printall def historyListCmd(self, extcmds): @@ -3265,16 +3315,16 @@ index b6aa277..be4e4d9 100755 + + :param extcmds: list of extra command line arguments + :return: (exit_code, [errors]) -+ -+ exit_code is:: ++ exit_code is:: ++ + 0 = we're done, exit + 1 = we've errored, exit with error string + """ tids, printall = self._history_list_transactions(extcmds) if tids is None: return 1, ['Failed history list'] -@@ -1564,6 +1954,16 @@ to exit. +@@ -1564,6 +1961,16 @@ to exit. return old[0] def historyInfoCmd(self, extcmds): @@ -3291,7 +3341,7 @@ index b6aa277..be4e4d9 100755 def str2int(x): try: return int(x) -@@ -1656,6 +2056,9 @@ to exit. +@@ -1656,6 +2063,9 @@ to exit. def _hpkg2from_repo(self, hpkg): """ Given a pkg, find the ipkg.ui_from_repo ... if none, then get an apkg. ... and put a ? in there. """ @@ -3301,7 +3351,15 @@ index b6aa277..be4e4d9 100755 ipkgs = self.rpmdb.searchPkgTuple(hpkg.pkgtup) if not ipkgs: apkgs = self.pkgSack.searchPkgTuple(hpkg.pkgtup) -@@ -1678,7 +2081,7 @@ to exit. +@@ -1672,13 +2082,12 @@ to exit. + 'o' : _('Updated'), 'n' : _('Downgraded')} + _pkg_states_available = {'i' : _('Installed'), 'e' : _('Not installed'), + 'o' : _('Older'), 'n' : _('Newer')} +- # max() only in 2.5.z +- maxlen = sorted([len(x) for x in (_pkg_states_installed.values() + +- _pkg_states_available.values())])[-1] ++ maxlen = max([len(x) for x in (_pkg_states_installed.values() + ++ _pkg_states_available.values())]) _pkg_states_installed['maxlen'] = maxlen _pkg_states_available['maxlen'] = maxlen def _simple_pkg(pkg, prefix_len, was_installed=False, highlight=False, @@ -3310,7 +3368,7 @@ index b6aa277..be4e4d9 100755 prefix = " " * prefix_len if was_installed: _pkg_states = _pkg_states_installed -@@ -1702,9 +2105,11 @@ to exit. +@@ -1702,9 +2111,11 @@ to exit. else: (hibeg, hiend) = self._highlight('normal') state = utf8_width_fill(state, _pkg_states['maxlen']) @@ -3324,7 +3382,18 @@ index b6aa277..be4e4d9 100755 if type(old.tid) == type([]): print _("Transaction ID :"), "%u..%u" % (old.tid[0], old.tid[-1]) -@@ -1794,7 +2199,9 @@ to exit. +@@ -1778,8 +2189,8 @@ to exit. + default_addons = set(['config-main', 'config-repos', 'saved_tx']) + non_default = set(addon_info).difference(default_addons) + if len(non_default) > 0: +- print _("Additional non-default information stored: %d" +- % len(non_default)) ++ print _("Additional non-default information stored: %d" ++ % len(non_default)) + + if old.trans_with: + # This is _possible_, but not common +@@ -1794,7 +2205,9 @@ to exit. print _("Packages Skipped:") pkg_max_len = max((len(str(hpkg)) for hpkg in old.trans_skip)) for hpkg in old.trans_skip: @@ -3335,7 +3404,7 @@ index b6aa277..be4e4d9 100755 if old.rpmdb_problems: print _("Rpmdb Problems:") -@@ -1833,6 +2240,13 @@ to exit. +@@ -1833,6 +2246,13 @@ to exit. 'Updated' : _('Updated'), } def historyInfoCmdPkgsAltered(self, old, pats=[]): @@ -3349,7 +3418,7 @@ index b6aa277..be4e4d9 100755 last = None # Note that these don't use _simple_pkg() because we are showing what # happened to them in the transaction ... not the difference between the -@@ -1886,6 +2300,10 @@ to exit. +@@ -1886,6 +2306,10 @@ to exit. self._hpkg2from_repo(hpkg)) def historySummaryCmd(self, extcmds): @@ -3360,7 +3429,7 @@ index b6aa277..be4e4d9 100755 tids, printall = self._history_list_transactions(extcmds) if tids is None: return 1, ['Failed history info'] -@@ -1946,6 +2364,10 @@ to exit. +@@ -1946,6 +2370,10 @@ to exit. utf8_width_fill(uiacts, 16, 16), count) def historyAddonInfoCmd(self, extcmds): @@ -3371,7 +3440,7 @@ index b6aa277..be4e4d9 100755 tid = None if len(extcmds) > 1: tid = extcmds[1] -@@ -1983,16 +2405,19 @@ to exit. +@@ -1983,16 +2411,19 @@ to exit. for item in extcmds[2:]: if item in addon_info: @@ -3397,7 +3466,7 @@ index b6aa277..be4e4d9 100755 tids = self.history.search(extcmds) limit = None if extcmds and not tids: -@@ -2078,9 +2503,95 @@ to exit. +@@ -2078,9 +2509,95 @@ to exit. if lastdbv.end_rpmdbversion != rpmdbv: self._rpmdb_warn_checks() @@ -3494,7 +3563,7 @@ index b6aa277..be4e4d9 100755 def __init__(self, ayum=None): """requires yum-cli log and errorlog functions as arguments""" -@@ -2089,6 +2600,25 @@ class DepSolveProgressCallBack: +@@ -2089,6 +2606,25 @@ class DepSolveProgressCallBack: self.ayum = ayum def pkgAdded(self, pkgtup, mode): @@ -3520,7 +3589,7 @@ index b6aa277..be4e4d9 100755 modedict = { 'i': _('installed'), 'u': _('an update'), 'e': _('erased'), -@@ -2104,43 +2634,85 @@ class DepSolveProgressCallBack: +@@ -2104,43 +2640,85 @@ class DepSolveProgressCallBack: modeterm) def start(self): @@ -3608,7 +3677,7 @@ index b6aa277..be4e4d9 100755 needname, needflags, needversion = reqTup yb = self.ayum -@@ -2225,45 +2797,89 @@ class DepSolveProgressCallBack: +@@ -2225,46 +2803,105 @@ class DepSolveProgressCallBack: return msg def procConflict(self, name, confname): @@ -3690,6 +3759,7 @@ index b6aa277..be4e4d9 100755 self.file_logger.log(level, message) def progressbar(self, current, total, name=None): +- progressbar(current, total, name) + """Output the current status to the terminal using a progress + status bar. + @@ -3699,10 +3769,26 @@ index b6aa277..be4e4d9 100755 + to be done + :param name: a name to label the progress bar with + """ - progressbar(current, total, name) ++ # We can easily have 10k+ packages in a repo. and we don't want to ++ # output 80 * 10k lines to the screen, esp. when the user probably ++ # doesn't care about < 1% jumps ... some serial consoles may also get ++ # really unhappy. ++ output = False ++ opc = total / 100 ++ if opc <= 1: ++ output = True ++ elif current < opc: ++ output = True # output all the begining ++ elif (total - current) < opc: ++ output = True # output all the end ++ elif not (current % opc): # output every 1% ++ output = True ++ if output: ++ progressbar(current, total, name) def _pkgname_ui(ayum, pkgname, ts_states=None): -@@ -2316,10 +2932,7 @@ def _pkgname_ui(ayum, pkgname, ts_states=None): + """ Get more information on a simple pkgname, if we can. We need to search +@@ -2316,10 +2953,7 @@ def _pkgname_ui(ayum, pkgname, ts_states=None): return pkgname class YumCliRPMCallBack(RPMBaseCallback): @@ -3714,7 +3800,7 @@ index b6aa277..be4e4d9 100755 width = property(lambda x: _term_width()) -@@ -2337,11 +2950,31 @@ class YumCliRPMCallBack(RPMBaseCallback): +@@ -2337,21 +2971,34 @@ class YumCliRPMCallBack(RPMBaseCallback): # Installing things have pkg objects passed to the events, so only need to # lookup for erased/obsoleted. def pkgname_ui(self, pkgname, ts_states=('e', 'od', 'ud', None)): @@ -3747,16 +3833,46 @@ index b6aa277..be4e4d9 100755 + """ process = self.action[action] - if not hasattr(self, '_max_action_wid'): -@@ -2366,6 +2999,7 @@ class YumCliRPMCallBack(RPMBaseCallback): +- if not hasattr(self, '_max_action_wid'): +- wid1 = 0 +- for val in self.action.values(): +- wid_val = utf8_width(val) +- if wid1 < wid_val: +- wid1 = wid_val +- self._max_action_wid = wid1 +- wid1 = self._max_action_wid ++ wid1 = self._max_action_width() + if type(package) not in types.StringTypes: + pkgname = str(package) +@@ -2363,9 +3010,25 @@ class YumCliRPMCallBack(RPMBaseCallback): + percent = 0 + else: + percent = (te_current*100L)/te_total +- ++ self._out_event(te_current, te_total, ts_current, ts_total, ++ percent, process, pkgname, wid1) ++ ++ def _max_action_width(self): ++ if not hasattr(self, '_max_action_wid_cache'): ++ wid1 = 0 ++ for val in self.action.values(): ++ wid_val = utf8_width(val) ++ if wid1 < wid_val: ++ wid1 = wid_val ++ self._max_action_wid_cache = wid1 ++ wid1 = self._max_action_wid_cache ++ return wid1 ++ ++ def _out_event(self, te_current, te_total, ts_current, ts_total, ++ percent, process, pkgname, wid1): if self.output and (sys.stdout.isatty() or te_current == te_total): (fmt, wid1, wid2) = self._makefmt(percent, ts_current, ts_total, + progress=sys.stdout.isatty(), pkgname=pkgname, wid1=wid1) msg = fmt % (utf8_width_fill(process, wid1, wid1), utf8_width_fill(pkgname, wid2, wid2)) -@@ -2377,6 +3011,11 @@ class YumCliRPMCallBack(RPMBaseCallback): +@@ -2377,6 +3040,11 @@ class YumCliRPMCallBack(RPMBaseCallback): print " " def scriptout(self, package, msgs): @@ -3768,8 +3884,23 @@ index b6aa277..be4e4d9 100755 if msgs: sys.stdout.write(to_unicode(msgs)) sys.stdout.flush() -@@ -2431,6 +3070,15 @@ class YumCliRPMCallBack(RPMBaseCallback): +@@ -2429,8 +3097,30 @@ class YumCliRPMCallBack(RPMBaseCallback): + wid2 = pnl + return fmt, wid1, wid2 ++ def verify_txmbr(self, base, txmbr, count): ++ " Callback for post transaction when we are in verifyTransaction(). " ++ te_current = count ++ te_total = len(base.tsInfo) ++ # self.event(txmbr.name, count, len(base.tsInfo), count, ) ++ ++ percent = 100 # (te_current*100L)/te_total ++ process = _('Verifying') ++ pkgname = str(txmbr.po) ++ wid1 = max(utf8_width(process), self._max_action_width()) ++ self._out_event(100, 100, te_current, te_total, ++ percent, process, pkgname, wid1) ++ def progressbar(current, total, name=None): + """Output the current status to the terminal using a simple @@ -3785,10 +3916,10 @@ index b6aa277..be4e4d9 100755 mark = '#' diff --git a/po/bn_IN.po b/po/bn_IN.po -index f1f232a..3d3e57d 100644 +index f1f232a..32b8dc4 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -3799,11 +3930,13 @@ index f1f232a..3d3e57d 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Bengali (India) (http://www.transifex.net/projects/p/yum/team/bn_IN/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,413 +17,438 @@ msgstr "" "Language: bn_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -3821,30 +3954,30 @@ index f1f232a..3d3e57d 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "" @@ -3871,7 +4004,7 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "" @@ -3897,53 +4030,53 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -3954,98 +4087,98 @@ index f1f232a..3d3e57d 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -4053,7 +4186,7 @@ index f1f232a..3d3e57d 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -4062,13 +4195,13 @@ index f1f232a..3d3e57d 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -4078,12 +4211,12 @@ index f1f232a..3d3e57d 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -4093,12 +4226,12 @@ index f1f232a..3d3e57d 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -4108,14 +4241,14 @@ index f1f232a..3d3e57d 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -4123,13 +4256,13 @@ index f1f232a..3d3e57d 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -4137,7 +4270,7 @@ index f1f232a..3d3e57d 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -4145,151 +4278,151 @@ index f1f232a..3d3e57d 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -4299,18 +4432,18 @@ index f1f232a..3d3e57d 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -4320,37 +4453,37 @@ index f1f232a..3d3e57d 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -4359,153 +4492,153 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -4848,22 +4981,22 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -4901,351 +5034,357 @@ index f1f232a..3d3e57d 100644 #, python-format msgid "" "\n" -@@ -869,57 +901,52 @@ msgid "" +@@ -869,57 +901,58 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "" -@@ -927,7 +954,7 @@ msgstr "" +@@ -927,7 +960,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -935,484 +962,536 @@ msgid "" +@@ -935,484 +968,536 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -5254,17 +5393,17 @@ index f1f232a..3d3e57d 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -5277,224 +5416,224 @@ index f1f232a..3d3e57d 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -5502,7 +5641,7 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -5510,7 +5649,7 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -5518,7 +5657,7 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -5526,103 +5665,103 @@ index f1f232a..3d3e57d 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr "" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr "" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr "" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr "" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr "" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -5630,7 +5769,7 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -5638,68 +5777,68 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1420,47 +1499,47 @@ msgid "" +@@ -1420,47 +1505,47 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "" -@@ -1472,7 +1551,7 @@ msgstr "" +@@ -1472,7 +1557,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -5708,7 +5847,7 @@ index f1f232a..3d3e57d 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1568,484 @@ msgid "" +@@ -1489,451 +1574,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -5971,188 +6110,187 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -6160,7 +6298,7 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -6168,148 +6306,148 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2056,106 @@ msgstr "" +@@ -1944,100 +2058,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -6317,7 +6455,7 @@ index f1f232a..3d3e57d 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -6354,226 +6492,226 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,774 +2163,784 @@ msgstr "" +@@ -2045,991 +2165,1028 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -6581,43 +6719,43 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -6805,24 +6943,24 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -6830,7 +6968,7 @@ index f1f232a..3d3e57d 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -6841,40 +6979,40 @@ index f1f232a..3d3e57d 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -6882,23 +7020,23 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "" @@ -6912,67 +7050,67 @@ index f1f232a..3d3e57d 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -6982,26 +7120,26 @@ index f1f232a..3d3e57d 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -7011,62 +7149,62 @@ index f1f232a..3d3e57d 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -7074,78 +7212,79 @@ index f1f232a..3d3e57d 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -7153,118 +7292,118 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -7272,7 +7411,7 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -7280,158 +7419,166 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2821,7 +2949,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2829,207 +2957,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -7439,29 +7586,29 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -7469,117 +7616,117 @@ index f1f232a..3d3e57d 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -7679,7 +7826,7 @@ index f1f232a..3d3e57d 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3190,14 @@ msgstr "" +@@ -3038,6 +3195,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -7695,10 +7842,10 @@ index f1f232a..3d3e57d 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/ca.po b/po/ca.po -index cca37b7..9bccab5 100644 +index cca37b7..0b69093 100644 --- a/po/ca.po +++ b/po/ca.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -7709,11 +7856,13 @@ index cca37b7..9bccab5 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,122 +17,124 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -7731,30 +7880,30 @@ index cca37b7..9bccab5 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instal·lant" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Obsolet" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Actualitzat" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Suprimit" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Instal·lat" @@ -7781,7 +7930,7 @@ index cca37b7..9bccab5 100644 msgstr "Suprimit: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Suprimint" @@ -7807,53 +7956,53 @@ index cca37b7..9bccab5 100644 msgstr "S'estan llegint les metadades de repositoris des de fitxers locals" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Error de configuració: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Error d'opcions: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Instal·lat: %s-%s a %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Muntat : %s a %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Pujat: %s a %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Cal que doneu alguna ordre" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Requeriments de disc:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -7864,7 +8013,7 @@ index cca37b7..9bccab5 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -7873,75 +8022,75 @@ index cca37b7..9bccab5 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" "S'ha intentat executar la transacció però no hi ha cap tasca a fer. S'està " "sortint." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "S'està sortint de l'ordre de l'usuari" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "S'estan baixant els següents paquets:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "S'ha produït un error baixant els següents paquets:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "S'ha produït un error. Necessiteu actualitzar el gestor rpm:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "Cal actualitzar l'RPM" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Siusplau, informeu d'aquest error a %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "S'està executant la transacció de prova" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "S'ha produït un error en la transacció de prova:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "La transacció de prova ha acabat amb èxit" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "S'està executant la transacció" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -7950,18 +8099,18 @@ index cca37b7..9bccab5 100644 "Feu servir \"-y\" per a importar les claus." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Potser volíeu dir: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Paquets %s%s%s disponibles, però no instal·lats." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "El paquet %s%s%s no està disponible." @@ -7969,7 +8118,7 @@ index cca37b7..9bccab5 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paquets a instal·lar" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -7978,13 +8127,13 @@ index cca37b7..9bccab5 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Res a fer" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paquets marcats per a actualitzar" @@ -7994,12 +8143,12 @@ index cca37b7..9bccab5 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "No hi ha cap paquet marcat per a actualitzar" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -8009,12 +8158,12 @@ index cca37b7..9bccab5 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paquets marcats per a suprimir" @@ -8024,14 +8173,14 @@ index cca37b7..9bccab5 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "No hi ha cap paquet marcat per a suprimir" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paquets per a desactualitzar" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -8039,13 +8188,13 @@ index cca37b7..9bccab5 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (des de %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "El paquet instal·lat %s%s%s%s no està disponible." @@ -8053,7 +8202,7 @@ index cca37b7..9bccab5 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paquets a reinstal·lar" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -8061,153 +8210,153 @@ index cca37b7..9bccab5 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "No s'ha proporcionat cap paquet" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Paquets a instal·lar" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Avís: no s'ha trobat cap coincidència per a: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "No s'ha trobat cap coincidència" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "No s'ha trobat cap paquet per a %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "S'està netejant tot" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "S'estan netejant les capçaleres" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "S'estan netejant els paquets" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "S'estan netejant les metadades xml" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "S'està netejant la memòria cau de la base de dades" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "S'està netejant la memòria cau de metadades que han vençut" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "S'estan netejant els connectors" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Grups instal·lats:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Grups disponibles:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Fet" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Avís: El grup %s no existeix." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "No hi ha cap paquet disponible per a instal·lar o actualitzar en els grups " "sol·licitats" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d paquets a instal·lar" @@ -8217,18 +8366,18 @@ index cca37b7..9bccab5 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "No existeix cap grup anomenat %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "No hi ha cap paquet a suprimir dels grups" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paquets a suprimir" @@ -8238,20 +8387,20 @@ index cca37b7..9bccab5 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "El paquet %s ja està instal·lat, s'ometrà" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "S'està descartant el paquet no comparable %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" @@ -8259,18 +8408,18 @@ index cca37b7..9bccab5 100644 "instal·lació" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Opcions del connector" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Error en la línia d'ordres: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -8279,155 +8428,155 @@ index cca37b7..9bccab5 100644 "%s: l'opció %s necessita un argument" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color pren un valor d'entre: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "mostra el missatge d'ajuda i surt" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "sigues tolerant amb els errors" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "ubicació del fitxer de configuració" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "temps màxim d'espera d'ordres" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "nivell de sortida de depuració" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "mostra duplicats, en repositoris, en les ordres per llistar i cercar" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "nivell de sortida d'error" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "operació silenciosa" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "operació descriptiva" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "respon sí a totes les preguntes" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "mostra la versió del Yum i surt" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "estableix l'arrel de la instal·lació" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" "habilita un o més repositoris (es permeten caràcters de reemplaçament)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" "deshabilita un o més repositoris (es permeten caràcters de reemplaçament)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "exclou els paquets per nom o expressió regular del glob" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "inhabilita l'exclusió des de l'inici, per a un repositori o per a tot" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "habilita el processament d'obsolets durant les actualitzacions" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "inhabilita els connectors de Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "inhabilita la comprobació de signatures gpg" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "inhabilita els connectors pel seu nom" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "habilita els connectors pel seu nom" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "omet paquets amb problemes de resolució de dependències" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "controla sempre que s'usi color" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -8771,22 +8920,22 @@ index cca37b7..9bccab5 100644 msgstr "S'està suprimint degut a les dependències" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Ignorat degut a problemes de dependències:" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Paquet" +msgid_plural "Packages" @@ -8824,351 +8973,357 @@ index cca37b7..9bccab5 100644 #, python-format msgid "" "\n" -@@ -889,57 +921,52 @@ msgstr "" +@@ -889,57 +921,58 @@ msgstr "" "Resum de la transacció\n" "%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Suprimit" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Dependència suprimida" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Dependència instal·lada" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Dependència actualitzada" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Reemplaçat" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Ha fallat" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "dos" -@@ -947,7 +974,7 @@ msgstr "dos" +@@ -947,7 +980,7 @@ 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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -958,475 +985,527 @@ msgstr "" +@@ -958,475 +991,527 @@ msgstr "" " S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%s segons\n" "per a sortir.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "interrupció de l'usuari" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Total" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -9177,17 +9332,17 @@ index cca37b7..9bccab5 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -9200,225 +9355,225 @@ index cca37b7..9bccab5 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "instal·lat" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "suprimit" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "actualitzat" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "obsolet" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> S'està executant la transacció de prova" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" "--> Tornant a calcular la resolució de dependències amb els nous canvis." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Ha finalitzat la resolució de dependències" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> S'està processant la dependència %s per al paquet: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Dependència no resolta: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -9426,7 +9581,7 @@ index cca37b7..9bccab5 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -9434,7 +9589,7 @@ index cca37b7..9bccab5 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -9442,7 +9597,7 @@ index cca37b7..9bccab5 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -9450,40 +9605,40 @@ index cca37b7..9bccab5 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> S'està processant el conflicte: %s té un conflicte amb %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> S'està poblant la transacció amb els paquets sel·leccionats. Si us plau," " espereu." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" @@ -9491,147 +9646,147 @@ index cca37b7..9bccab5 100644 "transacció de prova." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "S'està executant" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Està dormint" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombi" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Traçat/aturat" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Desconegut" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " L'altre aplicatiu és: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " L'altre aplicatiu és: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Memòria : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Iniciat: fa %s-%s" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Estat : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1436,7 +1515,7 @@ msgstr "" +@@ -1436,7 +1521,7 @@ msgstr "" "\n" "S'està sortint per la cancel·lació de l'usuari" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1446,7 +1525,7 @@ msgstr "" +@@ -1446,7 +1531,7 @@ msgstr "" "\n" "S'està sortint en trobar la canonada trencada" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1457,41 +1536,41 @@ msgstr "" +@@ -1457,41 +1542,41 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Error: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " Hauríeu de provar utilitzant --skip-broken per evitar el problema" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Errors desconeguts: Codi de sortida: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1499,7 +1578,7 @@ msgstr "" +@@ -1499,7 +1584,7 @@ msgstr "" "\n" "Dependències resoltes" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Completat!" -@@ -1511,7 +1590,7 @@ msgstr "" +@@ -1511,7 +1596,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Heu de ser root per a executar aquesta ordre." @@ -9640,7 +9795,7 @@ index cca37b7..9bccab5 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1541,362 +1620,355 @@ msgstr "" +@@ -1541,362 +1626,351 @@ msgstr "" "\n" "Per a més informació contacteu el vostre distribuïdor o proveïdor de paquets.\n" @@ -9907,353 +10062,352 @@ index cca37b7..9bccab5 100644 msgstr "S'està configurant el procés local de paquets" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Determina quin paquet satisfà la dependència donada" - +-msgid "Determine which package provides the given dependency" +-msgstr "Determina quin paquet satisfà la dependència donada" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "S'estan buscant paquets per a la dependència:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Executa un intèrpret d'ordres interactiu de yum" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "S'està preparant l'intèrpret d'ordres de yum" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Llista les dependències d'un paquet" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "S'estan trobant dependències: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Mostra els repositoris de programari configurats" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "habilitat" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "deshabilitat" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Id-repo : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Nom-repo : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Estat-repo : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Repo-revisió : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Repo-etiquetes : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Repo-etiq-dist : " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Repo-actualitzat : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Paquets-repo : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Mida-repo : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "URL-base-repo : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Repo-metaenllaç : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Actualitzat : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Miralls-repo : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Mai (últim: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Temps d'instal·lació (últim: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s segons (últim: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Venç-repo : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Repo-exclou : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Repo-inclou : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "id repo" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "estat" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "nom repo" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Mostra un missatge d'ajuda d'ús" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "No hi ha ajuda disponible per a %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1906,7 +1978,7 @@ msgstr "" +@@ -1906,7 +1980,7 @@ msgstr "" "\n" "àlies: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1916,85 +1988,125 @@ msgstr "" +@@ -1916,85 +1990,125 @@ msgstr "" "\n" "àlies: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "S'està preparant el procés de reinstal·lació" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "reinstal·la un paquet" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "S'està preparant el procés de desactualització" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "desactualitza un paquet" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Mostra una versió per a la màquina i/o repositoris disponibles" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Instal·lat:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Disponible:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -2005,28 +2117,34 @@ msgstr "" +@@ -2005,28 +2119,34 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" -#: ../yummain.py:114 +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" +msgstr "" + +#: ../yummain.py:124 @@ -10291,149 +10445,149 @@ index cca37b7..9bccab5 100644 msgid "" "\n" "\n" -@@ -2036,77 +2154,77 @@ msgstr "" +@@ -2036,77 +2156,77 @@ msgstr "" "\n" "S'està sortint de l'ordre de l'usuari." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() desapareixerà en una futura versió de Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" "S'està configurant TransactionSets abans que la classe de configuració " "estigui iniciada" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Tsflag invàlid en el fitxer de configuració: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "S'està buscant pkgSack per a la dependència: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Membre: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s convertits per a instal·lar" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "S'està afegint el paquet %s en mode %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "S'està suprimint el paquet %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s requereix: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" "El requeriment necessari ja s'ha buscat anteriorment, s'estan fent trampes" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "El requeriment necessari no és un nom de paquet. S'està buscant: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Proveïdor potencial: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "El mode és %s per al proveïdor de %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Mode per al paquet que proporciona %s: %s" -@@ -2114,120 +2232,120 @@ msgstr "Mode per al paquet que proporciona %s: %s" +@@ -2114,120 +2234,120 @@ msgstr "Mode per al paquet que proporciona %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: el paquet %s requereix %s marcat per a suprimir" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" "TSINFO: S'està marcant com a obsolet %s amb %s per resoldre dependències." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: S'està actualitzant %s per a resoldre dependències." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "No es pot trobar un camí d'actualització de dependències per a: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "La coincidència %s es requereix per a %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" @@ -10441,14 +10595,14 @@ index cca37b7..9bccab5 100644 " suprimint." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" "El paquet potencial que resol dependències %s té una instància nova a ts" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" @@ -10456,120 +10610,120 @@ index cca37b7..9bccab5 100644 "insta·lada." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s ja es troba en ts, s'està ometent" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: S'està marcant %s com a actualització per a %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: S'està marcant %s com a instal·lació per a %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Èxit - transacció buida" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "S'està recomençant el bucle" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Està acabant el procés de dependències" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Èxit - dependències resoltes" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "S'estan comprobant les dependències per a %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "s'està buscant %s com a requeriment de %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "S'està executant compare_providers() per a %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "millor arq en el po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s fa obsolet %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2236,142 +2354,142 @@ msgstr "" +@@ -2236,142 +2356,142 @@ msgstr "" "archdist ha comparat %s amb %s a %s\n" " Ha guanyat: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "rpm font comú %s i %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "prefix comú de %s entre %s i %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Millor ordre: %s" @@ -10702,7 +10856,7 @@ index cca37b7..9bccab5 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2379,21 +2497,21 @@ msgstr "" +@@ -2379,21 +2499,21 @@ msgstr "" "Encara hi ha transaccions sense acabar. Hauríeu de considerar executar yum-" "complete-transaction abans per acabar-les." @@ -10728,7 +10882,7 @@ index cca37b7..9bccab5 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2401,130 +2519,122 @@ msgstr "" +@@ -2401,130 +2521,122 @@ msgstr "" "\n" "Paquets omesos degut a problemes de dependències:" @@ -10761,7 +10915,7 @@ index cca37b7..9bccab5 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -10769,18 +10923,18 @@ index cca37b7..9bccab5 100644 "durant la transacció." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "No s'ha pogut suprimir el fitxer de transaccions %s" @@ -10788,7 +10942,7 @@ index cca37b7..9bccab5 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "S'havia d'instal·lar %s però no s'ha realitzat!" @@ -10799,40 +10953,40 @@ index cca37b7..9bccab5 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "S'havia de suprimir %s però no s'ha realitzat!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "No s'ha pogut comprovar si el PID %s es troba actiu" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Bloqueig existent %s: una altra còpia s'està executant amb pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -10840,17 +10994,17 @@ index cca37b7..9bccab5 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "No s'ha pogut realitzar la suma de verificació" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "No coincideix la suma de verificació del paquet" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" @@ -10858,7 +11012,7 @@ index cca37b7..9bccab5 100644 "habilitat per a %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "s'està utilitzant la còpia local de %s" @@ -10875,69 +11029,69 @@ index cca37b7..9bccab5 100644 -" * necessari %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "La capçalera no està completa." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2532,62 +2642,64 @@ msgstr "" +@@ -2532,62 +2644,64 @@ msgstr "" "La capçalera no es troba en la memòria cau local i està habilitat el mode de" " només memòria cau. No es pot baixar %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "La clau pública per a %s no està instal·lada" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Hi ha hagut un problema obrint el paquet %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "La clau pública per a %s no és de confiança" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "El paquet %s no està signat" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "No es pot suprimir %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "S'ha suprimit %s" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "No es pot suprimir %s fitxer %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s fitxer %s suprimit" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s fitxers suprimits" @@ -10947,28 +11101,28 @@ index cca37b7..9bccab5 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Hi ha més d'una coincidència idèntica en el sac per a %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "No hi ha coincidències %s.%s-%s:%s-%s de l'actualització" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2595,143 +2707,145 @@ msgstr "" +@@ -2595,143 +2709,146 @@ msgstr "" "searchPackages() desapareixerà en una futura versió de Yum." " Useu searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "S'estan buscant %d paquets" @@ -10978,23 +11132,23 @@ index cca37b7..9bccab5 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "s'està buscant el paquet %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "s'està buscant en les entrades de fitxers" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "s'està buscant en les entrades proporcionades" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" "No hi ha dades de grup disponibles en cap dels repositoris configurats" @@ -11002,39 +11156,39 @@ index cca37b7..9bccab5 100644 -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "No existeix cap grup anomenat %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "el paquet %s no estava marcat en el grup %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "S'està afegint el paquet %s del grup %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "No hi ha cap paquet anomenat %s disponible per a ser instal·lat" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -11042,41 +11196,42 @@ index cca37b7..9bccab5 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "No s'ha pogut trobar la tupla de paquets %s al sac de paquets" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "No s'ha trobat cap paquet per a %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "L'objecte paquet no era una instància d'objecte paquet" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "No hi ha res especificat per a instal·lar" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" @@ -11085,37 +11240,37 @@ index cca37b7..9bccab5 100644 -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "No hi ha cap coincidència per a l'argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "El paquet %s es troba instal·lat però no és disponible" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "No hi ha cap paquet disponible per a instal·lar" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "El paquet: %s - ja està en la transacció" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "El paquet %s és obsolet degut a %s, que ja està instal·lat" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -11123,7 +11278,7 @@ index cca37b7..9bccab5 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" @@ -11131,58 +11286,58 @@ index cca37b7..9bccab5 100644 "lloc" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "El paquet %s ja es troba instal·lat i en l'última versió." -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" -@@ -2739,66 +2853,72 @@ msgstr "" +@@ -2739,66 +2856,72 @@ msgstr "" "actualització." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "S'està actualitzant tot" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "No s'actualitzarà el paquet obsolet: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "El paquet és obsolet: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "No s'actualitzarà el paquet obsolet: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "No s'actualitzarà el paquet actualitzat: %s.%s %s:%s-%s" @@ -11190,67 +11345,67 @@ index cca37b7..9bccab5 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "No hi ha cap paquet coincident per a suprimir" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "S'està examinant %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2806,12 +2926,12 @@ msgstr "" +@@ -2806,12 +2929,12 @@ msgstr "" "No s'ha pogut afegir el paquet %s a la transacció. No és una arquitectura " "compatible: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2820,105 +2940,110 @@ msgstr "" +@@ -2820,140 +2943,147 @@ msgstr "" "El paquet %s no està instal·lat; no es pot actualitzar. Executeu «yum " "install» per a instal·lar-lo." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -11258,43 +11413,43 @@ index cca37b7..9bccab5 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "S'està excloent %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "S'està marcant %s per a ser instal·lat" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "S'està marcant %s com a actualització de %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s no actualitza el paquet instal·lat." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "No es pot obrir el fitxer %s. S'ometrà." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" "Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a suprimir" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" @@ -11302,148 +11457,156 @@ index cca37b7..9bccab5 100644 "instal·lar" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "No hi ha cap paquet disponible per a desactualitzar" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "El paquet %s permet múltiples instal·lacions, s'està ometent" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "No hi ha cap paquet disponible que coincideixi: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Només hi ha una actualització disponible per al paquet: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "La recuperació de la clau GPG ha fallat: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "L'ànalisi de la clau GPG ha fallat: la clau no té el valor %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2927,7 +3052,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2935,25 +3060,25 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "La clau GPG de %s (0x%s) ja està instal·lada" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "La importació de la clau ha fallat (codi %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "La clau s'ha importat amb èxit" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2962,184 +3087,208 @@ msgstr "" +@@ -2962,184 +3092,208 @@ msgstr "" "Les claus GPG llistades per al repositori \"%s\" ja estan instal·lades però no són correctes per a aquest paquet.\n" "Comproveu que les URL de claus correctes estan configurades per a aquest repositori." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "La importació de claus no ha ajudat, eren claus incorrectes?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "La clau GPG a %s (0x%s) ja ha estat importada" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Ha fallat la importació de la clau" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -11451,117 +11614,117 @@ index cca37b7..9bccab5 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "No s'ha pogut trobar un servidor rèplica vàlid." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "S'han trobat errors baixant paquets." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Siusplau, informeu d'aquest error al %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Errors en la transacció de prova: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -11663,7 +11826,7 @@ index cca37b7..9bccab5 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3148,6 +3297,17 @@ msgstr "" +@@ -3148,6 +3302,17 @@ msgstr "" msgid "Repackaging" msgstr "Reempaquetant" @@ -11682,7 +11845,7 @@ index cca37b7..9bccab5 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/cs.po b/po/cs.po -index 622394b..c8a5a90 100644 +index 622394b..b6b9b6b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,14 +2,16 @@ @@ -11700,9 +11863,9 @@ index 622394b..c8a5a90 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-09-23 14:26+0000\n" -+"Last-Translator: covex \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Czech (http://www.transifex.net/projects/p/yum/team/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11725,32 +11888,32 @@ index 622394b..c8a5a90 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" -msgstr "Instaluje se" +msgstr "Instalování" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" -msgstr "Zastaralé" +msgstr "Zastaralo" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Aktualizováno" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Smazáno" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Nainstalováno" @@ -11777,7 +11940,7 @@ index 622394b..c8a5a90 100644 msgstr "Smazáno: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Odstraňuje se" @@ -11806,54 +11969,54 @@ index 622394b..c8a5a90 100644 +msgstr "Načítání metadat repozitářů z lokálních souborů" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Chyba konfigurace: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Chybná volba: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Nainstalováno: %s-%s na %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Sestaveno : %s na %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Odesláno : %s na %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" -msgstr "Musíte zadat nějaký příkaz" +msgstr "Musít být zadán nějaký příkaz" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Neexistující příkaz: %s. Použijte %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Diskové požadavky:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Je potřeba alespoň o %dMB více místa na souborovém systému %s.\n" @@ -11865,7 +12028,7 @@ index 622394b..c8a5a90 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -11874,83 +12037,83 @@ index 622394b..c8a5a90 100644 "------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Pokus o spuštění transakce, ale není co dělat. Ukončeno." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Ukončeno na příkaz uživatele" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" -msgstr "Stahují se balíčky:" +msgstr "Stahování balíčků:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" -msgstr "Chyba stahování balíčků:\n" +msgstr "Chyba při stahování balíčků:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" -msgstr "" +msgstr "Spuštěna kontrola transakce" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "CHYBA Je potřeba aktualizovat rpm k provedení:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" -msgstr "" +msgstr "CHYBA při kontrole transakce a řešení závislostí:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" -msgstr "Je potřeba aktualizovat RPM" +msgstr "Je nutné aktualizovat RPM" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" -msgstr "Oznamte prosím tuto chybu v %s" +msgstr "Oznamte prosím tuto chybu na adrese %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" -msgstr "Spouští se test transakcí" +msgstr "Spuštěn test transakce" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" -msgstr "Chyba při kontrole transakcí:\n" +msgstr "Chyba při kontrole transakce:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" -msgstr "Test transakcí uspěl" +msgstr "Test transakce v pořádku" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" -msgstr "Spouští se transakce" +msgstr "Transakce spuštěna" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -11959,19 +12122,19 @@ index 622394b..c8a5a90 100644 "Použijte \"-y\" k potlačení." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " -msgstr " * Možná jste myslel: " +msgstr " * Možná bylo míněno: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Balíček(y) %s%s%s dostupný/é, ale nenainstalovaný/é." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Balíček %s%s%s není dostupný." @@ -11979,68 +12142,68 @@ index 622394b..c8a5a90 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Balíček(y) k instalaci" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "%d balíček k instalaci" -+msgstr[1] "%d balíčky k instalaci" -+msgstr[2] "%d balíčků k instalaci" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Není co dělat" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d balíčků označeno k aktualizaci" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "%d balíček označen k aktualizaci" -+msgstr[1] "%d balíčky označeny k aktualizaci" -+msgstr[2] "%d balíčků označeno k aktualizaci" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" -msgstr "Žádné balíčky označené k aktualizaci" +msgstr "Nejsou dostupné žádné balíčky s aktualizacemi" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d balíčků označených k synchronizaci distribuce" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" -+msgstr[0] "%d balíček označen k synchronizaci distribuce" -+msgstr[1] "%d balíčky označeny k synchronizaci distribuce" -+msgstr[2] "%d balíčků označeno k synchronizaci distribuce" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" -msgstr "K synchronizaci distribuce nebyly označeny žádné balíčky" +msgstr "K synchronizaci distribuce nebyly určeny žádné balíčky" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d balíčků označeno ke smazání" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "%d balíček označen k odstranění" -+msgstr[1] "%d balíčky označeny k odstranění" -+msgstr[2] "%d balíčků označeno k odstranění" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" -msgstr "Žádné balíčky označené k odstranění" +msgstr "Žádné balíčky ke smazání" @@ -12048,22 +12211,22 @@ index 622394b..c8a5a90 100644 -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Balíček(y) ke snížení verze" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "%d balíček ke snížení verze" -+msgstr[1] "%d balíčky ke snížení verze" -+msgstr[2] "%d balíčků ke snížení verze" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (z %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." -msgstr "Instalované balíčky %s%s%s%s nejsou dostupné" @@ -12072,33 +12235,33 @@ index 622394b..c8a5a90 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Balíček(y) k reinstalaci" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" -+msgstr[0] "%d balíček k reinstalaci" -+msgstr[1] "%d balíčky k reinstalaci" -+msgstr[2] "%d balíčků k reinstalaci" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" -msgstr "Žádný balíček neposkytuje" +msgstr "Neposkytnuty žádné balíčky" + -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Balíček(y) k instalaci" -#: ../cli.py:1058 -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" -msgstr "" +msgstr "Jméno/Souhrn odpovídá: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -12106,7 +12269,7 @@ index 622394b..c8a5a90 100644 +"úplné hledání." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -12115,177 +12278,177 @@ index 622394b..c8a5a90 100644 +"pro úplné hledání." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Shoda: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." -msgstr "" +msgstr " Vyhledáno %shlavně%s, použijte \"search all\" pro úplné hledání." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" -msgstr "Varování: Žádný balíček odpovídající: %s" +msgstr "Varování: Žádná shoda pro: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Nebyla nalezena shoda" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Nebyly nalezeny balíčky pro %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " -msgstr "Čištění repozitářů:" +msgstr "Vyčištění repozitářů:" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" -msgstr "Čistí se vše" +msgstr "Vymazání celého obsahu cache" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" -msgstr "Čistí se hlavičky" +msgstr "Vymazání hlaviček" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" -msgstr "Čistí se balíčky" +msgstr "Vymazání balíčků" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" -msgstr "Čistí se XML metadata" +msgstr "Vymazání XML metadat" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" -msgstr "Čistí se skladiště databáze" +msgstr "Vymazání databázové cache" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" -msgstr "Ze skladiště se odstraňují zastaralá metadata" +msgstr "Vymazání zastaralých metadat" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" -msgstr "Čistí se skladiště rpmdb dat" +msgstr "Vymazání rpmdb cache" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" -msgstr "Čistí se zásuvné moduly" +msgstr "Vymazání modulů" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "Varování: Žádná shoda skupiny pro: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Nainstalované skupiny:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" -msgstr "" +msgstr "Nainstalované jazykové skupiny:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Dostupné skupiny:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" -msgstr "" +msgstr "Dostupné jazykové skupiny:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Dokončeno" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Varování: skupina %s neexistuje." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "V žádné z požadovaných skupin nejsou balíčky k instalaci nebo aktualizaci" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d balíček(ů) k instalaci" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "%d balíček k instalaci" -+msgstr[1] "%d balíčky k instalaci" -+msgstr[2] "%d balíčků k instalaci" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Neexistuje skupina se jménem %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Žádné balíčky k odstranění ve skupině" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d balíček(ů) k odstranění" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "%d balíček k odstranění" -+msgstr[1] "%d balíčky k odstranění" -+msgstr[2] "%d balíčků k odstranění" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Balíček %s je již nainstalován, přeskakuje se" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" -msgstr "Skartuje se neporovnatelný balíček %s.%s" @@ -12293,26 +12456,26 @@ index 622394b..c8a5a90 100644 #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "Žádný jiný %s nainstalován, přidán do seznamu k potenciální instalaci" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" -msgstr "Možnosti zásuvného modulu" +msgstr "Volby zásuvného modulu" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" -msgstr "Chyba příkazové řádky: %s" +msgstr "Chyba na příkazovém řádku: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -12321,164 +12484,164 @@ index 622394b..c8a5a90 100644 "%s: %s volba vyžaduje argument" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" -msgstr "--color přijímá jeden z: auto, always, never" +msgstr "--color může být jen: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "--installroot musí být absolutní cesta: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "ukázat tuto nápovědu a skončit" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "tolerovat chyby" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" -msgstr "spustit vše ze systémového skladiště, bez jeho aktualizace" +msgstr "spustit vše ze systémové cache, bez její aktualizace" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "umístění konfiguračního souboru" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "maximální čas čekání na příkaz" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" -msgstr "úroveň výstupních ladících informací" +msgstr "úroveň výpisu ladících informací" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "ukázat duplikáty v repozitářích, v list/search příkazech" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" -msgstr "úroveň výstupu chyb" +msgstr "úroveň výpisu chyb" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" -msgstr "úroveň výstupních ladících informací pro rpm" +msgstr "úroveň výpisu ladících informací pro rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" -msgstr "tichý chod" +msgstr "tichý běh" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" -msgstr "užvaněný chod" +msgstr "užvaněný běh" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" -msgstr "odpovědět ano na všechny otázky" +msgstr "odpovědět na všechny otázky ano" ++ ++#: ../cli.py:2069 ++msgid "answer no for all questions" ++msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:1996 -+msgid "answer no for all questions" -+msgstr "odpověď je ne na všechny otázky" -+ -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "ukázat verzi yumu a skončit" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "nastavit kořen instalace " -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "povolit jeden nebo více repozitářů (zástupné znaky povoleny)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "zakázat jeden nebo více repozitářů (zástupné znaky povoleny)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" -msgstr "vyřadit balíček(y) podle jména nebo globálně" +msgstr "vyřadit balíček(y) podle jména nebo výrazu" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "zakázat vyřazení z hlavní části, pro repozitář nebo pro vše" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "povolit zpracování zastaralých během aktualizací" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "zakázat zásuvné moduly yumu" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "zakázat kontrolu GPG podpisů" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "zakázat zásuvné moduly podle jména" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "povolit zásuvné moduly podle jména" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "přeskočit balíčky s problémy v závislostech" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "kontrola zda jsou použity barvy" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" -msgstr "nastavte hodnotu $releasever v konfiguraci yumu a repo souborech" +msgstr "nastavit hodnotu $releasever pro yum a repo soubory" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "nastavit doplňkové konfigurace a možnosti repozitáře " @@ -12865,23 +13028,23 @@ index 622394b..c8a5a90 100644 +msgstr "Odstranění kvůli závislostem" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Přeskočeno (problémy se závislostmi)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Nenainstalováno" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Nedostupný" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Balíček" +msgid_plural "Packages" @@ -12920,7 +13083,7 @@ index 622394b..c8a5a90 100644 #, python-format msgid "" "\n" -@@ -883,65 +930,60 @@ msgstr "" +@@ -883,65 +930,67 @@ msgstr "" "Shrnutí transakce\n" "%s\n" @@ -12928,7 +13091,7 @@ index 622394b..c8a5a90 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Instalace %5.5s balíčků\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Instalovat" @@ -12936,23 +13099,23 @@ index 622394b..c8a5a90 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Aktualizace %5.5s balíčků\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" -+msgstr "Aktualizace" ++msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Odstranění %5.5s balíčků\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" -+msgstr "Odstranění" ++msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Reinstalace %5.5s balíčků\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Přeinstalovat" @@ -12960,43 +13123,50 @@ index 622394b..c8a5a90 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Snížení verze %5.5s balíčků\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Snížit verzi" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "Odstraněno" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Odstraněné závislosti" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Nainstalované závislosti" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Aktualizované závislosti" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Nahrazeno" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Selhalo" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" -msgstr "dvě" +msgstr "dvou" @@ -13006,283 +13176,283 @@ index 622394b..c8a5a90 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -952,364 +994,416 @@ msgstr "" +@@ -952,364 +1001,416 @@ msgstr "" "Aktuální stahování zrušeno, běh lze ukončit %sopakovaným přerušením (ctrl-c)%s\n" "během %s%s%s sekund.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "Přerušeno uživatelem" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Celkem" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Systém" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" -msgstr "" +msgstr "Vynechání sloučené transakce %d až %d, protože jsou v překryvu" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" -msgstr "" +msgstr "Žádné transakce" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Zadáno špatné ID transakce nebo balíčku/ů" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" -msgstr "" +msgstr "Příkazový řádek" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" -msgstr "Přihlášení uživatele" +msgstr "Přihlášen uživatel" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Datum a čas" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Akce" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Pozměněno" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Nezadáno ID transakce" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Špatné ID transakce" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Zadané ID transakce nenalezeno" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Nalezeno více než jedno ID transakce!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Nebylo zadáno ID transakce nebo balíčku/ů" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Snížena verze" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Starší" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Novější" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "ID transakce:" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Počáteční čas :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Začátek rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u sekund)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u minut)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u hodin)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u dnů)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" -msgstr "Konečný čas :" +msgstr "Čas ukončení :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Konec rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Uživatel :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Návratový kód :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Přerušeno" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" -msgstr "" +msgstr "Selhání:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Selhalo:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" -msgstr "Úspěch" +msgstr "Úspěšné" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" -msgstr "Příkazová řádka:" +msgstr "Příkazový řádek:" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Uložená přídavná nestandardní informace: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Transakce proběhla s:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Pozměněné balíčky:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Přeskočené balíčky:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Problémy rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Výstup skriptletu:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Chyby:" @@ -13291,17 +13461,17 @@ index 622394b..c8a5a90 100644 -msgstr "Instalovat" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Instalovat závislosti" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Zastaralé" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Smazat" @@ -13314,379 +13484,379 @@ index 622394b..c8a5a90 100644 -msgstr "Snížit verzi" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Aktualizovat" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Čas" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Poslední den" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Poslední týden" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Poslední 2 týdny" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Poslední 3 měsíce" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Posledních 6 měsíců" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Poslední rok" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Více než rok" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Nenalezena transakce %s" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "ID transakce:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Další dostupná informace z historie:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Nenalezena další data toho jména" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" -+msgstr "Balíček :" ++msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" -+msgstr "Stav :" ++msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" -+msgstr "Velikost :" ++msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" -+msgstr "Sestaveno na :" ++msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" -+msgstr "Čas sestavení :" ++msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" -+msgstr "Autor balíčku :" ++msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" -+msgstr "Distributor :" ++msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" -+msgstr "Licence :" ++msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" -+msgstr "URL :" ++msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" -+msgstr "Zdrojové RPM :" ++msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" -+msgstr "Čas odeslání :" ++msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" -+msgstr "Odesilatel :" ++msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" -+msgstr "Důvod :" ++msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" -+msgstr "Z repa :" ++msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" -+msgstr "Nainstaloval :" ++msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" -+msgstr "Změnil :" ++msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" -msgstr "instalaci" +msgstr "instalován" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" -msgstr "" +msgstr "novou aktualizací" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" -msgstr "smazání" +msgstr "smazán" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" -msgstr "reinstalaci" +msgstr "reinstalován" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" -msgstr "" +msgstr "ponížen" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" -msgstr "" +msgstr "nahrazen" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" -msgstr "aktualizaci" +msgstr "aktualizován" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" -msgstr "zastarání" +msgstr "zastaralý" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" -msgstr "" +msgstr "---> Balíček %s.%s %s:%s-%s bude %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" -msgstr "--> Spouští se kontrola transakce" +msgstr "--> Kontrola transakce spuštěna" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." -msgstr "--> Restartuje se řešení závislostí s novými změnami." +msgstr "--> Restartování řešení závislostí s novými změnami." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Řešení závislostí dokončeno" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" -msgstr "--> Zpracování závislosti: %s pro balíček: %s" +msgstr "--> Zpracování závislostí: %s pro balíček: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" -msgstr "---> Ponechají se balíčky: %s" +msgstr "---> Ponechíní balíčku: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" -msgstr "--> Nevyřešená závislost: %s" +msgstr "--> Nevyřešené závislosti: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Balíček: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1318,7 +1412,7 @@ msgstr "" +@@ -1318,7 +1419,7 @@ msgstr "" "\n" " Vyžaduje: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1327,7 +1421,7 @@ msgstr "" +@@ -1327,7 +1428,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1336,7 +1430,7 @@ msgstr "" +@@ -1336,7 +1437,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1345,85 +1439,85 @@ msgstr "" +@@ -1345,85 +1446,85 @@ msgstr "" " Nenalezeno" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" -msgstr "Aktualizoval" +msgstr "Aktualizací balíčku" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Snížil verzi" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" -msgstr "Zastaral" +msgstr "Zastaralán" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Dostupné" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Zpracování konfliktu: %s je v konfliktu s %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." -msgstr "--> Do transakční sady se přidávají vybrané balíčky. Čekejte prosím." +msgstr "--> Do transakce jsou přidávány vybrané balíčky. Čekejte prosím." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." -msgstr "---> Stahují se hlavičky %s pro přidání do transakce." +msgstr "---> Stahování hlaviček %s pro přidání do transakce." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Běží" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Spí" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Nepřerušitelné" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombie" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Trasován/Zastaven" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Neznámý" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Další aplikace je: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Další aplikace je: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Paměť : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" -msgstr " Spuštěn: %s - %s nazpět" +msgstr " Spuštěn: %s - před %s" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Stav : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1431,9 +1525,9 @@ msgid "" +@@ -1431,9 +1532,9 @@ msgid "" msgstr "" "\n" "\n" @@ -13694,11 +13864,11 @@ index 622394b..c8a5a90 100644 +"Ukončeno na příkaz uživatele" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1441,9 +1535,9 @@ msgid "" +@@ -1441,9 +1542,9 @@ msgid "" msgstr "" "\n" "\n" @@ -13706,16 +13876,16 @@ index 622394b..c8a5a90 100644 +"Ukončeno přerušením roury" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1454,63 +1548,63 @@ msgstr "" +@@ -1454,63 +1555,63 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" @@ -13725,42 +13895,42 @@ index 622394b..c8a5a90 100644 "exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Chyba PluginExit: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Chyba Yumu: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Chyba: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" -msgstr " Můžete zkusit volbu --skip-broken k překonání tohoto problému" +msgstr " Pro obejití problému můžete zkusit volbu --skip-broken" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Můžete zkusit spustit: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Neznámá chyba/y: Výstupní kód: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" @@ -13770,7 +13940,7 @@ index 622394b..c8a5a90 100644 +"Závislosti vyřešeny." -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Hotovo!" @@ -13789,7 +13959,7 @@ index 622394b..c8a5a90 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1527,9 +1621,9 @@ msgid "" +@@ -1527,9 +1628,9 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" "\n" @@ -13802,7 +13972,7 @@ index 622394b..c8a5a90 100644 " rpm --import public.gpg.key\n" "\n" "\n" -@@ -1539,362 +1633,355 @@ msgstr "" +@@ -1539,362 +1640,351 @@ msgstr "" "\n" "Více informací získáte u svého distributora nebo správce balíčku.\n" @@ -13986,12 +14156,12 @@ index 622394b..c8a5a90 100644 msgid "Setting up Remove Process" -msgstr "Uspořádává se průběh odstranění" +msgstr "Příprava průběhu odstranění" -+ -+#: ../yumcommands.py:773 -+msgid "Display, or use, the groups information" -+msgstr "Zobrazit nebo použít informace o skupinách" -#: ../yumcommands.py:435 ++#: ../yumcommands.py:773 ++msgid "Display, or use, the groups information" ++msgstr "" ++ +#: ../yumcommands.py:776 msgid "Setting up Group Process" -msgstr "Uspořádává se zpracování skupiny" @@ -14020,7 +14190,7 @@ index 622394b..c8a5a90 100644 +#: ../yumcommands.py:833 +#, python-format +msgid "Invalid groups sub-command, use: %s." -+msgstr "Neplatný příkaz podskupiny, použijte: %s" ++msgstr "" -#: ../yumcommands.py:550 +#: ../yumcommands.py:929 @@ -14098,165 +14268,163 @@ index 622394b..c8a5a90 100644 +msgstr "Příprava zpracování lokálního balíčku" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" +-msgid "Determine which package provides the given dependency" -msgstr "Určit který balíček poskytuje danou závislost" -+msgstr "Zjistit, který balíček poskytuje danou závislost" - +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" -msgstr "Prohledávají se balíčky kvůli závislostem:" +msgstr "Prohledávání balíčků pro vyřešení závislostí:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Spustit interaktivní shell yum" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" -msgstr "Nastavuje se yum shell" +msgstr "Příprava yum shellu" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" -msgstr "Zobrazit závislosti balíčku" +msgstr "Vypsat závislosti balíčku" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " -msgstr "Hledají se závislosti: " +msgstr "Hledání závislostí: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Zobrazit nastavené repozitáře softwaru" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "povoleno" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "zakázáno" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " -msgstr "Repo-id : " +msgstr "Repo-ID : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " -msgstr "Repo-jméno : " +msgstr "Repo-název : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Repo-status : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Repo-revize : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Repo-tagy : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Repo-distro-tagy: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " -msgstr "Repo-aktuální: " +msgstr "Repo-aktual. : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " -msgstr "Repo-bal. : " +msgstr "Repo-balíčků : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Repo-velikost: " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Repo-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " -msgstr " Aktualizováno: " +msgstr "Aktualizováno: " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Repo-zrcadla : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Nikdy (poslední: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Okamžitě (naposledy: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekund (naposledy: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Repo-vyprší : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Repo-vyřazeno: " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Repo-zahrnuto: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Repo-vyřazeno: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Repo-konfig : " @@ -14264,200 +14432,200 @@ index 622394b..c8a5a90 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" -msgstr "repo id" +msgstr "ID repozitáře:" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" -msgstr "status" +msgstr "Stav:" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" -msgstr "jméno repa" +msgstr "Název repozitáře:" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Zobrazit užitečnou nápovědu" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" -msgstr "Není dostupná nápověda pro %s" +msgstr "Pro %s není dostupná nápověda" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1904,7 +1991,7 @@ msgstr "" +@@ -1904,7 +1994,7 @@ msgstr "" "\n" "aliasy: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1914,115 +2001,163 @@ msgstr "" +@@ -1914,115 +2004,161 @@ msgstr "" "\n" "alias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" -msgstr "Uspořádává se průběh reinstalace" +msgstr "Příprava průběhu reinstalace" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "Reinstalace balíčku" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" -msgstr "Uspořádává se průběh snížení verze" +msgstr "Příprava snížení verze" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "Snížení verze balíčku" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." -msgstr "Zobrazit verzi pro tento počítač a/nebo dostupné repozitáře." +msgstr "Zobrazit verzi pro počítač a/nebo dostupné repozitáře." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Verze yum skupin:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Skupina :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Balíčky :" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Nainstalováno:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Nainstalované skupiny:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Dostupné:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Dostupné skupiny:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" -msgstr "Zobrazit nebo používat transakční historii" +msgstr "Zobrazit nebo používat historii transakcí" + -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" -+msgstr "Transakce:" ++msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" -+msgstr "Čas startu :" ++msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" -+msgstr "Čas konce :" ++msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" -+msgstr "Počet :" ++msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" -+msgstr " NEVRAC :" ++msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" -+msgstr " NEVRA :" ++msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" -+msgstr " NA :" ++msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" -+msgstr " NEVR :" ++msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" -+msgstr " rpm DB :" ++msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" -+msgstr " yum DB :" ++msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." -msgstr "Neplatný pod-příkaz historie, použijte: %s." +msgstr "Neplatný subpříkaz historie, použijte: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Nemáte přístup k databázi s historií." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Zkontrolovat problémy v rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" -msgstr "" +msgstr "Načíst transakci uloženou v souboru" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." -msgstr "" +msgstr "Nebyla zadána žádná uložená transakce." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "načítání transakce z %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "" @@ -14467,26 +14635,25 @@ index 622394b..c8a5a90 100644 #: ../yummain.py:84 #, python-format msgid " Yum checks failed: %s" --msgstr "" +msgstr " Selhaly kontroly Yumu: %s" - --#: ../yummain.py:114 --msgid "" --"Another app is currently holding the yum lock; waiting for it to exit..." --msgstr "Zámek yumu je obsazen jinou aplikací; čeká se na její ukončení..." ++ +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" -+msgstr "V aktuálním adresáři není povolen zápis ani čtení, přesouvám se do /" ++msgid "No read/execute access in current directory, moving to /" + msgstr "" --#: ../yummain.py:120 +-#: ../yummain.py:114 +#: ../yummain.py:124 - msgid "Can't create lock file; exiting" --msgstr "" ++msgid "Can't create lock file; exiting" +msgstr "Nelze vytvořit soubor se zámkem; končím" + +#: ../yummain.py:128 -+msgid "" -+"Another app is currently holding the yum lock; waiting for it to exit..." + msgid "" + "Another app is currently holding the yum lock; waiting for it to exit..." +-msgstr "Zámek yumu je obsazen jinou aplikací; čeká se na její ukončení..." +- +-#: ../yummain.py:120 +-msgid "Can't create lock file; exiting" +-msgstr "" +msgstr "Zámek yumu drží jiná aplikace; čeká se na její ukončení..." #. Depsolve stage @@ -14504,111 +14671,109 @@ index 622394b..c8a5a90 100644 +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" msgstr "" -+"Transakce byla uložena, znovu-spuštění:\n" -+"yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2032,448 +2167,451 @@ msgstr "" +@@ -2032,448 +2168,451 @@ msgstr "" "\n" "Ukončeno na pokyn uživatele." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() bude v následujících verzích yumu odstraněno.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" -msgstr "" -"Uspořádává se TransactionSet před tím než bude připravena třída config" +msgstr "Příprava TransactionSet před tím než bude připravena třída config" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Neplatný tsflag v konfiguračním souboru: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" -msgstr "Hledá se pkgSack pro závislost: %s" +msgstr "Hledání pkgSack pro závislost: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" -msgstr "Prvek: %s" +msgstr "Člen: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" -msgstr "%s zkonvertován na instalaci" +msgstr "%s zkonvertován pro instalaci" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" -msgstr "Přidává se balíček %s v módu %s" +msgstr "Přidání balíčeku %s v režimu %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" -msgstr "Odstraňuje se balíček %s" +msgstr "Odstranění balíčku %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s vyžaduje: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s vyžaduje %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" -msgstr "Závazné požadavky již byly prohledány, švindluje se" +msgstr "Potřebné Require již bylo vyhledáno, švindluje se" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" -msgstr "Závazný požadavek není jméno balíčku. Hledá se: %s" +msgstr "Potřebné Require není jméno balíčku. Hledání: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Možný poskytovatel: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" -msgstr "Mód je %s pro poskytovatele %s: %s" +msgstr "Režim %s pro poskytovatele %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" -msgstr "Mód pro bal. poskytující %s: %s" @@ -14618,28 +14783,28 @@ index 622394b..c8a5a90 100644 #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "Pro vyřešení závislostí se zkouší aktualizace %s" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" -msgstr "" +msgstr "Není cesta pro aktualizaci %s. Selhání!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" -msgstr "TSINFO: %s balíček požaduje %s označený ke smazání" +msgstr "TSINFO: balíček %s požaduje %s, který je určen ke smazání" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." -msgstr "TSINFO: Zastarává se %s s %s k vyřešení závislostí." @@ -14648,21 +14813,21 @@ index 622394b..c8a5a90 100644 +"závislostí." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." -msgstr "TSINFO: Aktualizuji %s k vyřešení závislostí." +msgstr "TSINFO: Aktualizace %s pro vyřešení závislostí." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" -msgstr "Nelze nalézt cestu aktualizací pro závislost pro: %s" +msgstr "Nelze nalézt cestu aktualizací pro závislosti pro: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" -msgstr "Rychlá shoda %s vyžadovaného pro %s" @@ -14670,104 +14835,104 @@ index 622394b..c8a5a90 100644 #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" "%s je v poskytujících balíčcích, ale je již nainstalován, odstraňuje se." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." -msgstr "Balíček %s, který může být řešení, má v ts novější verzi." +msgstr "Balíček %s, který může být řešením, má v transakci novější verzi." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." -msgstr "Balíček %s, který může být řešení, je nainstalován v novější verzi." +msgstr "Balíček %s, který může být řešením, je nainstalován v novější verzi." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" -msgstr "%s je již v ts, vynechává se" +msgstr "%s je již v transakci, vynechává se" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" -msgstr "TSINFO: Označuji %s jako aktualizaci %s" +msgstr "TSINFO: Označení %s jako aktualizaci pro %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" -msgstr "TSINFO: Označuji %s jako instalaci %s" +msgstr "TSINFO: Označení %s jako instalaci pro %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Úspěch - prázdná transakce" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" -msgstr "Restartuje se smyčka" +msgstr "Restartování smyčky" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" -msgstr "Proces zpracování závislostí končí" +msgstr "Proces zpracování závislostí skončil" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Úspěch - závislosti vyřešeny" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" -msgstr "Kontroluji závislosti pro %s" +msgstr "Kontrola závislostí pro %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" -msgstr "hledá se %s jako požadavek od %s" +msgstr "hledá se %s jako požadavek pro %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" -msgstr "Spouští se compare_providers() pro %s" +msgstr "Spuštěno compare_providers() pro %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "lepší architektura v po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s zastarává %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -14778,44 +14943,44 @@ index 622394b..c8a5a90 100644 " Vítěz: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "společné zdrojové rpm %s a %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "základní balíček %s je nainstalován pro %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "společný prefix %s mezi %s a %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "vyžaduje minimálně: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Vítěz: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" -msgstr " Poražený (kým %d): %s" +msgstr " Poražený (%d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" -msgstr "Nejlepší pořádek: %s" @@ -15033,7 +15198,7 @@ index 622394b..c8a5a90 100644 +msgstr "instalační konflikt" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -15041,18 +15206,18 @@ index 622394b..c8a5a90 100644 "chybě." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Transakce nemůže začít:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Nelze spustit transakci." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Selhalo odstranění transakčního souboru %s." @@ -15060,7 +15225,7 @@ index 622394b..c8a5a90 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" -msgstr "%s mělo být nainstalováno, ale není!" @@ -15072,21 +15237,21 @@ index 622394b..c8a5a90 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" -msgstr "%s mělo být odstraněno, ale není!" +msgstr "%s by mělo být odstraněno, ale není!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Nelze otevřít zámek %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" -msgstr "Nedá se zkontrolovat, zda je PID %s aktivní." @@ -15094,52 +15259,51 @@ index 622394b..c8a5a90 100644 #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Existující zámek %s: jiná kopie běží s pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Nelze vytvořit zámek na %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2482,103 +2620,95 @@ msgstr "" +@@ -2482,103 +2621,95 @@ msgstr "" "Balíček neodpovídá zamýšlenému stahování. Zkuste spustit: yum " "--enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Nelze zkontrolovat kontrolní součet" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" -msgstr "Balíček neodpovídá kontrolnímu součtu" +msgstr "Kontrolní součet balíčku nesouhlasí" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" -msgstr "balíček neprošel kontrolním součtem ale skladiště je povoleno pro %s" +msgstr "kontrolní součet balíčku nesouhlasím, avšak pro %s je povolena cache" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" -msgstr "používá se lokální kopie %s" -+msgstr "použití lokální kopie %s" - +- -#: ../yum/__init__.py:1991 -#, python-format -msgid "" @@ -15150,14 +15314,15 @@ index 622394b..c8a5a90 100644 -"Nedostatek diskového prostoru ve stahovacím adresáři %s\n" -" * volno %s\n" -" * potřeba %s" -- ++msgstr "použití lokální kopie %s" + -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Hlavička není kompletní." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" @@ -15168,121 +15333,121 @@ index 622394b..c8a5a90 100644 +" %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Veřejný klíč %s není nainstalován" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problém s otevřením balíčku %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Veřejný klíč %s není důvěryhodný" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Balíček %s není podepsán" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" -msgstr "Nemohu odstranit %s" +msgstr "Nelze odstranit %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s odstraněn" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" -msgstr "Nemohu odstranit %s soubor %s" +msgstr "Nelze odstranit %s soubor %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s soubor %s odstraněn" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s soubor odstraněn" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "%d %s soubor odstraněn" -+msgstr[1] "%d %s soubory odstraněny" -+msgstr[2] "%d %s souborů odstraněno" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" -msgstr "Více než jedna identická shoda v pytli pro %s" +msgstr "Více než jedna identická shoda v souhrnu pro %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" -msgstr "Nic se neshoduje s %s.%s %s:%s-%s z aktualizace" +msgstr "Z aktualizace se nic neshoduje s %s.%s %s:%s-%s" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2586,320 +2716,340 @@ msgstr "" +@@ -2586,382 +2717,405 @@ msgstr "" "searchPackages() bude odstraněn v příští verzi Yumu. " "Používejte místo něj searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Prohledává se %d balíčků" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "Prohledán %d balíček" -+msgstr[1] "Prohledány %d balíčky" -+msgstr[2] "Prohledáno %d balíčků" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" -msgstr "prohledává se balíček %s" +msgstr "vyhledávání balíčku %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" -msgstr "hledá se v souborových položkách" +msgstr "vyhledávání v názvech souborů" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" -msgstr "hledá se v položkách poskytovatelů" +msgstr "vyhledávání v položkách poskytuje" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" -msgstr "Pro nastavený repozitář nejsou žádná dostupná skupinová data" +msgstr "Pro aktivní repozitáře nejsou k dispozici žádná data o skupinách" @@ -15290,43 +15455,43 @@ index 622394b..c8a5a90 100644 -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" -msgstr "Neexistuje skupina pojmenovaná %s" +msgstr "Neexistuje skupina %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "balíček %s nebyl označen ve skupině %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" -msgstr "Přidává se balíček %s pro skupinu %s" +msgstr "Přidání balíčku %s ze skupiny %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" -msgstr "Žádný balíček pojmenovaný %s není dostupný pro instalaci" +msgstr "Pro instalaci není k dispozici žádný balíček s názvem %s" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "Varování: Skupina %s neobsahuje žádné balíčky." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." -msgstr "" @@ -15335,46 +15500,47 @@ index 622394b..c8a5a90 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" -msgstr "Uspořádaný seznam balíčků %s nenalezen v pytli balíčků" +msgstr "Položka balíčku %s nenalezena v souhrnu balíčků" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" -msgstr "Uspořádaný seznam balíčků %s nenalezen v rpmdb" +msgstr "Položka balíčku %s nenalezena v rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" -msgstr "" +msgstr "Neplatný příznak verze z: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" -msgstr "Nebyl nalezen balíček pro %s" +msgstr "Pro %s nebyl nalezen žádný balíček" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Objekt balíčku nebyl instancí balíčkového objektu" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" -msgstr "Nebylo určeno nic k instalaci" +msgstr "K instalaci nebylo nic určeno" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" -msgstr "Hledá se virtuální poskytovatel nebo soubor poskytující %s" @@ -15382,33 +15548,33 @@ index 622394b..c8a5a90 100644 -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" -msgstr "Nenalezena shoda pro argument: %s" +msgstr "Pro argument nenalezena shoda: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Balíček %s je nainstalován, ale není dostupný" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" -msgstr "Žádné balíčky dostupné pro instalaci" +msgstr "K instalaci nejsou dostupné žádné balíčky" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Balíček: %s - již je v transakční sadě" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" -msgstr "Balíček %s je zastaralý balíčkem %s, který je již nainstalován" @@ -15416,7 +15582,7 @@ index 622394b..c8a5a90 100644 +"Balíček %s je označen za zastaralý balíčkem %s, který je již nainstalován" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -15427,7 +15593,7 @@ index 622394b..c8a5a90 100644 +"vyřešení závislostí" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" @@ -15436,13 +15602,13 @@ index 622394b..c8a5a90 100644 +"instalovat %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Balíček %s je již nainstalován a v poslední verzi" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." -msgstr "Balíček odpovídající %s je již nainstalován. Hledají se aktualizace." @@ -15450,44 +15616,44 @@ index 622394b..c8a5a90 100644 #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" -msgstr "Aktualizuje se vše" +msgstr "Aktualizace všeho" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Neaktualizuje se balíček, který je již zastaralý: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "Žádný balíček nevyhovuje aktualizaci: %s" ++msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Balíček je již zastaralý: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Neaktualizuje se balíček, který je zastaralý: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Neaktualizuje se balíček, který jej již aktuální: %s.%s %s:%s-%s" @@ -15495,47 +15661,47 @@ index 622394b..c8a5a90 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nenalezen žádný shodný balíček pro odstranění" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "Žádný balíček nevyhovuje odstranění: %s" ++msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" -msgstr "Přeskakuji aktuálně používané jádro: %s" +msgstr "Aktuálně používané jádro bylo přeskočeno: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" -msgstr "Odstraňuji %s z transakce" +msgstr "Odstranění %s z transakce" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Nelze otevřít: %s. Přeskakuje se." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" -msgstr "Zkoumá se %s: %s" +msgstr "Zkoumání %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." -msgstr "Nelze lokálně instalovat deltarpm: %s. Přeskakuje se." +msgstr "Nelze lokálně nainstalovat deltarpm: %s. Přeskakuje se." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" @@ -15543,7 +15709,7 @@ index 622394b..c8a5a90 100644 +msgstr "Do transakce nelze přidat balíček %s. Nekompatibilní architektura: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" -msgstr "Nelze instalovat balíček %s. Je zastaralý nainstalovaným balíčkem %s" @@ -15551,7 +15717,7 @@ index 622394b..c8a5a90 100644 +"Nelze nainstalovat balíček %s. Je zastaralý nainstalovaným balíčkem %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -15563,7 +15729,7 @@ index 622394b..c8a5a90 100644 +"příkazem yum install." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -15573,177 +15739,177 @@ index 622394b..c8a5a90 100644 +"příkazem yum install." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" -msgstr "Vynechává se %s" +msgstr "Vynechání %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" -msgstr "Označuje se %s k instalaci" +msgstr "Označení %s k instalaci" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" -msgstr "Označuje se %s jako aktualizace %s" +msgstr "Označení %s jako aktualizace %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." -msgstr "%s: není aktualizací instalovaného balíčku." +msgstr "%s: není aktualizací nainstalovaného balíčku." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Nelze otevřít soubor: %s. Přeskakuje se." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Problém při reinstalaci: žádný shodný balíček k odstranění" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problém při reinstalaci: žádný shodný balíček %s k instalaci" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" -msgstr "Žádné balíčky dostupné ke snížení verze" +msgstr "Pro snížení verze není dostupný žádný balíček" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Balíček %s má dovoleno vícero instalací, přeskakuje se" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Neexistuje shoda pro dostupný balíček: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" -msgstr "Pouze aktualizace dostupná pro balíček: %s" +msgstr "Pouze aktualizace je dostupná pro balíček: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Nepodařilo se snížit verzi: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 -+#, python-format -+msgid "Failed to upgrade: %s" -+msgstr "Nezdařila se aktualizace: %s" -+ -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 #, python-format - msgid "Retrieving key from %s" --msgstr "" -+msgstr "Získávání klíče z %s" +-msgid "Retrieving key from %s" ++msgid "Failed to upgrade: %s" + msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5032 ++#, python-format ++msgid "Retrieving key from %s" ++msgstr "Získávání klíče z %s" ++ ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Získání GPG klíče selhalo: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" -msgstr "" +msgstr "GPG podpis klíčem %s neodpovídá klíči CA pro repozitář: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" -msgstr "" +msgstr "GPG podpis byl ověřen oproti CA klíči (klíčům)." -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Neplatný GPG klíč pro %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" -msgstr "Zpracování GPG klíče selhalo: klíč nemá žádnou hodnotu %s" +msgstr "Parsování GPG klíče selhalo: klíč nemá žádnou hodnotu %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2907,61 +3057,68 @@ msgid "" - " Package: %s (%s)\n" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -+"Načtení %s klíče 0x%s:\n" -+" Userid : %s\n" -+" Balíček: %s (%s)\n" -+" Z : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" - " Userid: \"%s\"\n" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -+"Načtení %s klíče 0x%s:\n" -+" Userid: \"%s\"\n" -+" Z : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG klíč %s (0x%s) je již nainstalován" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Import klíče selhal (kód %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Import klíče proběhl úspěšně" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" -msgstr "" +msgstr "Nebyly instalovány žádné klíče" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -15755,167 +15921,166 @@ index 622394b..c8a5a90 100644 +"Zkontrolujte, zda URL klíčů jsou pro tento repozitář správně nastaveny." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Import klíče/ů nepomohl, špatný klíč(e)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG klíč %s (0x%s) je již naimportován" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Import klíče selhal" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "Nebyly nainstalovány žádné klíče pro repozitář %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2970,164 +3127,199 @@ msgstr "" +@@ -2970,164 +3124,199 @@ msgstr "" "GPG klíče pro repozitář \"%s\" jsou již nainstalovány, ale nejsou správné.\n" "Zkontrolujte že pro repozitář je správně nastaveno URL klíče." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." -msgstr "Nemohu nalézt vhodné zrcadlo" +msgstr "Nelze nalézt vhodné zrcadlo" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Při stahování balíčků došlo k chybě." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" -msgstr "Oznamte prosím tuto chybu na %s" +msgstr "Oznamte tuto chybu na %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Chyby testu transakce: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" -msgstr "Nelze vytvořit skladiště: %s " +msgstr "Nelze nastavit adresář pro cache: %s " -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." -msgstr "" +msgstr "Závislosti nebyly vyřešeny. Nevyřešená transakce nebude uložena." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "Nelze uložit transakční soubor %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "" +msgstr "Nelze načíst uloženou transakci %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " -msgstr "" +msgstr "rpmdb obsahuje jinou verzi než je v uložené transakci, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." -msgstr "" +msgstr " ignorováno, jak bylo žádáno." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." -msgstr "" +msgstr " přerušeno." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." -msgstr "" +msgstr "nelze nalézt tsflags nebo tsflags není celé číslo." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" -msgstr "" +msgstr "Nalezen txmbr v neznámém stavu: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" -msgstr "" +msgstr "Nelze nalézt txmbr: %s ve stavu %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" -msgstr "" +msgstr "Nelze nalézt txmbr: %s z: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," -msgstr "" +msgstr "Transakční položky nebo vztahy chybí nebo byla transakce změněna," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" --msgstr "" +msgstr " ignorováno. Musíte spustit redepsolve!" + +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." -+msgstr "%s byl již navštíven a nelze jej odstranit." ++msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" -+msgstr "Zjišťují se závislosti %s" ++msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." -+msgstr "%s má závislosti %s které byly nainstalovány uživatelem." ++msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "%s nemá žádné uživatelem nainstalované závislosti." + msgstr "" #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 @@ -16038,7 +16203,7 @@ index 622394b..c8a5a90 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format -@@ -3141,11 +3333,11 @@ msgstr "Pro RPM %s selhala kontrola md5" +@@ -3141,11 +3330,11 @@ msgstr "Pro RPM %s selhala kontrola md5" #: ../rpmUtils/oldUtils.py:151 msgid "Could not open RPM database for reading. Perhaps it is already in use?" @@ -16053,10 +16218,10 @@ index 622394b..c8a5a90 100644 #: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260 #: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266 diff --git a/po/da.po b/po/da.po -index a7202e2..d02f3e5 100644 +index a7202e2..07977ae 100644 --- a/po/da.po +++ b/po/da.po -@@ -2,13 +2,14 @@ +@@ -2,14 +2,15 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -16069,11 +16234,13 @@ index a7202e2..d02f3e5 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Danish (http://www.transifex.net/projects/p/yum/team/da/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -17,122 +18,124 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -16091,30 +16258,30 @@ index a7202e2..d02f3e5 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installerer" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Overflødiggjort" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Opdateret" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Slettet" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Installeret" @@ -16141,7 +16308,7 @@ index a7202e2..d02f3e5 100644 msgstr "Slettet: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Fjerner" @@ -16167,53 +16334,53 @@ index a7202e2..d02f3e5 100644 msgstr "Læser pakkearkiv for metadata fra lokale filer" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Konfigurationsfejl: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Fejl i indstilling: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installeret: %s-%s på %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Bygget : %s på %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Indsendt: %s på %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Du skal angive en kommando" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Ingen sådan kommando: %s. Brug %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Behov for diskplads:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Mindst %dMB mere plads er krævet på filsystemet %s.\n" @@ -16224,7 +16391,7 @@ index a7202e2..d02f3e5 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -16233,73 +16400,73 @@ index a7202e2..d02f3e5 100644 "---------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Forsøger at udføre overførslen, men der intet at udføre. Afslutter." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Afslutter efter brugerens ønske" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Henter pakker:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Fejl ved hentning af pakker:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "FEJL Du skal opdatere RPM for at håndtere:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM skal opdateres" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Rapportér venligst denne fejl i %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Kører overførselstest" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Fejl i overførselskontrol:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Overførselstest afsluttet uden fejl" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Kører overførsel" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -16308,18 +16475,18 @@ index a7202e2..d02f3e5 100644 "Brug \"-y\" til at overskrive." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Du mente måske: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Pakke(r) %s%s%s tilgængelig(e), men ikke installeret." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Pakken %s%s%s er ikke tilgængelig." @@ -16327,7 +16494,7 @@ index a7202e2..d02f3e5 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Pakke(r) til installation" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -16336,13 +16503,13 @@ index a7202e2..d02f3e5 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Intet at udføre" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pakker markeret til opdatering" @@ -16352,12 +16519,12 @@ index a7202e2..d02f3e5 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Ingen pakker markeret til opdatering" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pakker er markeret til distributionssynkronisering" @@ -16367,12 +16534,12 @@ index a7202e2..d02f3e5 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Ingen pakker er markeret til distributionssynkronisering" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pakker markeret til fjernelse" @@ -16382,14 +16549,14 @@ index a7202e2..d02f3e5 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Ingen pakker markeret til fjernelse" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Pakke(r) til nedgradering" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -16397,13 +16564,13 @@ index a7202e2..d02f3e5 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (fra %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Installeret pakke %s%s%s%s er ikke tilgængelig." @@ -16411,7 +16578,7 @@ index a7202e2..d02f3e5 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Pakke(r) til geninstallation" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -16419,153 +16586,153 @@ index a7202e2..d02f3e5 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Ingen pakker angivet" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Pakke(r) til installation" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Matchede: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Advarsel: Ingen match blev fundet for: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Ingen match fundet" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Ingen pakke fundet for %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Oprydder pakkearkiver: " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Oprydning af alt" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Oprydning af headerfiler" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Oprydning af pakker" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Oprydning af xml-metadata" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Oprydning af mellemlager til database" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Oprydning af udløbet mellemlager til metadata" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Rydder mellemlagret rpmdb-data op" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Oprydning af udvidelsesmoduler" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Installerede grupper:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Tilgængelige grupper:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Afsluttet" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Advarsel: Gruppen %s findes ikke." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "Ingen pakke i nogen de efterspurgte grupper, er tilgængelige til " "installation eller opdatering" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pakke(r) til installation" @@ -16575,18 +16742,18 @@ index a7202e2..d02f3e5 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Gruppen %s findes ikke" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Ingen pakker at fjerne fra grupper" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pakke(r) til fjernelse" @@ -16596,38 +16763,38 @@ index a7202e2..d02f3e5 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Pakken %s er allerede installeret, springer over" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Ser bort fra ikke-kompatibel pakke %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" "Ingen andre %s er installeret, tilføjer til liste til mulig installation" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Indstillinger til udvidelsesmodul" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Kommandoliniefejl: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -16636,154 +16803,154 @@ index a7202e2..d02f3e5 100644 "%s: %s indstilling kræver et argument" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color tager en af: auto, altid, aldrig" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "vis denne hjælpemeddelse og afslut" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "vær fejltolerant" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "kør udelukkende fra systemmellemlager, opdatér ikke mellemlager" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "placering af konfigurationsfil" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "maksimal ventetid på kommando" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "debug-visningsniveau" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "vis gengangere, i pakkearkiver, i list/search-kommandoer" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "fejlvisningsniveau" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "outputniveau for fejlsøgning af rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "stille operation" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "uddybende operation" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "svar ja til alle spørgsmål" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "vis Yum-version og afslut" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "sæt installationsroden" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "aktivér en eller flere pakkearkiver (wildcards er tilladt)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "deaktivér en eller flere pakkearkiver (wildcards er tilladt)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "ekskludér pakke(r) med navn eller klump" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "deaktivér ekskludering fra main, for et pakkearkiv eller for alt" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "aktivér overflødiggørelse under behandling af opdateringer" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "deaktivér Yum-udvidelsesmoduler" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "deaktivér kontrol af gpg-signaturer" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "deaktivér udvidelsesmoduler ved navn" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "aktivér udvidelsesmoduler ved navn" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "spring pakker med afhængighedsproblemer over" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "kontrollér om farve er brugt" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" "indstil værdi for $releaseever i yum-konfiguration og pakkearkivsfiler" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "indstil arbitrærkonfiguration og indstillinger for pakkearkiv" @@ -17127,22 +17294,22 @@ index a7202e2..d02f3e5 100644 msgstr "Fjerner for afhængigheder" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Sprunget over (afhængighedsproblemer)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Ikke installeret" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Pakke" +msgid_plural "Packages" @@ -17180,7 +17347,7 @@ index a7202e2..d02f3e5 100644 #, python-format msgid "" "\n" -@@ -886,57 +918,52 @@ msgstr "" +@@ -886,57 +918,58 @@ msgstr "" "Overførselsopsummering\n" "%s\n" @@ -17188,7 +17355,7 @@ index a7202e2..d02f3e5 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Installér %5.5s pakke(r)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Installér" @@ -17196,7 +17363,7 @@ index a7202e2..d02f3e5 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Opgradér %5.5s pakke(r)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" +msgstr "" @@ -17204,7 +17371,7 @@ index a7202e2..d02f3e5 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Fjern %5.5s pakke(r)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "" @@ -17212,7 +17379,7 @@ index a7202e2..d02f3e5 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Geninstallér %5.5s pakke(r)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Geninstallér" @@ -17220,316 +17387,322 @@ index a7202e2..d02f3e5 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Nedgradér %5.5s pakke(r)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Nedgradér" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "Fjernet" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Afhængighed fjernet" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Afhængighed installeret" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Afhængighed opdateret" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Erstattet" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Fejlede" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "to" -@@ -944,7 +971,7 @@ msgstr "to" +@@ -944,7 +977,7 @@ msgstr "to" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -955,364 +982,416 @@ msgstr "" +@@ -955,364 +988,416 @@ msgstr "" " Nuværende hentning afbrudt, %safbryd (ctrl-c) igen%s indenfor %s%s%s sekunder\n" "for at afslutte.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "afsluttet af bruger" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Ialt" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "System" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Dårlige overførsels-id'er eller pakker givet" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Log bruger ind" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Dato og tid" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Handling(er)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Ændret" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Intet overførsels-id givet" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Dårlig overførsels-id givet" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Det angivne overførsels-id ikke fundet" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Fandt mere end ét overførsels-id!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Intet overførsels-id eller pakke givet" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Nedgraderet" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Ældre" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Nyere" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "Overførsels-id:" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Starttidspunkt :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Start rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Sluttidspunkt :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Slut rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Bruger :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Returkode :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Afbrudt" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Fejl:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Succes" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Kommandolinje :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Yderligere ikke-standard information gemt: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Overførsel udført med" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Pakker ændret:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Pakker sprunget over:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Problemer med rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Scriptletoutput:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Fejl:" @@ -17538,17 +17711,17 @@ index a7202e2..d02f3e5 100644 -msgstr "Installér" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Installér afhængigheder" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Forælder" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Slet" @@ -17561,440 +17734,440 @@ index a7202e2..d02f3e5 100644 -msgstr "Nedgradér" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Opdatér" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Tid" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Sidste dag" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Sidste uge" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Seneste to uger" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Seneste tre måneder" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Seneste seks måneder" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Sidste år" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Over et år siden" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Ingen overførsel %s fundet" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Overførsels-id:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Yderligere historikinformation tilgængelig:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Intet yderligere data fundet med dette navn" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "installeret" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "slettet" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "geninstalleret" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "opdateret" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "overflødiggjort" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Kører overførselskontrol" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Genstarter afhængighedssøgning med nye ændringer." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Afsluttede afhængighedssøgningen" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Behandler afhængighed: %s for pakken: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Beholder pakke: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Ikke fundet afhængighed: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Pakke: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1321,7 +1400,7 @@ msgstr "" +@@ -1321,7 +1406,7 @@ msgstr "" "\n" " Kræver: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1330,7 +1409,7 @@ msgstr "" +@@ -1330,7 +1415,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1339,7 +1418,7 @@ msgstr "" +@@ -1339,7 +1424,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1348,85 +1427,85 @@ msgstr "" +@@ -1348,85 +1433,85 @@ msgstr "" " Ikke fundet" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Opdateret af" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Nedgraderet af" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Forældet af" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Tilgængelig" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Behandler konflikt: %s konflikter med %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Udfylder overførselssættet med valgte pakker. Vent venligst." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Henter headerfil for %s til at indsætte i overførselssættet." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Kører" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Sover" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Ikke forstyrbar" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombie" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Fundet/stoppet" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Ukendt" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Det andet program er: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Det andet program er: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Hukommelse : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Startede: %s - %s siden" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Status : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1436,7 +1515,7 @@ msgstr "" +@@ -1436,7 +1521,7 @@ msgstr "" "\n" "Afslutter efter brugerens ønske" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1446,7 +1525,7 @@ msgstr "" +@@ -1446,7 +1531,7 @@ msgstr "" "\n" "Afslutter på ødelagt tunnel" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1457,7 +1536,7 @@ msgstr "" +@@ -1457,7 +1542,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1465,36 +1544,36 @@ msgstr "" +@@ -1465,36 +1550,36 @@ msgstr "" "Et andet program holder i øjeblikket yum-låsen; afslutter som konfigureret " "af exit_on_llock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Fejl med PluginExit: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum-fejl: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Fejl: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" " Du kunne prøve at bruge --skip-broken til at arbejde udenom problemet" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Du kan prøve at køre: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Ukendt(e) fejl: Returkode: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1502,7 +1581,7 @@ msgstr "" +@@ -1502,7 +1587,7 @@ msgstr "" "\n" "Afhængigheder løst" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Afsluttet!" -@@ -1514,7 +1593,7 @@ msgstr "" +@@ -1514,7 +1599,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Du skal være root for at udføre denne kommando." @@ -18003,7 +18176,7 @@ index a7202e2..d02f3e5 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1544,53 +1623,53 @@ msgstr "" +@@ -1544,53 +1629,53 @@ msgstr "" "\n" "For mere information, kan du kontakte din distribution eller pakkeudbyder.\n" @@ -18068,7 +18241,7 @@ index a7202e2..d02f3e5 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1600,307 +1679,300 @@ msgstr "" +@@ -1600,307 +1685,296 @@ msgstr "" " Kør \"yum repolist all\" for at se de pakkearkiver du har.\n" " Du kan aktivere pakkearkiver med yum-config-manager --enable " @@ -18269,347 +18442,346 @@ index a7202e2..d02f3e5 100644 msgstr "Opsætning af lokalpakkeprocessen" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Bestem hvilken pakke som leverer en bestemt afhængighed" - +-msgid "Determine which package provides the given dependency" +-msgstr "Bestem hvilken pakke som leverer en bestemt afhængighed" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Søger efter afhængighed i pakkerne:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Kør en interaktiv Yum-skal" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Opsætning af Yum-skal" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Viser en pakkes afhængigheder" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Finder afhængigheder: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Viser de konfigurerede pakkearkiver" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "aktiveret" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "deaktiveret" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Pakkearkivs-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Pakkearkivnavn : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Pakkearkivstatus : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Pakkearkivsversion: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Pakkearkivflag : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Kildedistroflag: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Pakkearkiv opdateret : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Pakkearkivpakker : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Pakkearkivstørrelse : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Pakkearkivbaseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Pakkearkivsmetahenvisning: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Opdateret : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Pakkearkivspejle: " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Aldrig (senest: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Med det samme (senest: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekund(er) (senest: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Pakkearkiv udløber : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Pakkearkiv ekskluderer : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Pakkearkiv inkluderer : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Pakkearkiv ekskluderet: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "kildeid" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "kildenavn" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Viser hjælp om brugen af en kommando" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Ingen tilgængelig hjælp til %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1910,7 +1982,7 @@ msgstr "" +@@ -1910,7 +1984,7 @@ msgstr "" "\n" "aliaser: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1920,85 +1992,125 @@ msgstr "" +@@ -1920,85 +1994,125 @@ msgstr "" "\n" "alias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Opsætning af geninstallationsprocessen" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "geninstallér en pakke" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Opsætning af nedgraderingsprocessen" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "nedgradér en pakke" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Vis en version for maskinen og/eller tilgængelige pakkearkiver." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Yum versiongrupper:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Gruppe :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Pakker:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Installeret:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Gruppe-Installeret" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Tilgængelige:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Gruppe-Tilgængelig:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Vis eller brug overførselshistorik" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Ugyldig underkommando for historik, brug: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Du har ikke adgang til historikdatabasen." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Kontrollér for problemer i rpmdb'en" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -2009,26 +2121,32 @@ msgstr "" +@@ -2009,26 +2123,32 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -18618,7 +18790,7 @@ index a7202e2..d02f3e5 100644 -"Another app is currently holding the yum lock; waiting for it to exit..." -msgstr "Yum er låst af et andet program, venter på at den afslutter..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" +msgstr "" -#: ../yummain.py:120 @@ -18651,276 +18823,276 @@ index a7202e2..d02f3e5 100644 msgid "" "\n" "\n" -@@ -2038,74 +2156,74 @@ msgstr "" +@@ -2038,74 +2158,74 @@ msgstr "" "\n" "Afslutter efter brugerens ønske." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() vil blive fjernet i en fremtidig version af Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Opsætning af TransactionSets før config-klassen er sat op" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Invalid tsflag i konfigurationsfilen: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Søger i pkgSack for afhængigheden: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Medlem: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s konverteret til installation" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Tilføjer pakke %s i mode %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Fjerner pakke %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s behøver: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s kræver %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Afhængighed fundet tidligere, snyder" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Afhængighed er ikke et pakkenavn. Søger efter: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Mulig udbyder: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Tilstand er %s for udbyder af %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Tilstand for pakke som leverer %s: %s" -@@ -2113,114 +2231,114 @@ msgstr "Tilstand for pakke som leverer %s: %s" +@@ -2113,114 +2233,114 @@ msgstr "Tilstand for pakke som leverer %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s pakker som behøver %s markeret til sletning" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: Overflødiggør %s med %s for at finde afhængighed." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Opdaterer %s for at opfylde afhængighed." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Kan ikke finde en opdateringsvej for afhængigheden for: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Hurtigmatchede %s som afhængighed for %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s er i udbudte pakker, men er allerede installeret, fjerner." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Mulig løsningspakke %s har en nyere udgave i ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Mulig løsningspakke %s har en nyere udgave installeret." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s er allerede i ts, springer den over" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Markerer %s som en opdatering for %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Markerer %s til installerer for %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Succes -- tom overførsel" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Genstarter løkke" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Afhængighedsproces afslutter" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Succes - afhængigheder løst" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Kontrollerer afhængigheder for %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "søger efter %s som afhængighed for %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Kører compare_providers() for %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "bedre arkitektur i po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s overflødigør %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2229,142 +2347,142 @@ msgstr "" +@@ -2229,142 +2349,142 @@ msgstr "" "arkitekturdistribution sammenligner %s med %s på %s\n" " Vinder: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "normal kilde-RPM %s og %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "basepakke %s er installeret for %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "normal præfiks af %s mellem %s og %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "kræver minimalt: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Vinder: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Taber(med %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Bedste orden: %s" @@ -19053,7 +19225,7 @@ index a7202e2..d02f3e5 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2372,21 +2490,21 @@ msgstr "" +@@ -2372,21 +2492,21 @@ msgstr "" "Der er uafsluttede overførsler tilbage. Du bør overveje at køre yum-" "complete-transaction først for at afslutte dem." @@ -19079,7 +19251,7 @@ index a7202e2..d02f3e5 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2394,89 +2512,92 @@ msgstr "" +@@ -2394,89 +2514,92 @@ msgstr "" "\n" "Pakker sprunget over på grund af problemer med afhængigheder:" @@ -19114,25 +19286,25 @@ index a7202e2..d02f3e5 100644 msgstr "installeret konflikt" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" "Advarsel: skriptlet eller andre ikke-fatale fejl opstod under overførslen." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Overførsel kunne ikke starte:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Kunne ikke køre overførsel." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Kunne ikke slette transaktionsfilen %s" @@ -19140,7 +19312,7 @@ index a7202e2..d02f3e5 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s skulle være blevet installeret, men det blev den ikke!" @@ -19151,65 +19323,65 @@ index a7202e2..d02f3e5 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s skulle være blevet fjernet, men det blev den ikke!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Kunne ikke åbne lås %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Kunne ikke kontrollere om PID %s er aktiv" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Lås fundet %s: en anden kopi kører som PID %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Kunne ikke oprette lås på %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2485,40 +2606,29 @@ msgstr "" +@@ -2485,40 +2608,29 @@ msgstr "" "Pakke matcher ikke den tænkte nedhentning. Forslag: kør yum --enablerepo=%s " "clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Kunne ikke udføre checksum" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Pakken matcher ikke checksum" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "pakken fejlede checksum, men mellemlagring er aktiveret for %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "bruger lokal kopi af %s" @@ -19226,69 +19398,69 @@ index a7202e2..d02f3e5 100644 -" * behøvet %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Headerfil er ikke komplet." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2526,62 +2636,64 @@ msgstr "" +@@ -2526,62 +2638,64 @@ msgstr "" "Headerfil er ikke i lokal cache og kun-caching-tilstand er aktiveret. Kan " "ikke hente %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Offentlig nøgle for %s er ikke installeret" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Kunne ikke åbne pakke %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Offentlig nøgle for %s er ikke sikker" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Pakken %s er ikke signeret" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Kan ikke fjerne %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s fjernet" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Kan ikke slette %s filen %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s filen %s er slettet" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s filer slettet" @@ -19298,28 +19470,28 @@ index a7202e2..d02f3e5 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Mere end et identisk match i liste for %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ingen opdateringer matcher %s.%s %s:%s-%s" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2589,121 +2701,123 @@ msgstr "" +@@ -2589,121 +2703,124 @@ msgstr "" "searchPackages() vil forsvinde i en fremtidig version af Yum." " Brug searchGenerator() istedet. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Genemsøger %d pakker" @@ -19329,62 +19501,62 @@ index a7202e2..d02f3e5 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "gennemsøger pakke %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "gennemsøger filopslag" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "søger efter afhængigheder" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Ingen tilgængelige gruppedata i konfigurerede pakkearkiver" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Gruppen %s findes ikke" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "pakken %s var ikke markeret i gruppen %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Tilføjer pakken %s fra gruppen %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Pakken %s er ikke tilgængelig til installation" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -19392,99 +19564,100 @@ index a7202e2..d02f3e5 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Pakken %s kunne ikke findes i pakkeliste" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Pakkepar %s kunne ikke findes i rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Ingen pakke fundet for %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Pakkeobjektet er ikke en pakkeobjektinstans" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Der er intet angivet til installation" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Kontrollerer for virtueludbyder eller filudbyder for %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Ingen match for argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Pakken %s installeret og ikke tilgængelig" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Ingen pakke(r) er tilgængelig(e) til installation" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pakken: %s - allerede i overførselssættet" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Pakke %s er overflødiggjort af %s, som allerede er installeret" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2711,97 +2825,103 @@ msgid "" +@@ -2711,97 +2828,103 @@ msgid "" msgstr "" "Pakke %s er forældret af %s, men forældet pakke tilbyder ikke afhængigheder" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Pakke %s er overflødiggjort af %s, prøver at installere %s istedet" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Pakke %s er allerede installeret i den nyeste version" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" @@ -19492,44 +19665,44 @@ index a7202e2..d02f3e5 100644 #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Opdaterer alt" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" "Ingen opdatering af pakke som allerede er overflødiggjort: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Pakke er allerede overflødiggjort: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Opdaterer ikke pakke som er blevet overflødiggjort: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" @@ -19538,43 +19711,43 @@ index a7202e2..d02f3e5 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Ingen pakker fundet til fjernelse" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Lader være med at køre kerne: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Fjerner %s fra overførslen" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Kan ikke åbne: %s. Springer over." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Undersøger %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Kan ikke lokalinstallere deltarpm: %s. Springer over." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" @@ -19582,22 +19755,22 @@ index a7202e2..d02f3e5 100644 "Kan ikke tilføje pakke %s til overførsel. Ikke en kompatibel arkitektur: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "Kan ikke installere pakke %s. Den er forældet af installeret pakke %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2810,102 +2930,107 @@ msgstr "" +@@ -2810,137 +2933,144 @@ msgstr "" "Pakken %s er ikke installeret, så den kan ikke opdateres. Kør yum install " "for at installere den istedet." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -19605,308 +19778,316 @@ index a7202e2..d02f3e5 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Ekskluderer %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Markerer %s til installation" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Markerer %s som en opdatering til %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s kan ikke opdatere installeret pakke." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Kan ikke åbne fil: %s. Springer over." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Problem med geninstallation, ingen pakke fundet til at blive fjernet" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problem med geninstallation: ingen pakke %s fundet til at installere" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Ingen pakke(r) er tilgængelig(e) til nedgradering" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Pakke %s er tilladt at have flere installationer, springer over" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Ingen match for tilgængelig pakke: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Opgradér kun tilgængelig på pakke: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Kunne ikke opgradere: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Hentning af GPG-nøglen mislykkedes: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Ugyldig GPG-nøgle fra %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Tolkning af GPG-nøgle mislykkedes: nøgle har ikke nogen værdi %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2914,7 +3039,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2922,25 +3047,25 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG-nøgle på %s (0x%s) er allerede installeret" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Importering af nøgle mislykkedes (kode %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Nøglen blev importet med succes" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2949,25 +3074,25 @@ msgstr "" +@@ -2949,25 +3079,25 @@ msgstr "" "GPG-nøglen er vist for \"%s\" pakkearkivet er allerede installeret, men den er ikke korrekt for denne pakke.\n" "Kontrollér at konfigurationen af nøgle-URL'er er korrekt for denne kilde." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Importering af nøgle(r) hjalp ikke, forkerte nøgle(r)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG-nøgle på %s (0x%s) er allerede importeret" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Importering af nøgle mislykkedes" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2976,159 +3101,183 @@ msgstr "" +@@ -2976,159 +3106,183 @@ msgstr "" "GPG-nøglen listet for pakkearkivet \"%s\" er allerede installeret, men de er ikke korrekte.\n" "Kontrollér at de korrekte nøgle-url'er er konfigureret for dette pakkearkiv." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Kunne ikke finde et passende filspejl." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Fejl blev fundet under hentning af pakker." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Rapportér venligst denne fejl på %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Fejl i testoverførslen: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Kunne ikke sætte mellemlagermappe: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -20008,7 +20189,7 @@ index a7202e2..d02f3e5 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s giver %s men kan ikke findes" -@@ -3137,6 +3286,17 @@ msgstr "%s giver %s men kan ikke findes" +@@ -3137,6 +3291,17 @@ msgstr "%s giver %s men kan ikke findes" msgid "Repackaging" msgstr "Genpakning" @@ -20027,10 +20208,10 @@ index a7202e2..d02f3e5 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/de.po b/po/de.po -index fa39cb0..5eb1c85 100644 +index fa39cb0..a5a6f59 100644 --- a/po/de.po +++ b/po/de.po -@@ -2,15 +2,17 @@ +@@ -2,16 +2,18 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -20048,11 +20229,13 @@ index fa39cb0..5eb1c85 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: German (http://www.transifex.net/projects/p/yum/team/de/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -19,124 +21,126 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -20070,30 +20253,30 @@ index fa39cb0..5eb1c85 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installieren" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Veraltet" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Aktualisiert" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Gelöscht" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Installiert" @@ -20120,7 +20303,7 @@ index fa39cb0..5eb1c85 100644 msgstr "Gelöscht: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Entfernen" @@ -20146,53 +20329,53 @@ index fa39cb0..5eb1c85 100644 msgstr "Lese Repository-Metadaten aus lokalen Dateien ein" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Konfigurationsfehler: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Optionenfehler: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installiert: %s-%s am %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Gebaut : %s am %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Übermittelt: %s am %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Sie müssen irgendeinen Befehl eingeben" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Kein solcher Befehl: %s. Bitte %s --help verwenden." -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Festplattenplatz-Anforderungen:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -20205,7 +20388,7 @@ index fa39cb0..5eb1c85 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -20214,74 +20397,74 @@ index fa39cb0..5eb1c85 100644 "----------------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Versuche Transaktion auszuführen, aber es ist nichts zu tun. Beende." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Beende nach Befehl des Benutzers" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Lade Pakete herunter:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Fehler beim Herunterladen der Pakete:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" "FEHLER Sie müssen RPM aktualisieren, damit es mit Folgendem umgehen kann:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM muss aktualisiert werden" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Bitte melden Sie diesen Fehler unter %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Führe Verarbeitungstest durch" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Prüffehler bei Verarbeitung:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Verarbeitungstest erfolgreich" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Führe Verarbeitung durch" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -20290,18 +20473,18 @@ index fa39cb0..5eb1c85 100644 "Benutze \"-y\" zum Überschreiben." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Meinten Sie vielleicht:" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Paket(e) %s%s%s verfügbar, aber nicht installiert." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Kein Paket %s%s%s verfügbar." @@ -20309,7 +20492,7 @@ index fa39cb0..5eb1c85 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paket(e) zum Installieren" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -20318,13 +20501,13 @@ index fa39cb0..5eb1c85 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nichts zu tun" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d Pakete zur Aktualisierung markiert" @@ -20334,12 +20517,12 @@ index fa39cb0..5eb1c85 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Keine Pakete für die Aktualisierung markiert" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -20349,12 +20532,12 @@ index fa39cb0..5eb1c85 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d Pakete für die Entfernung markiert" @@ -20364,14 +20547,14 @@ index fa39cb0..5eb1c85 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Keine Pakete für die Entfernung markiert" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paket(e) zum Downgrade" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -20379,13 +20562,13 @@ index fa39cb0..5eb1c85 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (von %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Installiertes Paket %s%s%s%s nicht verfügbar." @@ -20393,7 +20576,7 @@ index fa39cb0..5eb1c85 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paket(e) zum Neuinstallieren" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -20401,153 +20584,153 @@ index fa39cb0..5eb1c85 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Keine Pakete bereitgestellt" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Paket(e) zum Installieren" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Treffer: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Warnung: Keine Übereinstimmung gefunden für: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Keine Übereinstimmungen gefunden" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Kein Paket gefunden für %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Räume Repos auf:" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Räume alles auf" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Räume Header auf" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Räume Pakete auf" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Räume XML-Metadaten auf" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Räume Datenbank-Speicher auf" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Räume Metadaten für abgelaufene Caches auf" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Räume Plugins auf" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Installierte Gruppen:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Verfügbare Gruppen:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Fertig" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Warnung: Gruppe %s existiert nicht." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "Keine Pakete in irgendeiner Gruppe verfügbar zum Installieren oder " "Aktualisieren" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d Paket(e) zum Installieren" @@ -20557,18 +20740,18 @@ index fa39cb0..5eb1c85 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Es existiert keine Gruppe mit dem Namen %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Keine Pakete zum Entfernen aus dem Gruppen gefunden" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d Paket(e) zum Entfernen" @@ -20578,20 +20761,20 @@ index fa39cb0..5eb1c85 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paket %s ist bereits installiert, überspringen" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Verwerfe nicht vergleichbare Pakete %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" @@ -20599,18 +20782,18 @@ index fa39cb0..5eb1c85 100644 "Installation hinzu" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Plugin-Optionen" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Kommandozeilen-Fehler: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -20619,154 +20802,154 @@ index fa39cb0..5eb1c85 100644 "%s: %s Option benötigt ein Argument" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color kann einen der folgenden Werte haben: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "Hilfeinformation anzeigen und beenden" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "fehlertolerant sein" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" "laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischenspeicher nicht" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "Ort der Konfigurationsdatei" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "maximale Befehlswartezeit" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "Debugging-Ausgabe-Stufe" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "Duplikate, in Repos und in Listen/Suchen-Befehlen, anzeigen" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "Fehler-Ausgabe-Stufe" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "Stufe der Debugging-Ausgabe für rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "Stiller Betrieb" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "Wortreicher Betrieb" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "Beantwortet alle Fragen mit 'ja'" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "Yum-Version anzeigen und Programm beenden" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "Wurzel-Installationsverzeichnis setzen" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "aktiviere ein oder mehrere Repositories (Wildcards erlaubt)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "deaktiviere ein oder mehrere Repositories (Wildcards erlaubt)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "schliesse Paket(e) nach Namen oder global aus" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "deaktiviere Ausschluss von 'main', einem Repository oder allem" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "aktiviere veraltetes Verarbeiten während Aktualisierung" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "deaktiviere Yum-Plugins" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "deaktiviere GPG-Signatur-Prüfung" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "deaktiviere Plugins nach Namen" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "aktiviere Plugins nach Namen" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "überspringe Pakete mit Abhängigkeitsauflösungsproblemen" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "kontrolliert, ob Farbe benutzt wird" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -21111,23 +21294,23 @@ index fa39cb0..5eb1c85 100644 msgstr "Entfernt für Abhängigkeiten" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Übersprungen (Abhängigkeitsprobleme)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Nicht installiert" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Nicht verfügbar" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Paket" +msgid_plural "Packages" @@ -21165,7 +21348,7 @@ index fa39cb0..5eb1c85 100644 #, python-format msgid "" "\n" -@@ -892,57 +925,52 @@ msgstr "" +@@ -892,57 +925,58 @@ msgstr "" "Vorgangsübersicht\n" "%s\n" @@ -21173,7 +21356,7 @@ index fa39cb0..5eb1c85 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "%5.5s Paket(e) installieren\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Installieren" @@ -21181,7 +21364,7 @@ index fa39cb0..5eb1c85 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "%5.5s Paket(e) aktualisieren\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" +msgstr "" @@ -21189,7 +21372,7 @@ index fa39cb0..5eb1c85 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "%5.5s Paket(e) entfernen\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "" @@ -21197,329 +21380,335 @@ index fa39cb0..5eb1c85 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "%5.5s Paket(e) reinstallieren\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Entfernt" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Abhängigkeiten entfernt" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Abhängigkeit installiert" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Abhängigkeit aktualisiert" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Ersetzt " -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Fehlgeschlagen" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "zwei" -@@ -950,7 +978,7 @@ msgstr "zwei" +@@ -950,7 +984,7 @@ msgstr "zwei" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -961,364 +989,416 @@ msgstr "" +@@ -961,364 +995,416 @@ msgstr "" " Aktueller Download abgebrochen, %s unterbrechen Sie (Ctrl-c) erneut %s innerhalb %s%s%s Sekunden\n" "zum Beenden.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "Benutzer-Unterbrechung" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Gesamt" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" -msgstr "" +msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "System" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Schlechte Transaktions-IDs oder Paket(e) angegeben" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" -msgstr "" +msgstr "Kommandozeile" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Angemeldeter Benutzer" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Datum und Zeit" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Aktion(en)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Verändert" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Keine Transaktions-ID angegeben" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Schlechte Transaktions-ID angegeben" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Angebene Transaktions-ID nicht gefunden" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Mehr als eine Transaktions-ID gefunden!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Keine Transaktions-ID oder Paket angegeben" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Älter" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Neuer" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "Transaktions-ID :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Anfangszeit :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Anfang rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u Sekunden)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u Minuten)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u Stunden)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u Tage)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Endzeit :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Ende rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Benutzer :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Rückgabe-Code :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Erfolg" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Veränderte Pakete:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Übersprungene Pakete:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Fehler:" @@ -21528,17 +21717,17 @@ index fa39cb0..5eb1c85 100644 -msgstr "Installieren" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Löschen" @@ -21551,437 +21740,437 @@ index fa39cb0..5eb1c85 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Zeit" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Gestern" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Letzte Woche" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "In den letzten 2 Wochen" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "In den letzten 3 Monaten" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "In den letzten 6 Monaten" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Letztes Jahr" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Vor über einem Jahr" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Keine Transaktion %s gefunden" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Transaktions-ID" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Verfügbare zusätzliche Verlaufsinformationen" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Keine zusätzlichen Daten zu diesem Namen gefunden" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "installiert" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "gelöscht" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "reinstalliert" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "aktualisiert" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "veraltet" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Paket %s.%s %s:%s-%s markiert, um %s zu werden" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Führe Transaktionsprüfung aus" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Starte Abhängigkeitsauflösung mit den neuen Änderungen neu." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Abhängigkeitsauflösung beendet" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Verarbeite Abhängigkeiten: %s für Paket: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Behalte Paket: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nicht aufgelöste Abhängigkeit: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Paket: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1327,7 +1407,7 @@ msgstr "" +@@ -1327,7 +1413,7 @@ msgstr "" "\n" " Benötigt: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1336,7 +1416,7 @@ msgstr "" +@@ -1336,7 +1422,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1345,7 +1425,7 @@ msgstr "" +@@ -1345,7 +1431,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1354,85 +1434,85 @@ msgstr "" +@@ -1354,85 +1440,85 @@ msgstr "" " Nicht gefunden" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Aktualisiert durch" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Überholt durch" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Verfügbar" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Verarbeite Konflikt: %s kollidiert mit %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Fülle Verarbeitungsset mit ausgewählten Paketen. Bitte warten." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Lade Header für %s herunter, um ins Verarbeitungsset zu packen." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Läuft" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Schläft" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Nicht unterbrechbar" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombie" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Verfolgt/Gestoppt" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Unbekannt" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Die andere Anwendung ist: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Die andere Anwendung ist: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Speicher : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Gestartet: %s - vor %s" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Status : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1442,7 +1522,7 @@ msgstr "" +@@ -1442,7 +1528,7 @@ msgstr "" "\n" "Beende nach Abbruch durch den Benutzer" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1452,7 +1532,7 @@ msgstr "" +@@ -1452,7 +1538,7 @@ msgstr "" "\n" "Beende wegen defekter Pipe" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1463,41 +1543,41 @@ msgstr "" +@@ -1463,41 +1549,41 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "PluginExit Fehler: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum Fehler: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Fehler: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " Sie können versuchen mit --skip-broken das Problem zu umgehen." -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Unbekannte(r) Fehler: Exit Code: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1505,7 +1585,7 @@ msgstr "" +@@ -1505,7 +1591,7 @@ msgstr "" "\n" "Abhängigkeiten aufgelöst" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Komplett!" -@@ -1517,7 +1597,7 @@ msgstr "" +@@ -1517,7 +1603,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Sie müssen root sein, um diesen Befehl ausführen zu können." @@ -21990,7 +22179,7 @@ index fa39cb0..5eb1c85 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1547,53 +1627,53 @@ msgstr "" +@@ -1547,53 +1633,53 @@ msgstr "" "\n" "Für weitere Informationen kontaktieren Sie Ihren Distributions- oder Paket-Anbieter.\n" @@ -22055,7 +22244,7 @@ index fa39cb0..5eb1c85 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1603,309 +1683,302 @@ msgstr "" +@@ -1603,309 +1689,298 @@ msgstr "" "Führen sie \"yum repolist all\" aus, um zu sehen, welche repos sie haben.\n" "Sie können repos mit yum-config-manager --enable aktivieren" @@ -22258,354 +22447,353 @@ index fa39cb0..5eb1c85 100644 msgstr "Einrichten der lokalen Paketverarbeitung" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Bestimme, welche Pakete die gegebenen Abhängigkeiten bereitstellen" - +-msgid "Determine which package provides the given dependency" +-msgstr "Bestimme, welche Pakete die gegebenen Abhängigkeiten bereitstellen" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Suche Pakete für Abhängigkeit:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Führe eine interaktive Yum-Shell aus" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Einrichten der Yum-Shell" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Liste von Paket-Abhängigkeiten" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Suche Abhängigkeiten:" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Zeige die konfigurierten Software-Repositories an" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "aktiviert" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "deaktiviert" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Repo-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Repo-name : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Repo-status : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Repo-Revision: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Repo-tags : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Repo-Distro-Tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Repo aktualisiert : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Repo-pkgs : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Repo-Größe : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Repo-Metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Aktualisiert : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Repo-Spiegel : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Nie (zuletzt: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s Sekunde(n) (zuletzt: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Repo-ausgeschlossen : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Repo-eingeschlossen : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Repo-ausgeschlossen: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "Repo-ID" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "Status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "Repo-Name:" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Zeigt eine kurze Verwendungsinformation" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Keine Hilfe für %s vorhanden" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1915,7 +1988,7 @@ msgstr "" +@@ -1915,7 +1990,7 @@ msgstr "" "\n" "Aliase: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1925,86 +1998,126 @@ msgstr "" +@@ -1925,86 +2000,126 @@ msgstr "" "\n" "Alias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Einrichten des Neuinstallationsprozess" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "Installiere Paket neu" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Einrichten des Downgrade-Prozesses" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "Downgrade eines Pakets" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" "Eine Version für das System und/oder die verfügbaren Repositories anzeigen." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Gruppe :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Pakete:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Installiert:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Gruppe-installiert:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Verfügbar:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Gruppe-verfügbar:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Übertragungsverlauf anzeigen oder verwenden" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -2015,28 +2128,34 @@ msgstr "" +@@ -2015,28 +2130,34 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" -#: ../yummain.py:114 +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" +msgstr "" + +#: ../yummain.py:124 @@ -22643,278 +22831,278 @@ index fa39cb0..5eb1c85 100644 msgid "" "\n" "\n" -@@ -2046,75 +2165,75 @@ msgstr "" +@@ -2046,75 +2167,75 @@ msgstr "" "\n" "Verlasse nach Abbruch durch den Benutzer." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() wird in zukünftigen Versionen von Yum verschwinden.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" "Konfiguriere TransactionSets, bevor die Konfigurationsklasse gestartet ist" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Ungültiges tsflag in Konfigurationsdatei: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Suche pkgSack für Abhängigkeiten: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Mitglied: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s konvertiert zum Installieren" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Füge Paket %s hinzu in Modus %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Entferne Paket %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s benötigt: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s benötigt %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Benötigte Anforderung wurde bereits nachgeschlagen, betrüge" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Benötigte Anforderung ist kein Paket-Name. Schlage nach: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Potentieller Anbieter: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Modus ist %s für Anbieter von %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Modus für pkg-Bereitstellung %s: %s" -@@ -2122,115 +2241,115 @@ msgstr "Modus für pkg-Bereitstellung %s: %s" +@@ -2122,115 +2243,115 @@ msgstr "Modus für pkg-Bereitstellung %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s Paket benötigt %s, welches als gelöscht markiert ist" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: Ersetze %s durch %s zum Auflösen der Abhängigkeit." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Aktualisiere %s zum Auflösen der Abhängigkeit." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Kann keinen Aktualisierungspfad finden für Abhängigkeit für: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Übereinstimmung von %s, welche gebraucht wird für %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" "%s ist in einem bereitgestellten Paket, aber bereits installiert, entferne." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Potentielles aufgelöstes Paket %s hat eine neuere Instanz in ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Potentielles aufgelöste Paket %s hat eine neuere Instanz installiert." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s bereits in ts, überspringe dieses" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Markiere %s als Aktualisierung für %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Markiere %s als Installation für %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Erfolg - Leere Transaktion" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Starte Schleife neu" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Abhängigkeitsverarbeitung beendet" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Erfolg - Abhängigkeiten aufgelöst" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Prüfe Abhängigkeiten für %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "Suche nach %s als eine Anforderung von %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Führe compare_providers() aus für %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "bessere Architektur in po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s ersetzt %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2239,142 +2358,142 @@ msgstr "" +@@ -2239,142 +2360,142 @@ msgstr "" "archdist verglichen %s zu %s auf %s\n" " Gewinner: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "Gemeinsames Quellen-RPM %s und %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "Gemeinsamer Prefix von %s zwischen %s und %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Beste Bestellung: %s" @@ -23047,7 +23235,7 @@ index fa39cb0..5eb1c85 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2383,21 +2502,21 @@ msgstr "" +@@ -2383,21 +2504,21 @@ msgstr "" "ziehen, zuerst yum-complete-transaction auszuführen, um diese " "abzuschliessen." @@ -23073,7 +23261,7 @@ index fa39cb0..5eb1c85 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2405,90 +2524,93 @@ msgstr "" +@@ -2405,90 +2526,93 @@ msgstr "" "\n" "Pakete übersprungen wegen Abhängigkeitsproblemen:" @@ -23108,7 +23296,7 @@ index fa39cb0..5eb1c85 100644 msgstr "installierter Konflikt" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -23116,18 +23304,18 @@ index fa39cb0..5eb1c85 100644 "Verarbeitung aufgetreten." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Transaktion konnte nicht starten:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Konnte Transaktion nicht durchführen." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Entfernen der Verarbeitungsdatei %s fehlgeschlagen" @@ -23135,7 +23323,7 @@ index fa39cb0..5eb1c85 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s hätte installiert werden sollen, wurde aber nicht!" @@ -23146,59 +23334,59 @@ index fa39cb0..5eb1c85 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s hätte entfernt werden sollen, wurde aber nicht!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Konnte Sperrung %s nicht aufheben: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Unfähig zu prüfen, ob PID %s ist aktiv" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Existierende Blockierung %s: eine andere Kopie läuft mit PID %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Konnte keine Sperrung bei %s erstellen: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2497,42 +2619,31 @@ msgstr "" +@@ -2497,42 +2621,31 @@ msgstr "" "Paket stimmt nicht mit dem beabsichtigten Download überein. Vorschlag: " "starten sie yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Konnte Prüfsumme nicht bilden" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Paket stimmt nicht mit der Prüfsumme überein" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" @@ -23206,7 +23394,7 @@ index fa39cb0..5eb1c85 100644 "aktiviert für %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "benutze lokale Kopie von %s" @@ -23223,69 +23411,69 @@ index fa39cb0..5eb1c85 100644 -" * benötigt %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Header ist nicht vollständig." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2540,62 +2651,64 @@ msgstr "" +@@ -2540,62 +2653,64 @@ msgstr "" "Header ist nicht im lokalen Zwischenspeicher und Nur-Zwischenspeicher-Modus " "aktiviert. Kann %s nicht herunterladen" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Öffentlicher Schlüssel für %s ist nicht installiert" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problem beim Öffnen des Paketes %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Öffentlicher Schlüssel für %s ist nicht vertrauenswürdig" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Paket %s ist nicht unterschrieben" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Kann %s nicht entfernen" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s entfernt" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Kann %s Datei nicht entfernen %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s Datei %s entfernt" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s Dateien entfernt" @@ -23295,28 +23483,28 @@ index fa39cb0..5eb1c85 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Mehr als eine identische Übereinstimmung im Behälter für %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Keine Übereinstimmungen mit %s.%s %s:%s-%s bei der Aktualisierung" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2603,140 +2716,142 @@ msgstr "" +@@ -2603,140 +2718,143 @@ msgstr "" "searchPackages() wird in zukünftigen Versionen von Yum verschwinden." " Benutze stattdessen searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Suche %d Pakete" @@ -23326,62 +23514,62 @@ index fa39cb0..5eb1c85 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "Suche Paket %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "Suche in Datei-Einträgen" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "suche in bereitgestellten Einträgen" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Keine Gruppendaten für konfigurierte Repositories verfügbar" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Kein Gruppe mit dem Namen %s vorhanden" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "Paket %s war nicht markiert in Gruppe %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Füge Paket %s aus Gruppe %s hinzu" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Kein Paket mit Namen %s verfügbar zum Installieren" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -23389,41 +23577,42 @@ index fa39cb0..5eb1c85 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Paket-Tupel %s kann nicht gefunden werden im Paket-Behälter" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Kein Paket gefunden für %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Paketobjekt war keine Paketobjektinstanz" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Nichts angegeben zum Installieren" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" @@ -23431,37 +23620,37 @@ index fa39cb0..5eb1c85 100644 -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Kein Übereinstimmung für Argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Paket %s installiert und nicht verfügbar" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Kein(e) Paket(e) zum Installieren verfügbar." -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paket: %s - bereits im Transaktionsset" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Paket %s wurde ersetzt durch %s, welches bereits installiert ist" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -23469,65 +23658,65 @@ index fa39cb0..5eb1c85 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" "Paket %s wurde ersetzt durch %s, versuche stattdessen %s zu installieren." -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Paket %s ist bereits in der neusten Version installiert." -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" -@@ -2744,67 +2859,73 @@ msgstr "" +@@ -2744,67 +2862,73 @@ msgstr "" "Aktualisierung." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Aktualisiere alles" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Aktualisiere Paket nicht, da es bereits veraltet ist: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paket ist bereits veraltet: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Aktualisiere Paket nicht, da es bereits veraltet ist: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" @@ -23536,52 +23725,52 @@ index fa39cb0..5eb1c85 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Kein Paket stimmt zum Entfernen überein" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Überspringe den laufenden Kernel: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Entferne %s aus der Transaktion." -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Konnte nicht öffnen: %s. Überspringe." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Untersuche %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Konnte deltarpm nicht lokal installieren: %s. Überspringe." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2812,14 +2933,14 @@ msgstr "" +@@ -2812,14 +2936,14 @@ msgstr "" "Kann Paket %s nicht zur Transaktion hinzufügen. Keine kompatible " "Architektur: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" @@ -23589,16 +23778,16 @@ index fa39cb0..5eb1c85 100644 "überholt" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2828,104 +2949,109 @@ msgstr "" +@@ -2828,139 +2952,146 @@ msgstr "" "Paket %s nicht installiert, kann es nicht aktualisieren. Führen Sie " "stattdessen yum install aus, um es zu installieren." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -23606,310 +23795,318 @@ index fa39cb0..5eb1c85 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Schliesse %s aus" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Markiere %s zum Installieren" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Markiere %s als eine Aktualisierung für %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: aktualisiert installierte Pakete nicht." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Kann Datei nicht öffnen: %s. Überspringe." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" "Probleme beim Neuinstallieren: kein Paket stimmt zum Entfernen überein" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" "Probleme beim Neuinstallieren: kein Paket %s stimmt zum Installieren überein" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Kein(e) Paket(e) zum Downgrade verfügbar" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Paket %s darf mehrfach installiert sein, überspringe" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Keine Übereinstimmung der verfügbare Pakete: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Nur verfügbare Paket aktualisieren: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "GPG-Schlüssel-Abruf fehlgeschlagen:" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Ungültiger GPG-Schlüssel von %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG-Schlüssel-Analyse fehlgeschlagen: Schlüssel hat keinen Wert %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2934,7 +3060,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2942,25 +3068,25 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG-Schlüssel unter %s (0x%s) ist bereits installiert" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Schlüssel-Import fehlgeschlagen (Code %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Schlüssel erfolgreich importiert" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2969,25 +3095,25 @@ msgstr "" +@@ -2969,25 +3100,25 @@ msgstr "" "Die aufgelisteten GPG-Schlüssel für das \"%s\"-Repository sind bereits installiert, aber sie sind nicht korrekt für dieses Paket.\n" "Stellen Sie sicher, dass die korrekten Schlüssel-URLs für dieses Repository konfiguriert sind." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Importieren der Schlüssel hat nicht geholfen, falsche Schlüssel?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG-Schlüssel unter %s (0x%s) ist bereits importiert" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Schlüssel-Import fehlgeschlagen" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2997,157 +3123,181 @@ msgstr "" +@@ -2997,157 +3128,181 @@ msgstr "" "installiert, aber nicht korrekt. Überprüfen sie, ob die korrekten Schlüssel-" "URLs für dieses Repository konfiguriert sind." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Es kann kein geeigneten Spiegelserver gefunden werden." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Beim Herunterladen der Pakete sind Fehler aufgetreten." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Bitte melden Sie diesen Fehler unter %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Test-Transaktionsfehler: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Konnte Verzeichnis für Zwischenspeicher nicht festlegen: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -24009,7 +24206,7 @@ index fa39cb0..5eb1c85 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s stellt %s bereit, aber es konnte nicht gefunden werden" -@@ -3156,6 +3306,17 @@ msgstr "%s stellt %s bereit, aber es konnte nicht gefunden werden" +@@ -3156,6 +3311,17 @@ msgstr "%s stellt %s bereit, aber es konnte nicht gefunden werden" msgid "Repackaging" msgstr "Packe neu" @@ -24028,10 +24225,10 @@ index fa39cb0..5eb1c85 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/el.po b/po/el.po -index 8df34e7..0e34593 100644 +index 8df34e7..82146d6 100644 --- a/po/el.po +++ b/po/el.po -@@ -2,13 +2,14 @@ +@@ -2,14 +2,15 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -24044,11 +24241,13 @@ index 8df34e7..0e34593 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Greek (http://www.transifex.net/projects/p/yum/team/el/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -17,413 +18,438 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -24066,30 +24265,30 @@ index 8df34e7..0e34593 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Εγκατάσταση" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Ενημερώθηκε" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Διαγράφηκε" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Εγκαταστάθηκε" @@ -24116,7 +24315,7 @@ index 8df34e7..0e34593 100644 msgstr "Διαγράφηκε:%s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Γίνεται αφαίρεση" @@ -24142,53 +24341,53 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -24199,98 +24398,98 @@ index 8df34e7..0e34593 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -24298,7 +24497,7 @@ index 8df34e7..0e34593 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -24307,13 +24506,13 @@ index 8df34e7..0e34593 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -24323,12 +24522,12 @@ index 8df34e7..0e34593 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -24338,12 +24537,12 @@ index 8df34e7..0e34593 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -24353,14 +24552,14 @@ index 8df34e7..0e34593 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -24368,13 +24567,13 @@ index 8df34e7..0e34593 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -24382,7 +24581,7 @@ index 8df34e7..0e34593 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -24390,151 +24589,151 @@ index 8df34e7..0e34593 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -24544,18 +24743,18 @@ index 8df34e7..0e34593 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -24565,37 +24764,37 @@ index 8df34e7..0e34593 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -24604,153 +24803,153 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -25093,22 +25292,22 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -25146,351 +25345,357 @@ index 8df34e7..0e34593 100644 #, python-format msgid "" "\n" -@@ -870,57 +902,52 @@ msgid "" +@@ -870,57 +902,58 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "" -@@ -928,7 +955,7 @@ msgstr "" +@@ -928,7 +961,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -936,484 +963,536 @@ msgid "" +@@ -936,484 +969,536 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -25499,17 +25704,17 @@ index 8df34e7..0e34593 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -25522,224 +25727,224 @@ index 8df34e7..0e34593 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -25747,7 +25952,7 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -25755,7 +25960,7 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -25763,7 +25968,7 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -25771,103 +25976,103 @@ index 8df34e7..0e34593 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr "" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr "" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr "" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr "" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr "" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -25875,7 +26080,7 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -25883,68 +26088,68 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1421,47 +1500,47 @@ msgid "" +@@ -1421,47 +1506,47 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "" -@@ -1473,7 +1552,7 @@ msgstr "" +@@ -1473,7 +1558,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -25953,7 +26158,7 @@ index 8df34e7..0e34593 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1490,451 +1569,484 @@ msgid "" +@@ -1490,451 +1575,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -26216,188 +26421,187 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -26405,7 +26609,7 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -26413,148 +26617,148 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1945,100 +2057,106 @@ msgstr "" +@@ -1945,100 +2059,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -26562,7 +26766,7 @@ index 8df34e7..0e34593 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -26599,226 +26803,226 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2046,774 +2164,784 @@ msgstr "" +@@ -2046,991 +2166,1028 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -26826,43 +27030,43 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -27050,24 +27254,24 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -27075,7 +27279,7 @@ index 8df34e7..0e34593 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -27086,40 +27290,40 @@ index 8df34e7..0e34593 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -27127,23 +27331,23 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "" @@ -27157,67 +27361,67 @@ index 8df34e7..0e34593 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -27227,26 +27431,26 @@ index 8df34e7..0e34593 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -27256,62 +27460,62 @@ index 8df34e7..0e34593 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -27319,78 +27523,79 @@ index 8df34e7..0e34593 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -27398,118 +27603,118 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -27517,7 +27722,7 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -27525,158 +27730,166 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2822,7 +2950,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2830,207 +2958,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -27684,29 +27897,29 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -27714,117 +27927,117 @@ index 8df34e7..0e34593 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -27924,7 +28137,7 @@ index 8df34e7..0e34593 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3039,6 +3191,14 @@ msgstr "" +@@ -3039,6 +3196,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -27940,10 +28153,10 @@ index 8df34e7..0e34593 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/en_GB.po b/po/en_GB.po -index 0f3c750..f42b3bd 100644 +index 0f3c750..f485199 100644 --- a/po/en_GB.po +++ b/po/en_GB.po -@@ -2,13 +2,14 @@ +@@ -2,14 +2,15 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -27956,11 +28169,13 @@ index 0f3c750..f42b3bd 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/yum/team/en_GB/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -17,122 +18,124 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -27978,30 +28193,30 @@ index 0f3c750..f42b3bd 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installing" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Obsoleted" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Updated" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Erased" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Installed" @@ -28028,7 +28243,7 @@ index 0f3c750..f42b3bd 100644 msgstr "Erased: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Removing" @@ -28054,53 +28269,53 @@ index 0f3c750..f42b3bd 100644 msgstr "Reading repository metadata in from local files" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Config Error: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Options Error: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installed: %s-%s at %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Built : %s at %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Committed: %s at %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "You need to give some command" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "No such command: %s. Please use %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Disk Requirements:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " At least %dMB more space needed on the %s filesystem.\n" @@ -28111,7 +28326,7 @@ index 0f3c750..f42b3bd 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -28120,73 +28335,73 @@ index 0f3c750..f42b3bd 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Trying to run the transaction but nothing to do. Exiting." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Exiting on user Command" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Downloading Packages:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Error Downloading Packages:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "Running Transaction Check" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "ERROR You need to update rpm to handle:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "ERROR with transaction check vs depsolve:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM needs to be updated" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Please report this error in %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Running Transaction Test" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Transaction Check Error:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Transaction Test Succeeded" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Running Transaction" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -28195,18 +28410,18 @@ index 0f3c750..f42b3bd 100644 "Use \"-y\" to override." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Maybe you meant: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Package(s) %s%s%s available, but not installed." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "No package %s%s%s available." @@ -28214,7 +28429,7 @@ index 0f3c750..f42b3bd 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Package(s) to install" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -28223,13 +28438,13 @@ index 0f3c750..f42b3bd 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nothing to do" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d packages marked for Update" @@ -28239,12 +28454,12 @@ index 0f3c750..f42b3bd 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "No Packages marked for Update" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d packages marked for Distribution Synchronisation" @@ -28254,12 +28469,12 @@ index 0f3c750..f42b3bd 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "No Packages marked for Distribution Synchronisation" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d packages marked for removal" @@ -28269,14 +28484,14 @@ index 0f3c750..f42b3bd 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "No Packages marked for removal" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Package(s) to downgrade" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -28284,13 +28499,13 @@ index 0f3c750..f42b3bd 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (from %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Installed package %s%s%s%s not available." @@ -28298,7 +28513,7 @@ index 0f3c750..f42b3bd 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Package(s) to reinstall" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -28306,28 +28521,28 @@ index 0f3c750..f42b3bd 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "No Packages Provided" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Package(s) to install" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "N/S Matched: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr " Name and summary matches %sonly%s, use \"search all\" for everything." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -28335,123 +28550,123 @@ index 0f3c750..f42b3bd 100644 " Full name and summary matches %sonly%s, use \"search all\" for everything." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Matched: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr " Name and summary matches %smostly%s, use \"search all\" for everything." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Warning: No matches found for: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "No Matches found" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "No Package Found for %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Cleaning repos: " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Cleaning up Everything" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Cleaning up Headers" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Cleaning up Packages" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Cleaning up xml metadata" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Cleaning up database cache" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Cleaning up expire-cache metadata" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Cleaning up cached rpmdb data" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Cleaning up plugins" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "Warning: No groups match: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Installed Groups:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "Installed Language Groups:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Available Groups:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "Available Language Groups:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Done" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Warning: Group %s does not exist." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "No packages in any requested group available to install or update" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d Package(s) to Install" @@ -28461,18 +28676,18 @@ index 0f3c750..f42b3bd 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "No group named %s exists" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "No packages to remove from groups" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d Package(s) to remove" @@ -28482,37 +28697,37 @@ index 0f3c750..f42b3bd 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Package %s is already installed, skipping" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Discarding non-comparable pkg %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "No other %s installed, adding to list for potential install" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Plugin Options" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Command line error: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -28521,153 +28736,153 @@ index 0f3c750..f42b3bd 100644 "%s: %s option requires an argument" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color takes one of: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot must be an absolute path: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "show this help message and exit" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "be tolerant of errors" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "run entirely from system cache, don't update cache" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "config file location" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "maximum command wait time" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "debugging output level" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "show duplicates, in repos, in list/search commands" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "error output level" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "debugging output level for rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "quiet operation" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "verbose operation" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "answer yes for all questions" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "show Yum version and exit" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "set install root" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "enable one or more repositories (wildcards allowed)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "disable one or more repositories (wildcards allowed)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "exclude package(s) by name or glob" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "disable exclude from main, for a repo or for everything" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "enable obsoletes processing during updates" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "disable Yum plugins" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "disable gpg signature checking" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "disable plugins by name" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "enable plugins by name" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "skip packages with depsolving problems" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "control whether colour is used" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "set value of $releasever in yum config and repo files" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "set arbitrary config and repo options" @@ -29011,22 +29226,22 @@ index 0f3c750..f42b3bd 100644 msgstr "Removing for dependencies" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Skipped (dependency problems)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Not installed" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Package" +msgid_plural "Packages" @@ -29064,7 +29279,7 @@ index 0f3c750..f42b3bd 100644 #, python-format msgid "" "\n" -@@ -883,57 +915,52 @@ msgstr "" +@@ -883,57 +915,58 @@ msgstr "" "Transaction Summary\n" "%s\n" @@ -29072,7 +29287,7 @@ index 0f3c750..f42b3bd 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Install" @@ -29080,7 +29295,7 @@ index 0f3c750..f42b3bd 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" +msgstr "" @@ -29088,7 +29303,7 @@ index 0f3c750..f42b3bd 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "" @@ -29096,7 +29311,7 @@ index 0f3c750..f42b3bd 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Reinstall" @@ -29104,316 +29319,322 @@ index 0f3c750..f42b3bd 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Downgrade" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Removed" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Dependency Removed" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Dependency Installed" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Dependency Updated" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Replaced" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Failed" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "two" -@@ -941,7 +968,7 @@ msgstr "two" +@@ -941,7 +974,7 @@ msgstr "two" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -952,364 +979,416 @@ msgstr "" +@@ -952,364 +985,416 @@ msgstr "" " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" "to exit.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "user interrupt" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Total" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "System" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Skipping merged transaction %d to %d, as it overlaps" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "No transactions" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Bad transaction IDs, or package(s), given" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "Command line" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Login user" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Date and time" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Action(s)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Altered" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "No transaction ID given" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Bad transaction ID given" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Not found given transaction ID" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Found more than one transaction ID!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "No transaction ID, or package, given" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Downgraded" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Older" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Newer" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "Transaction ID :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Begin time :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Begin rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "(%u seconds)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "(%u minutes)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "(%u hours)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "(%u days)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "End time :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "End rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "User :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Return-Code :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Aborted" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "Failures:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Failure:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Success" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Command Line :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Additional non-default information stored: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Transaction performed with:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Packages Altered:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Packages Skipped:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Rpmdb Problems:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Scriptlet output:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Errors:" @@ -29422,17 +29643,17 @@ index 0f3c750..f42b3bd 100644 -msgstr "Install" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Dep-Install" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Obsoleting" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Erase" @@ -29445,439 +29666,439 @@ index 0f3c750..f42b3bd 100644 -msgstr "Downgrade" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Update" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Time" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Last day" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Last week" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Last 2 weeks" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Last 3 months" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Last 6 months" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Last year" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Over a year ago" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "No Transaction %s found" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Transaction ID:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Available additional history information:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: No additional data found by this name" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "installed" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "an update" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "erased" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "reinstalled" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "a downgrade" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "obsoleting" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "updated" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "obsoleted" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Package %s.%s %s:%s-%s will be %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Running transaction check" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Restarting Dependency Resolution with new changes." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Finished Dependency Resolution" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Processing Dependency: %s for package: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Keeping package: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Unresolved Dependency: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Package: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1318,7 +1397,7 @@ msgstr "" +@@ -1318,7 +1403,7 @@ msgstr "" "\n" " Requires: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1327,7 +1406,7 @@ msgstr "" +@@ -1327,7 +1412,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1336,7 +1415,7 @@ msgstr "" +@@ -1336,7 +1421,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1345,85 +1424,85 @@ msgstr "" +@@ -1345,85 +1430,85 @@ msgstr "" " Not found" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Updated By" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Downgraded By" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Obsoleted By" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Available" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Processing Conflict: %s conflicts %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Populating transaction set with selected packages. Please wait." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Downloading header for %s to pack into transaction set." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Running" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Sleeping" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Uninterruptible" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombie" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Traced/Stopped" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Unknown" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " The other application is: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " The other application is: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Memory : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Started: %s - %s ago" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " State : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1433,7 +1512,7 @@ msgstr "" +@@ -1433,7 +1518,7 @@ msgstr "" "\n" "Exiting on user cancel" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1443,7 +1522,7 @@ msgstr "" +@@ -1443,7 +1528,7 @@ msgstr "" "\n" "Exiting on Broken Pipe" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1454,7 +1533,7 @@ msgstr "" +@@ -1454,7 +1539,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1462,35 +1541,35 @@ msgstr "" +@@ -1462,35 +1547,35 @@ msgstr "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "PluginExit Error: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum Error: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Error: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " You could try using --skip-broken to work around the problem" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " You could try running: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Unknown Error(s): Exit Code: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1498,7 +1577,7 @@ msgstr "" +@@ -1498,7 +1583,7 @@ msgstr "" "\n" "Dependencies Resolved" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Complete!" -@@ -1510,7 +1589,7 @@ msgstr " Mini usage:\n" +@@ -1510,7 +1595,7 @@ msgstr " Mini usage:\n" msgid "You need to be root to perform this command." msgstr "You need to be root to perform this command." @@ -29886,7 +30107,7 @@ index 0f3c750..f42b3bd 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1540,53 +1619,53 @@ msgstr "" +@@ -1540,53 +1625,53 @@ msgstr "" "\n" "For more information contact your distribution or package provider.\n" @@ -29951,7 +30172,7 @@ index 0f3c750..f42b3bd 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1596,306 +1675,299 @@ msgstr "" +@@ -1596,306 +1681,295 @@ msgstr "" " Run \"yum repolist all\" to see the repos you have.\n" " You can enable repos with yum-config-manager --enable " @@ -30151,347 +30372,346 @@ index 0f3c750..f42b3bd 100644 msgstr "Setting up Local Package Process" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Determine which package provides the given dependency" - +-msgid "Determine which package provides the given dependency" +-msgstr "Determine which package provides the given dependency" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Searching Packages for Dependency:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Run an interactive yum shell" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Setting up Yum Shell" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "List a package's dependencies" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Finding dependencies: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Display the configured software repositories" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "enabled" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "disabled" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Repo-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Repo-name : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Repo-status : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Repo-revision: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Repo-tags : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Repo-distro-tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Repo-updated : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Repo-pkgs : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Repo-size : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Repo-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Updated : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Repo-mirrors : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Never (last: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Instant (last: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s second(s) (last: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Repo-expire : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Repo-exclude : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Repo-include : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Repo-excluded: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "repo id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "repo name" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Display a helpful usage message" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "No help available for %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1905,7 +1977,7 @@ msgstr "" +@@ -1905,7 +1979,7 @@ msgstr "" "\n" "aliases: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1915,85 +1987,125 @@ msgstr "" +@@ -1915,85 +1989,125 @@ msgstr "" "\n" "alias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Setting up Reinstall Process" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "reinstall a package" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Setting up Downgrade Process" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "downgrade a package" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Display a version for the machine and/or available repos." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Yum version groups:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Group :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Packages:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Installed:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Group-Installed:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Available:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Group-Available:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Display, or use, the transaction history" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Invalid history sub-command, use: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "You don't have access to the history DB." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Check for problems in the rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "load a saved transaction from filename" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "No saved transaction file specified." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "loading transaction from %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Transaction loaded from %s with %s members" -@@ -2004,27 +2116,33 @@ msgstr "Transaction loaded from %s with %s members" +@@ -2004,27 +2118,33 @@ msgstr "Transaction loaded from %s with %s members" msgid " Yum checks failed: %s" msgstr " Yum checks failed: %s" @@ -30499,7 +30719,7 @@ index 0f3c750..f42b3bd 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -"Another app is currently holding the yum lock; waiting for it to exit..." @@ -30535,276 +30755,276 @@ index 0f3c750..f42b3bd 100644 msgid "" "\n" "\n" -@@ -2034,74 +2152,74 @@ msgstr "" +@@ -2034,74 +2154,74 @@ msgstr "" "\n" "Exiting on user cancel." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() will go away in a future version of Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Setting up TransactionSets before config class is up" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Invalid tsflag in config file: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Searching pkgSack for dep: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Member: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s converted to install" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Adding Package %s in mode %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Removing Package %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s requires: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s requires %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Needed Require has already been looked up, cheating" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Needed Require is not a package name. Looking up: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Potential Provider: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Mode is %s for provider of %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Mode for pkg providing %s: %s" -@@ -2109,114 +2227,114 @@ msgstr "Mode for pkg providing %s: %s" +@@ -2109,114 +2229,114 @@ msgstr "Mode for pkg providing %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Trying to update %s to resolve dep" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "No update paths found for %s. Failure!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s package requiring %s marked as erase" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: Obsoleting %s with %s to resolve dep." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Updating %s to resolve dep." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Cannot find an update path for dep for: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Quick matched %s to require for %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s is in providing packages but it is already installed, removing." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Potential resolving package %s has newer instance in ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Potential resolving package %s has newer instance installed." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s already in ts, skipping this one" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Marking %s as update for %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Marking %s as install for %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Success - empty transaction" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Restarting Loop" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Dependency Process ending" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Success - deps resolved" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Checking deps for %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "looking for %s as a requirement of %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Running compare_providers() for %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "better arch in po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s obsoletes %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2225,142 +2343,142 @@ msgstr "" +@@ -2225,142 +2345,142 @@ msgstr "" "archdist compared %s to %s on %s\n" " Winner: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "common sourcerpm %s and %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "base package %s is installed for %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "common prefix of %s between %s and %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "requires minimal: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Winner: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Loser(with %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Best Order: %s" @@ -30937,7 +31157,7 @@ index 0f3c750..f42b3bd 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2368,21 +2486,21 @@ msgstr "" +@@ -2368,21 +2488,21 @@ msgstr "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." @@ -30963,7 +31183,7 @@ index 0f3c750..f42b3bd 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2390,88 +2508,91 @@ msgstr "" +@@ -2390,88 +2510,91 @@ msgstr "" "\n" "Packages skipped because of dependency problems:" @@ -30997,25 +31217,25 @@ index 0f3c750..f42b3bd 100644 msgstr "installed conflict" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" "Warning: scriptlet or other non-fatal errors occurred during transaction." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Transaction couldn't start:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Could not run transaction." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Failed to remove transaction file %s" @@ -31023,7 +31243,7 @@ index 0f3c750..f42b3bd 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s was supposed to be installed but is not!" @@ -31034,65 +31254,65 @@ index 0f3c750..f42b3bd 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s was supposed to be removed but is not!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Could not open lock %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Unable to check if PID %s is active" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Existing lock %s: another copy is running as pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Could not create lock at %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2480,102 +2601,93 @@ msgstr "" +@@ -2480,102 +2603,93 @@ msgstr "" "Package does not match intended download. Suggestion: run yum " "--enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Could not perform checksum" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Package does not match checksum" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "package fails checksum but caching is enabled for %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "using local copy of %s" @@ -31109,12 +31329,12 @@ index 0f3c750..f42b3bd 100644 -" * needed %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Header is not complete." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" @@ -31122,55 +31342,55 @@ index 0f3c750..f42b3bd 100644 "Header not in local cache and caching-only mode enabled. Cannot download %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Public key for %s is not installed" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problem opening package %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Public key for %s is not trusted" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Package %s is not signed" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Cannot remove %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s removed" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Cannot remove %s file %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s file %s removed" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s files removed" @@ -31180,28 +31400,28 @@ index 0f3c750..f42b3bd 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "More than one identical match in sack for %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Nothing matches %s.%s %s:%s-%s from update" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2583,121 +2695,123 @@ msgstr "" +@@ -2583,121 +2697,124 @@ msgstr "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Searching %d packages" @@ -31211,62 +31431,62 @@ index 0f3c750..f42b3bd 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "searching package %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "searching in file entries" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "searching in provides entries" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "No group data available for configured repositories" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "No Group named %s exists" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "package %s was not marked in group %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Adding package %s from group %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "No package named %s available to be installed" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Warning: Group %s does not have any packages." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "Group %s does have %u conditional packages, which may get installed." @@ -31274,142 +31494,143 @@ index 0f3c750..f42b3bd 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Package tuple %s could not be found in packagesack" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Package tuple %s could not be found in rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "Invalid version flag from: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "No Package found for %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Package Object was not a package object instance" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Nothing specified to install" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Checking for virtual provide or file-provide for %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "No Match for argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Package %s installed and not available" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "No package(s) available to install" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Package: %s - already in transaction set" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Package %s is obsoleted by %s which is already installed" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2706,94 +2820,100 @@ msgstr "" +@@ -2706,94 +2823,100 @@ msgstr "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " "requirements" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Package %s is obsoleted by %s, trying to install %s instead" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Package %s already installed and latest version" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Package matching %s already installed. Checking for update." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Updating Everything" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Package is already obsoleted: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Not Updating Package that is obsoleted: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Not Updating Package that is already updated: %s.%s %s:%s-%s" @@ -31417,43 +31638,43 @@ index 0f3c750..f42b3bd 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Skipping the running kernel: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Removing %s from the transaction" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Cannot open: %s. Skipping." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Examining %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Cannot localinstall deltarpm: %s. Skipping." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" @@ -31461,332 +31682,347 @@ index 0f3c750..f42b3bd 100644 "Cannot add package %s to transaction. Not a compatible architecture: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "Cannot install package %s. It is obsoleted by installed package %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2802,7 +2922,7 @@ msgstr "" +@@ -2802,7 +2925,7 @@ msgstr "" "Package %s not installed, cannot update it. Run yum install to install it " "instead." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2811,95 +2931,100 @@ msgstr "" +@@ -2811,137 +2934,137 @@ msgstr "" "Package %s.%s not installed, cannot update it. Run yum install to install it" " instead." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Excluding %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Marking %s to be installed" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Marking %s as an update to %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: does not update installed package." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Cannot open file: %s. Skipping." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Problem in reinstall: no package matched to remove" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problem in reinstall: no package %s matched to install" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "No package(s) available to downgrade" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Package %s is allowed multiple installs, skipping" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "No Match for available package: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Only Upgrade available on package: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Failed to downgrade: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "Retrieving key from %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "GPG key retrieval failed: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "GPG key signature on key %s does not matvch CA Key for repo: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "GPG key signature verified against CA Key(s)" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Invalid GPG Key from %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG key parsing failed: key does not have value %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2912,7 +3037,7 @@ msgstr "" - "Package: %s (%s)\n" - "From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" + msgstr "" +-"Importing %s key 0x%s:\n" +-"Userid : %s\n" +-"Package: %s (%s)\n" +-"From : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2923,25 +3048,25 @@ msgstr "" - "Userid : \"%s\"\n" - "From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" + msgstr "" +-"Importing %s key 0x%s:\n" +-"Userid : \"%s\"\n" +-"From : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG key at %s (0x%s) is already installed" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Key import failed (code %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Key imported successfully" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "Didn't install any keys" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2950,25 +3075,25 @@ msgstr "" +@@ -2950,25 +3073,25 @@ msgstr "" "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." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Import of key(s) didn't help, wrong key(s)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG key at %s (0x%s) is already imported" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Key import failed" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Didn't install any keys for repo %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2977,157 +3102,181 @@ msgstr "" +@@ -2977,157 +3100,181 @@ msgstr "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" "Check that the correct key URLs are configured for this repository." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Unable to find a suitable mirror." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Errors were encountered while downloading packages." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Please report this error at %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Test Transaction Errors: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Could not set cachedir: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "Dependencies not solved. Will not save unresolved transaction." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Could not save transaction file %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Could not access/read saved transaction %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "rpmdb ver mismatched saved transaction version, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr " ignoring, as requested." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr " aborting." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "cannot find tsflags or tsflags not integer." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Found txmbr in unknown current state: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Could not find txmbr: %s in state %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Could not find txmbr: %s from origin: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Transaction members, relations are missing or ts has been modified," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr " ignoring, as requested. You must redepsolve!" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -31886,7 +32122,7 @@ index 0f3c750..f42b3bd 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s provides %s but it cannot be found" -@@ -3136,6 +3285,17 @@ msgstr "%s provides %s but it cannot be found" +@@ -3136,6 +3283,17 @@ msgstr "%s provides %s but it cannot be found" msgid "Repackaging" msgstr "Repackaging" @@ -31905,7 +32141,7 @@ index 0f3c750..f42b3bd 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/es.po b/po/es.po -index 2b1397d..6f5ad55 100644 +index 2b1397d..ed3932e 100644 --- a/po/es.po +++ b/po/es.po @@ -2,15 +2,18 @@ @@ -31926,9 +32162,9 @@ index 2b1397d..6f5ad55 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-09-08 12:57+0000\n" -+"Last-Translator: beckerde \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-27 13:11+0000\n" ++"Last-Translator: elsupergomez \n" "Language-Team: Spanish (Castilian) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31949,30 +32185,30 @@ index 2b1397d..6f5ad55 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instalando" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Obsoleto" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Actualizado" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Eliminado" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Instalado" @@ -31999,7 +32235,7 @@ index 2b1397d..6f5ad55 100644 msgstr "Eliminado: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Eliminando" @@ -32025,53 +32261,53 @@ index 2b1397d..6f5ad55 100644 msgstr "Leyendo en archivos locales los metadatos de los repositorios" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Error de configuración: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Error de opciones: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Instalado: %s-%s en %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Construido: %s en %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Enviado: %s en %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Necesita ingresar algún comando" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "No existe el comando: %s. Por favor, utilice %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Requerimientos de disco:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format 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" @@ -32082,7 +32318,7 @@ index 2b1397d..6f5ad55 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -32091,74 +32327,74 @@ index 2b1397d..6f5ad55 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 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." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Saliendo de acuerdo al comando del usuario" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Descargando paquetes:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Error al descargar los paquetes:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "Ejecutando verificación de transacción" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "ERROR Necesita actualizar el rpm para manipular:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "ERROR en el chequeo de la transacción vs resolución de dependencias:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "El RPM necesita ser actualizado" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Por favor, reporte este error en %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Ejecutando prueba de transacción" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Error en la verificación de la transacción:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "La prueba de transacción ha sido exitosa" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Ejecutando transacción" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -32167,12 +32403,12 @@ index 2b1397d..6f5ad55 100644 "Utilice \"-y\" para forzar." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Tal vez quería decir: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" @@ -32180,7 +32416,7 @@ index 2b1397d..6f5ad55 100644 "instalado." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "No existe disponible ningún paquete %s%s%s." @@ -32188,7 +32424,7 @@ index 2b1397d..6f5ad55 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paquete(s) a instalarse" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -32197,75 +32433,75 @@ index 2b1397d..6f5ad55 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nada para hacer" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paquetes han sido seleccionados para ser actualizados" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "%d paquete marcado para Actualizar" -+msgstr[1] "%d paquetes marcados para Actualizar" ++msgstr[0] "%d paquete marcado para ser actualizado" ++msgstr[1] "%d paquetes marcados para ser actualizados" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "No se han seleccionando paquetes para ser actualizados" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" -"%d paquetes han sido seleccionados para Sincronización de distribución" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" -+msgstr[0] "%d paquete marcado para Sincronización de Distribución" -+msgstr[1] "%d paquetes marcados para Sincronización de Distribución" ++msgstr[0] "%d paquete marcado para la Sincronización de Distribución" ++msgstr[1] "%d paquetes marcados para la Sincronización de Distribución" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "No se han seleccionado paquetes para Sincronización de distribución" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paquetes han sido seleccionados para ser eliminados" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "%d paquete marcado para eliminar" -+msgstr[1] "%d paquetes marcados para eliminar" ++msgstr[0] "%d paquete marcado para ser eliminado" ++msgstr[1] "%d paquetes marcados para ser eliminados" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "No se han seleccionado paquetes para ser eliminados" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paquete(s) a desactualizar" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "%d paquete a desactualizar" -+msgstr[1] "%d paquetes a desactualizar" ++msgstr[0] "%d paquete a rebajar versión" ++msgstr[1] "%d paquetes a rebajar versión" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (desde %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "El paquete instalado %s%s%s%s no se encuentra disponible." @@ -32273,7 +32509,7 @@ index 2b1397d..6f5ad55 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paquete(s) a reinstalar" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -32281,22 +32517,22 @@ index 2b1397d..6f5ad55 100644 +msgstr[1] "%d paquetes a reinstalar" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "No se ha ofrecido ningún paquete" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Paquete(s) a instalarse" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "Nombre/Resumen que coinciden con: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -32304,7 +32540,7 @@ index 2b1397d..6f5ad55 100644 "todo." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -32313,13 +32549,13 @@ index 2b1397d..6f5ad55 100644 "todo\" para todo." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Concordante: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" @@ -32327,176 +32563,176 @@ index 2b1397d..6f5ad55 100644 "todo\" para todo." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Aviso: No se ha encontrado ningún resultado para: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "No se ha encontrado ningún resultado" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "No se ha encontrado ningún paquete para %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " -msgstr "Limpiando repositorios:" +msgstr "Limpiando repositorios: " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Limpiando todo" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Limpiando encabezados" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Limpiando paquetes" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Limpiando metadatos xml" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Limpiando el caché de la base de datos" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Limpiando metadatos expirados del caché" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Limpiando datos de rpmdb en el caché" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Limpiando complementos" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "Advertencia: No hay grupos coincidentes con: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Grupos instalados:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "Grupos de idioma instalados:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Grupos disponibles:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "Grupos de idioma disponibles:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Listo" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Aviso: el grupo %s no existe." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 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" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d paquete(s) a instalar" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "%d paquete a Instalar" -+msgstr[1] "%d paquetes a Installar" ++msgstr[0] "%d paquete a instalar" ++msgstr[1] "%d paquetes a instalar" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "No existe ningún grupo denominado %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "No existen paquetes a eliminarse de los grupos" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paquete(s) a eliminar" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "%d paquetes a eliminar" -+msgstr[1] "%d paquetes a elminar" ++msgstr[0] "%d paquete a eliminar" ++msgstr[1] "%d paquetes a eliminar" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Ya se encuentra instalado el paquete %s, ignorando" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, 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:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, 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" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Opciones de complementos" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Error en la línea de comando: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -32505,160 +32741,160 @@ index 2b1397d..6f5ad55 100644 "%s: la opción %s necesita un argumento" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color acepta una de las siguientes opciones: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--insallroot debe ser una ruta absoluta: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "muestra este mensaje de ayuda y cierra" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "sea tolerante con los errores" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "se ejecuta completamente a partir del caché, pero no lo actualiza" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "configurar ubicación de archivo" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "tiempo máximo de espera del comando" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "nivel de depuración de la salida" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" "muestra duplicados en los repositorios, y en los comandos para " "mostrar/buscar" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "nivel de error de la salida" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "nivel de depuración de salida para rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "operación discreta" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "operación detallada" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" -msgstr "responde \"si\" a todas las preguntas" +msgstr "responde \"sí\" a todas las preguntas" -+ -+#: ../cli.py:1996 -+msgid "answer no for all questions" -+msgstr "responder no a todas las preguntas" -#: ../cli.py:1675 -+#: ../cli.py:2000 ++#: ../cli.py:2069 ++msgid "answer no for all questions" ++msgstr "responder no para todas las preguntas" ++ ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "muestra la versión de Yum y finaliza" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "define la raíz de instalación" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "activa uno o más repositorios (los comodines son permitidos)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "desactiva uno o más repositorios (los comodines son permitidos)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "excluya paquete(s) de acuerdo a su nombre o glob " -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 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" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "habilita el proceso de paquetes obsoletos durante las actualizaciones" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "deshabilita los complementos de Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "deshabilita la verificación de firmas GPG" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "deshabilita complementos de acuerdo a su nombre" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "habilita complementos de acuerdo a su nombre" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "ignora paquetes con problemas de resolución de dependencias" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "controla la utilización de colores" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 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" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "define una configuración arbitraria y opciones de los repositorios" @@ -33003,23 +33239,23 @@ index 2b1397d..6f5ad55 100644 msgstr "Eliminando para las dependencias" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Ignorando (problemas de dependencias)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "No instalado" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "No disponible" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Paquete" +msgid_plural "Packages" @@ -33057,7 +33293,7 @@ index 2b1397d..6f5ad55 100644 #, python-format msgid "" "\n" -@@ -902,57 +935,52 @@ msgstr "" +@@ -902,57 +935,58 @@ msgstr "" "Resumen de la transacción\n" "%s\n" @@ -33065,7 +33301,7 @@ index 2b1397d..6f5ad55 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Instalar %5.5s Paquete(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Instalar" @@ -33073,7 +33309,7 @@ index 2b1397d..6f5ad55 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Actualizar %5.5s Paquete(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" +msgstr "Actualizar" @@ -33081,7 +33317,7 @@ index 2b1397d..6f5ad55 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Eliminar %5.5s Paquete(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "Eliminar" @@ -33089,7 +33325,7 @@ index 2b1397d..6f5ad55 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Reinstalar %5.5s Paquete(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Reinstalar" @@ -33097,56 +33333,62 @@ index 2b1397d..6f5ad55 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Desactualizar %5.5s Paquete(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Desactualizar" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "Paquete dependiente" ++msgstr[1] "Paquetes dependientes" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "Eliminado(s)" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Dependencia(s) eliminada(s)" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Dependencia(s) instalada(s)" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Dependencia(s) actualizada(s)" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Sustituido(s)" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Falló" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "dos" -@@ -960,7 +988,7 @@ msgstr "dos" +@@ -960,7 +994,7 @@ 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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -968,369 +996,421 @@ msgid "" +@@ -968,369 +1002,421 @@ msgid "" "to exit.\n" msgstr "" "\n" @@ -33155,262 +33397,262 @@ index 2b1397d..6f5ad55 100644 "para finalizar.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "interrupción solicitada por el usuario" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Total" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Sistema" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Omitiendo transacción mezclada %d a %d, dado que se superponen" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "Sin transacciones" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Se ha(n) indicado paquete(s), o IDs de transacciones erróneas" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "Linea de comandos" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Registro de usuario" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Día y hora" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Acción(es)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Modificado" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "No se ha indicado un ID de transacción" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Se ha indicado un ID de transacción no válido " -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "No se ha encontrado el ID de transacción indicado" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "¡Se ha encontrado más de un ID de transacción!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "No se ha indicado ningún paquete, o ID de transacción" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Desactualizado" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Antiguos" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Nuevos" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "ID de transacción :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Hora inicial :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Rpmdb inicial :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "(%u segundos)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "(%u minutos)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "(%u horas)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "(%u dias)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Hora final : " -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Rpmdb final :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Usuario :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Codigo-obtenido :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Abortado" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "Fallas:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Falla:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Exito" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Línea de comando :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Información adicional no predeterminada almacenada: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Transacción realizada con:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Paquetes modificados:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Paquetes ignorados:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Problemas en la base de datos RPM: " -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Información del scriptlet:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Errores:" @@ -33419,17 +33661,17 @@ index 2b1397d..6f5ad55 100644 -msgstr "Instalar" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Instalación de dependencias" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Convirtiendo en obsoleto" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Eliminar" @@ -33442,295 +33684,295 @@ index 2b1397d..6f5ad55 100644 -msgstr "Desactualizar" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Actualizar" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Hora" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Ultimo día" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Ultima semana" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Ultimas 2 semanas" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Ultimos 3 meses" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Ultimos 6 meses" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Ultimo año" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Hace más de un año" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "No se ha encontrado una transacción %s" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "ID de transacción :" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Información de historial adicional disponible:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s No ha sido encontrada información adicional con este nombre" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" -+msgstr "Paquete :" ++msgstr "Paquete :" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "Estado :" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "Tamaño :" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" -+msgstr "Construir anfitrión:" ++msgstr "Equipo de construcción:" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" -+msgstr "Tiempo de construcción:" ++msgstr "Fecha de construcción:" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "Empaquetador :" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "Vendedor :" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "Licencia :" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "URL :" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" -+msgstr "RPM de Fuentes :" ++msgstr "RPM Fuente :" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" -+msgstr "Tiempo de subida:" ++msgstr "Fecha de publicación:" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" -+msgstr "Quien lo sube:" ++msgstr "Publicador :" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "Razón :" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" -+msgstr "Desde el repo :" ++msgstr "Repositorio :" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "Instalado por :" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" -+msgstr "Cambiado por :" ++msgstr "Modificado por :" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "instalado" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "una actualización" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "eliminado" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "reinstalado" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "una desactualización" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "obsoleto" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "actualizado" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "obsoleto" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Paquete %s.%s %s:%s-%s debe ser %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Ejecutando prueba de transacción" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" "--> Reiniciando la resolución de las dependencias con las nuevas " "modificaciones." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Resolución de dependencias finalizada" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Procesando dependencias: %s para el paquete: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Manteniendo el paquete: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Dependencia no resuelta: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Paquete: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1339,7 +1419,7 @@ msgstr "" +@@ -1339,7 +1425,7 @@ msgstr "" "\n" " Necesita: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1348,7 +1428,7 @@ msgstr "" +@@ -1348,7 +1434,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1357,7 +1437,7 @@ msgstr "" +@@ -1357,7 +1443,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1366,89 +1446,89 @@ msgstr "" +@@ -1366,89 +1452,89 @@ msgstr "" " No encontrado" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Actualizado por" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Desactualizado por" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Obsoleto por" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Disponible" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Procesando conflictos: %s choca con %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> Construyendo el conjunto de las transacciones con los paquetes " "seleccionados. Por favor aguarde." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" @@ -33738,150 +33980,150 @@ index 2b1397d..6f5ad55 100644 "transacciones." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Ejecutando" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Durmiendo" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Ininterrumplible" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombi" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Rastreado/Detenido" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Desconocido" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " La otra aplicación es: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " La otra aplicación es: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Memoria : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Iniciado: %s - %s atrás" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Estado : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1458,7 +1538,7 @@ msgstr "" +@@ -1458,7 +1544,7 @@ msgstr "" "\n" "Saliendo por cancelación del usuario" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1468,7 +1548,7 @@ msgstr "" +@@ -1468,7 +1554,7 @@ msgstr "" "\n" "Saliendo por tubería rota" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1479,7 +1559,7 @@ msgstr "" +@@ -1479,7 +1565,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1487,36 +1567,36 @@ msgstr "" +@@ -1487,36 +1573,36 @@ msgstr "" "Otra aplicación tiene retenido el bloqueo de Yum; finalizando de acuerdo a " "la configuración de exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Error de PluginExit: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Error de yum: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Error: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 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" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "Podría intentar ejecutar: rpm- Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Error(es) desconocido(s): Código de salida: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1524,7 +1604,7 @@ msgstr "" +@@ -1524,7 +1610,7 @@ msgstr "" "\n" "Dependencias resueltas" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "¡Listo!" -@@ -1536,7 +1616,7 @@ msgstr " Minu uso:\n" +@@ -1536,7 +1622,7 @@ msgstr " Minu uso:\n" msgid "You need to be root to perform this command." msgstr "Necesita ser usuario root para poder ejecutar este comando." @@ -33890,7 +34132,7 @@ index 2b1397d..6f5ad55 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1566,53 +1646,53 @@ msgstr "" +@@ -1566,53 +1652,53 @@ msgstr "" "\n" "Para obtener mayor información, póngase en contacto con su distribución o con su proveedor de paquetes.\n" @@ -33956,7 +34198,7 @@ index 2b1397d..6f5ad55 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1622,308 +1702,301 @@ msgstr "" +@@ -1622,308 +1708,297 @@ msgstr "" " Ejecute \"yum repolist all\" para conocer los repositorios existentes.\n" " Puede habilitarlos con yum-config-manager --enable " @@ -34060,7 +34302,7 @@ index 2b1397d..6f5ad55 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "Mostrar, o usar, la información de grupos" ++msgstr "Muestra, o usa, la información de grupos" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -34089,7 +34331,7 @@ index 2b1397d..6f5ad55 100644 +#: ../yumcommands.py:833 +#, python-format +msgid "Invalid groups sub-command, use: %s." -+msgstr "Subcomando de grupos inválido, use: %s." ++msgstr "Sub-comando groups invalido, use: %s." -#: ../yumcommands.py:550 +#: ../yumcommands.py:929 @@ -34158,155 +34400,154 @@ index 2b1397d..6f5ad55 100644 msgstr "Configurando el proceso de instalación local de paquetes" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Determina qué paquetes ofrecen la dependencia indicada" - +-msgid "Determine which package provides the given dependency" +-msgstr "Determina qué paquetes ofrecen la dependencia indicada" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Buscando paquetes para la dependencia:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Ejecuta una shell de Yum interactiva " -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Configurando la shell de Yum" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Muestra las dependencias que necesita un paquete" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Buscando dependencias:" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Muestra los repositorios de software configurados" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "habilitado" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "deshabilitado" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Repo-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Repo-name : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Repo-status : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Repo-revision: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Repo-tags : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Repo-distro-tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Repo-updated : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Repo-pkgs : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Repo-size : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Repo-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Actualizados : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Repo-mirrors : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Nunca (último: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Instante (último: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s segundo(s) (último: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Repo-expire : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Repo-exclude : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Repo-include : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Repositorio excluído:" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Nombre de archivo del repositorio: " @@ -34314,192 +34555,192 @@ index 2b1397d..6f5ad55 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "id del repositorio" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "estado" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "nombre del repositorio" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Muestra un mensaje de ayuda del uso" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "No existe asistencia disponible para %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1933,7 +2006,7 @@ msgstr "" +@@ -1933,7 +2008,7 @@ msgstr "" "\n" "apodos: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1943,85 +2016,125 @@ msgstr "" +@@ -1943,85 +2018,125 @@ msgstr "" "\n" "apodo: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Configurando el proceso de reinstalación" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "reinstalar un paquete" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Configurando el proceso de desactualización" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "desactualizar un paquete a una versión anterior" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 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:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Grupos de la versión de Yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Grupo :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Paquetes:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Instalado:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Grupo-Instalado:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Disponible:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Grupo-Disponible:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Mostrar, o utilizar, el historial de la transacción" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "Transacciones:" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" -+msgstr "Hora de comienzo:" ++msgstr "Hora de inicio :" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" -+msgstr "Hora de finalización:" ++msgstr "Hora de fin :" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" -+msgstr "Contadores:" ++msgstr "Conteo :" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" -+msgstr " BD rpm :" ++msgstr " rpm DB :" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" -+msgstr " BD yum :" ++msgstr " yum DB :" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Sub-comando de historia no válido, utilice: %s" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "No posee acceso a la base de datos del historial." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Verifica si hay problemas en la base de datos (rpmdb)" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "carga una transacción guardada desde un archivo" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "No se especificó un archivo de transacción guardada." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "cargando transacción desde %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Transacción cargada desde %s con %s miembros." -@@ -2032,29 +2145,36 @@ msgstr "Transacción cargada desde %s con %s miembros." +@@ -2032,29 +2147,36 @@ msgstr "Transacción cargada desde %s con %s miembros." msgid " Yum checks failed: %s" msgstr " Yum falló verificando: %s" @@ -34507,10 +34748,10 @@ index 2b1397d..6f5ad55 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -"Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " -+"No hay acceso de lectura/escritura en el directorio actual, moviendo a /" ++"Sin permiso de lectura/ejecución en el directorio actual, moviendo a /" -#: ../yummain.py:120 +#: ../yummain.py:124 @@ -34539,7 +34780,7 @@ index 2b1397d..6f5ad55 100644 msgstr "" -"Su transacción fue guardada, ejecutela nuevamente con yum load-transaction " -"%s" -+"Su transacción fue guardada, ejecútela de nuevo con:\n" ++"Su transacción fue guardada, vuelva a ejecutarla con:\n" +" yum load-transaction %s" -#: ../yummain.py:288 @@ -34547,122 +34788,122 @@ index 2b1397d..6f5ad55 100644 msgid "" "\n" "\n" -@@ -2064,76 +2184,76 @@ msgstr "" +@@ -2064,76 +2186,76 @@ msgstr "" "\n" "Saliendo por cancelación del usuario." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() desaparecerá en alguna versión posterior de Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" "Configurando TransactionSets antes de la activación de clase de " "configuración" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "tsflag no válido en el archivo de configuración: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Buscando pkgSack para la dependencia: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Miembro: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s convertido para instalar" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Agregando paquete %s en modo %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Eliminando paquete %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s necesita: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s necesita %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "El requerimiento que se necesita ya fue buscado, haciendo trampa" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, 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:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Proveedor posible: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, 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:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Modo para el paquete que ofrece %s: %s" -@@ -2141,121 +2261,121 @@ msgstr "Modo para el paquete que ofrece %s: %s" +@@ -2141,121 +2263,121 @@ msgstr "Modo para el paquete que ofrece %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Intentando actualizar %s para resolver dependencia" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "No se encontraron rutas de actualización para %s. ¡Fallo!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, 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:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" @@ -34670,13 +34911,13 @@ index 2b1397d..6f5ad55 100644 "dependencia." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Actualizando %s para resolver la dependencia." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" @@ -34684,14 +34925,14 @@ index 2b1397d..6f5ad55 100644 " %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, 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:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" @@ -34699,133 +34940,133 @@ index 2b1397d..6f5ad55 100644 "eliminando. " -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, 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:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, 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:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s ya se encuentra en ts, ignorándolo" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Seleccionado %s como actualización de %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Seleccionando %s como una instalación para %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Exito - transacción vacía" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Reiniciando el bucle" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Finalizando el proceso de dependencias" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Exito - dependencias resueltas" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Verificando dependencias para %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "localizando a %s como un requerimiento de %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Ejecutando compare_providers() para %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "mejor arquitectura en po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s hace obsoleto a %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2264,145 +2384,145 @@ msgstr "" +@@ -2264,145 +2386,145 @@ msgstr "" "archdist comparó %s con %s en %s\n" " Vencedor: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "sourcerpm común %s y %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "el paquete principal %s está instalado para %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "prefijo común de %s entre %s y %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "requires el mínimo: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Ganador: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Perdedor(con %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Mejor orden: %s" @@ -34961,7 +35202,7 @@ index 2b1397d..6f5ad55 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2410,21 +2530,21 @@ msgstr "" +@@ -2410,21 +2532,21 @@ msgstr "" "Existen transacciones restantes no finalizadas. Podría considerar primero " "ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas." @@ -34987,7 +35228,7 @@ index 2b1397d..6f5ad55 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2432,93 +2552,96 @@ msgstr "" +@@ -2432,93 +2554,96 @@ msgstr "" "\n" "Paquetes ignorados por problemas de dependencias:" @@ -35024,7 +35265,7 @@ index 2b1397d..6f5ad55 100644 msgstr "conflicto instalado" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -35032,18 +35273,18 @@ index 2b1397d..6f5ad55 100644 "transacción." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "La transacción no pudo iniciarse:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "No se pudo ejecutar la transacción" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Falló al eliminar archivo de transacción %s" @@ -35051,7 +35292,7 @@ index 2b1397d..6f5ad55 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "¡se suponía que %s estuviera instalado, pero no lo está! " @@ -35062,27 +35303,27 @@ index 2b1397d..6f5ad55 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "¡se suponía que %s estuviera eliminado, pero no lo está! " -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "No se pudo abrir el bloqueo %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, 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:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" @@ -35090,32 +35331,32 @@ index 2b1397d..6f5ad55 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "No se ha podido crear el bloqueo en %s: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2527,42 +2650,31 @@ msgstr "" +@@ -2527,42 +2652,31 @@ msgstr "" "El paquete no se corresponde con la descarga pretendida. Sugerimos ejecutar " "el siguiente comando: yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "No se pudo realizar una suma de verificación" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "El paquete no se corresponde con la suma de verificación" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" @@ -35123,7 +35364,7 @@ index 2b1397d..6f5ad55 100644 "encuentra habilitado para %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "utilizando una copia local de %s" @@ -35140,69 +35381,69 @@ index 2b1397d..6f5ad55 100644 -" * necesario %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "El encabezado no está completo." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2570,62 +2682,64 @@ msgstr "" +@@ -2570,62 +2684,64 @@ 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:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "No se ha instalado la llave pública de %s " -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problemas abriendo el paquete %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "La llave pública de %s no es confiable" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "El paquete %s no está firmado" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "No es posible eliminar %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s eliminado" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "No es posible eliminar %s archivo %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s archivo %s eliminado" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s archivos eliminados" @@ -35212,54 +35453,54 @@ index 2b1397d..6f5ad55 100644 +msgstr[1] "%d %s archivos eliminados" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, 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:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, 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:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2633,122 +2747,124 @@ msgstr "" +@@ -2633,122 +2749,125 @@ msgstr "" "searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar " "utilice searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Buscando %d paquetes" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "Buscando %d paquete" -+msgstr[1] "Buscando %d paquetes" ++msgstr[0] "Buscando paquete %d" ++msgstr[1] "Buscando paquetes %d" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "buscando paquete %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "buscando en las entradas de archivo" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "buscando en las entradas \"provee\"" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" "No existen datos de grupo disponibles en los repositorios configurados" @@ -35267,39 +35508,39 @@ index 2b1397d..6f5ad55 100644 -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "No existe un grupo denominado %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, 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:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Agregando paquete %s del grupo %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, 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:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Advertencia: Grupo %s no tiene ningun paquete." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "El grupo %s tiene %u paquetes condicionales, que pueden instalarse." @@ -35307,87 +35548,88 @@ index 2b1397d..6f5ad55 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, 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:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, 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:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "Bandera de versión inválida en: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "No se ha encontrado ningún paquete para %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 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:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "No se ha indicado nada para instalar" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, 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:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "No hay nada concordante con el argumento: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "El paquete %s está instalado y no se encuentra disponible" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "No existe(n) paquete(s) disponible(s) para instalar" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paquete: %s - ya se encuentra en un conjunto de transacción" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, 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:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2757,19 +2873,19 @@ msgstr "" +@@ -2757,19 +2876,19 @@ msgstr "" "El paquete %s se hace obsoleto con %s, pero el paquete que lo hace obsoleto " "no ofrece requerimientos" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" @@ -35395,58 +35637,58 @@ index 2b1397d..6f5ad55 100644 "instalar %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, 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:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" -@@ -2777,69 +2893,75 @@ msgstr "" +@@ -2777,69 +2896,75 @@ msgstr "" "puede actualizarse." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Actualizando todo" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, 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:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "Ningún paquete coincidió para actualizar: %s" ++msgstr "Ningún paquete encontrado para actualizar: %s" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, 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:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" @@ -35456,53 +35698,53 @@ index 2b1397d..6f5ad55 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "No hay paquete correspondiente para ser eliminado" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "Ningún paquete coincidió para eliminar: %s" ++msgstr "Ningún paquete encontrado para eliminar: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Salteando el kernel en ejecución: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Eliminando %s de la transacción" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "No es posible abrir: %s. Ignorando." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Examinando %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" "No es posible realizar una instalación local de deltarpm: %s. Ignorando." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2847,14 +2969,14 @@ msgstr "" +@@ -2847,14 +2972,14 @@ msgstr "" "No es posible añadir el paquete %s a la transacción. La arquitectura no es " "compatible: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" @@ -35510,61 +35752,61 @@ index 2b1397d..6f5ad55 100644 "paquete instalado %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2863,7 +2985,7 @@ msgstr "" +@@ -2863,7 +2988,7 @@ msgstr "" "El paquete %s no está instalado, no puede actualizarse. En su lugar, para " "instalarlo, ejecute el comando yum install." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2872,100 +2994,105 @@ msgstr "" +@@ -2872,142 +2997,151 @@ msgstr "" "Paquete %s. %s no instalado, no se puede actualizar. En su lugar, ejecute " "yum install para instalarlo" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Excluyendo %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Marcando %s para ser instalado" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Marcando %s como una actualización de %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: no actualiza el paquete instalado." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "No es posible abrir el archivo: %s. Ignorando." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" "Problema al reinstalar: no existe ningún paquete concordante para eliminar" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" @@ -35572,54 +35814,54 @@ index 2b1397d..6f5ad55 100644 "instalar" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "No existe(n) paquete(s) disponible(s) para desactualizar" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "El paquete %s permite múltiples instalaciones, ignorando" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Ninguna correspondencia disponible para el paquete: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Solo existe la posibilidad de actualizar el paquete: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Falló al desactualizar: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" -+msgstr "Falló al actualizar: %s" ++msgstr "Falla al actualizar: %s" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "Obteniendo clave desde %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "La obtención de la llave GPG ha fallado:" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" @@ -35627,221 +35869,245 @@ index 2b1397d..6f5ad55 100644 " %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "Clave GPG de firma verificada contra clave(s) CA" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Llave GPG no válida de %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, 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:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2978,7 +3105,7 @@ msgstr "" - " Paquete: %s (%s)\n" - " Desde: %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" + msgstr "" +-"Importando clave %s 0x%s:\n" +-" Id Usuario: %s\n" +-" Paquete: %s (%s)\n" +-" Desde: %s" ++"Importando llave %s 0x%s:\n" ++" Usuarioid : \"%s\"\n" ++" Huella : %s\n" ++" Paquete : %s (%s)\n" ++" Desde : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2989,25 +3116,25 @@ msgstr "" - " Id Usuario: \"%s\"\n" - " Desde: %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" + msgstr "" +-"Importando clave %s 0x%s:\n" +-" Id Usuario: \"%s\"\n" +-" Desde: %s" ++"Importando llave %s 0x%s:\n" ++" Usuarioid : \"%s\"\n" ++" Huella : %s\n" ++" Desde : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "La llave GPG de %s (0x%s) ya se encuentra instalada" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "La importación de la llave falló (código %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "La llave ha sido importada exitosamente" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "No instalar ninguna clave" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -3016,26 +3143,26 @@ msgstr "" +@@ -3016,26 +3150,26 @@ 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." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 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:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, 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:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Falló la importación de la llave" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "No instalar ninguna clave para el repositorio %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3044,164 +3171,188 @@ msgstr "" +@@ -3044,164 +3178,188 @@ msgstr "" "Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero no son correctas.\n" "Verifique que se encuentren correctamente configuradas las URLs de la llave para este repositorio." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "No es posible encontrar un espejo que funcione." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Fueron encontrados errores mientras los paquetes eran descargados." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Por favor, informe este error en %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Errores de la prueba de transacción:" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "No se ha podido definir un directorio de chaché: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" "Dependencias no resueltas. No se guardarán las transacciónes no resuletas." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "No se puedo guardar el archivo de transacciones %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "No se puede acceder/leer el archivo guardado de transacción %s: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "versión de rpmdb no coincide con versión de transacción guardada, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr " ignorando, como fue requerido." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr " abortando." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "no se puede encontrar tsflags o tsflags no es un entero." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Encontrado txmbr en estado actual desconocido: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "No se pudo encontrar txmbr: %s en estado %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "No se pudo encontrar txmbr: %s del origen:%s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" "Están faltando los miembros de la transacción y sus relaciones, o ts fue " "modificada," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr " ignorando, a pedido. ¡Debe resolver dependencias nuevamente!" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." -+msgstr "%s ya fue visitado y no puede ser eliminado." ++msgstr "%s ya ha sido visitado y no puede ser removido." + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Examinando revdeps de %s" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." -+msgstr "%s tiene revdpe %s que fue instalado por el usuario." ++msgstr "%s tiene como revdep a %s que fue instalado por el usuario." + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "%s no tiene revdeps instalado por el usuario." ++msgstr "%s no tiene revdeps instaladas por el usuario." + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 @@ -35942,7 +36208,7 @@ index 2b1397d..6f5ad55 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s ofrece %s, pero no puede ser encontrado" -@@ -3210,6 +3361,17 @@ msgstr "%s ofrece %s, pero no puede ser encontrado" +@@ -3210,6 +3368,17 @@ msgstr "%s ofrece %s, pero no puede ser encontrado" msgid "Repackaging" msgstr "Reempaquetando" @@ -35961,7 +36227,7 @@ index 2b1397d..6f5ad55 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/eu.po b/po/eu.po -index f92862c..5fd7c2b 100644 +index f92862c..fed775a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -2,14 +2,15 @@ @@ -35978,9 +36244,9 @@ index f92862c..5fd7c2b 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-09-07 15:39+0000\n" -+"Last-Translator: assar \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Basque (http://www.transifex.net/projects/p/yum/team/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36001,30 +36267,30 @@ index f92862c..5fd7c2b 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instalatzen" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Zaharkitua" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Eguneratua" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Ezabatua" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Instalatua" @@ -36051,7 +36317,7 @@ index f92862c..5fd7c2b 100644 msgstr "Ezabatua: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Kentzen" @@ -36077,53 +36343,53 @@ index f92862c..5fd7c2b 100644 msgstr "Biltegien metadatuak irakurtzen fitxategi lokaletatik" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Konfigurazio-errorea: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Aukeren errorea: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Instalatua: %s-%s %s-(e)n" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Eraikia : %s %s-(e)n" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Egikaritua: %s %s-(e)n" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Komandoren bat eman behar duzu" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Ez dago halako komandorik: %s. Erabili %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Disko-eskakizunak:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Gutxienez %dMD gehiagoko espazioa behar da %s fitxategi-sisteman.\n" @@ -36134,7 +36400,7 @@ index f92862c..5fd7c2b 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -36143,74 +36409,74 @@ index f92862c..5fd7c2b 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" "Transakzioaren exekuzioa saiatzen baina ez dago egiteko ezer. Irteten." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Irteten erabiltzaile-komandoaren ondoren" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Paketeak deskargatzen:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Errorea paketeak deskargatzean:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "Transakzio-egiaztapena exekutatzen" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "ERROREA, rpm eguneratu behar duzu hau maneiatzeko:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "ERROREA transakzio-egiaztapena eta depsolve artean:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM eguneratu egin behar da" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Jakinarazi errore hau %s-(e)n" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Transakzio-testa exekutatzen" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Transakzioaren egiaztapen-errorea:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Transakzio-testak arrakasta izan du" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Transakzioa exekutatzen" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -36219,18 +36485,18 @@ index f92862c..5fd7c2b 100644 "Erabili \"-y\" gainidazteko." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Agian hau esan nahi zenuen: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "%s%s%s paketea(k) eskuragarri, baina ez daude instalatuta." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "%s%s%s paketea ez dago eskuragarri." @@ -36238,83 +36504,83 @@ index f92862c..5fd7c2b 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Instalatzeko paketea(k)" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "Pakete %d instalatzeko" -+msgstr[1] "%d pakete instalatzeko" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Ez dago egiteko ezer" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pakete markatu dira eguneratuak izateko" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "Pakete %d markatu da eguneratua izateko" -+msgstr[1] "%d pakete markatu dira eguneratuak izateko" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Ez da paketerik markatu eguneratua izateko" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pakete markatu dira banaketa sinkronizatzeko" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" -+msgstr[0] "Pakete %d markatu da banaketa sinkronizatzeko" -+msgstr[1] "%d pakete markatu dira banaketa sinkronizatzeko" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Ez da paketerik markatu banaketa sinkronizatzeko" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pakete markatu dira kenduak izateko" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "Pakete %d markatu da kendua izateko" -+msgstr[1] "%d pakete markatu dira kenduak izateko" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Ez da paketerik markatu kendua izateko" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Bertsio zaharragoa instalatzeko paketea(k)" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "Pakete %d bertsio zaharragoa instalatzeko" -+msgstr[1] "%d pakete bertsio zaharragoa instalatzeko" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (%s-(e)tik)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "%s%s%s%s pakete instalatua ez dago eskuragarri." @@ -36322,30 +36588,30 @@ index f92862c..5fd7c2b 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Berrinstalatzeko paketea(k)" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" -+msgstr[0] "Pakete %d berrinstalatzeko" -+msgstr[1] "%d pakete berrinstalatzeko" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Ez da paketerik adierazi" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Instalatzeko paketea(k)" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "N/S bat etortze: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -36353,7 +36619,7 @@ index f92862c..5fd7c2b 100644 "denean bilaketa egiteko." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -36362,13 +36628,13 @@ index f92862c..5fd7c2b 100644 " denean bilaketa egiteko." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Bat dator: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" @@ -36376,155 +36642,155 @@ index f92862c..5fd7c2b 100644 "denean bilaketa egiteko." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Abisua: Ez da bat datorrenik aurkitu honentzako: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Ez da parekatzerik aurkitu" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Ez da paketerik aurkitu %s-(e)rako" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Biltegiak garbitzen: " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Dena garbitzen" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Goiburuak garbitzen" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Paketeak garbitzen" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "XML metadatuak garbitzen" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Datu-basearen katxea garbitzen" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Metadatuen expire-cache garbitzen" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Katxetutako rpmdb datuak garbitzen" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "pluginak garbitzen" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "Abisua: Ez dago taldeen bat etortzerik: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Talde instalatuak:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "Instalatutako hizkuntza-taldeak:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Talde eskuragarriak:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "Eskuragarri dauden hizkuntza-taldeak:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Egina" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Abisua: %s taldea ez da existitzen." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "Eskatutako taldean ez dago paketerik instalatzeko edo eguneratzeko" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pakete instalatzeko" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "Pakete %d instalatzeko" -+msgstr[1] "%d pakete instalatzeko" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Ez da existitzen %s izena duen talderik" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Ez dago paketerik taldeetatik kentzeko" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pakete kentzeko" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "Pakete %d kentzeko" -+msgstr[1] "%d pakete kentzeko" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "%s paketea instalatuta dago, saltatzen" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Alderagarria ez den pkg %s.%s baztertzen" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" @@ -36532,18 +36798,18 @@ index f92862c..5fd7c2b 100644 "baterako" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Plugin aukerak" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Komando-lerroko errorea: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -36552,154 +36818,154 @@ index f92862c..5fd7c2b 100644 "%s: %s aukerak argumentua behar du" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color aukerak hauetako bat hartzen du: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot-ek bide-izen absolutua izan behar du: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "erakutsi laguntza-mezu hau eta irten" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "erroreekiko tolerantea izan" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "exekutatu osorik sistemaren katxetik, ez eguneratu katxea" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "konfigurazio-fitxategiaren kokapena" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "komandoen itxarote-denbora maximoa" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "arazketa-irteeraren maila" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "erakutsi bikoiztuak, biltegietan, zerrenda/bilaketa komandoetan" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "errore-irteeraren maila" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "arazketa-irteeraren maila rpm-rako" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "eragiketa lasaia" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "eragiketa berritsua" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "erantzun bai galdera guztiei" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" -+msgstr "erantzun ez galdera guztiei" ++msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "erakutsi Yum bertsioa eta irten" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "ezarri instalazio-erroa" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "gaitu biltegi bat edo gehiago (komodinak onartzen dira)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "desgaitu biltegi bat edo gehiago (komodinak onartzen dira)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "baztertu paketea(k) izenaren edo glob-aren arabera" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "desgaitu bazterketa main-etik, biltegi batetik edo denetik" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "gaitu zaharkituen prozesatzea eguneraketetan" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "desagitu Yum-en pluginak" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "desgaitu gpg sinaduren egiaztatzea" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "desgaitu pluginak izenaren arabera" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "gaitu pluginak izenaren arabera" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "saltatu mendekotasun-arazoak dituzten paketeak" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "kontrolatu kolorea erabiliko den" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" "ezarri $releasever balioa yum-en konfigurazioan eta biltegi-fitxategietan" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "ezarri konfigurazio- eta biltegi-aukera arbitrarioak" @@ -37043,23 +37309,23 @@ index f92862c..5fd7c2b 100644 msgstr "Mendekotasunengatik kentzen" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Saltatu egin da (mendekotasun-arazoak)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Ez instalatua" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Ez dago eskuragarri" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Paketea" +msgid_plural "Packages" @@ -37097,7 +37363,7 @@ index f92862c..5fd7c2b 100644 #, python-format msgid "" "\n" -@@ -892,57 +924,52 @@ msgstr "" +@@ -892,57 +924,58 @@ msgstr "" "Transakzio-laburpena\n" "%s\n" @@ -37105,7 +37371,7 @@ index f92862c..5fd7c2b 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Instalatu %5.5s pakete\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Instalatu" @@ -37113,23 +37379,23 @@ index f92862c..5fd7c2b 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Eguneratu %5.5s pakete\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" -+msgstr "Eguneratu" ++msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Kendu %5.5s pakete\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" -+msgstr "Kendu" ++msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Berrinstalatu %5.5s pakete\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Berrinstalatu" @@ -37137,316 +37403,322 @@ index f92862c..5fd7c2b 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Instalatu %5.5s paketeren bertsio zaharragoa\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Bertsio zaharra instalatu" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "Kendua" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Mendekotasuna kendu da" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Mendekotasuna instalatu da" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Mendekotasuna eguneratu da" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Ordezkatua" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Huts egin du" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "bi" -@@ -950,7 +977,7 @@ msgstr "bi" +@@ -950,7 +983,7 @@ msgstr "bi" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -960,364 +987,416 @@ msgstr "" +@@ -960,364 +993,416 @@ msgstr "" "\n" " Uneko deskarga bertan behera utzi da, %sinterrupt (ktrl-c) berriro%s %s%s%s segundotan\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "erabiltzaileak utzia" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Guztira" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Sistema" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Batutako %d transakzioa %d-ra saltatzen, teilakatu egiten baitira" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "Ez dago transakziorik" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Transakzio-ID, edo pakete, okerra(k) eman dira" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "Komando-lerroa" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Saioa hasteko erabiltzailea" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "IDa" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Data eta ordua" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Ekintza(k)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Aldatua" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Ez da transakzio-IDrik eman" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Transakzio-ID okerra eman da" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Ez da aurkitu emandako transakzio-IDarekin" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Transakzio-ID bat baino gehiago aurkitu da!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Ez da transakzio-IDrik, edo paketerik, eman" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Bertsio zaharra instalatua" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Zaharragoa" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Berriagoa" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "Transakzio-IDa :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Hasiera-ordua :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Hasierako rpmdb-a :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "(%u segundo)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "(%u minutu)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "(%u ordu)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "(%u egun)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Amaiera-ordua :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Amaierako rpmdb-a :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Erabiltzailea :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Itzulera-kodea :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Abortatua" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "Hutsegiteak:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Hutsegitea:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Arrakasta" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Komando-lerroa :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Informazio gehigarri ez-lehenetsia gorde da: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Transakzioa honekin burutu da:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Aldatutako paketeak:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Saltatutako paketeak:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Rpmdb-arazoak:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Scriptlet-irteera:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Erroreak:" @@ -37455,17 +37727,17 @@ index f92862c..5fd7c2b 100644 -msgstr "Instalatu" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Mendekotasunak instalatu" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Zaharkitutzat hartzen" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Ezabatu" @@ -37478,292 +37750,292 @@ index f92862c..5fd7c2b 100644 -msgstr "Bertsio zaharra instalatu" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Eguneratu" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Noiz" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Azken eguna" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Azken astea" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Azken 2 asteak" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Azken 3 hilabeteak" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Azken 6 hilabeteak" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Azken urtea" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Duela urtebete inguru" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Ez da %s transakziorik aurkitu" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Transakzioaren IDa:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Historia-informazio gehigarria eskuragarri:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Ez da datu gehigarririk aurkitu izen horrekin" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" -+msgstr "Paketea :" ++msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" -+msgstr "Egoera :" ++msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" -+msgstr "Tamaina :" ++msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" -+msgstr "Eraikitze-ostalaria :" ++msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" -+msgstr "Eraikitze-ordua :" ++msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" -+msgstr "Paketatzailea :" ++msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" -+msgstr "Hornitzailea :" ++msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" -+msgstr "Lizentzia :" ++msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" -+msgstr "URLa :" ++msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" -+msgstr "Jatorrizko RPMa :" ++msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" -+msgstr "Egikaritze-ordua :" ++msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" -+msgstr "Bidaltzailea :" ++msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" -+msgstr "Arrazoia :" ++msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" -+msgstr "Biltegi honetatik :" ++msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" -+msgstr "Instalatzailea :" ++msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" -+msgstr "Aldatzailea :" ++msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "instalatua" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "eguneraketa bat" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "ezabatua" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "berrinstalatua" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "bertsio-zahartze bat" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "zaharkitzen" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "eguneratua" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "zaharkitua" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> %s.%s %s:%s-%s paketea %s egingo da" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Transakzio-egiaztapena exekutatzen" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Mendekotasun-ebazpena berrabiarazten aldaketa berriekin." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Amaitu da mendekotasunen ebazpena" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Mendekotasuna prozesatzen: %s %s paketerako" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Paketea mantentzen: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Ebatzi gabeko mendekotasuna: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Paketea: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1326,7 +1405,7 @@ msgstr "" +@@ -1326,7 +1411,7 @@ msgstr "" "\n" " Behar du: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1335,7 +1414,7 @@ msgstr "" +@@ -1335,7 +1420,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1344,7 +1423,7 @@ msgstr "" +@@ -1344,7 +1429,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1353,88 +1432,88 @@ msgstr "" +@@ -1353,88 +1438,88 @@ msgstr "" " Ez da aurkitu" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Eguneratu duena" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Bertsio zaharra hobetsi duena" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Zaharkitutzat hartu duena" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Eskuragarri" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Gatazka prozesatzen: %s-(e)k gatazka du %s-(e)kin" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> Transakzio-multzoa sortzen hautatutako paketeekin. Itxaron mesedez." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" @@ -37771,149 +38043,149 @@ index f92862c..5fd7c2b 100644 "dadin." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Exekutatzen" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Lotan" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Ezin da eten" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zonbia" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Aztarnatua/Gelditua" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Ezezaguna" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Beste aplikazioa PackageKit da" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Beste aplikazioa %s da" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Memoria: %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Hasiera: %s - duela %s" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Egoera : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1444,7 +1523,7 @@ msgstr "" +@@ -1444,7 +1529,7 @@ msgstr "" "\n" "Irteten erabiltzaileak bertan behera utzi duelako" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1454,7 +1533,7 @@ msgstr "" +@@ -1454,7 +1539,7 @@ msgstr "" "\n" "Irteten kanalizazio hautsiagatik" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1465,7 +1544,7 @@ msgstr "" +@@ -1465,7 +1550,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1473,35 +1552,35 @@ msgstr "" +@@ -1473,35 +1558,35 @@ msgstr "" "Beste aplikazio batek yum blokeatuta dauka; irteten exit_on_lock-en " "konfiguratuta dagoenari kasu eginez" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "PluginExit errorea: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum errorea: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Errorea: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " --skip-broken erabiltzen saia zaitezke arazoa saihesteko" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " rpm -Va --nofiles --nodigest exekutatzen saia zaitezke" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Errore ezezaguna(k): Irteera-kodea: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1509,7 +1588,7 @@ msgstr "" +@@ -1509,7 +1594,7 @@ msgstr "" "\n" "Mendekotasunak ebatzi dira" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Osatua!" -@@ -1521,7 +1600,7 @@ msgstr " Mini erabilera:\n" +@@ -1521,7 +1606,7 @@ msgstr " Mini erabilera:\n" msgid "You need to be root to perform this command." msgstr "Erroa izan behar duzu komando hau exekutatzeko." @@ -37922,7 +38194,7 @@ index f92862c..5fd7c2b 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1549,54 +1628,54 @@ msgstr "" +@@ -1549,54 +1634,54 @@ msgstr "" "\n" "Informazio gehiagorako, jarri harremanetan zure banaketa- edo pakete-hornitzailearekin.\n" @@ -37989,7 +38261,7 @@ index f92862c..5fd7c2b 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1606,307 +1685,300 @@ msgstr "" +@@ -1606,307 +1691,296 @@ msgstr "" " Exekutatu \"yum repolist all\" dauzkazun biltegiak ikusteko.\n" " Biltegiak gaitzeko, yum-config-manager --enable erabil dezakezu" @@ -38093,7 +38365,7 @@ index f92862c..5fd7c2b 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "Erakutsi, edo erabili, taldeen informazioa" ++msgstr "" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -38122,7 +38394,7 @@ index f92862c..5fd7c2b 100644 +#: ../yumcommands.py:833 +#, python-format +msgid "Invalid groups sub-command, use: %s." -+msgstr "Baliogabeko talde-azpikomandoa, erabili: %s." ++msgstr "" -#: ../yumcommands.py:550 +#: ../yumcommands.py:929 @@ -38190,155 +38462,154 @@ index f92862c..5fd7c2b 100644 msgstr "Pakete lokalen prozesua konfiguratzen" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Zehaztu zein paketek hornitzen duen emandako mendekotasunaz" - +-msgid "Determine which package provides the given dependency" +-msgstr "Zehaztu zein paketek hornitzen duen emandako mendekotasunaz" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Mendekotasunetarako paketeak bilatzen:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Exekutatu yum shell interaktiboa" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Yum shell konfiguratzen" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Zerrendatu pakete baten mendekotasunak" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Mendekotasunak aurkitzen: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Erakutsi konfiguratutako software-biltegiak" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "gaitua" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "desgaitua" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Biltegi-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Biltegi-izena : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Biltegi-egoera : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Biltegi-berrikuspena: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Biltegi-etiketak : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Banaketa-biltegi-etiketak: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Biltegi-eguneratua: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Biltegi-pkgs: " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Biltegi-tamaina: " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Biltegi-baseurl: " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Biltegi-metaesteka: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Eguneratua : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Biltegi-ispiluak: " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Inoiz ez (azkena: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Berehala (azkena: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s segundo (azkena: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Biltegi-iraungipena: " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Biltegi-baztertu: " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Biltegi-barneratu: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Biltegi-baztertua: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Biltegi-izena: " @@ -38346,192 +38617,192 @@ index f92862c..5fd7c2b 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "biltegi id-a" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "egoera" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "biltegi-izena" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Erakutsi erabilera-mezu laguntzailea" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Ez dago laguntzarik %s-(e)rako" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1916,7 +1988,7 @@ msgstr "" +@@ -1916,7 +1990,7 @@ msgstr "" "\n" "aliasak: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1926,85 +1998,125 @@ msgstr "" +@@ -1926,85 +2000,125 @@ msgstr "" "\n" "aliasa: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Berrinstalazio-prozesua konfiguratzen" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "Berrinstalatu pakete bat" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Bertsio zaharragoaren instalazio-prozesua konfiguratzen" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "Pakete baten bertsio zaharragoa instalatu" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Erakutsi bertsio bat makinarako eta/edo biltegi eskuragarriak." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Yum bertsio-taldeak:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Taldea :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Paketeak:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Instalatua:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Talde-instalatua:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Eskuragarri:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Talde-eskuragarri:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Erakutsi, edo erabili, transakzio-historia" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" -+msgstr "Transakzioak:" ++msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" -+msgstr "Hasiera-ordua :" ++msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" -+msgstr "Amaiera-ordua :" ++msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" -+msgstr "Zenbaketa :" ++msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" -+msgstr " NEVRAC :" ++msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" -+msgstr " NEVRA :" ++msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" -+msgstr " NA :" ++msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" -+msgstr " NEVR :" ++msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" -+msgstr " rpm DB :" ++msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" -+msgstr " yum DB :" ++msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Baliogabeko historia-azpikomandoa, erabili: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Ez daukazu historiaren DBra sartzeko baimenik." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Begiratu arazorik dagoen rpmdb-an" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "kargatu gordetako transakzio bat fitxategi-izen batetik" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "Ez da gordetako transakzioaren fitxategia adierazi." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "transakzioa kargatzen %s fitxategitik" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Transakzioa kargatua %s-(e)tik, %s kide" -@@ -2015,28 +2127,35 @@ msgstr "Transakzioa kargatua %s-(e)tik, %s kide" +@@ -2015,28 +2129,32 @@ msgstr "Transakzioa kargatua %s-(e)tik, %s kide" msgid " Yum checks failed: %s" msgstr " Yum egiaztapenak huts egin du: %s" @@ -38540,9 +38811,8 @@ index f92862c..5fd7c2b 100644 -"Another app is currently holding the yum lock; waiting for it to exit..." -msgstr "Beste aplikazio batek yum blokeatuta dauka; irten dadin itxaroten..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" +msgstr "" -+"Ez dago irakurtzeko/idazteko baimenik uneko direktorioan, errora mugitzen" -#: ../yummain.py:120 +#: ../yummain.py:124 @@ -38570,287 +38840,285 @@ index f92862c..5fd7c2b 100644 msgstr "" -"Zure transakzioa gorde egin da, berrexekutatzeko erabili hau: yum load-" -"transacion %s" -+"Zure transakzioa gorde egin da, berrexekutatzeko erabili hau:\n" -+" yum load-transacion %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2046,75 +2165,75 @@ msgstr "" +@@ -2046,75 +2164,75 @@ msgstr "" "\n" "Irteten erabiltzeileak eragiketa bertan behera utzi duelako." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" "Transakzio-multzoak konfiguratzen konfigurazio-klasea aktibatu baino lehen" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Baliogabeko tsflag konfigurazio-fitxategian: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Bilatzen pkgSack mendekotasunetarako: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Kidea: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s bihurtu instalatzeko" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "%s paketea gehitzen %s moduan" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "%s paketea kentzen" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s-(e)k behar du: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s-(e)k %s behar du" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Beharrezko eskakizuna blokeatu da jadanik" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Beharrezko eskakizuna ez da pakete-izena. Bilatzen: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Balizko hornitzailea: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Modua %s da %s-(r)en hornitzailerako: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "pkg-rako moduak %s-(e)az hornitzen: %s" -@@ -2122,116 +2241,116 @@ msgstr "pkg-rako moduak %s-(e)az hornitzen: %s" +@@ -2122,116 +2240,116 @@ msgstr "pkg-rako moduak %s-(e)az hornitzen: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "%s eguneratzen saiatzen dep konpontzeko" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Ez da eguneratze-biderik aurkitu %s-(e)rako Hutsegitea!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s paketeak behar duen %s ezabatzeko markatu da" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: %s zaharkitu bihurtzen %s ordez, mendekotasuna konpontzeko." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: %s eguneratzen mendekotasuna konpontzeko." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Ezin da eguneraketa-biderik aurkitu %s-(e)rako" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "%s-(r)en bat etortze azkarra %s-(e)rako behar delako" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" "%s hornitutako paketeetan dago baina jadanik instalatuta dago, kentzen." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Konponketak ekar ditzakeen %s paketeak instantzia berria du ts-n." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" "Konponketak ekar ditzakeen %s paketeak instantzia berria du instalatuta." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s jadanik tx-en, saltatzen hau" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: %s markatzen %s-(r)en eguneraketa gisa" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: %s markatzen %s-(r)en instalazio gisa" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Arrakasta - transakzio hutsa" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Berrabiarazten begizta" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Amaitzen mendekotasun-prozesatzea" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Arrakasta - mendekotasunak konpondu dira" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "%s-(r)en mendekotasunak egiaztatzen" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "%s bilatzen %s-(e)k behar duelako" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "compare_providers() exekutatzen %s-(e)rako" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "Arkitektura hobea %s po-an" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s-(e)k %s zaharkitu bihurtzen du" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2240,146 +2359,146 @@ msgstr "" +@@ -2240,146 +2358,146 @@ msgstr "" "%s eta %s alderatu dira %s-(e)n\n" " Irabazlea: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "%s eta %s sourcerpm komuna" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "%s oinarrizko paketea instalatu da %s-(e)rako" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "%s-(r)en aurrizki komuna %s eta %s artean" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "minimoa behar du: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Irabazlea: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Galtzailea (%d-(r)ekin): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Ordenarik onena: %s" @@ -38987,7 +39255,7 @@ index f92862c..5fd7c2b 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2387,21 +2506,21 @@ msgstr "" +@@ -2387,21 +2505,21 @@ msgstr "" "Amaitu gabeko transakzioak geratu dira. Lehenengo yum-complete-transaction " "exekutatu beharko zenuke haiek amaitzeko." @@ -39013,7 +39281,7 @@ index f92862c..5fd7c2b 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2409,91 +2528,94 @@ msgstr "" +@@ -2409,91 +2527,94 @@ msgstr "" "\n" "Mendekotasun-arazoengatik saltatutako paketeak:" @@ -39048,7 +39316,7 @@ index f92862c..5fd7c2b 100644 msgstr "gatazka instalazioan" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -39056,18 +39324,18 @@ index f92862c..5fd7c2b 100644 " batzuk gertatu dira" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Transakzioa ezin izan da abiarazi:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Ezin izan da transakzioa exekutatu." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "%s transakzio-fitxategia kentzeak huts egin du" @@ -39075,7 +39343,7 @@ index f92862c..5fd7c2b 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s instalatuko zela uste zen baina ez dago instalatuta!" @@ -39086,27 +39354,27 @@ index f92862c..5fd7c2b 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s kenduko zela uste zen baina ez da kendu!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Ezin da %s blokeoa ireki: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Ezin izan da egiaztatu %s PIDa aktibo dagoen ala ez" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" @@ -39114,39 +39382,39 @@ index f92862c..5fd7c2b 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Ezin izan da blokeoa sortu %s-(e)n: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2502,41 +2624,30 @@ msgstr "" +@@ -2502,41 +2623,30 @@ msgstr "" "Paketea ez dator bat esandako deskargarekin. Iradokizuna: exekutatu yum " "--enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Ezin izan da checksum-a egin" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Paketea ez dator bat checksum-arekin" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" "paketeak huts egin du checksum-ean baina katxea gaituta dago %s-(e)rako" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "%s-(r)en kopia lokala erabiltzen" @@ -39163,165 +39431,165 @@ index f92862c..5fd7c2b 100644 -" * behar da %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Goiburua ez dago osorik." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2544,62 +2655,64 @@ msgstr "" +@@ -2544,62 +2654,64 @@ msgstr "" "Goiburua ez dago katxe lokalean eta katxea-bakarrik modua dago gaituta. Ezin" " da %s deskargatu" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "%s-(r)entzako gako publikoa ez dago instalatuta" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Arazoa %s paketea irekitzen" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "%s-(r)entzako gako publikoa ez da fidagarria" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "%s paketea ez dago sinatuta" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Ezin da %s kendu" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s kendu da" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Ezin da %s fitxategi %s kendu" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s fitxategi %s kendu da" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s fitxategi kendu dira" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "Fitxategi %d %s kendu da" -+msgstr[1] "%d %s fitxategi kendu dira" ++msgstr[0] "" ++msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Bat etortze bat baino gehiago dago multzoan %s(e)rako" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ezer ez dator bat %s-(r)ekin.%s %s:%s-%s eguneraketatik" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2607,122 +2720,124 @@ msgstr "" +@@ -2607,122 +2719,125 @@ msgstr "" "searchPackages() desagertu egingo da yum-en etorkizuneko bertsio batean." " Erabili searchGenerator() haren ordez. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "%d pakete bilatzen" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "Pakete %d bilatzen" -+msgstr[1] "%d pakete bilatzen" ++msgstr[0] "" ++msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "Pakete %s bilatzen" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "fitxategi-sarreretan bilatzen" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "hornitze-sarreretan bilatzen" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Ez dago talde-daturik eskuragarri konfiguratutako biltegietarako" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Ez da existitzen %s deritzon talderik" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "%s paketea ez da markatua izan %s taldean" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "%s taldeko %s paketea gehitzen" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Ez dago %s izeneko paketerik eskuragarri instalatua izateko" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Abisua: %s taldeak ez du paketerik." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "%s taldeak %u baldintza-pakete ditu, instalatuak izan daitezkeenak." @@ -39329,79 +39597,80 @@ index f92862c..5fd7c2b 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "%s pakete-tuplea ez da aurkitu pakete-multzoan" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "%s pakete-tuplea ez da aurkitu rpmdb-n" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "Baliogabeko bertsio-bandera: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Ez da paketerik aurkitu %s-(e)rako" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Package Object ez da pakete-objektuen instantzia bat" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Ez da instalatzeko ezer zehaztu" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Hornitze birtualen edo fitxategi-hornitzeen bila %s-(e)rako" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Ez dago bat etortzerik argumenturako: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "%s paketea instalatuta dago eta ez dago eskuragarri" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Ez dago paketerik eskuragarri instalatua izateko" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paketea: %s - jadanik transakzio-multzoan" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" "%s paketea zaharkitua dago, bere ordezkoa den %s paketea instalatuta dago" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -39410,20 +39679,20 @@ index f92862c..5fd7c2b 100644 "eskakizunak betetzen" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" "%s paketea zaharkitua dago, bere ordezkoa %s da, %s instalatzen saiatzen" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "%s paketea jadanik instalatuta dago bere azken bertsioan" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" @@ -39431,43 +39700,43 @@ index f92862c..5fd7c2b 100644 #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Dena eguneratzen" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Ez eguneratzen jadanik zaharkitua dagoen paketea: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "Ez dago eguneratzeko bat datorren paketerik: %s" ++msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paketea zaharkitua dago jadanik: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Ez eguneratzen zaharkitua dagoen paketea: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Ez eguneratzen jadanik eguneratua dagoen paketea: %s.%s %s:%s-%s" @@ -39475,43 +39744,43 @@ index f92862c..5fd7c2b 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Ez dago kentzeko bat datorren paketerik" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "Ez dago kentzeko bat datorren paketerik: %s" ++msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Exekutatzen ari den kernela saltatzen: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "%s kentzen transakziotik" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Ezin da ireki: %s. Saltatzen." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "%s aztertzen: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Ezin da lokalean instalatu deltarpm: %s. Saltatzen." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" @@ -39519,14 +39788,14 @@ index f92862c..5fd7c2b 100644 "Ezin da %s paketea gehitu transakzioari. Arkitektura ez da bateragarri: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" "Ezin da %s paketea instalatu. Instalatutako %s paketeak zaharkitu egin du" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -39535,323 +39804,338 @@ index f92862c..5fd7c2b 100644 "hura instalatzeko." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2839,96 +2960,101 @@ msgstr "" +@@ -2839,138 +2960,138 @@ msgstr "" "%s.%s paketea ez dago instalatua, ezin da eguneratu. Exekutatu yum install " "hura instalatzeko." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "%s baztertzen" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "%s markatzen instalatua izateko" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "%s markatzen %s(r)en eguneraketa gisa" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: ez du instalatutako paketea eguneratzen." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Ezin da fitxategia ireki: %s. Saltatzen." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Arazoa berrinstalatzean: kentzeko paketeak ez datoz bat" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Arazoa berrinstalatzean: %s paketea ez dator bat instalazioarekin" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Ez dago paketerik eskuragarri bertsio zaharragoa instalatzeko" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "%s paketeari instalazio anitz onartzen zaizkio, saltatzen" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Ez dago bat etortzerik eskuragarri dagoen paketerako: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Bertsio-berritzea soilik dago eskuragarri pakete honetarako: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Bertsio zaharragoa instalatzeak huts egin du: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" -+msgstr "Eguneraketak huts egin du: %s" ++msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "Gakoa atzitzen %s-(e)tik" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "GPG gakoaren atzipenak huts egin du: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" "%s gakoaren GPG gako-sinadura ez dator bat biltegiaren CA gakoarekin: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "GPG gako-sinadura CA gakoen aurka egiaztatu dira" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "GPG gako baliogabea %s-(e)tik: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG gakoaren analisiak huts egin du: gakoak ez dauka %s balioa" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2941,7 +3067,7 @@ msgstr "" - " Paketea: %s (%s)\n" - " Nondik : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" + msgstr "" +-"%s gakoa inportatzen 0x%s:\n" +-" Erabiltzaile-IDa: %s\n" +-" Paketea: %s (%s)\n" +-" Nondik : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2952,25 +3078,25 @@ msgstr "" - " Erabiltzaile-IDa: \"%s\"\n" - " Nondik : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" + msgstr "" +-"%s gakoa inportatzen 0x%s:\n" +-" Erabiltzaile-IDa: \"%s\"\n" +-" Nondik : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "%s-(e)ko GPG gakoa (0x%s) jadanik instalatuta dago" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Gakoaren inportazioak huts egin du (%d kodea)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Gakoa ongi inportatu da" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "Ez da gakorik instalatu" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2979,25 +3105,25 @@ msgstr "" +@@ -2979,25 +3100,25 @@ msgstr "" "\"%s\" biltegirako zerrendatu diren GPG gakoak jadanik instalatuta daude, baina ez dira zuzenak pakete honetarako.\n" "Egiaztatu gako URL zuzena konfiguratuta dagoela biltegi honetarako." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Gako(ar)en inportazioak ez du balio izan, gako okerra(k)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "%s (0x%s)-(e)ko GPG gakoa jadanik inportatuta dago" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Gakoaren inportazioak huts egin du" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Ez da gakorik instalatu %s biltegirako" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3006,160 +3132,184 @@ msgstr "" +@@ -3006,160 +3127,184 @@ msgstr "" "\"%s\" biltegirako zerrendatu diren GPG gakoak jadanik instalatuta daude, baina ez dira zuzenak.\n" "Egiaztatu gako URL zuzena konfiguratuta dagoela biltegi honetarako." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Ezin izan da ispilu egokia aurkitu." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Erroreak aurkitu dira paketeak deskargatzean." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Jakinarazi errore hau %s-(e)n" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Probatu transakzio-erroreak: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Ezin izan da katxe-direktorioa ezarri: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" "Mendekotasunak ez dira konpondu. Ez da gordeko konpondu gabeko transakzioa." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Ezin izan da %s transakzio-fitxategia gorde: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Ezin izan da atzitu/irakurri gordetako %s transakzioa: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " -msgstr "" +msgstr "rpmdb ver mismatched saved transaction version, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr " ezikusten, eskatu den bezala." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr " abortatzen." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "ezin da tsflags aurkitu edo tsflags ez da balio osoa." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "txmbr uneko egoera ezezagunean aurkitu da: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Ezin izan da txmbr aurkitu: %s %s egoeran" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Ezin izan da txmbr aurkitu: %s jatorritik: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Transakzio-kideak, erlazioak galdu dira edo ts aldatua izan da," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr " ezikusten, eskatu den bezala. Redepsolve erabili behar duzu!" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." -+msgstr "%s jadanik bisitatu da eta ezin da kendu." ++msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" -+msgstr "%s paketearen revdep-ak aztertzen" ++msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." -+msgstr "%s paketeak %s revdep-a du, jadanik erabiltzaileak instalatutakoa." ++msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "%s paketeak ez dauka erabiltzaileak instalatutako revdep-ik." ++msgstr "" + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 @@ -39950,7 +40234,7 @@ index f92862c..5fd7c2b 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s-(e)k %s hornitzen du baina ezin da aurkitu" -@@ -3168,6 +3318,17 @@ msgstr "%s-(e)k %s hornitzen du baina ezin da aurkitu" +@@ -3168,6 +3313,17 @@ msgstr "%s-(e)k %s hornitzen du baina ezin da aurkitu" msgid "Repackaging" msgstr "Birpaketatzen" @@ -39969,10 +40253,10 @@ index f92862c..5fd7c2b 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/fi.po b/po/fi.po -index 269bf15..021b9b7 100644 +index 269bf15..eec91f6 100644 --- a/po/fi.po +++ b/po/fi.po -@@ -2,13 +2,14 @@ +@@ -2,14 +2,15 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -39985,11 +40269,13 @@ index 269bf15..021b9b7 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -17,122 +18,124 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -40007,30 +40293,30 @@ index 269bf15..021b9b7 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Asennetaan" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Vanhennettu" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Päivitetty" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Poistettu" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Asennettu" @@ -40057,7 +40343,7 @@ index 269bf15..021b9b7 100644 msgstr "Poistettiin: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Poistetaan" @@ -40083,53 +40369,53 @@ index 269bf15..021b9b7 100644 msgstr "Luetaan asennuslähteiden metadataa paikallisista tiedostoista" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Asetusvirhe: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Valitsinvirhe: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Asennettiin : %s-%s ajassa %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Käännettiin : %s ajassa %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Suoritettiin: %s ajassa %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Jokin komento on annettava" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Komentoa %s ei ole olemassa. Käytä komentoa %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Vaadittu levytila:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format 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" @@ -40140,7 +40426,7 @@ index 269bf15..021b9b7 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -40149,74 +40435,74 @@ index 269bf15..021b9b7 100644 "--------------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 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:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Lopetetaan, käyttäjä antoi lopetuskomennon" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Ladataan paketteja:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Virhe pakettien latauksessa:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "VIRHE RPM on päivitettävä, jotta se osaa käsitellä:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM on päivitettävä" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Ilmoita tästä ongelmasta osoitteeseen %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Suoritetaan transaktiotestiä" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Transaktiotarkistuksen virhe:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Transaktiotesti onnistui" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Suoritetaan transaktiota" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -40225,19 +40511,19 @@ index 269bf15..021b9b7 100644 "Käytä valitsinta ”-y” tämän muuttamiseksi." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Tarkoititko: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, 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:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Pakettia %s%s%s ei ole saatavilla." @@ -40245,7 +40531,7 @@ index 269bf15..021b9b7 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Asennettavat paketit" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -40254,13 +40540,13 @@ index 269bf15..021b9b7 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Ei mitään tehtävää" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pakettia merkitty päivitettäväksi" @@ -40270,12 +40556,12 @@ index 269bf15..021b9b7 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Yhtään pakettia ei ole merkitty päivitettäväksi" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pakettia merkitty jakelusynkronointia varten" @@ -40285,12 +40571,12 @@ index 269bf15..021b9b7 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Yhtään pakettia ei ole merkitty jakelusynkronointia varten" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pakettia merkitty poistettavaksi" @@ -40300,14 +40586,14 @@ index 269bf15..021b9b7 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Yhtään pakettia ei ole merkitty poistettavaksi" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Vanhennettavat paketit" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -40315,13 +40601,13 @@ index 269bf15..021b9b7 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (asennuslähteestä %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Asennettua pakettia %s%s%s%s ei ole saatavilla." @@ -40329,7 +40615,7 @@ index 269bf15..021b9b7 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Uudelleenasennettavat paketit" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -40337,153 +40623,153 @@ index 269bf15..021b9b7 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Yhtään pakettia ei annettu" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Asennettavat paketit" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Löytyi: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Varoitus: hakutuloksia ei löytynyt hakusanalle %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Hakutuloksia ei löytynyt" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Hakusanalla %s ei löytynyt pakettia" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Siivotaan asennuslähteitä:" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Siivotaan kaikki" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Siivotaan otsakkeet" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Siivotaan paketit" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Siivotaan XML-metadata" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Siivotaan tiedokannan välimuisti" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Siivotaan välimuistin vanhentumiseen liittyvä metadata" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Siivotaan välimuistissa oleva rpm-tietokannan data" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Siivotaan liitännäiset" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Asennetut ryhmät:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Saatavilla olevat ryhmät:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Valmis" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Varoitus: Ryhmää %s ei ole olemassa." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 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:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pakettia asennettavana" @@ -40493,18 +40779,18 @@ index 269bf15..021b9b7 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Ryhmää nimeltä %s ei ole olemassa" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Ei yhtään poistettavaa pakettia ryhmien perusteella" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d poistettavaa pakettia" @@ -40514,20 +40800,20 @@ index 269bf15..021b9b7 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paketti %s on jo asennettu, ohitetaan" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, 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:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" @@ -40535,18 +40821,18 @@ index 269bf15..021b9b7 100644 "asennettavien luetteloon" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Liitännäisten valitsimet" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Komentorivivirhe: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -40555,159 +40841,159 @@ index 269bf15..021b9b7 100644 "%s: valitsin %s vaatii argumentin" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color vaatii yhden seuraavista argumenteista: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "näytä tämä ohjeviesti ja lopeta" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "hyväksy virheet" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "toimi kokonaan välimuistista, älä päivitä sitä" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "asetustiedoston sijainti" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "komennon suurin odotusaika" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "virheenjäljitystulosteiden taso" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "näytä duplikaatit asennuslähteissä ja list/search-komennoissa" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "virhetulostustaso" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "rpm:n virheenjäljitystulosteiden taso" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "hiljainen toiminta" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "yksityiskohtaset tulosteet" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "vastaa kyllä kaikkiin kysymyksiin" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "näytä Yumin versio ja lopeta" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "aseta asennusjuuri" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" "ota käyttöön yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" "poista käytöstä yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "jätä pois paketteja nimen tai jokerimerkkien perusteella" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 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:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "ota käyttöön vanhentuneiden pakettien käsittely päivitysten aikana" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "poista Yumin liitännäiset käytöstä" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "poista GPG-allekirjoitusten tarkistus käytöstä" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "poista liitännäisiä käytöstä nimen perusteella" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "ota liitännäisiä käyttöön nimen perusteella" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "ohita paketit, joilla on riippuvuusongelmia" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "käytetäänkö värejä" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" "aseta $releasever-muuttujan arvo yumin asetuksissa ja " "asennuslähdetiedostoissa" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "aseta mielivaltaisia asetus- ja asennuslähdevalitsimia" @@ -41051,22 +41337,22 @@ index 269bf15..021b9b7 100644 msgstr "Poistetaan riippuvuuksien vuoksi" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Ohitettiin (riippuvuusongelmia)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Ei asennettu" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Paketti" +msgid_plural "Packages" @@ -41104,7 +41390,7 @@ index 269bf15..021b9b7 100644 #, python-format msgid "" "\n" -@@ -894,57 +926,52 @@ msgstr "" +@@ -894,57 +926,58 @@ msgstr "" "Transaktion yhteenveto\n" "%s\n" @@ -41112,7 +41398,7 @@ index 269bf15..021b9b7 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Asennetaan %5.5s paketti(a)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Asennus" @@ -41120,7 +41406,7 @@ index 269bf15..021b9b7 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Päivitetään %5.5s paketti(a)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" +msgstr "" @@ -41128,7 +41414,7 @@ index 269bf15..021b9b7 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Poistetaan %5.5s paketti(a)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "" @@ -41136,7 +41422,7 @@ index 269bf15..021b9b7 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Asennetaan uudelleen %5.5s paketti(a)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Uudelleenasennus" @@ -41144,316 +41430,322 @@ index 269bf15..021b9b7 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Varhennetaan %5.5s paketti(a)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Varhennus" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "Poistettu" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Poistettu riippuvuuksia" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Asennettu riippuvuuksia" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Päivitetty riippuvuuksia" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Korvattu" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Epäonnistui" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "kahden" -@@ -952,7 +979,7 @@ msgstr "kahden" +@@ -952,7 +985,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -963,365 +990,417 @@ msgstr "" +@@ -963,365 +996,417 @@ msgstr "" " Nykyinen lataus peruttiin, %skeskeytä (ctrl-c) uudelleen%s %s%s%s sekunnin aikana\n" "ohjelman lopettamiseksi.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "käyttäjä keskeytti" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Yhteensä" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "A" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "Vanh." -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "P" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "U" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "Varh." -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "P" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Järjestelmä" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Annettu virheellinen transaktiotunnus tai paketit" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Kirjautunut käyttäjä" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "Tunniste" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Päivämäärä ja kellonaika" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Toiminnot" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Muutettu" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Transaktiotunnusta ei annettu" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Annettiin virheellinen transaktiotunnus" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Annettua transaktiotunnusta ei löytynyt" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Löytyi useampi kuin yksi transaktiotunnus!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Transaktiotunnusta tai pakettia ei annettu" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Varhennettu" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Vanhempi" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Uudempi" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "Transaktiotunnus :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Aloitusaika :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "RPM-tietokanta alussa :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Lopetusaika :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "RPM-tietokanta lopussa:" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Käyttäjä :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Lopetuskoodi :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Keskeytetty" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Epäonnistui:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Onnistui" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Komentorivi :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Tallennetut lisätiedot: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Transaktio suoritettiin:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Muutetut paketit:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Ohitetut paketit:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Rpmdb:n ongelmia:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Sovelman tuloste:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Virheet:" @@ -41462,17 +41754,17 @@ index 269bf15..021b9b7 100644 -msgstr "Asennus" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Riippuvuuden asennus" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Vanhentava" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Poisto" @@ -41485,441 +41777,441 @@ index 269bf15..021b9b7 100644 -msgstr "Varhennus" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Päivitys" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Aika" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Eilen" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Viime viikolla" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Viimeisen kahden viikon aikana" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Viimeisen kolmen kuukauden aikana" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Viimeisen kuuden kuukauden aikana" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Viime vuonna" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Yli vuosi sitten" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Transaktiota %s ei löytynyt" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Transaktiotunnus:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Käytettävissä olevaa historiatietoa:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Lisätietoja ei löytynyt tällä nimellä" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "asennettavaksi" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "poistettavaksi" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "asennettavaksi uudelleen" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "päivitettäväksi" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "vanhennettavaksi" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Suoritetaan transaktiotarkistusta" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" "--> Aloitetaan riippuvuuksien tarkistus uudelleen uusien muutosten kanssa." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Riippuvuuksien tarkistus valmistui" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Käsitellään riipuvuutta: %s paketille: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Pidetään paketti: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Ratkaisematon riippuvuus: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Paketti: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1330,7 +1409,7 @@ msgstr "" +@@ -1330,7 +1415,7 @@ msgstr "" "\n" " Vaatii: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1339,7 +1418,7 @@ msgstr "" +@@ -1339,7 +1424,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1348,7 +1427,7 @@ msgstr "" +@@ -1348,7 +1433,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1357,85 +1436,85 @@ msgstr "" +@@ -1357,85 +1442,85 @@ msgstr "" " Ei löytynyt" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Päivittää" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Varhentaa" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Vanhentaa" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Saatavilla" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Käsitellään ristiriitaa: %s on ristiriidassa paketin %s kanssa" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Täytetään transaktiojoukkoa valituilla paketeilla. Odota hetki." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Ladataan paketin %s otsaketta transaktiojoukkoon lisäämseksi." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Suoritetaan" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Unessa" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Ei voi keskeyttää" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombi" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Jäljitetään/Pysäytetty" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Tuntematon" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Toinen ohjelma on: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Toinen ohjelma on: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Muisti : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Aloitettu : %s - %s sitten" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Tila : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1445,7 +1524,7 @@ msgstr "" +@@ -1445,7 +1530,7 @@ msgstr "" "\n" "Lopetetaan käyttäjän peruttua" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1455,7 +1534,7 @@ msgstr "" +@@ -1455,7 +1540,7 @@ msgstr "" "\n" "Lopetetaan putken katkettua" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1466,7 +1545,7 @@ msgstr "" +@@ -1466,7 +1551,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1474,36 +1553,36 @@ msgstr "" +@@ -1474,36 +1559,36 @@ msgstr "" "Toinen ohjelma pitää tällä hetkellä yumin lukkoa. Lopetetaan, kuten " "exit_on_lock määrää" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "PluginExit-virhe: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum-virhe: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Virhe: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " Ongelman pystyy ehkä kiertämään valitsimella --skip-broken" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" " Kannattaa myös kokeilla komennon rpm -Va --nofiles --nodigest suorittamista" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Tuntematon virhe: lopetuskoodi: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1511,7 +1590,7 @@ msgstr "" +@@ -1511,7 +1596,7 @@ msgstr "" "\n" "Riippuvuudet on ratkaistu" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Valmis!" -@@ -1523,7 +1602,7 @@ msgstr "" +@@ -1523,7 +1608,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Vain pääkäyttäjä voi suorittaa tämän komennon." @@ -41928,7 +42220,7 @@ index 269bf15..021b9b7 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1552,54 +1631,54 @@ msgstr "" +@@ -1552,54 +1637,54 @@ msgstr "" "\n" "Lisätietoja saattaa olla jakelun tai pakettien tarjoajan ohjeissa.\n" @@ -41994,7 +42286,7 @@ index 269bf15..021b9b7 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1609,306 +1688,299 @@ msgstr "" +@@ -1609,306 +1694,295 @@ msgstr "" " Suorita ”yum repolist all” kaikkien asennuslähteiden luettelemiseksi.\n" " Voit ottaa asennuslähteitä käyttöön komennolla yum-config-manager --enable " @@ -42194,354 +42486,353 @@ index 269bf15..021b9b7 100644 msgstr "Aloitetaan paikallinen pakettiprosessi" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Selvitä mikä paketti tarjoaa annetun riippuvuuden" - +-msgid "Determine which package provides the given dependency" +-msgstr "Selvitä mikä paketti tarjoaa annetun riippuvuuden" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Etsitään riippuvuutta paketeista:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Suorita interaktiivinen yum-komentorivi" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Asetetaan Yum-komentoriviä" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Luettele paketin riippuvuudet" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Etsitään riippuvuuksia: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Näytä asetetut asennuslähteet" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "käytössä" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "poissa käytöstä" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Lähdetunnus : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Lähdenimi : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Lähteen tila : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Lähderevisio : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Lähteen tagit : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Lähteen jakelutagit: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Lähde päivitetty : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Lähteen paketit : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Lähteen koko : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Lähteen baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Lähteen metalink : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Päivitetty : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Lähteen peilit : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Ei koskaan (viimeksi: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Heti (viimeksi: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekunti(a) (viimeksi: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Lähde vanhentuu : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Lähde ohittaa : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Lähde sisältää : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Lähde ohitettu : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "lähdetunnus" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "tila" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "lähdenimi" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Näytä käyttöohjeviesti" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Ei ohjeita komennolle %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1918,7 +1990,7 @@ msgstr "" +@@ -1918,7 +1992,7 @@ msgstr "" "\n" "muut nimet: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1928,86 +2000,126 @@ msgstr "" +@@ -1928,86 +2002,126 @@ msgstr "" "\n" "toinen nimi: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Aloitetaan uudelleenasennusprosessi" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "asenna paketti uudelleen" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Aloitetaan varhennusprosessi" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "varhenna paketti" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 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:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Yum-versioryhmät:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Ryhmä:" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Paketit:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Asennettu:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Asennettu ryhmässä:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Saatavilla:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Saatavilla ryhmässä:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Näytä tai käytä transaktiohistoriaa" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Virheellinen historyn alikomento, käytä: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Sinulla ei ole historiatietokannan käyttöoikeutta" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Etsi ongelmia rpm-tietokannasta" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -2018,28 +2130,34 @@ msgstr "" +@@ -2018,28 +2132,34 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" -#: ../yummain.py:114 +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" +msgstr "" + +#: ../yummain.py:124 @@ -42579,279 +42870,279 @@ index 269bf15..021b9b7 100644 msgid "" "\n" "\n" -@@ -2049,74 +2167,74 @@ msgstr "" +@@ -2049,74 +2169,74 @@ msgstr "" "\n" "Lopetetaan käyttäjän peruttua." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Asetetaan TransactionSetsit ennen kuin asetusluokka on käytössä" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Virheellinen tsflag asetustiedostossa: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Etsitään pkgSackista riippuvuutta: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Jäsen: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s muutettu asennukseksi" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Lisätään paketti %s tilassa %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Poistetaan paketti %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s vaatii: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s vaatii %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Tarvittava vaatimus on jo etsitty, huijataan" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, 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:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Mahdollinen tarjoaja: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Tila %s riippuvuuden %s: %s tarjoajalla" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Riippuvuuden %s: %s tarjoavan paketin tila" -@@ -2124,117 +2242,117 @@ msgstr "Riippuvuuden %s: %s tarjoavan paketin tila" +@@ -2124,117 +2244,117 @@ msgstr "Riippuvuuden %s: %s tarjoavan paketin tila" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, 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:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" "TSINFO: Vanhennetaan paketti %s paketilla %s riippuvuuden ratkaisemiseksi." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Päivitetään paketti %s riippuvuuden ratkaisemiseksi." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Päivityspolkua ei löydetty riippuvuudelle: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Pikavastaavuus %s vaatimukselle %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, 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:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, 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:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi asennettuna." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "paketti %s on jo ts:ssä, ohitetaan" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Merkitään paketti %s päivitykseksi paketille %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Merkitään %s asennukseksi paketille %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Onnistui - tyhjä transaktio" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Käynnistetään silmukka uudelleen" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Riippuvuuksien käsittely päättyy" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Onnistui – riippuvuudet on ratkaistu" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Tarkistetaan paketin %s riippuvuuksia" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "etsitään riippuvuutta %s paketille %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Suoritetaan compare_providers() paketeille %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "po:ssa %s on parempi arkkitehtuuri" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "paketti %s vanhentaa paketin %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2243,142 +2361,142 @@ msgstr "" +@@ -2243,142 +2363,142 @@ msgstr "" "archdist vertasi paketteja %s ja %s arkkitehtuurilla %s\n" " Voittaja: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "paketeilla %s ja %s on yhteinen lähde-RPM" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "peruspaketti %s on asennettu paketille %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "yhteinen %s merkin mittainen etuliite paketeilla %s ja %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "vaatii vähintään: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Voittaja: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Häviäjä (arvolla %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Paras järjestys %s" @@ -42984,7 +43275,7 @@ index 269bf15..021b9b7 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2386,21 +2504,21 @@ msgstr "" +@@ -2386,21 +2506,21 @@ msgstr "" "Keskeneräisiä transaktioita on jäljellä. Niiden päättämiseksi on suositeltua" " suorittaa ensin yum-complete-transaction." @@ -43010,7 +43301,7 @@ index 269bf15..021b9b7 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2408,88 +2526,91 @@ msgstr "" +@@ -2408,88 +2528,91 @@ msgstr "" "\n" "Riippuvuusongelmien vuoksi ohitetut paketit:" @@ -43043,7 +43334,7 @@ index 269bf15..021b9b7 100644 msgstr "asennettu konflikti" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -43051,18 +43342,18 @@ index 269bf15..021b9b7 100644 "tapahtui transaktion aikana." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Transaktiota ei voitu aloittaa:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Transaktiota ei voitu suorittaa." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Transaktiotiedoston %s poistaminen epäonnistui" @@ -43070,7 +43361,7 @@ index 269bf15..021b9b7 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s piti olla asennettuna, mutta se ei ole!" @@ -43081,66 +43372,66 @@ index 269bf15..021b9b7 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s piti olla poistettu, mutta se ei ole!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Lukkoa %s ei voitu avata: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, 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:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, 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:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Ei voitu luoda lukkoa sijaintiin %s: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2498,41 +2619,30 @@ msgstr "" +@@ -2498,41 +2621,30 @@ msgstr "" "Paketti ei vastaa odotettua latausta. Ehdotus: suorita yum --enablerepo=%s " "clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Ei voitu laskea tarkistussummaa" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Paketti ei vastaa tarkistussummaa" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, 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:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "käytetään paikallista kopiota paketista %s" @@ -43157,69 +43448,69 @@ index 269bf15..021b9b7 100644 -" * tarvitaan %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Otsake ei ole täydellinen." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2540,62 +2650,64 @@ msgstr "" +@@ -2540,62 +2652,64 @@ 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:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Julkista avainta pakettia %s varten ei ole asennettu" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Ongelma paketin %s avaamisessa" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Paketin %s julkiseen avaimeen ei luoteta" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Pakettia %s ei ole allekirjoitettu" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Ei voida poistaa tiedostoa %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "tiedosto %s on poistettu" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Ei voida poistaa %s-tyyppistä tiedostoa %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s-tyyppinen tiedosto %s on poistettu" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s-tyyppistä tiedostoa on poistettu" @@ -43229,28 +43520,28 @@ index 269bf15..021b9b7 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, 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:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, 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:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2603,121 +2715,123 @@ msgstr "" +@@ -2603,121 +2717,124 @@ msgstr "" "searchPackages() poistetaan jossakin Yumin tulevassa versiossa. Käytä sen " "sijaan searchGenerator()-metodia.\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Etsitään %d pakettia" @@ -43260,62 +43551,62 @@ index 269bf15..021b9b7 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "etsitään pakettia %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "etsitään tiedostoista" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "etsitään tarjoajista" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Asetetuille asennuslähteille ei ole saatavilla ryhmädataa" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Ryhmää nimeltä %s ei ole olemassa" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "pakettia %s ei ollut merkitty kuuluvaksi ryhmään %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Lisätään paketti %s ryhmästä %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Pakettia nimeltä %s ei ole saatavilla asennusta varten" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -43323,99 +43614,100 @@ index 269bf15..021b9b7 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Paketti-tuplea %s ei löytynyt pakettisäkistä" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Paketti-tuplea %s ei löytynyt RPM-tietokannasta" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Riippuvuudelle %s ei löytynyt pakettia" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Pakettiolio ei ollutkaan pakettiolioinstanssi" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Mitään ei määritelty asennettavaksi" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Etsitään virtuaalista tai tiedostotarjoajaa argumentille %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Mikään ei vastaa argumenttia: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Paketti %s on asennettu, mutta ei saatavilla" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Yhtään pakettia ei ole saatavilla asennettavaksi" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paketti: %s – on jo transaktiojoukossa" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, 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:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2726,83 +2840,89 @@ msgstr "" +@@ -2726,83 +2843,89 @@ msgstr "" "Paketin %s vanhentaa paketti %s, mutta vanhentava paketti ei tarjoa " "riippuvuuksia" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, 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:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Paketti %s on jo asennettuna ja uusin versio" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" @@ -43423,43 +43715,43 @@ index 269bf15..021b9b7 100644 #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Päivitetään kaikki" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, 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:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, 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:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Ei päivitetä vanhennettua pakettia: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, 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" @@ -43467,67 +43759,67 @@ index 269bf15..021b9b7 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Yhtään poistopyyntöä vastaavaa pakettia ei ole" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Ohitetaan käytössä oleva ydin: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Poistetaan %s transaktiosta" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Ei voida avata pakettia: %s. Ohitetaan." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Tutkitaan %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Deltarpm:ää %s ei voi asentaa paikallisesti. Ohitetaan." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2810,12 +2930,12 @@ msgstr "" +@@ -2810,12 +2933,12 @@ msgstr "" "Pakettia %s ei voida lisätä transaktioon. Arkkitehtuuri ei ole yhteensopiva:" " %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "Pakettia %s ei voi asentaa. Asennettu paketti %s vanhentaa sen." -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2824,104 +2944,109 @@ msgstr "" +@@ -2824,139 +2947,146 @@ msgstr "" "Pakettia %s ei ole asennettu, sitä ei voida päivittää. Suorita yum install " "-komento paketin asentamiseksi." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -43535,310 +43827,318 @@ index 269bf15..021b9b7 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Ohitetaan paketti %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Merkitään paketti %s asennettavaksi" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Merkitään paketti %s päivitykseksi paketille %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: ei päivitä asennettua pakettia" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Ei voida avata tiedostoa: %s. Ohitetaan." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" "Ongelma uudelleenasennuksessa: poistopyyntöä vastaavaa pakettia ei ole" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" "Ongelma uudelleenasennuksessa: asennuspyyntöä vastaavaa pakettia %s ei ole" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Yhtään pakettia ei ole saatavilla varhennettavaksi" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Paketille %s sallitaan useita asennuksia, ohitetaan." -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Ei vastaavuutta saatavilla olevalle paketille: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Vain päivitys saatavilla paketille: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Varhentaminen epäonnistui: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "GPG-avaimen nouto epäonnistui: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Virheellinen GPG-avain osoitteesta %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, 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:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2930,7 +3055,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2938,25 +3063,25 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo asennetuna" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Avaimen tuonti epäonnistui (koodi %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Avaimen tuonti onnistui" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2965,25 +3090,25 @@ msgstr "" +@@ -2965,25 +3095,25 @@ msgstr "" "Asennuslähteelle ”%s” luetellut GPG-avaimet on jo asennettu, mutta ne eivät vastaa tätä pakettia.\n" "Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Avainten tuonti ei auttanut, ovatko avaimet vääriä?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, 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:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Avaimen tuonti epäonnistui" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2992,157 +3117,181 @@ msgstr "" +@@ -2992,157 +3122,181 @@ msgstr "" "Asennuslähteelle ”%s” luetellut GPG-avaimet on jo asennettu, mutta ne ovat virheelliset.\n" "Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Sopivaa peilipalvelinta ei löytynyt." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Paketteja ladatessa tapahtui virheitä." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Ilmoita tästä ongelmasta: %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Testitransaktion virheitä: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Välimuistihakemiston asettaminen epäonnistui %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -43938,7 +44238,7 @@ index 269bf15..021b9b7 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s tarjoaa %s, mutta sitä ei löydy" -@@ -3151,6 +3300,17 @@ msgstr "%s tarjoaa %s, mutta sitä ei löydy" +@@ -3151,6 +3305,17 @@ msgstr "%s tarjoaa %s, mutta sitä ei löydy" msgid "Repackaging" msgstr "Paketoidaan uudelleen" @@ -43957,7 +44257,7 @@ index 269bf15..021b9b7 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/fr.po b/po/fr.po -index 4636b15..6444485 100644 +index 4636b15..a80098f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,14 +2,16 @@ @@ -43975,9 +44275,9 @@ index 4636b15..6444485 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-28 05:51+0000\n" -+"Last-Translator: dominique \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-12-02 20:09+0000\n" ++"Last-Translator: shaiton \n" "Language-Team: French (http://www.transifex.net/projects/p/yum/team/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43998,30 +44298,31 @@ index 4636b15..6444485 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" - msgstr "Installation de" +-msgstr "Installation de" ++msgstr "Installation de " -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Obsolète " -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Mis à jour " -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Supprimés " -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Installé " @@ -44048,7 +44349,7 @@ index 4636b15..6444485 100644 msgstr "Supprimé : %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Suppression " @@ -44074,64 +44375,66 @@ index 4636b15..6444485 100644 msgstr "Lecture des méta données du dépôt depuis les fichiers locaux" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Erreur de configuration : %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Erreur d'options : %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installés : %s-%s à %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" - msgstr " Compilé : %s à %s" +-msgstr " Compilé : %s à %s" ++msgstr " Compilé : %s à %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" - msgstr " Commité : %s à %s" +-msgstr " Commité : %s à %s" ++msgstr " Commité : %s à %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Vous devez spécifier des commandes" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Aucune commande telle que : %s. Veuillez utiliser %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Besoins en espace disque :\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Au moins %d Mio requis sur le système de fichiers %s.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" +msgstr[0] " Au moins %d Mio requis sur le système de fichiers %s.\n" -+msgstr[1] "Au moins %d Mio requis sur le système de fichiers %s.\n" ++msgstr[1] " Au moins %d Mio requis sur le système de fichiers %s.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -44140,76 +44443,76 @@ index 4636b15..6444485 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" "Tentative d'exécution de la transaction mais aucune tâche à effectuer. " "Sortie." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Arrêt à la demande de l'utilisateur" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Téléchargement des paquets :" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Erreur durant le téléchargement des paquets :\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "Test de la transaction en cours" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "ERREUR Vous devez mettre à jour rpm pour manipuler :" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" "ERREUR lors de la vérification de la transaction avec les dépendances :" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM doit être mis à jour" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Veuillez reporter cette erreur dans %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Lancement de la transaction de test" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Erreur du contrôle de transaction :\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Transaction de test réussie" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Lancement de la transaction" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -44218,18 +44521,18 @@ index 4636b15..6444485 100644 "Utilisez l'option « -y » pour passer outre." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Vouliez-vous dire : " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Le ou les paquets %s%s%s sont disponibles, mais non installés." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Aucun paquet %s%s%s disponible." @@ -44237,7 +44540,7 @@ index 4636b15..6444485 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paquets à installer" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -44246,74 +44549,74 @@ index 4636b15..6444485 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Rien à faire" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paquets marqués pour mise à jour" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "%d paquet marqué pour mise à jour" -+msgstr[1] "%d paquets marqués pour mise à jour" ++msgstr[0] "%d paquet à mettre à jour" ++msgstr[1] "%d paquets à mettre à jour" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Aucun paquet marqué pour mise à jour" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d paquets marqués pour la synchronisation de la distribution" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" -+msgstr[0] "%d paquet marqué pour la synchronisation de la distribution" -+msgstr[1] "%d paquets marqués pour la synchronisation de la distribution" ++msgstr[0] "%d paquet marqué pour une synchronisation de distribution" ++msgstr[1] "%d paquets marqués pour une synchronisation de distribution" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Aucun paquet marqué pour la synchronisation de la distribution" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paquets marqués pour suppression" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "%d paquet marqué pour suppression" -+msgstr[1] "%d paquets marqués pour suppression" ++msgstr[0] "%d paquet à supprimer" ++msgstr[1] "%d paquets à supprimer" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Aucun paquet marqué pour suppression" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paquets à rétrograder" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "%d paquet à rétrograder" -+msgstr[1] "%d paquets à rétrograder" ++msgstr[0] "%d paquet à passer à une version antérieur" ++msgstr[1] "%d paquets à passer à une version antérieur" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "(depuis %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Paquets installés %s%s%s%s indisponibles." @@ -44321,7 +44624,7 @@ index 4636b15..6444485 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paquets à réinstaller" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -44329,22 +44632,22 @@ index 4636b15..6444485 100644 +msgstr[1] "%d paquets à réinstaller" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Pas de paquet fourni" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Paquets à installer" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "Non spécifié, correspond à : %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -44352,7 +44655,7 @@ index 4636b15..6444485 100644 "all » pour une recherche complète." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -44361,14 +44664,14 @@ index 4636b15..6444485 100644 "« search all » pour une recherche complète." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" -msgstr " Marqués : %s" +msgstr "Marqués : %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" @@ -44376,113 +44679,113 @@ index 4636b15..6444485 100644 "search all » pour une recherche complète." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Attention : aucune correspondance trouvée pour : %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Aucune correspondance trouvée" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Aucun paquet trouvé pour %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Nettoyage des dépôts : " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Nettoyage complet" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Nettoyage des en-têtes" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Nettoyage des paquets" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Nettoyage des méta données xml" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Nettoyage du cache de la base de données" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Nettoyage des méta données expirées dans le cache" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Nettoyage des données du cache de RPMDB" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Nettoyage des modules complémentaires" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "Attention : aucun groupe ne correspond : %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Groupes installés :" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "Groupes de langues installés :" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Groupes disponibles :" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "Groupes de langues disponibles :" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Effectué" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Attention : le groupe %s n'existe pas." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "Aucun paquet disponible pour installation ou mise à jour dans les groupes " "demandés" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d paquet(s) à installer" @@ -44492,59 +44795,59 @@ index 4636b15..6444485 100644 +msgstr[1] "%d paquets à installer" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Aucun groupe nommé %s n'existe" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Aucun paquet du groupe à supprimer" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paquet(s) à supprimer" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "%d paquet à supprimer" -+msgstr[1] "%d paquets à supprimer" ++msgstr[0] "%d paquet à désinstaller" ++msgstr[1] "%d paquets à désinstaller" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Le paquet %s est déjà installé, omission" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Rejet du paquet non comparable %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" "Pas d'autre %s installé, ajout à la liste pour installation potentielle" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Options du plugin" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Erreur sur la ligne de commande : %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -44553,158 +44856,158 @@ index 4636b15..6444485 100644 "%s : l'option %s requiert un argument" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color accepte les paramètres : auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot doit correspondre à un chemin absolu : %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "affiche ce message d'aide et quitte" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "tolère les erreurs" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "exécute entièrement depuis le cache, sans le mettre à jour" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "emplacement du fichier de configuration" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "temps d'attente maximum de la commande" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "niveau de déboguage pour la sortie" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "affiche les doublons dans les dépôts, pour les commandes list/search" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "niveau d'erreur pour la sortie" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "niveau de déboguage pour rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "opération silencieuse" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "opération verbeuse" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "répondre oui à toutes les questions" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "répondre non à toutes les questions" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "affiche la version de Yum et quitte" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "définit la racine d'installation" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "active un ou plusieurs dépôts (jokers autorisés)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "désactive un ou plusieurs dépôts (jokers autorisés)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" "exclut des paquets par leur nom (le caractère * générique peut être utilisé)" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" "désactive l'exclusion pour le dépôt principal, pour un dépôt particulier ou " "pour tout" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "active le traitement des paquets obsolètes pendant les mises à jour" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "désactive les modules complémentaires Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "désactive la vérification de clé gpg" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "désactive les modules complémentaires par nom" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "active les modules complémentaires par nom" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "omettre les paquets qui ont des problèmes de dépendances" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "contrôle l'utilisation de la couleur" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" "configuration de la valeur de $releasever dans le fichier de configuration " "de yum et dans les fichiers des dépôts" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "réinitialise la configuration ainsi que les options des dépôts" @@ -44777,7 +45080,8 @@ index 4636b15..6444485 100644 +#: ../output.py:798 #, python-format msgid "Name : %s%s%s" - msgstr "Nom : %s%s%s" +-msgstr "Nom : %s%s%s" ++msgstr "Nom : %s%s%s" -#: ../output.py:582 +#: ../output.py:799 @@ -44789,43 +45093,50 @@ index 4636b15..6444485 100644 +#: ../output.py:801 #, python-format msgid "Epoch : %s" - msgstr "Date : %s" +-msgstr "Date : %s" ++msgstr "Date : %s" -#: ../output.py:585 +#: ../output.py:802 #, python-format msgid "Version : %s" - msgstr "Version : %s" +-msgstr "Version : %s" ++msgstr "Version : %s" -#: ../output.py:586 +#: ../output.py:803 #, python-format msgid "Release : %s" - msgstr "Révision : %s" +-msgstr "Révision : %s" ++msgstr "Révision : %s" -#: ../output.py:587 +#: ../output.py:804 #, python-format msgid "Size : %s" - msgstr "Taille : %s" +-msgstr "Taille : %s" ++msgstr "Taille : %s" -#: ../output.py:588 ../output.py:900 +#: ../output.py:805 ../output.py:1198 #, python-format msgid "Repo : %s" - msgstr "Dépôt  : %s" +-msgstr "Dépôt  : %s" ++msgstr "Dépôt   : %s" -#: ../output.py:590 +#: ../output.py:807 #, python-format msgid "From repo : %s" - msgstr "Depuis le dépôt : %s" +-msgstr "Depuis le dépôt : %s" ++msgstr "Depuis le dépôt : %s" -#: ../output.py:592 +#: ../output.py:809 #, python-format msgid "Committer : %s" - msgstr "Auteur : %s" +-msgstr "Auteur : %s" ++msgstr "Auteur : %s" -#: ../output.py:593 +#: ../output.py:810 @@ -44837,7 +45148,8 @@ index 4636b15..6444485 100644 +#: ../output.py:811 #, python-format msgid "Buildtime : %s" - msgstr "Date de compilation : %s" +-msgstr "Date de compilation : %s" ++msgstr "Date de compilation : %s" -#: ../output.py:596 +#: ../output.py:813 @@ -44849,34 +45161,40 @@ index 4636b15..6444485 100644 +#: ../output.py:821 #, python-format msgid "Installed by: %s" - msgstr "Installés par : %s" +-msgstr "Installés par : %s" ++msgstr "Installés par  : %s" -#: ../output.py:611 +#: ../output.py:828 #, python-format msgid "Changed by : %s" - msgstr "Modifié par  : %s" +-msgstr "Modifié par  : %s" ++msgstr "Modifié par   : %s" -#: ../output.py:612 +#: ../output.py:829 msgid "Summary : " - msgstr "Résumé  : " +-msgstr "Résumé  : " ++msgstr "Résumé   : " -#: ../output.py:614 ../output.py:913 +#: ../output.py:831 ../output.py:1214 #, python-format msgid "URL : %s" - msgstr "URL : %s" +-msgstr "URL : %s" ++msgstr "URL : %s" -#: ../output.py:615 +#: ../output.py:832 msgid "License : " - msgstr "Licence  : " +-msgstr "Licence  : " ++msgstr "Licence   : " -#: ../output.py:616 ../output.py:910 +#: ../output.py:833 ../output.py:1211 msgid "Description : " - msgstr "Description : " +-msgstr "Description : " ++msgstr "Description  : " -#: ../output.py:684 +#: ../output.py:949 @@ -44916,13 +45234,15 @@ index 4636b15..6444485 100644 +#: ../output.py:1050 #, python-format msgid " Group-Id: %s" - msgstr " Id du g : %s" +-msgstr " Id du g : %s" ++msgstr " ID du groupe : %s" -#: ../output.py:786 +#: ../output.py:1055 #, python-format msgid " Description: %s" - msgstr " Description : %s" +-msgstr " Description : %s" ++msgstr " Description : %s" -#: ../output.py:788 +#: ../output.py:1057 @@ -44933,7 +45253,8 @@ index 4636b15..6444485 100644 -#: ../output.py:790 +#: ../output.py:1059 msgid " Mandatory Packages:" - msgstr " Paquets mandataires :" +-msgstr " Paquets mandataires :" ++msgstr " Paquets obligatoires :" -#: ../output.py:791 +#: ../output.py:1060 @@ -44965,7 +45286,8 @@ index 4636b15..6444485 100644 +#: ../output.py:1093 #, python-format msgid " dependency: %s" - msgstr " dépendance : %s" +-msgstr " dépendance : %s" ++msgstr " dépendance  : %s" -#: ../output.py:823 +#: ../output.py:1095 @@ -44981,18 +45303,21 @@ index 4636b15..6444485 100644 +#: ../output.py:1217 #, python-format msgid "License : %s" - msgstr "Licence  : %s" +-msgstr "Licence  : %s" ++msgstr "Licence  : %s" -#: ../output.py:919 +#: ../output.py:1220 #, python-format msgid "Filename : %s" - msgstr "Nom de fichier  : %s" +-msgstr "Nom de fichier  : %s" ++msgstr "Nom de fichier : %s" -#: ../output.py:923 +#: ../output.py:1224 msgid "Other : " - msgstr "Autre  :" +-msgstr "Autre  :" ++msgstr "Autre :" -#: ../output.py:966 +#: ../output.py:1280 @@ -45005,7 +45330,8 @@ index 4636b15..6444485 100644 +#: ../output.py:1285 #, python-format msgid "Total size: %s" - msgstr "Taille totale : %s" +-msgstr "Taille totale : %s" ++msgstr "Taille totale  : %s" -#: ../output.py:974 +#: ../output.py:1288 @@ -45034,7 +45360,8 @@ index 4636b15..6444485 100644 -#: ../output.py:1040 +#: ../output.py:1358 msgid "Downgrading" - msgstr "Retour à la version précédente" +-msgstr "Retour à la version précédente" ++msgstr "Retour à la version précédente " -#: ../output.py:1041 +#: ../output.py:1359 @@ -45052,23 +45379,23 @@ index 4636b15..6444485 100644 msgstr "Suppression pour dépendances " -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Omis (problèmes de dépendances) " -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Non installé" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Indisponible" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Paquet" +msgid_plural "Packages" @@ -45093,7 +45420,8 @@ index 4636b15..6444485 100644 -#: ../output.py:1077 +#: ../output.py:1395 msgid "Size" - msgstr "Taille " +-msgstr "Taille " ++msgstr "Taille" -#: ../output.py:1089 +#: ../output.py:1407 @@ -45106,7 +45434,7 @@ index 4636b15..6444485 100644 #, python-format msgid "" "\n" -@@ -903,57 +936,52 @@ msgstr "" +@@ -903,57 +936,58 @@ msgstr "" "Résumé de la transaction\n" "%s\n" @@ -45114,7 +45442,7 @@ index 4636b15..6444485 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Installation de %5.5s paquets\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Installation " @@ -45122,23 +45450,23 @@ index 4636b15..6444485 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Mise à jour de %5.5s paquets\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" -+msgstr "Mis à jour" ++msgstr "Mettre à jour" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Suppression de %5.5s paquets\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" -+msgstr "Supprimé" ++msgstr "Supprimer" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Réinstallation de %5.5s paquets\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Réinstallation" @@ -45146,317 +45474,333 @@ index 4636b15..6444485 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Retour à une version antérieur de %5.5s paquets\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Retour à la version précédente" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "Paquet en dépendance" ++msgstr[1] "Paquets en dépendance" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "Supprimés " -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Dépendances supprimées " -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Dépendances installées " -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Dépendances mises à jour " -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Remplacés " -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Échec" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "deux" -@@ -961,7 +989,7 @@ msgstr "deux" +@@ -961,7 +995,7 @@ msgstr "deux" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -972,367 +1000,419 @@ msgstr "" - "Téléchargement courant annulé, demandez de nouveau l%sinterruption (crtl-c)%s dans %s%s%s secondes\n" +@@ -969,370 +1003,422 @@ msgid "" + "to exit.\n" + msgstr "" + "\n" +-"Téléchargement courant annulé, demandez de nouveau l%sinterruption (crtl-c)%s dans %s%s%s secondes\n" ++"Téléchargement courant annulé, demandez de nouveau l'%sinterruption (crtl-c)%s dans %s%s%s secondes\n" "pour quitter.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "interruption par l'utilisateur" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Total" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Système" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" "Omission des transactions regroupées de %d à %d, puisqu'elles se superposent" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "Pas de transaction" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Le ou les paquets ou identifiants de transaction fournis sont erronés" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "Ligne de commande" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Identifiant utilisateur" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" - msgstr "Id" +-msgstr "Id" ++msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Date et heure" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Action" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Modifié" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Aucun identifiant de transaction n'a été fourni" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "L'identifiant de transaction fourni est erroné" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "L'identifiant de transaction fourni est introuvable" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Plus d'un identifiant de transaction a été trouvé !" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Le paquet ou l'identifiant de transaction fourni sont absents" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Rétrogradé" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Plus ancien" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Plus récent" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" - msgstr "Identifiant de transaction :" +-msgstr "Identifiant de transaction :" ++msgstr "ID de transaction :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" - msgstr "Temps de début :" +-msgstr "Temps de début :" ++msgstr "Temps de début :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" - msgstr "Début de RPMDB :" +-msgstr "Début de RPMDB :" ++msgstr "Début de RPMDB :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "(%u secondes)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "(%u minutes)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "(%u heures)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "(%u jours)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Temps de fin :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Fin de RPMDB :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" - msgstr "Utilisateur :" +-msgstr "Utilisateur :" ++msgstr "Utilisateur :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" - msgstr "Code retour :" +-msgstr "Code retour :" ++msgstr "Code retour :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Avorté" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "Échecs :" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Échec :" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Réussi" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Ligne de commande :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Informations supplémentaires stockées : %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Transaction effectuée avec :" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Paquets modifiés :" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Paquets ignorés :" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Problèmes RPMDB :" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Sortie du scriplet :" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Erreurs :" @@ -45465,17 +45809,18 @@ index 4636b15..6444485 100644 -msgstr "Installation " - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Installation déps." -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" - msgstr "Obsolète" +-msgstr "Obsolète" ++msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Supprimé" @@ -45488,445 +45833,453 @@ index 4636b15..6444485 100644 -msgstr "Retour à la version précédente" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Mise à jour" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Heure" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Dernier jour" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Semaine dernière" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Deux dernières semaines" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Trois derniers mois" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Six derniers mois" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "L'année dernière" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Il y a plus d'un an" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Aucune transaction %s n'a été trouvée" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Identifiant de transaction :" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Informations additionnelles disponibles dans l'historique :" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s : aucune donnée supplémentaire trouvée avec ce nom" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" -+msgstr "Paquet :" ++msgstr "Paquet  :" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" -+msgstr "État :" ++msgstr "État  :" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" -+msgstr "Taille :" ++msgstr "Taille  :" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" -+msgstr "Hôte de construction :" ++msgstr "Hôte de construction :" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" -+msgstr "Date de construction :" ++msgstr "Date de compilation :" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" -+msgstr "Empaqueteur :" ++msgstr "Empaqueteur  :" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" -+msgstr "Vendeur :" ++msgstr "Vendeur  :" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" -+msgstr "Licence :" ++msgstr "Licence  :" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" -+msgstr "URL :" ++msgstr "URL  :" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" -+msgstr "RPM source :" ++msgstr "source du RPM  :" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" -+msgstr "Date de validation :" ++msgstr "Heure de commit  :" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" -+msgstr "Proposé par :" ++msgstr "Committer  :" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" -+msgstr "Motif :" ++msgstr "Raison  :" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" -+msgstr "Depuis le dépôt :" ++msgstr "Depuis le dépôt  :" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" -+msgstr "Installé par :" ++msgstr "Installé par  :" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" -+msgstr "Changé par :" ++msgstr "Modifié par  :" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "installé" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" - msgstr "la mise à jour" +-msgstr "la mise à jour" ++msgstr "utilisé" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "effacé" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "réinstallé" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "une rétrogradation" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" - msgstr "obsolète" +-msgstr "obsolète" ++msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "mis à jour" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "obsolète" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Le paquet %s.%s %s:%s-%s sera %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Lancement de la transaction de test" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" "--> Redémarrage de la résolution des dépendances avec les nouveaux " "changements." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Résolution des dépendances terminée" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Traitement de la dépendance : %s pour le paquet : %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Conservation du paquet : %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Dépendance non résolue : %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Paquet : %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1341,7 +1421,7 @@ msgstr "" +@@ -1341,7 +1427,7 @@ msgstr "" "\n" " Requiert : %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1350,7 +1430,7 @@ msgstr "" +@@ -1350,7 +1436,7 @@ msgstr "" "\n" " %s : %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1359,7 +1439,7 @@ msgstr "" +@@ -1359,7 +1445,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1368,88 +1448,88 @@ msgstr "" +@@ -1368,88 +1454,88 @@ msgstr "" " Non trouvé" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Mis à jour par" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Rétrogradé par" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Rendu obsolète par" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Disponible" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Traitement du conflit : %s entre en conflit avec %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> Peuplement du jeu de transaction avec les paquets sélectionnés. Merci de" " patienter." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" - "--> Téléchargement de l'en-tête de %s pour l'ajouter à la transaction." +-"--> Téléchargement de l'en-tête de %s pour l'ajouter à la transaction." ++"---> Téléchargement de l'en-tête de %s pour l'ajouter à la transaction." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Exécution" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Mise en attente" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" - msgstr "Impossible d'interrompre" +-msgstr "Impossible d'interrompre" ++msgstr "Interruption impossible" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombie" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Tracé/Stoppé" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Inconnu" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" - msgstr " L'autre application est : PackageKit" +-msgstr " L'autre application est : PackageKit" ++msgstr "Il s'agit de PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" - msgstr " L'autre application est : %s" +-msgstr " L'autre application est : %s" ++msgstr "Il s'agit de %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Mémoire : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" - msgstr " Débuté : il y a %s - %s" +-msgstr " Débuté : il y a %s - %s" ++msgstr " Débuté  : %s - il y a %s" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" - msgstr " État : %s, pid : %d" +-msgstr " État : %s, pid : %d" ++msgstr " État  : %s, pid : %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1459,7 +1539,7 @@ msgstr "" +@@ -1459,7 +1545,7 @@ msgstr "" "\n" "Sortie sur annulation par l'utilisateur" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1469,7 +1549,7 @@ msgstr "" +@@ -1469,7 +1555,7 @@ msgstr "" "\n" "Sortie suite à une redirection cassée" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1480,7 +1560,7 @@ msgstr "" +@@ -1480,7 +1566,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1488,36 +1568,36 @@ msgstr "" +@@ -1488,36 +1574,36 @@ msgstr "" "Une autre application verrouille actuellement l'utilisation de yum ; " "fermeture en cours conformément à la configuration de exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Erreur de PluginExit : %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Erreur de yum : %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Erreur : %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" " Vous pouvez essayer d'utiliser --skip-broken pour contourner le problème" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Vous pouvez essayer d'exécuter : rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Erreur inconnue : code de sortie %d :" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1525,7 +1605,7 @@ msgstr "" +@@ -1525,7 +1611,7 @@ msgstr "" "\n" "Dépendances résolues" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Terminé !" -@@ -1537,7 +1617,7 @@ msgstr " Usage minimal :\n" +@@ -1537,7 +1623,7 @@ msgstr " Usage minimal :\n" msgid "You need to be root to perform this command." msgstr "Vous devez être super-utilisateur pour lancer cette commande." @@ -45935,7 +46288,7 @@ index 4636b15..6444485 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1567,53 +1647,53 @@ msgstr "" +@@ -1567,53 +1653,53 @@ msgstr "" "\n" "Pour plus de renseignements, contactez le fournisseur de paquets de votre distribution.\n" @@ -46001,7 +46354,7 @@ index 4636b15..6444485 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1623,309 +1703,302 @@ msgstr "" +@@ -1623,309 +1709,298 @@ msgstr "" " Exécutez « yum repolist all » pour consulter la liste des dépôts installés.\n" " Vous pouvez activer des dépôts avec la commande yum-config-manager --enable " @@ -46105,7 +46458,7 @@ index 4636b15..6444485 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "Afficher ou utiliser les informations des groupes" ++msgstr "Affiche ou utilise les informations des groupes" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -46134,7 +46487,7 @@ index 4636b15..6444485 100644 +#: ../yumcommands.py:833 +#, python-format +msgid "Invalid groups sub-command, use: %s." -+msgstr "Sous-commande de groupes invalides, utiliser %s" ++msgstr "Sous-commande de groupe invalide : %s." -#: ../yumcommands.py:550 +#: ../yumcommands.py:929 @@ -46204,356 +46557,377 @@ index 4636b15..6444485 100644 msgstr "Configuration du processus de paquets locaux" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Détermine quel paquet fournit une dépendance donnée" - +-msgid "Determine which package provides the given dependency" +-msgstr "Détermine quel paquet fournit une dépendance donnée" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Recherche dans les paquets pour la dépendance :" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Lance un shell yum interactif" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Configuration du shell Yum" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Liste les dépendances d'un paquet" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Recherche de dépendances :" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Affiche les dépôts logiciels configurés" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "activé" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "désactivé" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " - msgstr "Id du dépôt : " +-msgstr "Id du dépôt : " ++msgstr "Id du dépôt : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " - msgstr "Nom du dépôt : " +-msgstr "Nom du dépôt : " ++msgstr "Nom du dépôt : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " - msgstr "État du dépôt : " +-msgstr "État du dépôt : " ++msgstr "État du dépôt : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " - msgstr "Révision du dépôt :" +-msgstr "Révision du dépôt :" ++msgstr "Révision du dépôt  : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " - msgstr "Tags du dépôt :" +-msgstr "Tags du dépôt :" ++msgstr "Tags du dépôt : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " - msgstr "Repo-distro-tags : " +-msgstr "Repo-distro-tags : " ++msgstr "Repo-distro-tags  : " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " - msgstr "Mise à jour du dépôt :" +-msgstr "Mise à jour du dépôt :" ++msgstr "Mise à jour du dépôt : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " - msgstr "Paquets du dépôt  : " +-msgstr "Paquets du dépôt  : " ++msgstr "Paquets du dépôt  : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " - msgstr "Taille du dépôt  : " +-msgstr "Taille du dépôt  : " ++msgstr "Taille du dépôt   : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " - msgstr "Baseurl du dépôt : " +-msgstr "Baseurl du dépôt : " ++msgstr "Baseurl du dépôt  : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " - msgstr "Méta-lien du dépôt :" +-msgstr "Méta-lien du dépôt :" ++msgstr "Méta-lien du dépôt  : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " - msgstr " Mis à jour : " +-msgstr " Mis à jour : " ++msgstr " Mis à jour : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " - msgstr "Miroirs du dépôt :" +-msgstr "Miroirs du dépôt :" ++msgstr "Miroirs du dépôt  : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Jamais (dernier : %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Instant (dernier : %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s secondes (en date du : %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " - msgstr "Expiration du dépôt : " +-msgstr "Expiration du dépôt : " ++msgstr "Expiration du dépôt : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " - msgstr "Exclus du dépôt :" +-msgstr "Exclus du dépôt :" ++msgstr "Exclus du dépôt  : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " - msgstr "Inclus au dépôt :" +-msgstr "Inclus au dépôt :" ++msgstr "Inclus au dépôt  : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " - msgstr "Exclus du dépôt : " +-msgstr "Exclus du dépôt : " ++msgstr "Exclus du dépôt  : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" -+msgstr "Nom du dépôt : " ++msgstr "Nom du dépôt : " #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "id du dépôt" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "statut" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "nom du dépôt" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Affiche un message d'aide à l'utilisation" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Aucune aide disponible pour %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1935,7 +2008,7 @@ msgstr "" +@@ -1935,7 +2010,7 @@ msgstr "" "\n" "alias : " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1945,85 +2018,125 @@ msgstr "" +@@ -1945,85 +2020,125 @@ msgstr "" "\n" "alias : " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Configuration du processus de réinstallation" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "Réinstaller un paquet" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Configuration du processus de retour à une version antérieure" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "Restaure un paquet à une version antérieure" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Affiche une version de la machine ou des dépôts disponibles" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "Groupes de version de yum :" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" - msgstr "Groupe :" +-msgstr "Groupe :" ++msgstr " Groupe :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" - msgstr "Paquets :" +-msgstr "Paquets :" ++msgstr " Paquets :" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" - msgstr "Installés :" +-msgstr "Installés :" ++msgstr "Installés :" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" - msgstr "Groupe installé :" +-msgstr "Groupe installé :" ++msgstr "Groupes installés :" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Disponible :" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Groupes disponibles :" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Affiche ou utilise l'historique de transaction" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" -+msgstr "Transactions" ++msgstr "Transactions :" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" -+msgstr "Heure de début :" ++msgstr "Début  :" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" -+msgstr "Heure de fin :" ++msgstr "Fin  :" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" -+msgstr "Compteurs :" ++msgstr "Nombre :" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr " rpm DB :" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr " yum DB :" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Sous-commande de l'historique invalide, utilisez : %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Vous n'avez pas accès à la base de données de l'historique." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Recherche des problèmes dans RPMDB" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "charge une transaction sauvegardée à partir d'un nom de fichier" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "Aucun fichier de sauvegarde de transaction spécifié." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "Chargement de la transaction à partir de %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Transaction chargée à partir de %s avec %s membres" -@@ -2034,30 +2147,37 @@ msgstr "Transaction chargée à partir de %s avec %s membres" +@@ -2034,30 +2149,38 @@ msgstr "Transaction chargée à partir de %s avec %s membres" msgid " Yum checks failed: %s" msgstr " Échec du vérificateur de Yum : %s" -#: ../yummain.py:114 +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" +msgstr "" -+"Pas d'accès en lecture/écriture dans le répertoire courant, déplacé vers /" ++"Pas d'accès en lecture/écriture sur le répertoire courant, on se déblace " ++"dans /" + +#: ../yummain.py:124 +msgid "Can't create lock file; exiting" @@ -46586,160 +46960,162 @@ index 4636b15..6444485 100644 msgstr "" -"Votre transaction a été sauvegardée, relancez-là avec : yum load-transaction" -" %s" -+"Votre transaction est sauvegardée, relancez-la avec : \n" -+"yum load-transaction %s" ++"Votre transaction a été enregistrée, relancez-la avec :\n" ++" yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2067,74 +2187,74 @@ msgstr "" +@@ -2067,74 +2190,74 @@ msgstr "" "\n" "Sortie sur annulation par l'utilisateur." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() sera supprimé dans une future version de Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Mise en place de l'ensemble des transactions avant configuration" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "tsflag invalide dans le fichier de configuration : %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Recherche dans le regroupement pour la dépendance : %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Membre : %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s converti pour installation" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Ajout du paquet %s en mode %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Suppression du paquet %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s requiert : %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s requiert %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Le prérequis a déjà été trouvé, on triche" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Le prérequis n'est pas un nom de paquet. Recherche de : %s " -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Fournisseur potentiel : %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Le mode est %s pour le fournisseur de %s : %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Mode pour le paquet qui fournit %s : %s" -@@ -2142,119 +2262,119 @@ msgstr "Mode pour le paquet qui fournit %s : %s" +@@ -2142,265 +2265,265 @@ msgstr "Mode pour le paquet qui fournit %s : %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Éssai de mise à jour de %s pour résoudre les dépendances" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Pas de chemin de mise à jour pour %s. Échec !" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO : le paquet %s requiert la suppression de %s" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "TSINFO : Obsolescence de %s avec %s pour résoudre les dépendances." +-msgstr "TSINFO : Obsolescence de %s avec %s pour résoudre les dépendances." ++msgstr "TSINFO : obsolescence de %s avec %s pour résoudre les dépendances." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." - msgstr "TSINFO : Mise à jour de %s pour la résolution des dépendances." +-msgstr "TSINFO : Mise à jour de %s pour la résolution des dépendances." ++msgstr "TSINFO : mise à jour de %s pour la résolution des dépendances." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" "Impossible de trouver un chemin de mise à jour pour la dépendance de : %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Correspondance %s trouvée pour %s " #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s est dans les paquets fournis mais est déjà installé, suppression." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" @@ -46747,7 +47123,7 @@ index 4636b15..6444485 100644 " dépendance." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" @@ -46755,120 +47131,124 @@ index 4636b15..6444485 100644 " version plus récente." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s déjà dans ts, omission de celui-ci" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO : Sélection de %s pour mise à jour de %s" +-msgstr "TSINFO : Sélection de %s pour mise à jour de %s" ++msgstr "TSINFO : sélection de %s pour mise à jour de %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO : Sélection de %s pour installation de %s" +-msgstr "TSINFO : Sélection de %s pour installation de %s" ++msgstr "TSINFO : sélection de %s pour installation de %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Succès - transaction vide" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Re-démarrage de la boucle" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Finalisation du processus de dépendance" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Succès - dépendances résolues" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Recherche des dépendances pour %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "recherche de %s comme prérequis de %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Lancement de compare_providers() pour %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "meilleure architecture dans l'objet paquet %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s rend obsolète %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2263,144 +2383,144 @@ msgstr "" + " Winner: %s" + msgstr "" "architecture %s comparée à %s sur %s\n" - " Gagnant : %s" +-" Gagnant : %s" ++" Vainqueur : %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "rpm source commun pour %s et %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "le paquet de base %s est installé pour %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "préfixe commun %s entre %s et %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "requiert au minimum : %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Vainqueur : %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Perdant (avec %d) : %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Meilleur ordre : %s" @@ -47003,7 +47383,7 @@ index 4636b15..6444485 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2408,22 +2528,22 @@ msgstr "" +@@ -2408,22 +2531,22 @@ msgstr "" "Il reste des transactions non terminées. Vous devriez envisager de lancer de" " yum-complete-transaction pour les terminer." @@ -47030,7 +47410,7 @@ index 4636b15..6444485 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2431,90 +2551,93 @@ msgstr "" +@@ -2431,90 +2554,94 @@ msgstr "" "\n" "Paquets omis en raison de problèmes de dépendances :" @@ -47066,25 +47446,27 @@ index 4636b15..6444485 100644 msgstr "conflit installé" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" - "Attention : scriptlet ou autres erreurs non fatales pendant la transaction." +-"Attention : scriptlet ou autres erreurs non fatales pendant la transaction." ++"Attention : scriptlet ou autres erreurs non fatales apparues pendant la " ++"transaction." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "La transaction n'a pas pu démarrer :" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Impossible d'exécuter la transaction." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Échec de la suppression du fichier de transaction %s" @@ -47092,7 +47474,7 @@ index 4636b15..6444485 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s est censé être installé, mais ne l'est pas !" @@ -47103,59 +47485,59 @@ index 4636b15..6444485 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s est censé être supprimé, mais ne l'est pas !" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Impossible de libérer le verrou %s : %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Impossible de vérifier si le PID %s est actif" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Verrou %s existant : une autre copie est lancée avec le pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Impossible de créer le verrou sur %s : %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2523,42 +2646,31 @@ msgstr "" +@@ -2523,42 +2650,31 @@ msgstr "" "Le paquet ne correspond pas au téléchargement attendu. Suggestion : exécutez" " yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Ne peut procéder à la vérification des sommes de contrôle" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Le paquet ne correspond pas à sa somme de contrôle" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" @@ -47163,7 +47545,7 @@ index 4636b15..6444485 100644 "pour %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "utilisation de la copie locale de %s" @@ -47180,69 +47562,69 @@ index 4636b15..6444485 100644 -" * nécessaire %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "L'en-tête est incomplet." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2566,62 +2678,64 @@ msgstr "" +@@ -2566,62 +2682,64 @@ msgstr "" "L'en-tête n'est pas dans le cache et le mode cache uniquement est activé. " "Impossible de télécharger %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "La clé publique pour %s n'est pas installée" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problème à l'ouverture du paquet %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "La clé publique pour %s n'est pas de confiance" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Le paquet %s n'est pas signé" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Impossible de supprimer %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s supprimé" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Impossible de supprimer depuis %s le fichier %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "fichier de %s : %s supprimé" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d fichiers de %s supprimés" @@ -47252,136 +47634,137 @@ index 4636b15..6444485 100644 +msgstr[1] "%d %s fichiers supprimés" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Plus d'une correspondance identique dans le regroupement pour %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Rien ne correspond à %s.%s %s:%s-%s dans la mise à jour" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2629,56 +2743,58 @@ msgstr "" +@@ -2629,56 +2747,58 @@ msgstr "" "searchPackages() sera supprimé dans une future version de Yum." " Utilisez searchGenerator() à la place. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Recherche de %d paquets" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "Recherche %d paquet" -+msgstr[1] "Recherche %d paquets" ++msgstr[0] "Recherche de %d paquet" ++msgstr[1] "Recherche de %d paquets" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "recherche du paquet %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "recherche dans les entrées de fichiers" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "recherche dans les entrées de correspondance" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Aucune donnée sur les groupes disponible pour les dépôts configurés" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Aucun groupe nommé %s n'existe" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "le paquet %s n'a pas été marqué dans le groupe %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Ajout du paquet %s pour le groupe %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Aucun paquet nommé %s n'est disponible pour installation" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Attention : le goupe %s ne contient aucun paquets." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" -@@ -2687,66 +2803,66 @@ msgstr "" +@@ -2687,66 +2807,67 @@ msgstr "" #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Impossible de trouver le tuple de paquet %s dans le regroupement" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Impossible de trouver le tuple de paquet %s dans RPMDB" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "Version de drapeau invalide : %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Aucun paquet trouvé pour %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "L'objet paquet n'était pas une instance correcte d'objet paquet" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Rien de spécifié pour installation" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" @@ -47389,46 +47772,46 @@ index 4636b15..6444485 100644 -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Aucune correspondance pour l'argument : %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Le paquet %s est installé et n'est pas disponible" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Aucun paquet disponible pour installation" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paquet : %s - déjà dans le jeu de transaction" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Le paquet %s est rendu obsolète par %s qui est déjà installé" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2755,19 +2871,19 @@ msgstr "" +@@ -2755,19 +2876,19 @@ msgstr "" "Le paquet %s est rendu obsolète par %s, mais l'obsolescence n'affecte pas " "les dépendances" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" @@ -47436,29 +47819,29 @@ index 4636b15..6444485 100644 "place" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Le paquet %s est déjà installé dans sa dernière version" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" -@@ -2775,69 +2891,75 @@ msgstr "" +@@ -2775,69 +2896,75 @@ msgstr "" "jour." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Mise à jour complète" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" @@ -47466,30 +47849,30 @@ index 4636b15..6444485 100644 "%s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "Aucun paquet correspondant à mettre à jour : %s" ++msgstr "Aucun paquet correspondant à mettre à jour : %s" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paquet déjà rendu obsolète : %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Pas de mise à jour du paquet qui est obsolète : %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" @@ -47498,52 +47881,52 @@ index 4636b15..6444485 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Aucun paquet sélectionné pour suppression" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "Aucun paquet correspondant à supprimer : %s" ++msgstr "Aucun paquet correspondant à désinstaller : %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Omission du noyau en cours d'exécution : %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Suppression de %s de la transaction" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Impossible d'ouvrir : %s. Omission." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Examen de %s : %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Impossible d'exécuter localinstall sur le deltarpm : %s. Omission." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2845,14 +2967,14 @@ msgstr "" +@@ -2845,14 +2972,14 @@ msgstr "" "Impossible d'ajouter le paquet %s à la transaction. Architecture " "incompatible : %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" @@ -47551,339 +47934,364 @@ index 4636b15..6444485 100644 "installé" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2861,7 +2983,7 @@ msgstr "" +@@ -2861,7 +2988,7 @@ msgstr "" "Le paquet %s n'est pas installé, il est impossible de le mettre à jour. " "Lancez plutôt yum install pour l'installer." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2870,97 +2992,102 @@ msgstr "" +@@ -2870,139 +2997,148 @@ msgstr "" "Le paquet %s.%s n'est pas installé, il ne peut pas être mis à jour. Utilisez" " « yum install » pour l'installer." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Exclusion de %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Sélection de %s pour installation " -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Sélection de %s pour mise à jour de %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s : ne met pas à jour le paquet installé." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Impossible d'ouvrir le fichier : %s. Omission." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" "Problème dans la réinstallation : aucun paquet correspondant à supprimer" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" "Problème dans la réinstallation : aucun paquet %s correspondant à installer" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Aucun paquet disponible pour retour à une version antérieure" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Le paquet %s autorise des installations multiples, omission" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Aucune correspondance pour le paquet disponible : %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Mise à jour uniquement disponible pour le paquet : %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Échec lors du lors du retour à la version précédente : %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" -+msgstr "Échec de la mise à jour : %s" ++msgstr "Erreur lors de la mise à jour : %s" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "Récupération de la clé à partir de %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Échec de la récupération de la clé GPG : " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "La signature de la clé GPG %s ne correspond pas à celle du dépôt : %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "Signature de clé GPG vérifiée avec un certificat d'autorité de clés." -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Clé GPG invalide depuis %s :%s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Échec d'analyse de la clé GPG : la clé n'a pas de valeur %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2973,7 +3100,7 @@ msgstr "" - " Paquet       : %s (%s)\n" - " À partir de : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" + msgstr "" +-"Importation de la clé %s 0x%s :\n" +-" Utilisateur : %s\n" +-" Paquet       : %s (%s)\n" +-" À partir de : %s" ++"Importation de la clef %s 0x%s :\n" ++"ID utilisateur : « %s »\n" ++"Empreinte  : %s\n" ++"Paquet  : %s (%s)\n" ++"Provient de  : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2984,25 +3111,25 @@ msgstr "" - " Utilisateur : « %s »\n" - " À partir de : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" + msgstr "" +-"Importation de la clé %s 0x%s :\n" +-" Utilisateur : « %s »\n" +-" À partir de : %s" ++"Importation de la clef %s 0x%s :\n" ++"ID utilisateur : « %s »\n" ++"Empreinte  : %s\n" ++"Provient de  : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "La clé GPG %s (0x%s) est déjà installée" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "L'import de la clé à échoué (code %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "La clé a été importée avec succès" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "Toutes les clés n'ont pas été installées" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -3011,26 +3138,26 @@ msgstr "" +@@ -3011,26 +3147,26 @@ msgstr "" "Les clés GPG listées pour le dépôt « %s » sont déjà installées mais sont incorrectes pour ce paquet.\n" "Vérifiez que les URL des clés pour ce dépôt soient correctes." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" "L'import de la ou des clés n'a pas résolu le problème, clés incorrectes ?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "La clé GPG %s (0x%s) est déjà importée" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "L'import de la clé à échoué" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Aucune clé n'a été installée pour le dépôt %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3039,170 +3166,194 @@ msgstr "" +@@ -3039,170 +3175,195 @@ msgstr "" "Les clés GPG listées pour le dépôt « %s » sont déjà installées mais sont incorrectes.\n" "Vérifiez que les URL des clés pour ce dépôt soient correctes." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Impossible de trouver un miroir adapté." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Des erreurs ont été rencontrée durant le téléchargement des paquets." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Veuillez reporter cette erreur dans %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Erreurs de la transaction de test : " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Impossible de configurer cachedir : %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" "Les dépendances ne sont pas résolues. Les transactions non résolues ne " "seront pas sauvegardées." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Impossible de sauvegarder le fichier de transaction %s : %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Impossible de lire le fichier de transaction sauvegardé %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" "La version de rpmdb ne correspond pas à la version de la transaction " "enregistrée," -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr " ignoré, comme spécifié." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr " arrêt." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "impossible de trouver de tsflags, ou alors ce n'est pas un entier." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "txmbr est dans un état inconnu : %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Impossible de trouver txmbr : %s dans l'état %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Impossible de trouver txmbr : %s depuis : %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" "Des composants ou relations de la transactions sont manquant, ou la " "transaction a été modifiée," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" " ignoré, comme spécifié. Vous devez résoudre les dépendances à nouveau !" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." -+msgstr "%s a déjà été examiné et ne peut pas être supprimé." ++msgstr "%s a déjà été consulté et ne peut donc pas être supprimé." + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" -+msgstr "Examiner les dépendances de %s" ++msgstr "Examination des dépendances inverses de %s" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." -+msgstr "%s a une dépendance %s qui a été installée par l'utilisateur." ++msgstr "" ++"%s a %s en tant que dépendance inverse qui a été installé par l'utilisateur." + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "%s n'a pas de dépendances installées par l'utilisateur." ++msgstr "%s n'a pas de dépendances inverses installées par l'utilisateur." + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 @@ -47986,7 +48394,7 @@ index 4636b15..6444485 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s fournit %s mais est introuvable" -@@ -3211,6 +3362,17 @@ msgstr "%s fournit %s mais est introuvable" +@@ -3211,6 +3372,17 @@ msgstr "%s fournit %s mais est introuvable" msgid "Repackaging" msgstr "Réempaquetage" @@ -48005,10 +48413,10 @@ index 4636b15..6444485 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/gu.po b/po/gu.po -index e9ad955..090a90e 100644 +index e9ad955..5b9fed2 100644 --- a/po/gu.po +++ b/po/gu.po -@@ -2,13 +2,14 @@ +@@ -2,14 +2,15 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -48021,11 +48429,13 @@ index e9ad955..090a90e 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Gujarati (http://www.transifex.net/projects/p/yum/team/gu/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -17,122 +18,124 @@ msgstr "" "Language: gu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -48043,30 +48453,30 @@ index e9ad955..090a90e 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "સ્થાપિત કરી રહ્યા છે" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "અપ્રચલિત થયેલ" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "સુધારેલ" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "દૂર કરેલ" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "સ્થાપિત થયેલ" @@ -48093,7 +48503,7 @@ index e9ad955..090a90e 100644 msgstr "દૂર કરેલ: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "દૂર કરી રહ્યા છે" @@ -48119,53 +48529,53 @@ index e9ad955..090a90e 100644 msgstr "સ્થાનિય ફાઇલોમાંથી રિપોઝીટરી મેટાડેટાને વાંચી રહ્યા છે" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "રૂપરેખાંકન ભૂલ: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "વિકલ્પો ભૂલ: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " સ્થાપિત થયેલ: %s-%s પર %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "તમારે અમુક આદેશને આપવાની જરૂર છે" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "આવો આદેશ નથી: %s. મહેરબાની કરીને %s --help વાપરો" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "ડિસ્ક જરૂરિયાતો:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -48176,7 +48586,7 @@ index e9ad955..090a90e 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -48185,91 +48595,91 @@ index e9ad955..090a90e 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "વપરાશકર્તા આદેશ પર બહાર નીકળી રહ્યા છે" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "પેકેજોને ડાઉનલોડ કરી રહ્યા છે:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "પેકેજોને ડાઉનલોડ કરતી વખતે ભૂલ:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM ને સુધારવાની જરૂર છે" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "મહેરબાની કરીને %s માં આ ભૂલનો અહેવાલ કરો" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "પેકેજ(ઓ) %s%s%s ઉપલબ્ધ છે, પરંતુ સ્થાપિત થયેલ છે." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "પેકેજ %s%s%s ઉપલબ્ધ નથી." @@ -48277,7 +48687,7 @@ index e9ad955..090a90e 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "સ્થાપિત કરવા માટે પેકેજ (ઓ)" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -48286,13 +48696,13 @@ index e9ad955..090a90e 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "કંઇ કરવાનુ નથી" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "સુધારવા માટે %d પેકેજો ચિહ્નિત થયેલ છે" @@ -48302,12 +48712,12 @@ index e9ad955..090a90e 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "સુધારવા માટે પેકેજો ચિહ્નિત થયેલ નથી" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -48317,12 +48727,12 @@ index e9ad955..090a90e 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "દૂર કરવા માટે %d પેકેજો ચિહ્નિત થયેવ છે" @@ -48332,14 +48742,14 @@ index e9ad955..090a90e 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "દૂર કરવા માટે પેકેજો ચિહ્નિત થયેલ નથી" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -48347,13 +48757,13 @@ index e9ad955..090a90e 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (%s માંથી)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "સ્થાપિત થયેલ પેકેજ %s%s%s%s ઉપલબ્ધ નથી." @@ -48361,7 +48771,7 @@ index e9ad955..090a90e 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "પુન:સ્થાપિત કરવા માટે પેકેજ (ઓ)" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -48369,151 +48779,151 @@ index e9ad955..090a90e 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "પેકેજો પૂરા પાડેલ નથી" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "સ્થાપિત કરવા માટે પેકેજ (ઓ)" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "ચેતવણી: તેની માટે બંધબેસતુ મળ્યુ નથી: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "%s માટે પેકેજ મળ્યુ નથી" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "બધુ જ સાફ કરી રહ્યા છે" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "હેડરો સાફ કરી રહ્યા છે" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "પેકેજો સાફ કરી રહ્યા છે" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "xml મેટાડેટા સાફ કરી રહ્યા છે" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "ડેટાબેઝ કેશ સાફ કરી રહ્યા છે" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "પ્લગઇનને સાફ કરી રહ્યા છે" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "સ્થાપિત થયેલ જૂથો:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "ઉપલબ્ધ જૂથો:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "ચેતવણી: જૂથ %s અસ્તિત્વ ધરાવતુ નથી." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "સ્થાપિત અથવા સુધારવા ઉપલબ્ધ કોઇપણ સૂચિત થયેલ જૂથમાં પેકેજો નથી" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "સ્થાપિત કરવા માટે %d પેકેજ(ઓ)" @@ -48523,18 +48933,18 @@ index e9ad955..090a90e 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "જૂથોમાંથી દૂર કરવા માટે પેકેજો નથી" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "દૂર કરવા માટે %d પેકેજ(ઓ)" @@ -48544,37 +48954,37 @@ index e9ad955..090a90e 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "પેકેજ %s પહેલેથી જ સ્થાપિત થયેલ છે, છોડી રહ્યા છે" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "પ્લગઇન વિકલ્પો" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "આદેશ વાક્ય ભૂલ: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -48583,154 +48993,154 @@ index e9ad955..090a90e 100644 "%s: %s વિકલ્પને દલીલની જરૂર છે" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "રૂપરેખાંકન ફાઇલ સ્થાન" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "ડિબગીંગ આઉટપુટ લેવલ" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "ભૂલ આઉટપુટ લેવલ" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "rpm માટે ડિબગીંગ આઉટપુટ લેવલ" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "બધા પ્રશ્ર્નો માટે જવાબ હાં" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "Yum આવૃત્તિ બતાવો અને બહાર નીકળો" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "સ્થાપન રુટ સુયોજિત કરો" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "એક અથવા વધારે રિપોઝીટરીઓને સક્રિય કરો (વાઇલ્ડકાર્ડને પરવાનગી આપેલ છે)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" "એક અથવા વધારે રિપોઝીટરીઓને નિષ્ક્રિય કરો (વાઇલ્ડકાર્ડને પરવાનગી આપેલ છે)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "Yum પ્લગઇનને નિષ્ક્રિય કરો" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "નામ પ્રમાણે પ્લગઇનને નિષ્ક્રિય કરો" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "નામ પ્રમાણે પ્લગઇનને સક્રિય કરો" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -49074,22 +49484,22 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "સ્થાપિત થયેલ નથી" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "પેકેજ" +msgid_plural "Packages" @@ -49127,28 +49537,28 @@ index e9ad955..090a90e 100644 #, python-format msgid "" "\n" -@@ -878,57 +910,52 @@ msgid "" +@@ -878,57 +910,58 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" @@ -49156,323 +49566,329 @@ index e9ad955..090a90e 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "પુન:સ્થાપિત કરો" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "દૂર કરેલ" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "નિષ્ફળ" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "બે" -@@ -936,7 +963,7 @@ msgstr "બે" +@@ -936,7 +969,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -944,371 +971,423 @@ msgid "" +@@ -944,371 +977,423 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "કુલ" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "સિસ્ટમ" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "તારીખ અને સમય" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "ક્રિયા (ઓ)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "વપરાશકર્તા :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "નિષ્ફળતા:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "સફળતા" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "આદેશ વાક્ય :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Rpmdb સમસ્યાઓ:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "ભૂલો:" @@ -49481,17 +49897,17 @@ index e9ad955..090a90e 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "ભૂંસી નાખો" @@ -49504,224 +49920,224 @@ index e9ad955..090a90e 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "સુધારવું" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "સમય" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "છેલ્લો દિવસ" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "છેલ્લુ અઠવાડિયું" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "છેલ્લા 2 અઠવાડિયાઓ" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "છેલ્લા 3 મહિનાઓ" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "છેલ્લા 6 મહિનાઓ" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "છેલ્લુ વર્ષ" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "ઉપલબ્ધ વધારાની ઇતિહાસ જાણકારી:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: આ નામ પ્રમાણે વધારાની માહિતી મળી નથી" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "સ્થાપિત થયેલ" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "ભૂંસી નાખેલ" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "પુન:સ્થાપિત થયેલ" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "સુધારેલ" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "અપ્રચલિત થયેલ" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> પેકેજને રાખી રહ્યા છે: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "પેકેજ: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -49729,130 +50145,130 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1317,7 +1396,7 @@ msgstr "" +@@ -1317,7 +1402,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1326,7 +1405,7 @@ msgstr "" +@@ -1326,7 +1411,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1335,99 +1414,99 @@ msgstr "" +@@ -1335,99 +1420,99 @@ msgstr "" " મળ્યુ નથી" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "ઉપલબ્ધ" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "ચાલી રહ્યુ છે" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "અજ્ઞાત" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr "" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr "" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " મેમરી : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr "" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr "" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -49860,7 +50276,7 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -49868,68 +50284,68 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1438,47 +1517,47 @@ msgstr "" +@@ -1438,47 +1523,47 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "PluginExit ભૂલ: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum ભૂલ: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "ભૂલ: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "સમાપ્ત!" -@@ -1490,7 +1569,7 @@ msgstr "" +@@ -1490,7 +1575,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "આ આદેશને ચલાવવા માટે તમારે રુટમાં હોવુ જરૂરી છે." @@ -49938,7 +50354,7 @@ index e9ad955..090a90e 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1507,451 +1586,484 @@ msgid "" +@@ -1507,451 +1592,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -50202,188 +50618,187 @@ index e9ad955..090a90e 100644 msgstr "સ્થાનિય પેકેજ પ્રક્રિયાને સુયોજિત કરી રહ્યા છીએ" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Yum Shell ને સુયોજિત કરી રહ્યા છીએ" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "રૂપરેખાંકિત થયેલ સોફ્ટવેર રિપોઝીટરીઓને દર્શાવો" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "સક્રિય" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "નિષ્ક્રિય" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "પરિસ્થિતિ" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "રિપોઝીટરી નામ" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "%s માટે ઉપલબ્ધ મદદ નથી" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -50391,7 +50806,7 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -50399,148 +50814,148 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "પેકેજને પુન:સ્થાપિત કરો" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Yum આવૃત્તિ જૂથો:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " જૂથ :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " પેકેજો:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "સ્થાપિત થયેલ:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "ઉપલબ્ધ:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "જૂથ-ઉપલબ્ધ:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "rpmdb માં સમસ્યાઓ માટે ચકાસો" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1962,100 +2074,106 @@ msgstr "" +@@ -1962,100 +2076,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -50548,7 +50963,7 @@ index e9ad955..090a90e 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -50585,226 +51000,226 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "સભ્ય: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "પેકેજ %s ને દૂર કરી રહ્યા છે" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2063,774 +2181,784 @@ msgstr "" +@@ -2063,991 +2183,1028 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "લુપ પુન:શરૂ કરી રહ્યા છે" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "%s માટે compare_providers() ચલાવી રહ્યા છે" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -50812,43 +51227,43 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "સામાન્ય sourcerpm %s અને %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " વિજેતા: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -51036,24 +51451,24 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -51061,7 +51476,7 @@ index e9ad955..090a90e 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -51072,40 +51487,40 @@ index e9ad955..090a90e 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "તાળુ %s ને ખોલી શક્યા નહિં: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "ચકાસવાનું અસમર્થ જો PID %s સક્રિય છે" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -51113,23 +51528,23 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "%s ની સ્થાનિક નકલને વાપરી રહ્યા છે" @@ -51143,67 +51558,67 @@ index e9ad955..090a90e 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "હેડર પૂર્ણ નથી." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "%s માટે સાર્વજનિક કી સ્થાપિત થયેલ નથી" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "પેકેજ %s ને ખોલી રહ્યા હોય ત્યારે સમસ્યા" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "પેકેજ %s હસ્તાક્ષર થયેલ નથી" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "%s ને દૂર કરી શકાતુ નથી" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s દૂર થયેલ છે" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s ફાઇલો દૂર થયેલ છે" @@ -51213,26 +51628,26 @@ index e9ad955..090a90e 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "%d પેકેજોને શોધી રહ્યા છે" @@ -51242,62 +51657,62 @@ index e9ad955..090a90e 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "પેકેજ %s ને શોધી રહ્યા છે" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "રૂપરેખાંકિત થયેલ રિપોઝીટરીઓ માટે ઉપલબ્ધ જૂથ માહિતી નથી" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "નામ થયેલ જૂથ %s અસ્તિત્વ ધરાવતુ નથી" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "જૂથ %s માંથી પેકેજ %s ને ઉમેરી રહ્યા છે" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "સ્થાપિત કરવા માટે નામ થયેલ પેકેજ %s ઉપલબ્ધ નથી" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -51305,78 +51720,79 @@ index e9ad955..090a90e 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "%s માટે પેકેજ મળ્યુ નથી" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "સ્થાપિત કરવા માટે કઇ જ સ્પષ્ટ થયેલ નથી" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "પેકેજ %s સ્થાપિત થયેલ છે અને ઉપલબ્ધ નથી" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "સ્થાપિત કરવા માટે પેકેજ (ઓ) ઉપલબ્ધ નથી" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -51384,118 +51800,118 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "બધુ જ સુધારી રહ્યા છે" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "પેકેજ પહેલેથી જ અપ્રચલિત થયેલ છે: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "પેકેજને સુધારી રહ્યા નથી કે જે અપ્રચલિત થયેલ છે: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "પેકેજને સુધારી રહ્યા નથી કે જે પહેલેથી જ સુધારેલ છે: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "%s નું પરિક્ષણ કરી રહ્યા છે: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -51503,7 +51919,7 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -51511,158 +51927,166 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: સ્થાપિત પેકેજોને સુધારાતુ નથી." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "ઉપલબ્ધ પેકેજ માટે બંધબેસતુ નથી: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "%s માંથી અયોગ્ય GPG કી: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2839,7 +2967,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2847,207 +2975,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -51670,29 +52094,29 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -51700,117 +52124,117 @@ index e9ad955..090a90e 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "cachedir ને સુયોજિત કરી શક્યા નહિં: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -51910,7 +52334,7 @@ index e9ad955..090a90e 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3056,6 +3208,14 @@ msgstr "" +@@ -3056,6 +3213,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -51926,10 +52350,10 @@ index e9ad955..090a90e 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/hi.po b/po/hi.po -index 988a7a5..cb6b64e 100644 +index 988a7a5..4842245 100644 --- a/po/hi.po +++ b/po/hi.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -51940,11 +52364,13 @@ index 988a7a5..cb6b64e 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Hindi (http://www.transifex.net/projects/p/yum/team/hi/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,413 +17,438 @@ msgstr "" "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -51962,30 +52388,30 @@ index 988a7a5..cb6b64e 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "" @@ -52012,7 +52438,7 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "" @@ -52038,53 +52464,53 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -52095,98 +52521,98 @@ index 988a7a5..cb6b64e 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -52194,7 +52620,7 @@ index 988a7a5..cb6b64e 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -52203,13 +52629,13 @@ index 988a7a5..cb6b64e 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -52219,12 +52645,12 @@ index 988a7a5..cb6b64e 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -52234,12 +52660,12 @@ index 988a7a5..cb6b64e 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -52249,14 +52675,14 @@ index 988a7a5..cb6b64e 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -52264,13 +52690,13 @@ index 988a7a5..cb6b64e 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -52278,7 +52704,7 @@ index 988a7a5..cb6b64e 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -52286,151 +52712,151 @@ index 988a7a5..cb6b64e 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -52440,18 +52866,18 @@ index 988a7a5..cb6b64e 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -52461,37 +52887,37 @@ index 988a7a5..cb6b64e 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -52500,153 +52926,153 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -52989,22 +53415,22 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -53042,351 +53468,357 @@ index 988a7a5..cb6b64e 100644 #, python-format msgid "" "\n" -@@ -869,57 +901,52 @@ msgid "" +@@ -869,57 +901,58 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "" -@@ -927,7 +954,7 @@ msgstr "" +@@ -927,7 +960,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -935,484 +962,536 @@ msgid "" +@@ -935,484 +968,536 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -53395,17 +53827,17 @@ index 988a7a5..cb6b64e 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -53418,224 +53850,224 @@ index 988a7a5..cb6b64e 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -53643,7 +54075,7 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -53651,7 +54083,7 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -53659,7 +54091,7 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -53667,103 +54099,103 @@ index 988a7a5..cb6b64e 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr "" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr "" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr "" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr "" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr "" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -53771,7 +54203,7 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -53779,68 +54211,68 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1420,47 +1499,47 @@ msgid "" +@@ -1420,47 +1505,47 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "" -@@ -1472,7 +1551,7 @@ msgstr "" +@@ -1472,7 +1557,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -53849,7 +54281,7 @@ index 988a7a5..cb6b64e 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1568,484 @@ msgid "" +@@ -1489,451 +1574,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -54112,188 +54544,187 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -54301,7 +54732,7 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -54309,148 +54740,148 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2056,106 @@ msgstr "" +@@ -1944,100 +2058,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -54458,7 +54889,7 @@ index 988a7a5..cb6b64e 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -54495,226 +54926,226 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,774 +2163,784 @@ msgstr "" +@@ -2045,991 +2165,1028 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -54722,43 +55153,43 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -54946,24 +55377,24 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -54971,7 +55402,7 @@ index 988a7a5..cb6b64e 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -54982,40 +55413,40 @@ index 988a7a5..cb6b64e 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -55023,23 +55454,23 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "" @@ -55053,67 +55484,67 @@ index 988a7a5..cb6b64e 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -55123,26 +55554,26 @@ index 988a7a5..cb6b64e 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -55152,62 +55583,62 @@ index 988a7a5..cb6b64e 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -55215,78 +55646,79 @@ index 988a7a5..cb6b64e 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -55294,118 +55726,118 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -55413,7 +55845,7 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -55421,158 +55853,166 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2821,7 +2949,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2829,207 +2957,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -55580,29 +56020,29 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -55610,117 +56050,117 @@ index 988a7a5..cb6b64e 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -55820,7 +56260,7 @@ index 988a7a5..cb6b64e 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3190,14 @@ msgstr "" +@@ -3038,6 +3195,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -55836,10 +56276,10 @@ index 988a7a5..cb6b64e 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/hu.po b/po/hu.po -index db7c07f..7b2d097 100644 +index db7c07f..5442d27 100644 --- a/po/hu.po +++ b/po/hu.po -@@ -2,13 +2,14 @@ +@@ -2,14 +2,15 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -55852,11 +56292,13 @@ index db7c07f..7b2d097 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Hungarian (http://www.transifex.net/projects/p/yum/team/hu/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -17,123 +18,125 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -55874,30 +56316,30 @@ index db7c07f..7b2d097 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Telepítés" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Elévült" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Frissítve" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Törölve" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Telepítve" @@ -55924,7 +56366,7 @@ index db7c07f..7b2d097 100644 msgstr "Eltávolítva: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Eltávolítás" @@ -55950,53 +56392,53 @@ index db7c07f..7b2d097 100644 msgstr "Tárolók metaadatainak beolvasása helyi fájlokból" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Beállítási hiba: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Opció hiba: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Telepítve : %s-%s at %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Létrehozva: %s at %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Hozzáadva: %s at %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Egy parancs megadása szükségeltetik" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Nincs ilyen parancs: %s. Kérjük használja a következőt: %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Szükséges hely:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -56008,7 +56450,7 @@ index db7c07f..7b2d097 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -56017,74 +56459,74 @@ index db7c07f..7b2d097 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" "A tranzakciót megpróbáltuk végrehajtani, de nincs semmi tennivaló. Kilépünk." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Felhasználói parancs miatt kilépés." -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Csomagok letöltése:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Hiba ezen csomagok letöltésekor:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "Tranzakció-ellenőrzés futtatása" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "HIBA frissíteni kell az rpmet, hogy kezeljük:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "HIBA a tranzakció ellenőrzés- és függőségfeloldásnál:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM frissítésére van szükség" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Kérem jelentse ezt a hibát a következőben: %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Tranzakció teszt futtatása" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Tranzakció hibaellenőrzése:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "A Tranzakció teszt sikeres" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Tranzakció futtatása" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -56093,18 +56535,18 @@ index db7c07f..7b2d097 100644 "Használjuk az \"-y\" kapcsolót a felülbíráláshoz." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "* Lehet, hogy erre gondolt:" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "A(z) %s%s%s elérhető, de nincs telepítve." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Nincs ilyen csomag: %s%s%s." @@ -56112,7 +56554,7 @@ index db7c07f..7b2d097 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Telepítendő csomagok" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -56121,13 +56563,13 @@ index db7c07f..7b2d097 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nincs tennivaló" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d csomag kijelölve frissítésre" @@ -56137,12 +56579,12 @@ index db7c07f..7b2d097 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Nincs csomag kijelölve frissítésre" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d csomag van kijelölve Disztribúció Szinkronizáláshoz" @@ -56152,12 +56594,12 @@ index db7c07f..7b2d097 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Nincs csomag kijelölve Disztribúció Szinkronizáláshoz" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d csomag van kijelölve eltávolításra" @@ -56167,14 +56609,14 @@ index db7c07f..7b2d097 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Nincs csomag kijelölve eltávolításra" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Visszaállítandó csomagok" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -56182,13 +56624,13 @@ index db7c07f..7b2d097 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "(ebből: %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "A következő telepített csomag nem elérhető: %s%s%s%s" @@ -56196,7 +56638,7 @@ index db7c07f..7b2d097 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Újratelepítendő csomagok" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -56204,22 +56646,22 @@ index db7c07f..7b2d097 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Nem találhatóak csomagok" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Telepítendő csomagok" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "N/S Megegyezett: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -56227,7 +56669,7 @@ index db7c07f..7b2d097 100644 +"all\" parancsot bárki kereséséhez." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -56236,13 +56678,13 @@ index db7c07f..7b2d097 100644 +"\"search all\" parancsot bárki kereséséhez." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Találat: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" @@ -56250,111 +56692,111 @@ index db7c07f..7b2d097 100644 +"\"search all\" parancsot bárki kereséséhez." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Figyelem: Nincs találat a következőnél: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Nincsenek találatok" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Nem találhatóak csomagok a következőre: %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Tárolók tisztítása" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Minden tisztítása" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Fejlécek tisztítása" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Csomagok tisztítása" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "xml metaadat tisztítása" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Adatbázis-gyorsítótár tisztítása" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Elévülési gyorsítótár tisztítása" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Gyorsítótárazott rpmdb adatok tisztítása" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Bővítmények tisztítása" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "Figyelem: Egy csoport sem azonos a következővel: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Telepített csoportok:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "Telepített nyelvi csoportok:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Elérhető csoportok:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "Elérhető nyelvi csoportok:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Kész" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Figyelem: Az alábbi csoport nem létezik: %s" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "Nincs telepítendő vagy frissítendő csomag a kiválasztott csoportokból" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d Telepítendő csomag" @@ -56364,18 +56806,18 @@ index db7c07f..7b2d097 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Nincs ilyen csoport: %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Nincs szükség csomag eltávolítására csoportokból" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d Eltávolítandó csomag" @@ -56385,37 +56827,37 @@ index db7c07f..7b2d097 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "A(z) %s nevű csomag már telepítve van, ezért továbblépünk." -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Megválunk a következőtől: pkg %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "Nincs más %s telepítve, ezért hozzáadjuk a listához." -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Bővítmény beállítások" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Parancssori hiba a következőben: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -56424,159 +56866,159 @@ index db7c07f..7b2d097 100644 "%s: %s opciónak szüksége van egy argumentumra" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--Szín egyikét veszi fel: auto, mindig, soha" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "A(z) --instalroot -nak abszolút elérési útnak kell lennie: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "ezen segítség mutatása" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "a hibák figyelmen kívül hagyása" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" "futtatás a rendszer gyorsítótárából anélkül, hogy a csomagok vagy " "tárolóinformációk frissítve lennének" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "konfigurációs fájl elérésí útja" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "leghosszabb várakozási idő meghatározása" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "a hibakeresés szintje" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "ismétlődések mutatása a tárolókban és a keresési parancsokban" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "hiba kimeneti szintje" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "rpm hibakereső szint" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "csendes működés" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "visszajelzés működés közben" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "igennel válaszol minden felmerülő kérdésre" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "Yum verziójának mutatása és kilépés" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "telepítési root beállítása" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" "egy vagy több tároló engedélyezése (helyettesítő karakterek megengedettek)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "egy vagy több tároló tiltása (helyettesítő karakterek megengedettek)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "csomagok kizárása név vagy glob szerint" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "kizárás letiltása alapkomponensre, tárolókra ill. bármire" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "elavult komponensek feldolgozásának engedélyezése" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "Yum bővítmények tiltása" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "gpg-aláírás ellenőrzés kihagyása" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "bővítmények tiltása név szerint" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "bővítmények engedélyezése név szerint" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "azon csomagok átugrása, melyeknek függőségi problémáik vannak" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "szín használatának befolyásolása" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" "az alábbi érték beállítása a yum tároló és konfigurációs fájljaiban: " "$releasever" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "tetszőleges konfiguráció- és tárolóbeállítások" @@ -56920,23 +57362,23 @@ index db7c07f..7b2d097 100644 msgstr "Eltávolítás a függőségeknek" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Kihagyva (függőségi problémák)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Nem telepítve" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Nem elérhető" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Csomag" +msgid_plural "Packages" @@ -56974,7 +57416,7 @@ index db7c07f..7b2d097 100644 #, python-format msgid "" "\n" -@@ -889,57 +927,52 @@ msgstr "" +@@ -889,57 +927,58 @@ msgstr "" "Tranzakció Összegzés\n" "%s\n" @@ -56982,7 +57424,7 @@ index db7c07f..7b2d097 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "%5.5s csomag telepítése\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Telepítés" @@ -56990,7 +57432,7 @@ index db7c07f..7b2d097 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "%5.5s csomag frissítése\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" +msgstr "" @@ -56998,7 +57440,7 @@ index db7c07f..7b2d097 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "%5.5s csomag eltávolítása\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "" @@ -57006,7 +57448,7 @@ index db7c07f..7b2d097 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "%5.5s csomag újratelepítése\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Újratelepítés" @@ -57014,317 +57456,323 @@ index db7c07f..7b2d097 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "%5.5s csomag visszaállítva\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Visszaállítás" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "Eltávolítva" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Függőség Eltávolítva" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Függőség Telepítve" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Függőség Frissítve" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Lecserélve" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Sikertelen" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "kettő" -@@ -947,7 +980,7 @@ msgstr "kettő" +@@ -947,7 +986,7 @@ msgstr "kettő" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -958,364 +991,416 @@ msgstr "" +@@ -958,364 +997,416 @@ msgstr "" "A jelenlegi letöltés megszakítva, %s megszakítás (ctrl-c) mégegyszer %s, %s%s%s másodperc alatt\n" "a kilépéshez.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "Felhasználó által megszakítva" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Összesen" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "<üres>" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Rendszer" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" -msgstr "" +msgstr "Egyesített tranzakció kihagyása: %d, mivel fedi a %d tranzakciót." -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "Nincsenek tranzakciók" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Rossz tranzakció azonosító vagy csomagnév lett megadva" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "Parancssor" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Felhasználó" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "azonosító" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Dátum és idő" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Művelet(ek)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Változtatta" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Nem lett megadva tranzakció azonosító" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Rossz tranzakció azonosító lett megadva" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Nem található a megadott tranzakció azonosítója" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Több, mint egy tranzakció azonosító található!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Nem lett megadva tranzakció azonosító vagy csomag" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Visszaállítva" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Régebbi" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Újabb" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "Tranzakció azonosító:" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Kezdés ideje :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "rpmdb kezdete:" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "(%u másodperc)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "(%u perc)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "(%u óra)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "(%u nap)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Befejezés ideje:" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "rpmdb befejezése:" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Felhasználó :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Visszatérési érték:" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Megszakítva" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "Hibák:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Hiba:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Siker" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Parancssor :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "További nem alapértelmezett információ lett eltárolva: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "A tranzakció lezajlott a következővel:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Módosított csomagok:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Kihagyott csomagok:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Rpmdb hibák:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Scriptlet kimenet:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Hibák:" @@ -57333,17 +57781,17 @@ index db7c07f..7b2d097 100644 -msgstr "Telepítés" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Függőség-Telepítés" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Elavulttá tevés" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Törlés" @@ -57356,440 +57804,440 @@ index db7c07f..7b2d097 100644 -msgstr "Visszaállítás" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Frissítés" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Időpont" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "1 napja" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "1 hete" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "2 hete" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "3 hónapja" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "6 hónapja" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "1 éve" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Több, mint egy éve" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Nem található a következő tranzakció: %s" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Tranzakció azonosító:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Rendelkezésre álló további információ az előzményekről:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Nem található további adat erre a névre" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "telepítve" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "egy frissítés" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "törölve" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "újratelepítve" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "egy visszaállítás" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "visszaállítás" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "frissítve" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "elavult" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> A(z) %s.%s %s:%s-%s csomaggal a következő történik: %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Tranzakció ellenőrzés futtatása" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Függőségvizsgálat újraindítása az új változásokkal." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> A függőségvizsgálat véget ért" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> A(z) %s függőség feldolgozása a következő csomaghoz: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Csomag megtartása: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nem talált függőség: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Csomag: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1324,7 +1409,7 @@ msgstr "" +@@ -1324,7 +1415,7 @@ msgstr "" "\n" " Megkövetel: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1333,7 +1418,7 @@ msgstr "" +@@ -1333,7 +1424,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1342,7 +1427,7 @@ msgstr "" +@@ -1342,7 +1433,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1351,86 +1436,86 @@ msgstr "" +@@ -1351,86 +1442,86 @@ msgstr "" " Nem található" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Frissítette" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Visszaállította" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Elavulttá tette" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Elérhető" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Konfliktus feldolgozása: %s ellentétben áll: %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> A tranzakció feltöltése csomagokkal. Kis türelmet." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" "---> A(z) %s fejlécének betöltése, hogy a tranzakcióhoz hozzáadhassuk." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Fut" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Alszik" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Nem megszakítható" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombi" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Nyomozott/Megállított" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Ismeretlen" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " A másik alkalmazás: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " A másik alkalmazás: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Memória : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Elindítva: %s - %s" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Állapot : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1440,7 +1525,7 @@ msgstr "" +@@ -1440,7 +1531,7 @@ msgstr "" "\n" "Felhasználó által megszakítva" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1450,7 +1535,7 @@ msgstr "" +@@ -1450,7 +1541,7 @@ msgstr "" "\n" "Kilépés megtört cső miatt (broken pipe)" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1461,7 +1546,7 @@ msgstr "" +@@ -1461,7 +1552,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1469,35 +1554,35 @@ msgstr "" +@@ -1469,35 +1560,35 @@ msgstr "" "Egy másik alkalmazás használja a yum zárat, ezért kilépünk, ahogy be van " "állítva az exit_on_lock szerint" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Bővítmény-Összeomlási Hiba: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum Hiba: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Hiba: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " Próbálja meg használni --skip kapcsolót a probléma elkerüléséhez" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Próbálja meg futtatni: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Ismeretlen Hiba: Kilépési Kód: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1505,7 +1590,7 @@ msgstr "" +@@ -1505,7 +1596,7 @@ msgstr "" "\n" "Függőségek Megtalálva" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Kész!" -@@ -1517,7 +1602,7 @@ msgstr " Használat:\n" +@@ -1517,7 +1608,7 @@ msgstr " Használat:\n" msgid "You need to be root to perform this command." msgstr "Csak a root felhasználó futtathatja ezt a parancsot." @@ -57798,7 +58246,7 @@ index db7c07f..7b2d097 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1546,53 +1631,53 @@ msgstr "" +@@ -1546,53 +1637,53 @@ msgstr "" "\n" "További információért lépjen kapcsolatba a disztribúciójával ill. a csomagszolgáltatójával.\n" @@ -57864,7 +58312,7 @@ index db7c07f..7b2d097 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1603,306 +1688,299 @@ msgstr "" +@@ -1603,306 +1694,295 @@ msgstr "" "A következő paranccsal engedélyezhet tárolót:\n" " yum-config-manager --enable " @@ -58064,155 +58512,154 @@ index db7c07f..7b2d097 100644 msgstr "Helyi csomagolási folyamat megkezdése" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Megállapítja, melyik csomag tartalmazza a megadott függőséget" - +-msgid "Determine which package provides the given dependency" +-msgstr "Megállapítja, melyik csomag tartalmazza a megadott függőséget" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Csomagfüggőségek keresése:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Interaktív yum shell futtatása" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Yum Shell indítása" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Egy csomag függőségeinek listázása" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Függőségek keresése: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Beállított szoftverforrások megjelenítése" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "engedélyezett" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "tiltott" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Tároló-azonosító: " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Tároló-név : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Tároló-állapot: " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Tároló-vizsgálat:" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Tároló-címkék : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Tároló-diszt.-címkék: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Tároló-frissítve: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Tároló-csomagok: " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Tároló-méret : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Tároló-baseurl: " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Tároló-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Frissítve : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Tároló-tükrök: " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Soha (utoljára: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Most (utoljára: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s másodperc (utoljára: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Tároló-lejárat: " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Tároló-kizárás:" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Tároló-tartalmaz: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Tároló-kizárt: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Tároló-fájlnév: " @@ -58220,190 +58667,190 @@ index db7c07f..7b2d097 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "tároló azon" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "állapot" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "tároló név" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Egy használati tipp mutatása" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Nincs súgó az alábbi témakörben: %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1912,7 +1990,7 @@ msgstr "" +@@ -1912,7 +1992,7 @@ msgstr "" "\n" "alias-ok: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1922,117 +2000,163 @@ msgstr "" +@@ -1922,117 +2002,163 @@ msgstr "" "\n" "alias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Újratelepítő folyamat indítása" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "egy csomag újratelepítése" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Visszaállítási folyamat indítása" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "egy csomag visszaállítása" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Verzió és/vagy elérhető tárolók megjelenítése" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Yum verzió csoportok:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Csoport :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "Csomagok:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Telepített:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Telepített csoport:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Elérhető:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Elérhető csoport:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Korábbi tranzakciók használata vagy megjelenítése" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Helytelen alparancs az előzményekhez, használja a következőt: %s" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Ön nem tudja elérni az előzmények adatbázisát." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Hibák keresése az rpmdb-ben" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "egy elmentett tranzakció betöltése fájlnév alapján" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." -msgstr "" +msgstr "Nincs meghatározva az elmentett tranzakció fájlja." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "tranzakciók betöltések a következőből: %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "" @@ -58416,7 +58863,7 @@ index db7c07f..7b2d097 100644 +msgstr " Yum ellenőrzés meghiúsult: %s" + +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:114 @@ -58455,147 +58902,147 @@ index db7c07f..7b2d097 100644 msgid "" "\n" "\n" -@@ -2042,74 +2166,74 @@ msgstr "" +@@ -2042,74 +2168,74 @@ msgstr "" "\n" "Kilépés felhasználói megszakítás miatt." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "A doTsSetup() már nem lesz elérhető a későbbi Yum verziókban.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Tranzakciók indítása a konfigurációs osztályok felállása előtt" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Hibás tsflag a következő konfigurációs fájlban: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Keresés a pkgSack-ben függőség után: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Tag: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "A(z) %s át lett konvertálva telepítéshez" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "A(z) %s nevű csomag hozzáadása %s módban" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "A következő csomag eltávolítása: %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "A(z) %s megköveteli a következőket: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "A(z) %s megköveteli a következőt: %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "A szükséges dolognak már utánanéztek, lecsaljuk" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "A megkövetelt dolog nem csomag, ezért utánanézünk: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Lehetséges Szolgáltató: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "A mód %s a(z) %s kiszolgáló felé: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "A(z) %s nevű csomag szolgáltatásának módja: %s" -@@ -2117,117 +2241,117 @@ msgstr "A(z) %s nevű csomag szolgáltatásának módja: %s" +@@ -2117,117 +2243,117 @@ msgstr "A(z) %s nevű csomag szolgáltatásának módja: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "Kisérlet a(z) %s frissítésére a függőségek feloldásához" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" -msgstr "" +msgstr "Nem található frissítési útvonal a következőhöz: %s." -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: A(z) %s nevű csomaghoz szükséges a(z) %s törlése" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: %s lecserélése függőség miatt a következőre: %s." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: %s frissítése függőség miatt." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Nem található frissítési útvonal a következőhöz: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "A(z) %s követelménye %s (gyors találattal)" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" @@ -58603,133 +59050,133 @@ index db7c07f..7b2d097 100644 "eltávolítjuk." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" "A lehetséges %s nevű csomag már újabb verzióval szerepel a tranzakcióban." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "A lehetséges %s nevű csomagból már újabb verzió van telepítve." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "A(z) %s már szerepel a tranzakcióban, kihagyás" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: %s bejelölése a(z) %s frissítéseként" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: A(z) %s telepítésre való bejelölése a következőhöz: %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Siker - üres tranzakció" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Folyamat újraindítása" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Függőségkezelő folyamat végetért" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Siker - függőségek megoldva" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Függőségek keresése a következőre: %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "A(z) %s keresése, mint a(z) %s szükséglete." -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "A compare_providers() parancs futtatása a következőhöz: %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "Jobb architektúra a következőben: %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "A(z) %s már újabb, mint a(z) %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2236,144 +2360,144 @@ msgstr "" +@@ -2236,144 +2362,144 @@ msgstr "" "archdist osszehasonlítva %s a következőhöz: %s a következőn: %s\n" " Nyertes: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "gyakori forrásrpm %s és %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "legjobb %s nevű csomag telepítve van a következőhöz: %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "gyakori előtag a következőre: %s, %s és %s között" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "minimum szükséges: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Nyertes: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Vesztes(ezzel: %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Legjobb sorrend: %s" @@ -58864,7 +59311,7 @@ index db7c07f..7b2d097 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2381,21 +2505,21 @@ msgstr "" +@@ -2381,21 +2507,21 @@ msgstr "" "Félbehagyott tranzakciók találhatóak. Ha be kívánja azokat fejezni, " "használja a yum-complete-transaction parancsot." @@ -58892,7 +59339,7 @@ index db7c07f..7b2d097 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2403,54 +2527,54 @@ msgstr "" +@@ -2403,54 +2529,54 @@ msgstr "" "\n" "Az alábbi csomagok ki lettek hagyva függőségi problémák miatt:" @@ -58927,25 +59374,25 @@ index db7c07f..7b2d097 100644 msgstr "konfliktusokat teremtett" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" "Figyelem: scriptlet vagy egyéb nem végzetes hiba adódott a tranzakció során." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "A tranzakció nem indítható:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Tranzakció futtatása meghiúsult." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "A következő tranzakció-fájl eltávolítása meghiúsult: %s" @@ -58953,11 +59400,11 @@ index db7c07f..7b2d097 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" -@@ -2458,37 +2582,40 @@ msgstr "" +@@ -2458,37 +2584,40 @@ msgstr "" #. maybe a file log here, too #. but raising an exception is not going to do any good @@ -58965,7 +59412,7 @@ index db7c07f..7b2d097 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" @@ -58973,53 +59420,53 @@ index db7c07f..7b2d097 100644 "történt meg." -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "A zárolás feloldása nem lehetséges: %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Nem lehetséges az ellenőrzés, ha a %s PID aktív" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Már le van zárva %s: egy másik példány fut a következő pid-vel: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Nem zárható le a következő: %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2497,42 +2624,31 @@ msgstr "" +@@ -2497,42 +2626,31 @@ msgstr "" "A csomag nem egyezik a várt letöltéssel. Ajánlott futtatni az alábbi parancsot:\n" "yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Ellenőrzőösszeg végrehajtása nem lehetséges" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "A csomag nem egyezik az ellenőrzőösszeggel" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" @@ -59027,7 +59474,7 @@ index db7c07f..7b2d097 100644 "engedélyezett a következőhöz: %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "helyi másolat használata a következőhöz: %s" @@ -59044,69 +59491,69 @@ index db7c07f..7b2d097 100644 -" * szükséges %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "A fejléc nem teljes." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2540,62 +2656,64 @@ msgstr "" +@@ -2540,62 +2658,64 @@ msgstr "" "A fejléc nem található meg a helyi gyorsítótárban és a \"csak " "gyorsítótárazás\" mód be van kapcsolva. Nem tölthető le a következő: %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "A publikus kulcs nincs telepítve a következőhöz: %s" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Hiba a következő csomag megnyitásánál: %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "A publikus kulcs nem megbízható a következőhöz: %s" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "A következő csomag nincs aláírva: %s" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Nem távolítható el: %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s eltávolítva" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Nem távolítható el a %s nevű fájl: %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s fájl %s eltávolította" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s fájl eltávolítva" @@ -59116,28 +59563,28 @@ index db7c07f..7b2d097 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Több, mint egy azonos találat a tömbben a következőre: %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Semmi sem egyezik a következővel: %s.%s %s:%s-%s a frissítésből" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2603,122 +2721,126 @@ msgstr "" +@@ -2603,122 +2723,127 @@ msgstr "" "A searchPackages() parancs már nem lesz elérhető a későbbi Yum verziókban.\n" "Kérjük, inkább használja a searchGenerator() parancsot helyette.\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "%d csomag keresése" @@ -59147,63 +59594,63 @@ index db7c07f..7b2d097 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "A következő csomag keresése: %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "Keresés fájlbejegyzésekben" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "Keresés ellátási bejegyzésekben" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Nincsenek elérhető csoportadatok a beállított tárolókban" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Nincs %s nevű csoport" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "A(z) %s nevű csomag nem lett bejelölve a következő csoportban: %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "A(z) %s nevű csomag hozzáadás a következő csoportból: %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Nincs telepíthető csomag %s néven." -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "Figyelem: A(z) %s csoport nem tartalmaz egyetlen csomagot sem." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -59213,42 +59660,43 @@ index db7c07f..7b2d097 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "A csomagtömbben nem található leíró a következőre: %s" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Az rpmdb nem tartalmaz csomagleírót a következőre: %s" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" -msgstr "" +msgstr "Érvénytelen verzió: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Nem található csomag a következőre: %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "A Csomag Objektum nem egy csomag-objektum példány" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Semmi sem lett megadva telepítésnek" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" @@ -59256,46 +59704,46 @@ index db7c07f..7b2d097 100644 -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Nincs találat a következő argumentumra: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "A(z) %s nevű csomag telepítve, bár nem érhető el" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Nincsenek elérhető csomagok telepítésre" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Csomag: %s - már szerepel a tranzakcióban" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "A csomag %s cserélve lett a következőre: %s, ami már telepítve van" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2727,19 +2849,19 @@ msgstr "" +@@ -2727,19 +2852,19 @@ msgstr "" "A(z) %s nevű csomag már elavult a következő miatt: %s, bár ez nem teljesíti " "a követelményeket" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" @@ -59303,59 +59751,59 @@ index db7c07f..7b2d097 100644 "a(z) %s telepítésével" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "A(z) %s nevű csomag már a legfrissebb verzióval rendelkezik" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" -@@ -2747,70 +2869,76 @@ msgstr "" +@@ -2747,70 +2872,76 @@ msgstr "" " keresése." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Minden frissítése" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" "Azon csomagok nem lesznek frissítve, melyek már elavultak: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "A következő csomag már elavult: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "A következő elavult csomag nem lesz frissítve: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" @@ -59365,53 +59813,53 @@ index db7c07f..7b2d097 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nem található csomag eltávolításra" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "A futó kernel kihagyása: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "%s eltávolítása a tranzakcióból" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Nem nyitható meg a következő: %s. Kihagyás." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "%s felülvizsgálata: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" "Nem lehet helyileg telepíteni a következő deltarpm fájlt: %s. Kihagyás." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2818,14 +2946,14 @@ msgstr "" +@@ -2818,14 +2949,14 @@ msgstr "" "Nem lehet a(z) %s csomagot hozzáadni a tranzakcióhoz. Nincs kompatibilis " "architektúra: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" @@ -59419,16 +59867,16 @@ index db7c07f..7b2d097 100644 "ezen telepített csomag miatt: %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2834,103 +2962,110 @@ msgstr "" +@@ -2834,138 +2965,147 @@ msgstr "" "A(z) %s nevű csomag már telepítve van, frissítése nem lehetséges. Kérjük, " "használja ehelyett a yum install parancsot a telepítéséhez." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -59438,335 +59886,335 @@ index db7c07f..7b2d097 100644 +"Futtassa a \"yum install\" parancsot a telepítéshez." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "%s kizárása" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "%s megjelölése telepítésre" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "%s megjelölése, mint %s frissítése" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: nem frissíti a telepített csomagot." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Nem nyitható meg a következő fájl: %s. Kihagyás." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Probléma az újratelepítésnél: egy csomag sem eltávolítandó" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" "Probléma az újratelepítésnél: nem található %s nevű csomag telepítéshez" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Nincsenek elérhető csomagok visszaállításhoz" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "A(z) %s csomag többször is telepíthető, kihagyás" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Nem található csomag a következőre: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Csak frissítés érhető el a következő csomagnál: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Visszaállítás meghiúsult: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 #, python-format -msgid "Retrieving key from %s" +msgid "Failed to upgrade: %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 +#, python-format +msgid "Retrieving key from %s" +msgstr "GPG kulcs beszerzése a következőből: %s" + -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "GPG kulcs beszerzés meghiúsult: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" -msgstr "" +msgstr "A(z) %s GPG kulcs aláírása nem egyezik a tároló CA kulcsával: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" -msgstr "" +msgstr "A GPG kulcs sikeresen ellenőrizve lett a CA kulcsokkal" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Hibás GPG kulcs a következőből: %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG kulcs elemzés meghiúsult: a kulcs nem tartalmaz értéket: %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2938,34 +3073,41 @@ msgid "" - " Package: %s (%s)\n" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -+"%s GPG kulcs 0x%s importálása:\n" -+"Felhasználó: %s\n" -+"Csomag : %s (%s)\n" -+"Származás: %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" - " Userid: \"%s\"\n" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -+"%s GPG kulcs 0x%s importálása:\n" -+"Felhasználó: %s\n" -+"Származás: %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "A következő GPG kulcs már telepítve van: %s (0x%s)" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "A kulcs importálása meghiúsult (hibakód %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "A kulcs importálása sikeres" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" -msgstr "" +msgstr "Nem lett telepítve egyetlen kulcs sem" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2974,25 +3116,25 @@ msgstr "" +@@ -2974,25 +3114,25 @@ msgstr "" "A GPG kulcsok a(z) \"%s\" nevű tárolóhoz már telepítve vannak, de nem jók ehhez a csomaghoz.\n" "Kérjük, ellenőrizze, hogy az URL címek helyesen vannak-e megadva ezen tárolóhoz." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "A kulcsok importálása nem segített, rossz kulcsok?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "A következő GPG kulcs már telepítve van: %s (0x%s)" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "A kulcs importálása meghiúsult" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "Nem lett telepítve egyetlen kulcs sem a következő tárolóhoz: %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3001,158 +3143,186 @@ msgstr "" +@@ -3001,158 +3141,186 @@ msgstr "" "A GPG kulcsok a(z) \"%s\" nevű tárolóhoz már telepítve vannak, de nem jók.\n" "Kérjük, ellenőrizze, hogy az URL címek helyesen vannak-e megadva ezen tárolóhoz." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Nem található megfelelő tükörszerver." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Hiba történt a csomagok letöltése közben." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Kérjük, jelentse ezt a hibát a következő címen: %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Tranzakció teszt hibák: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Gyorsítótár-mappa beállítása meghiúsult: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" +"A függőségek feloldása még nincs kész. Nem lehet a függőben lévő tranzakciót" +" menteni." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "A következő tranzakciófájl mentése meghiúsult: %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "" +msgstr "Az elmentett tranzakció beolvasása meghiúsult: %s: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " -msgstr "" +msgstr "Az rpmdb verziója nem egyezik a mentett tranzakció verziójával, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." -msgstr "" +msgstr " kihagyva, ahogy kértük." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." -msgstr "" +msgstr "megszakítás." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." -msgstr "" +msgstr "Nem található a tsflags, vagy a tsflags nem egész szám." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" -msgstr "" +msgstr "txmbr található a jelenleg ismeretlen állapotban: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" -msgstr "" +msgstr "Nem található txmbr: %s állapotban %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" -msgstr "" +msgstr "Nem található txmbr: %s, innen: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" +"A tranzakció elemek, tranzakció-viszonyok hiányoznak, vagy a ts feltehetően " +"megváltozott," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" +msgstr " átugorva, ahogy kérte. Szükséges a redepsolve!" + +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." msgstr "" @@ -59867,7 +60315,7 @@ index db7c07f..7b2d097 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s ellátja a következőt: %s, de nem található" -@@ -3161,6 +3331,17 @@ msgstr "%s ellátja a következőt: %s, de nem található" +@@ -3161,6 +3329,17 @@ msgstr "%s ellátja a következőt: %s, de nem található" msgid "Repackaging" msgstr "Újracsomagolás" @@ -59886,10 +60334,10 @@ index db7c07f..7b2d097 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/id.po b/po/id.po -index 2fbdf46..f3ad415 100644 +index 2fbdf46..062d956 100644 --- a/po/id.po +++ b/po/id.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -59900,11 +60348,13 @@ index 2fbdf46..f3ad415 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Indonesian (http://www.transifex.net/projects/p/yum/team/id/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,413 +17,429 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0\n" @@ -59922,30 +60372,30 @@ index 2fbdf46..f3ad415 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "" @@ -59972,7 +60422,7 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "" @@ -59998,53 +60448,53 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -60054,98 +60504,98 @@ index 2fbdf46..f3ad415 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -60153,7 +60603,7 @@ index 2fbdf46..f3ad415 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -60161,13 +60611,13 @@ index 2fbdf46..f3ad415 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -60176,12 +60626,12 @@ index 2fbdf46..f3ad415 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -60190,12 +60640,12 @@ index 2fbdf46..f3ad415 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -60204,27 +60654,27 @@ index 2fbdf46..f3ad415 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -60232,158 +60682,158 @@ index 2fbdf46..f3ad415 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -60392,18 +60842,18 @@ index 2fbdf46..f3ad415 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -60412,37 +60862,37 @@ index 2fbdf46..f3ad415 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -60451,153 +60901,153 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -60940,22 +61390,22 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -60992,351 +61442,356 @@ index 2fbdf46..f3ad415 100644 #, python-format msgid "" "\n" -@@ -869,57 +891,52 @@ msgid "" +@@ -869,57 +891,57 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "" -@@ -927,7 +944,7 @@ msgstr "" +@@ -927,7 +949,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -935,484 +952,536 @@ msgid "" +@@ -935,484 +957,536 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -61345,17 +61800,17 @@ index 2fbdf46..f3ad415 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -61368,224 +61823,224 @@ index 2fbdf46..f3ad415 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -61593,7 +62048,7 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -61601,7 +62056,7 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -61609,7 +62064,7 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -61617,103 +62072,103 @@ index 2fbdf46..f3ad415 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr "" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr "" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr "" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr "" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr "" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -61721,7 +62176,7 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -61729,68 +62184,68 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1420,47 +1489,47 @@ msgid "" +@@ -1420,47 +1494,47 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "" -@@ -1472,7 +1541,7 @@ msgstr "" +@@ -1472,7 +1546,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -61799,7 +62254,7 @@ index 2fbdf46..f3ad415 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1558,484 @@ msgid "" +@@ -1489,451 +1563,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -62062,188 +62517,187 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -62251,7 +62705,7 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -62259,148 +62713,148 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2046,106 @@ msgstr "" +@@ -1944,100 +2047,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -62408,7 +62862,7 @@ index 2fbdf46..f3ad415 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -62445,226 +62899,226 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,774 +2153,782 @@ msgstr "" +@@ -2045,991 +2154,1026 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -62672,43 +63126,43 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -62896,24 +63350,24 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -62921,7 +63375,7 @@ index 2fbdf46..f3ad415 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -62932,40 +63386,40 @@ index 2fbdf46..f3ad415 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -62973,23 +63427,23 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "" @@ -63003,67 +63457,67 @@ index 2fbdf46..f3ad415 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -63072,26 +63526,26 @@ index 2fbdf46..f3ad415 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -63100,62 +63554,62 @@ index 2fbdf46..f3ad415 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -63163,78 +63617,79 @@ index 2fbdf46..f3ad415 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -63242,118 +63697,118 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -63361,7 +63816,7 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -63369,158 +63824,166 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2821,7 +2937,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2829,207 +2945,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -63528,29 +63991,29 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -63558,117 +64021,117 @@ index 2fbdf46..f3ad415 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -63768,7 +64231,7 @@ index 2fbdf46..f3ad415 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3178,14 @@ msgstr "" +@@ -3038,6 +3182,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -63784,10 +64247,10 @@ index 2fbdf46..f3ad415 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/id_ID.po b/po/id_ID.po -index 964c239..ec2d379 100644 +index 964c239..35410f6 100644 --- a/po/id_ID.po +++ b/po/id_ID.po -@@ -2,13 +2,14 @@ +@@ -2,14 +2,15 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -63800,11 +64263,13 @@ index 964c239..ec2d379 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -17,415 +18,431 @@ msgstr "" "Language: id_ID\n" "Plural-Forms: nplurals=1; plural=0\n" @@ -63822,30 +64287,30 @@ index 964c239..ec2d379 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Memasang" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Usang" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Termutakhirkan" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Dihapus" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Terpasang" @@ -63872,7 +64337,7 @@ index 964c239..ec2d379 100644 msgstr "Dihapus: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Menghapus" @@ -63898,53 +64363,53 @@ index 964c239..ec2d379 100644 msgstr "Membaca metadata repositori dari berkas lokal" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Kesalahan Konfigurasi: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Kesalahan Opsi: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Terpasang: %s-%s di %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Anda perlu memberi beberapa perintah" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Persyaratan Disk:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Setidaknya dibutuhkan ruang %dMB lagi di sistem berkas %s.\n" @@ -63954,100 +64419,100 @@ index 964c239..ec2d379 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" "Mencoba untuk menjalankan transaksi tetapi tidak ada yang harus dikerjakan. " "Keluar." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Mengunduh Paket-paket:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Kesalahan Saat Mengunduh Paket-paket:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "GALAT Anda perlu memperbarui rpm untuk menangani:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM perlu dimutakhirkan" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Laporkan kesalahan di %s ini" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Menjalankan Uji Transaksi" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Kesalahan Pengujian Transaksi:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Uji Transaksi Berhasil" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Menjalankan Transaksi" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Mungkin maksud Anda: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Paket %s%s%s tersedia, tapi tidak terpasang." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Tidak ada paket %s%s%s yang tersedia." @@ -64055,7 +64520,7 @@ index 964c239..ec2d379 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paket yang akan dipasang" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -64063,13 +64528,13 @@ index 964c239..ec2d379 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Tak ada tindakan yang dilakukan" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paket telah ditandai untuk dimutakhirkan" @@ -64078,12 +64543,12 @@ index 964c239..ec2d379 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Tidak ada Paket yang ditandai untuk dimutakhirkan" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -64092,12 +64557,12 @@ index 964c239..ec2d379 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paket ditandai untuk dihapus" @@ -64106,27 +64571,27 @@ index 964c239..ec2d379 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Tidak ada paket yang ditandai untuk dihapus" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (dari %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Paket %s%s%s%s yang terpasang tidak tersedia." @@ -64134,158 +64599,158 @@ index 964c239..ec2d379 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paket yang akan dipasang ulang" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Tidak ada paket yang tersedia" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Paket yang akan dipasang" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Cocok: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Peringatan: Tidak ada yang cocok: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Tidak ada yang cocok" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Tidak ada paket yang ditemukan untuk %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Membersihkan repo: " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Membersihkan Semuanya" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Membersihkan Header" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Membersihkan Paket-paket" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Membersihkan metadata xml" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Membersihkan singgahan basis data" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Membersihkan metadata singgahan yang kadaluarsa" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Membersihkan data rpmdb yang disinggahkan" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Membersihkan pengaya" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Grup yang terpasang:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Grup yang Tersedia:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Selesai" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Peringatan: Grup %s tidak ada." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d Paket yang akan dipasang" @@ -64294,18 +64759,18 @@ index 964c239..ec2d379 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Tidak ada nama grup %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Tidak ada paket yang akan dihapus dari grup" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d Paket akan dihapus" @@ -64314,37 +64779,37 @@ index 964c239..ec2d379 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paket %s sudah diinstal, lewati" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Opsi Pengaya" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Galat di perintah baris: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -64353,156 +64818,156 @@ index 964c239..ec2d379 100644 "%s: opsi %s membutuhkan argumen" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "tampilkan pesan bantuan ini dan keluar" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "toleran terhadap kesalahan" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" "jalankan sepenuhnya dari singgahan sistem, jangan memutakhirkan persinggahan" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "lokasi berkas konfigurasi" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "waktu tunggu perintah maksimum" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "operasi senyap" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "jawab ya untuk semua pertanyaan" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "tampilkan versi Yum dan keluar" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" "aktifkan satu atau lebih repositori (diperbolehkan menggunakan wildcard)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" "nonaktifkan satu atau lebih repositori (diperbolehkan menggunakan wildcard)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "nonaktifkan pengaya Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "nonaktifkan pemeriksaan tanda tangan gpg" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "nonaktifkan pengaya berdasarkan nama" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "aktifkan pengaya berdasarkan nama" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "tentukan nilai $releasever di berkas konfigurasi yum dan repo" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -64846,22 +65311,22 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Tidak terpasang" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Paket" +msgid_plural "Packages" @@ -64898,7 +65363,7 @@ index 964c239..ec2d379 100644 #, python-format msgid "" "\n" -@@ -883,57 +905,52 @@ msgstr "" +@@ -883,57 +905,57 @@ msgstr "" "Ringkasan Transaksi\n" "%s\n" @@ -64906,14 +65371,14 @@ index 964c239..ec2d379 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Pasang %5.5s Paket\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Instal" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" @@ -64921,7 +65386,7 @@ index 964c239..ec2d379 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Hapus %5.5s Paket\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "" @@ -64929,323 +65394,328 @@ index 964c239..ec2d379 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Pasang Ulang %5.5s Paket\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Instal Ulang" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Dihapus" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Ketergantungan Dihapus" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Ketergantungan Dipasang" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Ketergantungan Dimutakhirkan" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Diganti" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Gagal" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "dua" -@@ -941,7 +958,7 @@ msgstr "dua" +@@ -941,7 +963,7 @@ msgstr "dua" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -949,364 +966,416 @@ msgid "" +@@ -949,364 +971,416 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "diinterupsi pengguna" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Sistem" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Tanggal dan waktu" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Tindakan" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Diubah" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Tak ada ID transaksi yang diberikan" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Tidak ditemukan ID transaksi yang diberikan" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Ditemukan lebih dari satu ID transaksi!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Tidak ada ID transaksi, atau paket, yang diberikan" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Lebih Lama" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Lebih Baru" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "ID Transaksi:" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Waktu mulai :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Waktu selesai :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Pengguna :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Kode-Balikan :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Dibatalkan" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Kegagalan:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Sukses" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Perintah Baris :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Transaksi dilakukan dengan:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Paket Diubah:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Paket Dilewati:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Permasalahan rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Keluaran scriptlet:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -65254,17 +65724,17 @@ index 964c239..ec2d379 100644 -msgstr "Instal" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Hapus" @@ -65277,356 +65747,356 @@ index 964c239..ec2d379 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Mutakhirkan" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Waktu" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Hari terakhir" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Minggu lalu" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "2 minggu terakhir" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "3 bulan terakhir" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "6 bulan terakhir" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Setahun terakhir" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Lebih dari setahun yang lalu" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "terpasang" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "dihapus" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "dipasang ulang" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "termutakhirkan" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "usang" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Menjalankan pemeriksaan transaksi" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Paket: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1315,7 +1384,7 @@ msgstr "" +@@ -1315,7 +1389,7 @@ msgstr "" "\n" " Dibutuhkan: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1324,7 +1393,7 @@ msgstr "" +@@ -1324,7 +1398,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1333,7 +1402,7 @@ msgstr "" +@@ -1333,7 +1407,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1342,99 +1411,99 @@ msgstr "" +@@ -1342,99 +1416,99 @@ msgstr "" " Tidak ditemukan" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Dimutakhirkan Oleh" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Tersedia" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Berjalan" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Tak dapat diinterupsi" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombie" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Tak diketahui" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Aplikasi lainnya adalah: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Aplikasi lainnya adalah: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Memori : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Dijalankan: %s - %s yang lalu" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " State : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -65634,7 +66104,7 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -65642,68 +66112,68 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1445,47 +1514,47 @@ msgstr "" +@@ -1445,47 +1519,47 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Selesai!" -@@ -1497,7 +1566,7 @@ msgstr "" +@@ -1497,7 +1571,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -65712,7 +66182,7 @@ index 964c239..ec2d379 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1514,53 +1583,53 @@ msgid "" +@@ -1514,53 +1588,53 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -65777,7 +66247,7 @@ index 964c239..ec2d379 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1570,398 +1639,431 @@ msgstr "" +@@ -1570,398 +1644,427 @@ msgstr "" "Jalankan \"yum repolist all\" untuk melihat repo apa yang Anda miliki.\n" "Anda dapat mengaktifkan repo dengan yum-config-manager --enable " @@ -65976,188 +66446,187 @@ index 964c239..ec2d379 100644 msgstr "Menyiapkan Proses Paket Lokal" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Pencarian Paket untuk Ketergantungan:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Jalankan shell yum interaktif" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Menyiapkan Shell Yum" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Daftar ketergantungan paket" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Mencari ketergantungan: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Tampilkan repositori perangkat lunak yang terkonfigurasi" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "aktif" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "nonaktif" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "ID-Repo : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Nama-Repo : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Status-Repo : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Revisi-Repo: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Tag-Repo : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Ukuran-Repo : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Tak Pernah (terakhir: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -66165,7 +66634,7 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -66173,148 +66642,148 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Menampilkan versi mesin dan/atau repo yang tersedia." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Grup versi Yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Grup :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Paket:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Terpasang:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Grup-Terpasang:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Tersedia" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Grup-Tersedia:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Tampilkan, atau gunakan, riwayat transaksi" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Anda tidak memiliki akses ke DB riwayat" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Memeriksa masalah di rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1972,100 +2074,106 @@ msgstr "" +@@ -1972,100 +2075,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -66322,7 +66791,7 @@ index 964c239..ec2d379 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -66359,226 +66828,226 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Anggota: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s telah dikonversi untuk instalasi" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Menghapus Paket: %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s membutuhkan: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s membutuhkan %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2073,774 +2181,782 @@ msgstr "" +@@ -2073,991 +2182,1026 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -66586,43 +67055,43 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -66810,24 +67279,24 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -66835,7 +67304,7 @@ index 964c239..ec2d379 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -66846,40 +67315,40 @@ index 964c239..ec2d379 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -66887,23 +67356,23 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "" @@ -66917,67 +67386,67 @@ index 964c239..ec2d379 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -66986,26 +67455,26 @@ index 964c239..ec2d379 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -67014,62 +67483,62 @@ index 964c239..ec2d379 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -67077,78 +67546,79 @@ index 964c239..ec2d379 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -67156,118 +67626,118 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -67275,7 +67745,7 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -67283,158 +67753,166 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2849,7 +2965,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2857,207 +2973,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -67442,29 +67920,29 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -67472,117 +67950,117 @@ index 964c239..ec2d379 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -67682,7 +68160,7 @@ index 964c239..ec2d379 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3066,6 +3206,14 @@ msgstr "" +@@ -3066,6 +3210,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -67698,7 +68176,7 @@ index 964c239..ec2d379 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/it.po b/po/it.po -index 44b6091..f66ac5c 100644 +index 44b6091..4a96f6c 100644 --- a/po/it.po +++ b/po/it.po @@ -2,13 +2,15 @@ @@ -67714,8 +68192,8 @@ index 44b6091..f66ac5c 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:25+0000\n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 23:02+0000\n" +"Last-Translator: guidograzioli \n" "Language-Team: Italian (http://www.transifex.net/projects/p/yum/team/it/)\n" "MIME-Version: 1.0\n" @@ -67737,30 +68215,30 @@ index 44b6091..f66ac5c 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installazione" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Reso obsoleto" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Aggiornato" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Eliminato" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Installato" @@ -67787,7 +68265,7 @@ index 44b6091..f66ac5c 100644 msgstr "Eliminato: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Rimozione in corso" @@ -67813,64 +68291,64 @@ index 44b6091..f66ac5c 100644 msgstr "Lettura dei metadati dei repository dai file locali" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Errore di configurazione: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Errore opzioni: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installato: %s-%s da %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Build : %s su %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Committed: %s su %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "È necessario specificare un comando" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Comando sconosciuto: %s. Eseguire %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Requisiti disco:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Servono almeno altri %dMB sul filesystem %s.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" -+msgstr[0] " Servono almeno altri %dMB sul filesystem %s.\n" -+msgstr[1] "" ++msgstr[0] " Serve almeno %dMB sul filesystem %s.\n" ++msgstr[1] " Servono almeno altri %dMB sul filesystem %s.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -67879,75 +68357,75 @@ index 44b6091..f66ac5c 100644 "----------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "La transazione non contiene alcuna operazione da eseguire." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Uscita richiesta dall'utente" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Download dei pacchetti:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Errore nel download dei pacchetti:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" -msgstr "" +msgstr "Esecuzione del controllo di transazione" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "ERRORE Occorre aggiornare rpm per gestire:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" -msgstr "" +msgstr "ERRORE del controllo di transazione nei confronti di depsolve:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM deve essere aggiornato" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Riportare questo errore su %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Test di transazione in corso" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Errore nel controllo transazione:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Test di transazione eseguito con successo" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Transazione in corso" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -67956,18 +68434,18 @@ index 44b6091..f66ac5c 100644 "Usare \"-y\" per abilitarla." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Forse si intendeva: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Pacchetto %s%s%s disponibile, ma non installato." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Nessun pacchetto %s%s%s disponibile." @@ -67975,7 +68453,7 @@ index 44b6091..f66ac5c 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Pacchetto(i) da installare" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -67984,13 +68462,13 @@ index 44b6091..f66ac5c 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Niente da fare" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pacchetti marcati per l'aggiornamento" @@ -68000,44 +68478,44 @@ index 44b6091..f66ac5c 100644 +msgstr[1] "%d pacchetti marcati per l'aggiornamento" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Nessun pacchetto marcato per l'aggiornamento" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pacchetti marcati per la Distribution Synchronization" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" +msgstr[0] "%d pacchetto marcato per la Distribution Synchronization" -+msgstr[1] "%d pacpacchetti marcati per la Distribution Synchronization" ++msgstr[1] "%d pacchetti marcati per la Distribution Synchronization" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Nessun pacchetto marcato per la Distribution Synchronization" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pacchetti marcati per la rimozione" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" +msgstr[0] "%d pacchetto marcato per la rimozione" -+msgstr[1] "%d pacchetti marcati per la rimozione" ++msgstr[1] "%d pacchetto marcati per la rimozione" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Nessun pacchetto marcato per la rimozione" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Downgrade dei pacchetti" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -68045,13 +68523,13 @@ index 44b6091..f66ac5c 100644 +msgstr[1] "%d pacchetti marcati per il downgrade" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (da %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Pacchetto installato %s%s%s%s non disponibile." @@ -68059,31 +68537,31 @@ index 44b6091..f66ac5c 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Pacchetto(i) da reinstallare" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "%d pacchetto da reinstallare" -+msgstr[1] "%d paccchetti " ++msgstr[1] "%d pacchetti da reinstallare" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Nessun pacchetto specificato" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Pacchetto(i) da installare" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" -msgstr "" +msgstr "N/D trovati: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -68091,7 +68569,7 @@ index 44b6091..f66ac5c 100644 +"\"search all\" per cercare in tutti i campi." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -68100,13 +68578,13 @@ index 44b6091..f66ac5c 100644 +"usare \"search all\" per cercare in tutti i campi." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Trovato: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" @@ -68114,116 +68592,116 @@ index 44b6091..f66ac5c 100644 +"\"search all\" per cercare in tutti i campi." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Attenzione: Nessun pacchetto trovato per: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Nessuna corrispondenza trovata" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Nessun pacchetto trovato per %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Pulizia dei repository:" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Pulizia completa" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Pulizia header" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Pulizia pacchetti" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Pulizia metadati xml" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Pulizia cache database" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Pulizia metadati expire-cache" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Pulizia cache di rpmdb" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Pulizia plugin" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "Attenzione: nessun gruppo trovato per: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Gruppi installati:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" -msgstr "" +msgstr "Gruppi lingua installati:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Gruppi disponibili:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" -msgstr "" +msgstr "Gruppi lingua disponibili:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Fatto" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Attenzione: Il gruppo %s non esiste." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 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" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pacchetto(i) da installare" @@ -68233,41 +68711,41 @@ index 44b6091..f66ac5c 100644 +msgstr[1] "%d pacchetti da installare" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Non esiste nessun gruppo con nome %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Nessun pacchetto da rimuovere dai gruppi" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pacchetto(i) da eliminare" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "%d pacchetto da eliminare" -+msgstr[1] "%d pacchetti da eliminare" ++msgstr[0] "%d pacchetto da rimuovere" ++msgstr[1] "%d pacchetti da rimuovere" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Il pacchetto %s è già installato, verrà ignorato" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Esclusione del pacchetto non comparabile %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" @@ -68275,18 +68753,18 @@ index 44b6091..f66ac5c 100644 "installazione" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Opzioni plugin" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Errore di linea di comando: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -68295,155 +68773,155 @@ index 44b6091..f66ac5c 100644 "%s: l'opzione %s richiede un argomento" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color deve specificare uno tra: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "--installroot deve essere un percorso assoluto: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "mostra questo messaggio di aiuto ed esce" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "tollera gli errori" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "esegui esclusivamente in cache, senza aggiornarla" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "percorso del file di configurazione" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "tempo massimo di attesa comando" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "livello output di debug" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "mostra i duplicati nei repo, per i comandi list/search" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "livello output per gli errori" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "livello output di debug per rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "modalità silenziosa" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "mostra più messaggi di log" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "risponde si a tutte le domande" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" -+msgstr "risponde no a tutte le domande" ++msgstr "rispondi no a tutte le domande" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "mostra la versione di yum ed esce" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "imposta la root d'installazione" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "abilita uno o più repository (wildcard consentite)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "disabilita uno o più repository (wildcard consentite)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "esclude pacchetti per nome o glob" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 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:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "abilita l'elaborazione degli obsoleti durante l'aggiornamento" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "disabilita i plugin di Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "disabilita il controllo della firma gpg" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "disabilita i plugin per nome" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "abilita i plugin per nome" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "ignora pacchetti con problemi di risoluzione dipendenze" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" -msgstr "controlla se il colore è usato" +msgstr "imposta l'uso del colore" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "imposta $releasever nella configurazione di yum e nei file dei repo" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "imposta configurazioni arbitrarie e opzioni dei repository" @@ -68738,7 +69216,8 @@ index 44b6091..f66ac5c 100644 +#: ../output.py:1280 msgid "There was an error calculating total download size" msgstr "" - "Si è verificato un errore nel calcolo della dimensione totale di download" +-"Si è verificato un errore nel calcolo della dimensione totale di download" ++"Si è verificato un errore nel calcolo della dimensione totale del download" -#: ../output.py:971 +#: ../output.py:1285 @@ -68791,28 +69270,28 @@ index 44b6091..f66ac5c 100644 msgstr "Rimozioni per dipendenze" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Saltato (problemi di dipendenze)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Non installato" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Non disponibile" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Pacchetto" +msgid_plural "Packages" +msgstr[0] "Pacchetto" -+msgstr[1] "" ++msgstr[1] "Pacchetto" -#: ../output.py:1075 +#: ../output.py:1393 @@ -68845,7 +69324,7 @@ index 44b6091..f66ac5c 100644 #, python-format msgid "" "\n" -@@ -888,57 +927,52 @@ msgstr "" +@@ -888,57 +927,58 @@ msgstr "" "Riepilogo della transazione\n" "%s\n" @@ -68853,7 +69332,7 @@ index 44b6091..f66ac5c 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Installa %5.5s pacchetti\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Install" @@ -68861,23 +69340,23 @@ index 44b6091..f66ac5c 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Aggiorna %5.5s pacchetti\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" -+msgstr "Aggiornamento" ++msgstr "Upgrade" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Elimina %5.5s pacchetti\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" -+msgstr "Rimozione" ++msgstr "Remove" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Reinstalla %5.5s pacchetti\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Reinstall" @@ -68885,324 +69364,330 @@ index 44b6091..f66ac5c 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Downgrade %5.5s pacchetti\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Downgrade" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "Pacchetto dipendente" ++msgstr[1] "Pacchetti dipendenti" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Eliminato" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Dipendenza rimossa" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Dipendenza installata" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Dipendenza aggiornata" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Sostituito" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Fallito" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "due" -@@ -946,7 +980,7 @@ msgstr "due" +@@ -946,7 +986,7 @@ 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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -957,365 +991,417 @@ msgstr "" +@@ -957,365 +997,417 @@ msgstr "" " Download interrotto, %spremi nuovamente (ctrl-c)%s entro %s%s%s secondi\n" "per uscire.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "interruzione utente" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Totale" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Sistema" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" -msgstr "" +msgstr "Ignoro la transazione importata %d a %d, perchè genera conflitti" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" -msgstr "" +msgstr "Nessuna transazione" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "L'ID transazione, o il pacchetto specificato, non è corretto" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" -msgstr "" +msgstr "Linea di comando" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Utente loggato" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Data e ora" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Azione/i" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Modifiche" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "ID transazione non specificato" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "L'ID transazione specificato non è corretto" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "L'ID transazione specificato non è stato trovato" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Sono stati trovati ID transazione multipli!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "ID transazione o pacchetto non specificato" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Downgraded" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Meno recente" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Più recente" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "ID transazione :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Ora inizio :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "rpmdb iniziale :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u secondi)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u minuti)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u ore)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u giorni)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Ora termine :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "rpmdb finale :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Utente :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Return-Code : " -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Interrotto" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" -msgstr "" +msgstr "Operazioni fallite:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Errore:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Completato" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Linea di comando :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Informazioni non predefinite addizionali salvate: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Transazione eseguita con:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Pacchetti modificati:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Pacchetti ignorati:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Problemi di rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Output della scriptlet:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Errori:" @@ -69211,17 +69696,17 @@ index 44b6091..f66ac5c 100644 -msgstr "Install" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Dep-Install" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Obsoleto" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Eliminato" @@ -69234,442 +69719,442 @@ index 44b6091..f66ac5c 100644 -msgstr "Downgrade" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Update" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Data" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Ultime 24 ore" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Ultima settimana" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Ultime 2 settimane" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Ultimi 3 mesi" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Ultimi 6 mesi" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Ultimi 12 mesi" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Più di un anno" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Transazione %s non trovata" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "ID transazione:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Informazioni addizionali sulla cronologia:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: nessuna informazione addizionale trovata con questo nome" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "Pacchetto :" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "Stato :" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "Dimensione :" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "Build host :" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "Build time :" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "Packager :" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "Vendor :" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "Licenza :" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "URL :" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "RPM sorgente :" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" -+msgstr "Data Commit :" ++msgstr "Commit Time :" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "Committer :" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "Motivo :" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" -+msgstr "Dal repo :" ++msgstr "Dal repository :" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "Installato da :" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" -+msgstr "Modificato da :" ++msgstr "Modficato da :" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "installato" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" -msgstr "" +msgstr "un aggiornamento" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "eliminato" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "reinstallato" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" -msgstr "" +msgstr "un downgrade" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" -msgstr "" +msgstr "reso obsoleto" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "aggiornato" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "reso obsoleto" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" -msgstr "" +msgstr "---> Pacchetto %s.%s %s:%s-%s settato per essere %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Esecuzione del controllo di transazione" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" "--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Risoluzione delle dipendenze completata" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Elaborazione dipendenza: %s per il pacchetto: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Pacchetto mantenuto: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Dipendenza non risolta: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Pacchetto: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1324,7 +1410,7 @@ msgstr "" +@@ -1324,7 +1416,7 @@ msgstr "" "\n" " Richiede: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1333,7 +1419,7 @@ msgstr "" +@@ -1333,7 +1425,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1342,7 +1428,7 @@ msgstr "" +@@ -1342,7 +1434,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1351,87 +1437,87 @@ msgstr "" +@@ -1351,87 +1443,87 @@ msgstr "" " Non trovato" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Aggiornato da" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Downgraded da" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Reso obsoleto da" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Disponibile" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Analisi conflitto: %s va in conflitto con %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> Inizializzazione della transazione con i pacchetti selezionati. " "Attendere prego." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Download dell'header per includere %s nel set di transazione." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "In esecuzione" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "In attesa" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Non interrompibile" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombie" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Traced/Interrotto" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Sconosciuto" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " L'altra applicazione è: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " L'altra applicazione è: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Memoria : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Avviato: %s - %s fa" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Stato : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1441,7 +1527,7 @@ msgstr "" +@@ -1441,7 +1533,7 @@ msgstr "" "\n" "Uscita forzata da utente" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1451,7 +1537,7 @@ msgstr "" +@@ -1451,7 +1543,7 @@ msgstr "" "\n" "Uscita per broken pipe" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1462,7 +1548,7 @@ msgstr "" +@@ -1462,7 +1554,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1470,35 +1556,35 @@ msgstr "" +@@ -1470,35 +1562,35 @@ msgstr "" "Un'altra applicazione sta bloccando l'esecuzione di yum; arresto come " "configurato da exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Errore ritorno del plugin: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Errore di yum: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Errore: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " Si può provare ad usare --skip-broken per aggirare il problema" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Provare ad eseguire: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Errore sconosciuto: Codice di uscita: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1506,19 +1592,19 @@ msgstr "" +@@ -1506,19 +1598,19 @@ msgstr "" "\n" "Dipendenze risolte" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Completo!" @@ -69687,7 +70172,7 @@ index 44b6091..f66ac5c 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1548,53 +1634,53 @@ msgstr "" +@@ -1548,53 +1640,53 @@ msgstr "" "\n" "Per altre informazioni contattare il supporto della distribuzione.\n" @@ -69753,7 +70238,7 @@ index 44b6091..f66ac5c 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1604,307 +1690,300 @@ msgstr "" +@@ -1604,307 +1696,296 @@ msgstr "" " Eseguire \"yum repolist all\" per vedere la lista dei repository.\n" " E' possibile abilitare i repository desiderati con yum-config-manager --enable " @@ -69856,7 +70341,7 @@ index 44b6091..f66ac5c 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "Mostra o utilizza le informazioni sui gruppi" ++msgstr "Mostra o utilizza le informazioni dei gruppi" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -69885,7 +70370,7 @@ index 44b6091..f66ac5c 100644 +#: ../yumcommands.py:833 +#, python-format +msgid "Invalid groups sub-command, use: %s." -+msgstr "Sottocomando di groups non valido, usare: %s" ++msgstr "Sottocomando di groups non corretto, usare: %s." -#: ../yumcommands.py:550 +#: ../yumcommands.py:929 @@ -69955,155 +70440,154 @@ index 44b6091..f66ac5c 100644 msgstr "Impostazione processo per pacchetti in locale" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Determina quale pacchetto soddisfa la dipendenza specificata" - +-msgid "Determine which package provides the given dependency" +-msgstr "Determina quale pacchetto soddisfa la dipendenza specificata" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Ricerca dei pacchetti per le dipendenze:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Esegue una shell di yum interattiva" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Impostazione della shell di yum" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Elenca le dipendenze di un pacchetto" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Ricerca delle dipendenze: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Mostra i repository di software configurati" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "abilitato" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "disabilitato" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Id-Repo : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Nome-Repo : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Stato-Repo : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Revisione-Repo: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Repo-tags : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Repo-distro-tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Repo-updated : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Repo-pkgs : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Dim.-Repo : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Repo-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Aggiornato :" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Repo-mirrors : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Mai (ultimo: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Istantaneo (ultimo: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s secondi (ultimo: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Repo-expire : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Repo-exclude : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Repo-include :" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Repo-excluded: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Repo-filename: " @@ -70111,191 +70595,191 @@ index 44b6091..f66ac5c 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "id repo" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "stato" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "nome repo" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Mostra un'utile guida all'uso" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Nessun aiuto disponibile per %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1914,7 +1993,7 @@ msgstr "" +@@ -1914,7 +1995,7 @@ msgstr "" "\n" "alias: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1924,117 +2003,167 @@ msgstr "" +@@ -1924,117 +2005,167 @@ msgstr "" "\n" "alias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Impostazione processo di reinstallazione" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "Reinstalla un pacchetto" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Impostazione processo di downgrade" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "Esegue il downgrade di un pacchetto" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Mostra una versione del sistema e/o dei repo disponibili." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Gruppi della versione di yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Gruppo :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Pacchetti:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Installato:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Group-Installed:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Disponibile:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Group-Available:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Visualizza e gestisci la cronologia delle transazioni" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" -+msgstr "Transazioni:" ++msgstr "Transazioni :" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "Ora inizio :" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "Ora fine :" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" -+msgstr "Conteggi :" ++msgstr "Conteggio :" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr " rpm DB :" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr " yum DB :" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Sotto comando per history non valido, usare: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Non si dispone dell'accesso alla cronologia." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Identifica gli errori nell'rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" -msgstr "" +msgstr "carica una transazione salvata da un file" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." -msgstr "" +msgstr "Nessun file specificato per la transazione salvata." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "caricamento transazione da %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "" @@ -70308,16 +70792,16 @@ index 44b6091..f66ac5c 100644 +msgstr " Controlli Yum falliti: %s" + +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -+"Accesso in lettura/scrittura non disponibile nella directory corrente, mi " -+"sposto su /" -+ ++"Non si hanno i diritti di read/execute nella directory corrente, viene usata" ++" /" + +-#: ../yummain.py:114 +#: ../yummain.py:124 +msgid "Can't create lock file; exiting" +msgstr "Impossibile creare il file di lock; uscita" - --#: ../yummain.py:114 ++ +#: ../yummain.py:128 msgid "" "Another app is currently holding the yum lock; waiting for it to exit..." @@ -70343,7 +70827,7 @@ index 44b6091..f66ac5c 100644 +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" msgstr "" -+"La transazione è stata salvata; per eseguirla nuovamente:\n" ++"La transazione è stata salvata, per eseguirla nuovamente:\n" +" yum load-transaction %s" -#: ../yummain.py:288 @@ -70351,123 +70835,123 @@ index 44b6091..f66ac5c 100644 msgid "" "\n" "\n" -@@ -2044,74 +2173,74 @@ msgstr "" +@@ -2044,74 +2175,74 @@ msgstr "" "\n" "Uscita su richiesta utente." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() verrà eliminato in una futura versione di yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Impostazione del TransactionSets prima che sia attivo config class" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "tsflag non valido nel file di configurazione: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" -msgstr "Ricerca di pkgSack per dip: %s" +msgstr "Ricerca nel pkgSack per dip: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Membro: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s convertito in installazione" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Aggiunto il pacchetto %s in modo %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Rimozione pacchetto %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s richiede: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s richiede %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Il requisito necessario è già stato controllato, imbroglio" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Il requisito necessario non è il nome di un pacchetto. Ricerca di: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Provider potenziale: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "La modalità è %s per il provider di %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Modalità per il pacchetto che fornisce %s: %s" -@@ -2119,120 +2248,121 @@ msgstr "Modalità per il pacchetto che fornisce %s: %s" +@@ -2119,120 +2250,121 @@ msgstr "Modalità per il pacchetto che fornisce %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "Tentativo di aggiornare %s per risolvere una dipendenza" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" +"Nessun percorso di aggiornamento trovato per %s. Aggiornamento fallito!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, 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:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" @@ -70475,40 +70959,40 @@ index 44b6091..f66ac5c 100644 "dipendenza." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Aggiornamento di %s per risolvere dip." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" "Impossibile trovare un percorso di aggiornamento delle dipendenze per: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Individuato %s come requisito per %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s è nei pacchetti fornitori ma è già installato, viene rimosso." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" "Il potenziale pacchetto risolutore %s ha già una più recente istanza in ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" @@ -70516,120 +71000,120 @@ index 44b6091..f66ac5c 100644 "installata." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s è gia nel set delle transazioni (ts), verrà saltato" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: %s marcato come aggiornamento per %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: %s marcato come da installare per %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Successo - transazione vuota" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Riavvio del ciclo" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Elaborazione delle dipendenze terminata" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Successo - dipendenze risolte" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Controllo delle dipendenze per %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "ricerca di %s come requisito di %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Esecuzione di compare_providers() per %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "migliore architettura in po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s rende obsoleto %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2241,143 +2371,143 @@ msgstr "" +@@ -2241,143 +2373,143 @@ msgstr "" "archdist ha comparato %s a %s su %s\n" " Vincitore: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "sourcerpm comune %s e %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "il pacchetto base %s è installato per %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "prefisso comune di %s tra %s e %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr " richiede almeno: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Vincitore: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Perdente (con %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Ordine migliore: %s" @@ -70763,7 +71247,7 @@ index 44b6091..f66ac5c 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2385,21 +2515,21 @@ msgstr "" +@@ -2385,21 +2517,21 @@ msgstr "" "Ci sono transazioni non completate. Si consiglia di eseguire prima yum-" "complete-transaction per portarle a termine." @@ -70791,7 +71275,7 @@ index 44b6091..f66ac5c 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2407,89 +2537,92 @@ msgstr "" +@@ -2407,89 +2539,92 @@ msgstr "" "\n" "Pacchetti ignorati a causa di problemi di dipendenze:" @@ -70825,7 +71309,7 @@ index 44b6091..f66ac5c 100644 msgstr "conflitto installato" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -70833,18 +71317,18 @@ index 44b6091..f66ac5c 100644 "altri errori non fatali." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Non è stato possibile iniziare la transazione:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Impossibile eseguire la transazione." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Eliminazione del file di transazione %s fallita" @@ -70852,7 +71336,7 @@ index 44b6091..f66ac5c 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s doveva essere installato, ma non sembra esserlo!" @@ -70863,65 +71347,65 @@ index 44b6091..f66ac5c 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s doveva essere eliminato, ma non lo è stato!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Impossibile creare il lock su %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, 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:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, 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:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Impossibile creare il lock su %s: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2498,40 +2631,29 @@ msgstr "" +@@ -2498,40 +2633,29 @@ msgstr "" "Il pacchetto non corrisponde al download desiderato. Suggerimento: eseguire " "yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Non è stato possibile calcolare il checksum" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Il pacchetto non corrisponde al checksum" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, 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:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "utilizzo di una copia locale di %s" @@ -70938,69 +71422,69 @@ index 44b6091..f66ac5c 100644 -" * necessario %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "L'header non è completo." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2539,62 +2661,64 @@ msgstr "" +@@ -2539,62 +2663,64 @@ msgstr "" "Header non presente in cache locale e modalità solo-cache abilitata. " "Impossibile scaricare %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "La chiave pubblica per %s non è installata" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problemi nell'apertura di %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "La chiave pubblica per %s non è trusted" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Il pacchetto %s non è firmato" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Non posso rimuovere %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s eliminato" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Impossibile rimuovere %s file %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s file %s rimosso" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s file rimossi" @@ -71010,28 +71494,28 @@ index 44b6091..f66ac5c 100644 +msgstr[1] "%d %s file rimossi" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Più di una corrispondenza identica nel sack per %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Nessuna corrispondenza per %s.%s %s:%s-%s dall'aggiornamento" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2602,121 +2726,125 @@ msgstr "" +@@ -2602,121 +2728,126 @@ msgstr "" "searchPackages() verrà eliminato in una futura versione di yum. In " "sostituzione usare searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Ricerca dei pacchetti %d" @@ -71041,63 +71525,63 @@ index 44b6091..f66ac5c 100644 +msgstr[1] "Ricerca di %d pacchetti" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "ricerca del pacchetto %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "ricerca nelle file entries" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "ricerca nelle provides entries" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Non ci sono informazioni sui gruppi per i repository configurati" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Il gruppo %s non esiste" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "il pacchetto %s non è stato contrassegnato nel gruppo %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Aggiunta del pacchetto %s dal gruppo %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Nessun pacchetto con nome %s disponibile per l'installazione" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "Attenzione: il gruppo %s non contiene alcun pacchetto." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -71107,88 +71591,89 @@ index 44b6091..f66ac5c 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Il pacchetto con tupla %s non è stato trovato nel packagesack" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Il pacchetto con tupla %s non è stato trovato nel rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" -msgstr "" +msgstr "Flag di versione non valido da: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Nessun pacchetto trovato per %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Package Object non è un'istanza di un oggetto package" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Non è specificato niente da installare" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Controllo dei virtual provide o file-provide per %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Nessuna corrispondenza per l'argomento: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Il pacchetto %s è installato e non disponibile" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Nessun pacchetto disponibile per l'installazione" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pacchetto: %s - già nel set di transazione" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Il pacchetto %s è reso obsoleto da %s, che è già installato" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2725,85 +2853,91 @@ msgstr "" +@@ -2725,85 +2856,91 @@ msgstr "" "Il pacchetto %s è reso obsoleto da %s, ma quest'ultimo non fornisce i " "provide richiesti" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" @@ -71196,13 +71681,13 @@ index 44b6091..f66ac5c 100644 "posto" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Il pacchetto %s è già installato e aggiornato all'ultima versione" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" @@ -71210,43 +71695,43 @@ index 44b6091..f66ac5c 100644 #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Aggiornamento completo" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Il pacchetto obsoleto non verrà aggiornato: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "Nessun pacchetto trovato per l'aggiornamento: %s" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Il pacchetto era già obsoleto: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Il pacchetto obsoleto non verrà aggiornato: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Il pacchetto è già aggiornato: %s.%s %s:%s-%s" @@ -71254,52 +71739,52 @@ index 44b6091..f66ac5c 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nessun pacchetto selezionato per l'eliminazione" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "Nessun pacchetto trovato per la rimozione: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Ignoro il kernel in esecuzione: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Rimozione di %s dalla transazione" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Impossibile aprire: %s. Verrà ignorato." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Analisi di %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "localinstall del deltarpm fallito: %s. Verrà ignorato." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2811,14 +2945,14 @@ msgstr "" +@@ -2811,14 +2948,14 @@ msgstr "" "Impossibile aggiungere il pacchetto %s alla transazione. Architettura non " "compatibile: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" @@ -71307,16 +71792,16 @@ index 44b6091..f66ac5c 100644 "installato %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2827,106 +2961,115 @@ msgstr "" +@@ -2827,141 +2964,161 @@ msgstr "" "Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire" " yum install per installarlo." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -71326,44 +71811,44 @@ index 44b6091..f66ac5c 100644 +"Eseguire yum install se si desidera installarlo." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Esclusione di %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "%s contrassegnato per l'installazione" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "%s contrassegnato come aggiornamento di %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: non aggiorna il pacchetto installato." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Impossibile aprire il file: %s. Verrà ignorato." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" "Problema nella reinstallazione: nessun pacchetto corrispondente per la " "rimozione" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" @@ -71371,55 +71856,55 @@ index 44b6091..f66ac5c 100644 "l'installazione" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Nessun pacchetto disponibile per il downgrade" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Il pacchetto %s permette installazioni multiple, lo salto" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Nessuna corrispondenza per il pacchetto disponibile: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Solo l'upgrade è disponibile per il pacchetto: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Downgrade fallito: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" -+msgstr "Impossibile aggiornare: %s" ++msgstr "Errore nell'upgrade: %s" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" -msgstr "" +msgstr "Recupero chiave da %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Recupero chiave GPG fallito: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" @@ -71427,243 +71912,252 @@ index 44b6091..f66ac5c 100644 +"repository: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" -msgstr "" +msgstr "Verifica della firma della chiave GPG con la chiave della CA fallita " -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Chiave GPG non valida da %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Analisi chiave GPG fallita: la chiave non ha il valore %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2934,34 +3077,41 @@ msgid "" - " Package: %s (%s)\n" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -+"Importazione chiave %s 0x%s:\n" -+" Userid : %s\n" -+" Pacchetto: %s (%s)\n" -+" Da : %s" ++"Importazione della chiave %s 0x%s:\n" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Pacchetto : %s (%s)\n" ++" Da : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" - " Userid: \"%s\"\n" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -+"Importazione chiave %s 0x%s:\n" -+" Userid: %s\n" -+" Da : %s" ++"Importazione della chiave %s 0x%s:\n" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Da : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "Chiave GPG in %s (0x%s) già installata" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Importazione chiave fallita (codice %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Chiave importata correttamente" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" -msgstr "" +msgstr "Non è stata installata alcuna chiave" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2970,25 +3120,25 @@ msgstr "" +@@ -2970,25 +3127,25 @@ msgstr "" "Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette per questo pacchetto.\n" "Controllare che gli URL delle chiavi di questo repository siano configurati correttamente." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Importazione delle chiavi non sufficiente, chiave sbagliata?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, 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:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Importazione chiave fallita" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "Non è stata installata alcuna chiave per il repository %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2997,158 +3147,189 @@ msgstr "" +@@ -2997,158 +3154,189 @@ msgstr "" "Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette.\n" "Controllare che gli URL delle chiavi di questo repository siano configurati correttamente." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Impossibile trovare un mirror adatto." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Si sono verificati degli errori durante il download dei pacchetti." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Riportare questo errore su %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Errori nel test di transazione: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Impossibile impostare la cachedir: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" +"Dipendenze non risolte. La transazione con dipendenze non risolte non verrà " +"salvata." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "Impossibile salvare il file di transazione %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "" +msgstr "Impossibile accedere/leggere la transazione salvata %s: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" +"la versione di rpmdb non corrisponde alla versione della transazione " +"salvata, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." -msgstr "" +msgstr " ignorato, come richiesto." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." -msgstr "" +msgstr " esecuzione annullata." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." -msgstr "" +msgstr "impossibile trovare tsflags o tsflags non intero." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" -msgstr "" +msgstr "Membro di transazione trovato in stato attuale sconosciuto: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" -msgstr "" +msgstr "Impossibile trovare il membro di transazione: %s in stato %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" -msgstr "" +msgstr "Impossibile trovare il membro di transazione: %s dall'origine: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" +"Membri della transazione, ci sono relazioni mancanti oppure ts è stata " +"modificata," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +" ignorati, come richiesto. E' necessario eseguire nuovamente depsolve." + +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." -+msgstr "%s è già stato visitato e non è possibile rimuoverlo." ++msgstr "%s è già stato visitato e non può essere rimossi." + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Esame delle revdeps di %s" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." -+msgstr "%s ha come revdep %s che è stato installato dall'utente." ++msgstr "%s ha la revdep %s che è stata installata dall'utente." + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "%s non ha revdep installate dall'utente." ++msgstr "%s non ha revdeps installate dall'utente." #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 @@ -71761,7 +72255,7 @@ index 44b6091..f66ac5c 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s fornisce %s, ma non è stato possibile trovarlo" -@@ -3157,6 +3338,17 @@ msgstr "%s fornisce %s, ma non è stato possibile trovarlo" +@@ -3157,6 +3345,17 @@ msgstr "%s fornisce %s, ma non è stato possibile trovarlo" msgid "Repackaging" msgstr "Reimpacchettamento" @@ -71780,7 +72274,7 @@ index 44b6091..f66ac5c 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/ja.po b/po/ja.po -index a232b0c..fd3f905 100644 +index a232b0c..c9549cf 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2,14 +2,16 @@ @@ -71798,9 +72292,9 @@ index a232b0c..fd3f905 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-10-10 03:08+0000\n" -+"Last-Translator: elf \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Japanese (http://www.transifex.net/projects/p/yum/team/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71821,30 +72315,30 @@ index a232b0c..fd3f905 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "インストールしています" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "不要" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "更新" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "削除" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "インストール" @@ -71871,7 +72365,7 @@ index a232b0c..fd3f905 100644 msgstr "削除しました: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "削除" @@ -71897,53 +72391,53 @@ index a232b0c..fd3f905 100644 msgstr "ローカルファイルからリポジトリーのメタデータを読み込んでいます" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "設定エラー: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "オプションエラー: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "インストール: %s-%s (日時: %s)" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " 構築 : %s (日時: %s)" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " コミット : %s (日時: %s)" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "いくつかのコマンドを指定する必要があります" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "コマンド「%s」が見つかりません。「%s --help」を実行してください。" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "ディスク要求:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " 少なくとも %dMB の空き容量がファイルシステム %s で必要です。\n" @@ -71953,7 +72447,7 @@ index a232b0c..fd3f905 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -71962,91 +72456,91 @@ index a232b0c..fd3f905 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "トランザクションの実行を試みましたが、何もありませんでした。終了します。" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "ユーザーコマンドを終了しています" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "パッケージをダウンロードしています:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "パッケージのダウンロードでエラー:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "トランザクションのチェックを実行してします。" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "エラー: RPM の更新のためのハンドルを更新する必要があります" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "更新には RPM が必要です" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "%s にこのエラーを報告してください" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "トランザクションのテストを実行しています" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "トランザクションの確認エラー\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "トランザクションのテストを成功しました" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "トランザクションを実行しています" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * おそらくの意味: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "パッケージ %s%s%s は利用できますが、インストールしませんでした。" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "パッケージ %s%s%s は利用できません。" @@ -72054,7 +72548,7 @@ index a232b0c..fd3f905 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "インストールするパッケージ" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -72062,13 +72556,13 @@ index a232b0c..fd3f905 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "何もしません" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d 個のパッケージが更新の設定しました。" @@ -72077,12 +72571,12 @@ index a232b0c..fd3f905 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "更新と設定されたパッケージがありません。" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d 個のパッケージを同期配信に設定しました。" @@ -72091,12 +72585,12 @@ index a232b0c..fd3f905 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "パッケージが同期配信に設定したパッケージはありません。" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d 個のパッケージを削除に設定しました。" @@ -72105,27 +72599,27 @@ index a232b0c..fd3f905 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "削除と設定したパッケージはありません。" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "ダウングレードするパッケージ" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (%s から)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "インストール済みパッケージ %s%s%s%s は利用できません。" @@ -72133,161 +72627,161 @@ index a232b0c..fd3f905 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "再インストールするパッケージ" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "パッケージが提供されていません。" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "インストールするパッケージ" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "一致: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "警告: 一致するものが見つかりません: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "見つかりませんでした" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "%s のパッケージが見つかりません" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "リポジトリーを清掃しています: " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "すべて掃除しています" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "ヘッダーを掃除しています" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "パッケージを掃除しています" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "XML メタデータを掃除しています" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "データベースキャッシュを掃除しています" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "期限切れのメタデータキャッシュを掃除しています" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "キャッシュ済み rpmdb データを掃除しています" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "プラグインを掃除しています" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "警告: 一致するグループがありません: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "インストール済みグループ:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" -msgstr "" +msgstr "インストール済みの言語グループ:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "利用可能なグループ" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" -msgstr "" +msgstr "利用できる言語グループ:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "完了" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "警告: グループ %s が存在しません。" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "インストールまたは更新に利用できるいくつかの要求されたグループにパッケージがありません" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d 個のパッケージをインストールします" @@ -72296,18 +72790,18 @@ index a232b0c..fd3f905 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "グループ名 %s が存在しません" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "グループから削除するパッケージがありません" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d 個のパッケージを削除します" @@ -72316,37 +72810,37 @@ index a232b0c..fd3f905 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "パッケージ %s は既にインストールされているので飛ばします" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "非互換のパッケージ %s.%s を破棄しています" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "プラグインのオプション" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "コマンドライン エラー: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -72355,154 +72849,154 @@ index a232b0c..fd3f905 100644 "%s: オプション %s は引数が必要です " -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color がとることができる値な次のうちひとつです: auto、always、never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "--installroot は絶対パスでなければなりません: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "このヘルプ メッセージを表示して終了する" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "エラーを黙認する" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "キャッシュから完全に実行し、キャッシュを更新しません" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "構成ファイルの場所" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "コマンドの最大待ち時間" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "デバッグ情報の出力レベル" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "一覧/検索コマンドのリポジトリーの重複の表示" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "エラー出力レベル" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "rpm のデバッグ情報の出力レベル" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "静かに処理をする" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "冗長に処理をする" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "すべての問い合わせに「yes」で答える" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "Yum のバージョンを表示して終了する" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "インストールのベース ディレクトリーを設定する" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "ひとつ以上のリポジトリーを有効にする (ワイルドカード許可)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "ひとつ以上のリポジトリーを無効にする (ワイルドカード許可)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "名前かワイルドカードでパッケージを除外する" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "main、あるリポジトリー、またはすべてからの除外を無効にします。" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "更新中に不要な処理を有効にします" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "Yum プラグインを無効にする" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "GPG 署名の確認を無効にする" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "名前でプラグインを無効にする" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "名前でプラグインを有効にする" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "依存性に問題があるパッケージを飛ばす" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "色を使うかどうか制御する" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "yum 設定と repo ファイルに $releasever の値を設定する" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "全体設定とリポジトリー オプションの任意に設定する" @@ -72847,23 +73341,23 @@ index a232b0c..fd3f905 100644 msgstr "依存性関連での削除をします。" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "飛ばしました (依存性の問題)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "未インストール" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "利用できません" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "パッケージ" +msgid_plural "Packages" @@ -72900,7 +73394,7 @@ index a232b0c..fd3f905 100644 #, python-format msgid "" "\n" -@@ -880,57 +903,52 @@ msgstr "" +@@ -880,57 +903,57 @@ msgstr "" "トランザクションの要約\n" "%s\n" @@ -72908,7 +73402,7 @@ index a232b0c..fd3f905 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "インストール %5.5s パッケージ\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "インストール" @@ -72916,23 +73410,23 @@ index a232b0c..fd3f905 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "アップグレード %5.5s パッケージ\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" -+msgstr "アップグレード" ++msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "削除 %5.5s パッケージ\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" -+msgstr "削除" ++msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "再インストール %5.5s パッケージ\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "再インストール" @@ -72940,323 +73434,328 @@ index a232b0c..fd3f905 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "ダウングレード %5.5s パッケージ\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "ダウングレード" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "削除しました" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "依存性の削除をしました" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "依存性関連をインストールしました" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "依存性を更新しました" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "置換" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "失敗" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "2" -@@ -938,7 +956,7 @@ msgstr "2" +@@ -938,7 +961,7 @@ msgstr "2" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -948,364 +966,416 @@ msgstr "" +@@ -948,364 +971,416 @@ msgstr "" "\n" "現在のダウンロードをキャンセルしました。終了するには %s再度割り込み ([Ctrl][C]キー)%s を %s%s%s 秒以内に押してください。\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "ユーザーの割り込み" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "合計" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "<未設定>" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "システム" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" -msgstr "" +msgstr "トランザクションがありません" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "指定されたトランザクション ID、またはパッケージがおかしいです" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" -msgstr "" +msgstr "コマンドライン" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "ログイン ユーザー" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "日時" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "操作" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "変更" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "指定されたトランザクション ID がありません。" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "指定されたトランザクション ID がおかしいです" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "指定されたトランザクション ID が見つかりません" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "ひとつ以上のトランザクション ID が見つかりません!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "指定されたトランザクション ID、またはパッケージが見つかりません。" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "ダウングレード済み" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "より古い" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "より新しい" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "トランザクション ID :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "開始時間 :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "開始 rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u 秒)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u 分)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u 時間)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u 日)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "終了時間 :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "終了 rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "ユーザー :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "終了コード :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "中断しました" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" -msgstr "" +msgstr "失敗:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "失敗しました:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "成功" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "コマンドライン :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "保存済みの追加の非標準な情報: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "トランザクションの実行:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "切り替えたパッケージ:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "パッケージを飛ばします:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Rpmdb の問題:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "スクリプトの出力:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "エラー:" @@ -73265,17 +73764,17 @@ index a232b0c..fd3f905 100644 -msgstr "インストール" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "依存インストール" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "不要削除" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "削除" @@ -73288,438 +73787,438 @@ index a232b0c..fd3f905 100644 -msgstr "ダウングレード" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "更新" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "時間" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "昨日" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "先週" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "最近の 2 週間" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "最近の 3 ヶ月間" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "最近の 6 ヶ月間" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "昨年" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "1 年以上前" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "トランザクション %s が見つかりません。" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "トランザクション ID:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "追加の履歴情報が利用できます:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: この名前から追加のデータが見つかりません。" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "インストール" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "削除" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "再インストール" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "更新" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "不要" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> トランザクションの確認を実行しています。" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> 新しい変更と依存性の解決を再開しています。" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> 依存性解決を終了しました。" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> 依存性の処理をしています: %s のパッケージ: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> 維持しています: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> 未解決の依存性: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "パッケージ: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1314,7 +1384,7 @@ msgstr "" +@@ -1314,7 +1389,7 @@ msgstr "" "\n" " 要求: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1323,7 +1393,7 @@ msgstr "" +@@ -1323,7 +1398,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1332,7 +1402,7 @@ msgstr "" +@@ -1332,7 +1407,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1341,85 +1411,85 @@ msgstr "" +@@ -1341,85 +1416,85 @@ msgstr "" " 見つかりません" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "次のものにより更新された: " -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "次のものによりダウングレードされた: " -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "次のものにより不要にされた: " -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "利用可能" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> 衝突を処理しています: %s は %s と衝突しています" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> トランザクションセットに束ねるために %s のヘッダーをダウンロードしています" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "実行中" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "スリープ中" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "割り込み不可" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "ゾンビ" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "トレース/停止" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "不明" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " 他のアプリケーション: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " 他のアプリケーション: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " メモリー: %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " 開始 : %s - %s 秒経過" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " 状態 : %s、PID: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1429,7 +1499,7 @@ msgstr "" +@@ -1429,7 +1504,7 @@ msgstr "" "\n" "ユーザーのキャンセルで終了しています" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1439,7 +1509,7 @@ msgstr "" +@@ -1439,7 +1514,7 @@ msgstr "" "\n" "パイプが壊れたため終了しています" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1450,41 +1520,41 @@ msgstr "" +@@ -1450,41 +1525,41 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "別のアプリケーションが現在 yum のロックを持っています。exit_on_lock による設定が存在します" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "プラグインのエラー終了: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum エラー: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "エラー: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" -msgstr " 問題を回避するために --skip-broken を用いることができません" +msgstr " 問題を回避するために --skip-broken を用いることができます。" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " これらを試行できます: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "不明なエラー: 終了コード: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1492,7 +1562,7 @@ msgstr "" +@@ -1492,7 +1567,7 @@ msgstr "" "\n" "依存性を解決しました" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "完了しました!" -@@ -1504,7 +1574,7 @@ msgstr "" +@@ -1504,7 +1579,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "このコマンドを実行するには root である必要があります。" @@ -73728,7 +74227,7 @@ index a232b0c..fd3f905 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1521,53 +1591,53 @@ msgid "" +@@ -1521,53 +1596,53 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -73794,7 +74293,7 @@ index a232b0c..fd3f905 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1577,306 +1647,299 @@ msgstr "" +@@ -1577,306 +1652,295 @@ msgstr "" " 「yum repolist all」を実行し、所持するリポジトリーを参照してください。\n" " 「yum-config-manager --enable 」でリポジトリーを有効にできます。" @@ -73994,357 +74493,356 @@ index a232b0c..fd3f905 100644 msgstr "ローカルパッケージ処理の設定をしています" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "指定の依存性を提供するパッケージがどれか特定する" - +-msgid "Determine which package provides the given dependency" +-msgstr "指定の依存性を提供するパッケージがどれか特定する" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "依存性のパッケージ検索:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "対話型の yum シェルを実行する" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Yum シェルの設定をしています" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "パッケージの依存性の一覧を表示する" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "依存性の検索中: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "ソフトウェアリポジトリーの構成を表示する" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "有効" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "無効" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "リポジトリー ID : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "リポジトリーの名前 : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "リポジトリーの状態 : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "リポジトリーのリビジョン : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "リポジトリーのタグ : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "リポジトリー更新日 : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "リポジトリー内パッケージ数 : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "リポジトリー容量 : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "リポジトリー基準 URL : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "リポジトリーメタリンク : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " 更新日 : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "リポジトリーのミラー : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "ずっと (最終: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "インスタント (最終: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s 秒 (最終: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "リポジトリーの期限 : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "リポジトリーの除外 : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "リポジトリーの内包 : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "リポジトリーの除外数 : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "リポジトリー ID" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "状態" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "リポジトリー名" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "役立つ使い方のメッセージを表示する" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "%s のヘルプは利用できません" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1886,7 +1949,7 @@ msgstr "" +@@ -1886,7 +1950,7 @@ msgstr "" "\n" "別名: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1896,85 +1959,125 @@ msgstr "" +@@ -1896,85 +1960,125 @@ msgstr "" "\n" "別名: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "再インストール処理の設定をしています" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "パッケージの再インストール" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "ダウングレード処理の設定をしています" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "パッケージのダウングレード" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "ホストの利用できるリポジトリーのバージョンを表示する" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Yum バージョン グループ" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " グループ :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "パッケージ :" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "インストール済み :" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "グループ インストール済み:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "利用可能 :" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "利用可能なグループ :" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "トランザクション履歴を表示、使用する" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" -+msgstr "トランザクション:" ++msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "使用した history のサブコマンドが正しくありません: %s" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "履歴 DB にアクセスできません。" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "rpmdb の問題を確認する" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" -msgstr "" +msgstr "filename から保存済みトランザクションを読み込む" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." -msgstr "" +msgstr "指定したトランザクション ファイルに保存していません" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "%s からトランザクションを読み込んでいます" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1983,28 +2086,34 @@ msgstr "" +@@ -1983,28 +2087,34 @@ msgstr "" #: ../yummain.py:84 #, python-format msgid " Yum checks failed: %s" +msgstr " Yum のチェックに失敗failed: %s" + +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:114 @@ -74381,233 +74879,233 @@ index a232b0c..fd3f905 100644 msgid "" "\n" "\n" -@@ -2015,74 +2124,74 @@ msgstr "" +@@ -2015,74 +2125,74 @@ msgstr "" "\n" "ユーザーによるキャンセルで終了しています。" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() は Yum の将来のバージョンでなくなります。\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "構成クラスが終わる前にトランザクションセットを設定しています" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "構成ファイルの tsflag が不正です: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "依存性の pkgSack を検索しています: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "メンバー: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s をインストールに変更しました" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "モード %s にパッケージ %s を追加しています" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "パッケージ %s の削除をしています" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s の要求: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s は %s を要求します" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "必要な要求は既に調べましたが不正をしています" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "必要な要求はパッケージ名ではありません。調べています: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" -msgstr "" +msgstr "%s が提供するモードは %s です: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2090,277 +2199,277 @@ msgstr "" +@@ -2090,277 +2200,277 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "依存解決のために %s の更新を試みます" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "依存する更新パスを見つけられません: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s を提供するパッケージはすでにインストールされています。削除しています。" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s はすでに ts にあります。これを飛ばします" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: %s を更新として %s で設定しています" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: %s をインストールとして %s で設定しています" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "成功 - 空のトランザクション" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "ループを再開しています" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "依存性の処理を終了しています" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "成功 - 依存性を解決しました" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "%s の依存性を確認しています" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "%s の要求として %s を検索しています" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "%s の compare_providers() を実行しています" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s は %s で不要です" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -74615,43 +75113,43 @@ index a232b0c..fd3f905 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "%s と %s の共通ソース RPM(SRPM)" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "ベースパッケージ %s は %s のためにインストールしています" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "%s から %s と %s の共通接頭辞" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "最低限の要求: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " 勝者: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " 敗者(%d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "最適の順序: %s" @@ -74809,7 +75307,7 @@ index a232b0c..fd3f905 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2368,187 +2477,180 @@ msgstr "" +@@ -2368,187 +2478,180 @@ msgstr "" "\n" "パッケージは依存関係に問題があるため、飛ばします:" @@ -74842,24 +75340,24 @@ index a232b0c..fd3f905 100644 msgstr "インストール済みとの衝突" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "警告: スクリプト、もしくはその他で処理の間に致命的ではないエラーが発生しました。" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "トランザクションを解しできません:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "トランザクションを実行できません。" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "トランザクションファイル %s の削除に失敗しました" @@ -74867,7 +75365,7 @@ index a232b0c..fd3f905 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s のインストールを想定したがそうではなかった!" @@ -74878,40 +75376,40 @@ index a232b0c..fd3f905 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s の削除を想定したがそうではなかった!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "%s のロックを開けません: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "PID %s がアクティブかどうかの確認に失敗しました" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "ロックファイル %s が存在します: PID %s として別に実行されています。" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "%s でロックを作成できません: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -74919,23 +75417,23 @@ index a232b0c..fd3f905 100644 msgstr "パッケージは予定したダウンロードと一致しません。 提案: 「yum --enablerepo=%s clean metadata」の実行" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "チェックサムの実行ができません" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "パッケージのチェックサムが一致しません" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "%s のためにキャッシュを有効にしていますが、パッケージのチェックサム演算に失敗します。" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "%s のローカルコピーを使う" @@ -74952,67 +75450,67 @@ index a232b0c..fd3f905 100644 -" * 必要容量 %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "ヘッダーが完了していません。" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "ヘッダーはキャッシュのみのモードが有効で、ローカルにありません。%s のダウンロードができません" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "%s の公開鍵がインストールされていません" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "パッケージ %s を開いている最中に問題です" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "%s の公開鍵が信頼されません" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "パッケージ %s は署名されていません" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "%s を削除できません" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s を削除しました" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "%s のファイル %s を削除できませんでした" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s のファイル %s を削除しました" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %sファイルを削除しました" @@ -75021,28 +75519,28 @@ index a232b0c..fd3f905 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "更新から %s.%s %s:%s-%s に一致しません" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2556,316 +2658,328 @@ msgstr "" +@@ -2556,533 +2659,572 @@ msgstr "" "searchPackages() は Yum の将来のバージョンでなくなります。 代わりに " "searchGenerator() を使います。\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "%d 個のパッケージを検索しています" @@ -75051,62 +75549,62 @@ index a232b0c..fd3f905 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "パッケージ %s を検索しています" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "ファイルのエントリーから検索しています" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "提供されたエントリーを検索しています" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "構成されたリポジトリーに利用できるグループはありません" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "グループ名 %s が存在しません" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "パッケージ%s はグループ %s で設定されていません" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "パッケージ %s をグループ %s から追加しています" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "インストールに利用できるパッケージ名 %s がありません" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -75114,78 +75612,79 @@ index a232b0c..fd3f905 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "%s のパッケージが見つかりません" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "パッケージ オブジェクトはパッケージ オブジェクト インスタンスではありません" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "インストールへの指定がありません" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "%s の仮想提供かファイル提供を確認しています" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "引数に一致しません: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "パッケージ %s はインストール済みか利用できません" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "インストールに利用できるパッケージはありません" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "パッケージ: %s - すでにトランザクション設定をしています。" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "パッケージ %s は既にインストール済みの %s によって不要扱いになりました。" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -75193,62 +75692,62 @@ index a232b0c..fd3f905 100644 msgstr "パッケージ %s は %s によって不要になりました。しかし、不要のパッケージは要求を提供していません。" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "パッケージ %s は %s によって不要になりました。代わりに %s のインストールを試みています。" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "パッケージ %s はインストール済みか最新バージョンです" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "一致したパッケージ %s はすでにインストールされています。更新を確認しています。" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "すべて更新しています" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "既に不要なパッケージの更新はありません: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "upgrade に一致するパッケージがありません: %s" ++msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "パッケージは既に不要です: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "既に不要なパッケージの更新はありません: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "既にアップデートされているのでパッケージをアップデートしません: %s.%s %s:%s-%s" @@ -75256,56 +75755,56 @@ index a232b0c..fd3f905 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "削除に一致するパッケージはありません" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "remove に一致するパッケージがありません: %s" ++msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "実行中のカーネルを飛ばします: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "トランザクションの中から %s を削除しています。" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "ファイルが開けません: %s を飛ばします。" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "%s を調べています: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "トランザクションにパッケージ %s を追加できません。アーキテクチャに互換性がありません: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "パッケージ %s をインストールできません。それはパッケージ %s により不要になっています。" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -75313,7 +75812,7 @@ index a232b0c..fd3f905 100644 msgstr "パッケージ %s はインストールされていないので更新できません。代わりに「yum install」を実行してインストールしてください。" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -75321,158 +75820,166 @@ index a232b0c..fd3f905 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "%s の除外中" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "%s をインストール済みとして設定しています" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "次のリポジトリーへの更新として %s を設定します: %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: インストールされたパッケージを更新しません。" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "ファイル %s が開けません。飛ばします。" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "再インストール中に問題: 削除するパッケージがありません" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "再インストールでの問題: インストールのための %s に一致するパッケーがありません" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "ダウングレードに利用できるパッケージはありません" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "パッケージ %s は複数インストールが許可されています。飛ばします" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "利用できるパッケージに一致しません: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "アップグレードにのみ利用できるパッケージ: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "ダウングレードに失敗: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" -+msgstr "アップグレードに失敗: %s" ++msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "%s から鍵を取得中です。" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "GPG 鍵の取得に失敗しました: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "キー %s のGPGキーの署名は、次のレポジトリーのCA鍵と一致していません。: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "%s からの GPG 鍵が正しくありません: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG 鍵の解析に失敗しました: 鍵は値 %s を持っていません" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2874,7 +2988,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2882,207 +2996,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG 鍵 %s (0x%s) はすでにインストールしています" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "鍵のインポートに失敗しました (コード: %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "鍵のインポートに成功しました" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -75480,29 +75987,29 @@ index a232b0c..fd3f905 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "鍵のインポートを助けられません。鍵が壊れていませんか?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG 鍵 %s (0x%s) はすでにインポートしています" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "鍵のインポートに失敗しました" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -75510,117 +76017,117 @@ index a232b0c..fd3f905 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "適当なミラーを見つけることができませんでした。" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "パッケージのダウンロード中にエラーに遭遇しました。" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "%s にこのエラーを報告してください" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "テストトランザクションでエラー: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "cackedir が設定できません: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "トランザクションファイル %s が保存できません。: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "保存されているトランザクションファイル %s にアクセスできません。: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "保存されているトランザクションファイルの rpmdb のバージョンがマッチしていません。" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -75720,7 +76227,7 @@ index a232b0c..fd3f905 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s は %s を提供していますが、見つかりません。" -@@ -3091,6 +3229,17 @@ msgstr "%s は %s を提供していますが、見つかりません。" +@@ -3091,6 +3233,17 @@ msgstr "%s は %s を提供していますが、見つかりません。" msgid "Repackaging" msgstr "再パッケージをしています" @@ -75739,10 +76246,10 @@ index a232b0c..fd3f905 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/lt_LT.po b/po/lt_LT.po -index 4a1d933..3826bcf 100644 +index 4a1d933..fe1c1e3 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po -@@ -2,13 +2,15 @@ +@@ -2,14 +2,16 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -75756,11 +76263,13 @@ index 4a1d933..3826bcf 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-21 20:44+0000\n" ++"Last-Translator: aurisc4 \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/yum/team/lt_LT/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -17,122 +19,125 @@ msgstr "" "Language: lt_LT\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n" @@ -75778,30 +76287,30 @@ index 4a1d933..3826bcf 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Diegiama" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Pažymėta pasenusiu" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Atnaujinta" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Pašalinta" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Įdiegta" @@ -75828,7 +76337,7 @@ index 4a1d933..3826bcf 100644 msgstr "Pašalinta: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Šalinama" @@ -75854,65 +76363,65 @@ index 4a1d933..3826bcf 100644 msgstr "Skaitoma saugyklų informacija iš vietinių failų" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Konfigūracijos klaida: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Parinkčių klaida: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Įdiegta: %s-%s %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Sukurta : %s %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Pateikta : %s %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Reikia pateikti kokią nors komandą" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Nėra komandos: %s. Naudokite %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Disko reikalavimai:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Reikia bent %dMB daugiau vietos failų sistemoje %s.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" +msgstr[0] " Reikia bent %dMB daugiau vietos failų sistemoje %s.\n" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[1] " Reikia bent %dMB daugiau vietos failų sistemoje %s.\n" ++msgstr[2] " Reikia bent %dMB daugiau vietos failų sistemoje %s.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -75921,73 +76430,80 @@ index 4a1d933..3826bcf 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "Bandoma paleisti transakciją, bet nėra veiksmų. Išeinama." +-msgstr "Bandoma paleisti transakciją, bet nėra veiksmų. Išeinama." ++msgstr "Bandoma paleisti tranzakciją, bet nėra veiksmų. Išeinama." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Išeinama po naudotojo komandos" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Parsiunčiami paketai:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Klaida parsiunčiant paketus:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" - msgstr "Vykdomas transakcijos tikrinimas" +-msgstr "Vykdomas transakcijos tikrinimas" ++msgstr "Vykdomas tranzakcijos tikrinimas" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "KLAIDA Reikia atnaujinti rpm norint apdoroti:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" - msgstr "KLAIDA su transakcijos ir priklausomybių tikrinimu:" +-msgstr "KLAIDA su transakcijos ir priklausomybių tikrinimu:" ++msgstr "KLAIDA su tranzakcijos ir priklausomybių tikrinimu:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM turi būti atnaujintas" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Praneškite apie šią klaidą adresu %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" - msgstr "Vykdomas transakcijos tikrinimas" +-msgstr "Vykdomas transakcijos tikrinimas" ++msgstr "Vykdomas tranzakcijos tikrinimas" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" - msgstr "Transakcijos tikrinimo klaida:\n" +-msgstr "Transakcijos tikrinimo klaida:\n" ++msgstr "Tranzakcijos tikrinimo klaida:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" - msgstr "Transakcijos tikrinimas sėkmingas" +-msgstr "Transakcijos tikrinimas sėkmingas" ++msgstr "Tranzakcijos tikrinimas sėkmingas" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" - msgstr "Vykdoma transakcija" +-msgstr "Vykdoma transakcija" ++msgstr "Vykdoma tranzakcija" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -75996,18 +76512,18 @@ index 4a1d933..3826bcf 100644 "Naudokite „-y“ veiksenos pakeitimui." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Gal turėjote omenyje:" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Paketas(-ai) %s%s%s prieinami, bet neįdiegti." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Nėra prieinamo paketo %s%s%s." @@ -76015,88 +76531,88 @@ index 4a1d933..3826bcf 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paketas(-ai) diegimui" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d paketas įdiegimui" ++msgstr[1] "%d paketai įdiegimui" ++msgstr[2] "%d paketų įdiegimui" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nėra ką atlikti" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paketas(-ai) pažymėti atnaujinimui" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d paketas pažymėtas atnaujinimui" ++msgstr[1] "%d paketai pažymėtas atnaujinimui" ++msgstr[2] "%d paketų pažymėtas atnaujinimui" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Nėra paketų, pažymėtų atnaujinimui" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d paketas(-ai) pažymėtas(-i) distribucijos sinchronizavimui" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d paketas pažymėtas distribucijos sinchronizacijai" ++msgstr[1] "%d paketai pažymėtas distribucijos sinchronizacijai" ++msgstr[2] "%d paketų pažymėtas distribucijos sinchronizacijai" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Nėra paketų, pažymėtų distribucijos sinchronizavimui" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paketas(-ai) pažymėtas(-i) pašalinimui" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d paketas pažymėtas pašalinimui" ++msgstr[1] "%d paketai pažymėtas pašalinimui" ++msgstr[2] "%d paketų pažymėtas pašalinimui" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Nėra paketų, pažymėtų pašalinimui" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paketas(-ai) grąžinimui" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d paketas grąžinimui" ++msgstr[1] "%d paketai grąžinimui" ++msgstr[2] "%d paketų grąžinimui" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (iš %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Įdiegtas paketas %s%s%s%s neprieinamas." @@ -76104,31 +76620,32 @@ index 4a1d933..3826bcf 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paketas(-ai) pakartotiniam diegimui" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d paketas pakartotiniam diegimui" ++msgstr[1] "%d paketai pakartotiniam diegimui" ++msgstr[2] "%d paketų pakartotiniam diegimui" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Nėra pateiktų paketų" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Paketas(-ai) diegimui" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" - msgstr "Paieškos atitikmenu: %s" +-msgstr "Paieškos atitikmenu: %s" ++msgstr "Paieškos atitikmenų: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -76136,7 +76653,7 @@ index 4a1d933..3826bcf 100644 "paieškai visur." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -76145,13 +76662,13 @@ index 4a1d933..3826bcf 100644 " paieškai visur." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Atitinka: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" @@ -76159,174 +76676,174 @@ index 4a1d933..3826bcf 100644 "all“ paieškai visur." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Įspėjimas: nerasta atitikmenų: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Nerasta atitikmenų" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Nerasta paketų užklausai %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Išvalomos saugyklos:" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Išvaloma viskas" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Išvalomos antraštės" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Išvalomi paketai" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Išvalomi xml metaduomenys" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Išvalomas duomenų bazės podėlis" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Išvalomas pasenę podėlio metaduomenys" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Išvalomi podėlio rpmdb duomenys" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Išvalomi įskiepiai" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "Įspėjimas: nėra grupių atitikmenų: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Įdiegto grupės:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "Įdiegtos kalbų grupės:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Prieinamos grupės:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "Prieinamos kalbų grupės:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Atlikta" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Įspėjimas: nėra grupės %s." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "Nėra paketų diegimui ar atnaujinimui jokioje pageidaujamoje grupėje" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d diegtinas(-i) paketai(-ai)" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d paketas įdiegimui" ++msgstr[1] "%d paketai įdiegimui" ++msgstr[2] "%d paketų įdiegimui" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Nėra grupės %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Nėra paketų pašalinimui iš grupių" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paketas(-ai) pašalinimui" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d paketas pašalinimui" ++msgstr[1] "%d paketai pašalinimui" ++msgstr[2] "%d paketų pašalinimui" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paketas %s jau įdiegtas, praleidžiama" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Atmetami nepalyginami paketai %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "Nėra įdiegto kito %s, įtraukiama į sąrašą galimam diegimui" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Įskiepių parinktys" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Komandinės eilutės klaida: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -76335,154 +76852,155 @@ index 4a1d933..3826bcf 100644 "%s: %s parinktis reikalauja argumento" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color gali būti: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot turi būti absoliutus kelias: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "rodyti šį pagalbos pranešimą ir išeiti" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "toleruoti klaidas" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "vykdyti tik iš sistemos podėlio jo neatnaujinant" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "konfigūracijos failo vieta" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "didžiausias komandos laukimo laikas" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "derinimo išvesties lygmuo" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "rodyti dublikatus saugyklose, sąrašo/paieškos komandose" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "klaidų išvesties lygmuo" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "derinimo išvesties lygmuo rpm komandai" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "tyli operacija" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "išsami operacija" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "atsakyti „taip“ į visus klausimus" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" -+msgstr "" ++msgstr "atsakyti ne į visus klausimus" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "rodyti Yum versiją ir išeiti" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "nustatyti diegimo šaknį" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "leisti vieną ar daugiau saugyklų (leidžiami pakaitos simboliai)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "drausti vieną ar daugiau saugyklų (leidžiami pakaitos simboliai)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "išskirti paketą(-us) pagal pavadinimą arba globalų vardą" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" - msgstr "drausti iškyrimą iš pagrindinio saugyklai arba viskam" +-msgstr "drausti iškyrimą iš pagrindinio saugyklai arba viskam" ++msgstr "drausti išskyrimą iš pagrindinio saugyklai arba viskam" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "leisti pasenusių apdorojimą atnaujinimo metu" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "drausti Yum įskiepius" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "drausti gpg parašo tikrinimą" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "drausti įskiepius pagal pavadinimą" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "leisti įskiepius pagal pavadinimą" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "praleisti paketus su priklausomybių tikrinimo problemomis" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "valdyti, ar naudojama spalva" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" "nustatyti $releasever reikšmę yum konfigūracijoje ir saugyklų failuose" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "nustatyti savavališkas konfigūracijos ir saugyklų parinktis" @@ -76826,29 +77344,29 @@ index 4a1d933..3826bcf 100644 msgstr "Šalinama dėl priklausomybių" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Praleista (priklausomybių problemos)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Neįdiegtas" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Neprieinama" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Paketas" +msgid_plural "Packages" +msgstr[0] "Paketas" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[1] "Paketai" ++msgstr[2] "Paketų" -#: ../output.py:1075 +#: ../output.py:1393 @@ -76881,15 +77399,19 @@ index 4a1d933..3826bcf 100644 #, python-format msgid "" "\n" -@@ -889,57 +932,52 @@ msgstr "" - "Transakcijos santrauka\n" +@@ -886,60 +929,62 @@ msgid "" + "%s\n" + msgstr "" + "\n" +-"Transakcijos santrauka\n" ++"Tranzakcijos santrauka\n" "%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Įdiegti %5.5s pektą(-us)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Įdiegti" @@ -76897,23 +77419,23 @@ index 4a1d933..3826bcf 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Atnaujinti %5.5s paketą(-us)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" -+msgstr "" ++msgstr "Atnaujinti" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Pašalinti %5.5s paketą(-us)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" -+msgstr "" ++msgstr "Pašalinti" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Perdiegti %5.5s paketą„-u)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Perdiegti" @@ -76921,316 +77443,333 @@ index 4a1d933..3826bcf 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Grąžinti %5.5s paketą(-us)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Grąžinti" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "Priklausomas paketas" ++msgstr[1] "Priklausomi paketai" ++msgstr[2] "Priklausomų paketų" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "Pašalinta" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Priklausomybė pašalinta" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Priklausomybė įdiegta" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Priklausomybė atnaujinta" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Pakeista" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Nepavyko" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "du" -@@ -947,7 +985,7 @@ msgstr "du" +@@ -947,7 +992,7 @@ msgstr "du" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -958,365 +996,417 @@ msgstr "" +@@ -958,365 +1003,417 @@ msgstr "" " Dabartinis parsiuntimas atšauktas, %snutraukite (ctrl-c) vėl%s per %s%s%s sekundes\n" "išėjimui.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "naudotojo nutraukimas" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Iš viso" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Sistema" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" - msgstr "Praleidžiama persidengianti transakcija %d, apjungta į %d" +-msgstr "Praleidžiama persidengianti transakcija %d, apjungta į %d" ++msgstr "Praleidžiama persidengianti tranzakcija %d, apjungta į %d" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" - msgstr "Nėra transakcijų" +-msgstr "Nėra transakcijų" ++msgstr "Nėra tranzakcijų" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" - msgstr "Pateikti blogi transakcijų ID arba paketai" +-msgstr "Pateikti blogi transakcijų ID arba paketai" ++msgstr "Pateikti blogi tranzakcijų ID arba paketai" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "Komandų eilutė" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Prisijungęs naudotojas" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Data ir laikas" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Veiksmas(-ai)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Pakeista" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" - msgstr "Nepateiktas transakcijos ID" +-msgstr "Nepateiktas transakcijos ID" ++msgstr "Nepateiktas tranzakcijos ID" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" - msgstr "Pateiktas blogas transakcijos ID" +-msgstr "Pateiktas blogas transakcijos ID" ++msgstr "Pateiktas blogas tranzakcijos ID" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" - msgstr "Nerastas pateiktas transakcijos ID" +-msgstr "Nerastas pateiktas transakcijos ID" ++msgstr "Nerastas pateiktas tranzakcijos ID" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" - msgstr "Rastas daugiau nei vienas transakcijos ID!" +-msgstr "Rastas daugiau nei vienas transakcijos ID!" ++msgstr "Rastas daugiau nei vienas tranzakcijos ID!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" - msgstr "Nepateiktas transakcijos ID arba paketas" +-msgstr "Nepateiktas transakcijos ID arba paketas" ++msgstr "Nepateiktas tranzakcijos ID arba paketas" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Grąžintas" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Senesnis" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Naujesnis" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" - msgstr "Transakcijos ID:" +-msgstr "Transakcijos ID:" ++msgstr "Tranzakcijos ID:" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Pradžios laikas:" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Pradėti rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "(%u sekundžių)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "(%u minučių)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "(%u valandų)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "(%u dienų)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Pabaigos laikas:" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Baigti rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Naudotojas :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Grąžinimo kodas:" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Nutraukta" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "Klaidos:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Klaida:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Sėkminga" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Komandų eilutė :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Išsaugota papildoma nenumatyta informacija: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" - msgstr "Transakcija atlikta su:" +-msgstr "Transakcija atlikta su:" ++msgstr "Tranzakcija atlikta su:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Pakeisti paketai:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Praleisti paketai:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Rpmdb problemos:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Scenarijaus išvestis:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Klaidos:" @@ -77239,17 +77778,17 @@ index 4a1d933..3826bcf 100644 -msgstr "Įdiegti" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Įdiegti priklausomybes" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Pažymima pasenusiu" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Pašalinti" @@ -77262,440 +77801,445 @@ index 4a1d933..3826bcf 100644 -msgstr "Grąžinti" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Atnaujinti" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Laikas" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Vakar" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Praėjusią savaitę" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Praėjusias 2 savaites" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Praėjusius 3 mėnesius" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Praėjusius 6 mėnesius" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Praėjusiais metais" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Daugiau nei prieš metus" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" - msgstr "Nerasta transakcija %s" +-msgstr "Nerasta transakcija %s" ++msgstr "Nerasta tranzakcija %s" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" - msgstr "Transakcijos ID:" +-msgstr "Transakcijos ID:" ++msgstr "Tranzakcijos ID:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Prieinama papildoma istorijos informacija:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: nerasta papildomų duomenų su šiuo pavadinimu" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" -+msgstr "" ++msgstr "Paketas :" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" -+msgstr "" ++msgstr "Būsena :" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" -+msgstr "" ++msgstr "Dydis :" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" -+msgstr "" ++msgstr "Sukūrimo vieta :" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" -+msgstr "" ++msgstr "Sukūrimo laikas:" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" -+msgstr "" ++msgstr "Supakavo :" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" -+msgstr "" ++msgstr "Tiekėjas :" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" -+msgstr "" ++msgstr "Licencija :" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" -+msgstr "" ++msgstr "URL :" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" -+msgstr "" ++msgstr "Išeities RPM :" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" -+msgstr "" ++msgstr "Įdėjimo laikas :" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" -+msgstr "" ++msgstr "Įdėjo :" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" -+msgstr "" ++msgstr "Priežastis :" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" -+msgstr "" ++msgstr "Iš saugyklos :" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" -+msgstr "" ++msgstr "Įdiegė :" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" -+msgstr "" ++msgstr "Pakeitė :" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "įdiegta" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "atnaujinimas" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "pašalinta" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "perdiegta" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "grąžinimas" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "žymima pasenusiu" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "atnaujinta" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "pažymėta pasenusiu" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Paketas %s.%s %s:%s-%s bus %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" - msgstr "--> Vykdomas transakcijos tikrinimas" +-msgstr "--> Vykdomas transakcijos tikrinimas" ++msgstr "--> Vykdomas tranzakcijos tikrinimas" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" "--> Iš naujo paleidžiamas priklausomybių sprendimas su naujais pakeitimais" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Baigtas priklausomybių sprendimas" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Apdorojama priklausomybė: %s paketui: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Paliekamas paketas: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nerasta priklausomybė: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Paketas: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1325,7 +1415,7 @@ msgstr "" +@@ -1325,7 +1422,7 @@ msgstr "" "\n" " Reikalauja: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1334,7 +1424,7 @@ msgstr "" +@@ -1334,7 +1431,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1343,7 +1433,7 @@ msgstr "" +@@ -1343,7 +1440,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1352,85 +1442,85 @@ msgstr "" +@@ -1352,85 +1449,85 @@ msgstr "" " Nerasta" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Atnaujino" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Grąžino" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Pažymėjo pasenusiu" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Prieinamas" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Sprendžiamas konfliktas: %s konfliktuoja su %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "--> Tęsiama transakcija su pasirinktais paketais. Palaukite." +-msgstr "--> Tęsiama transakcija su pasirinktais paketais. Palaukite." ++msgstr "--> Tęsiama tranzakcija su pasirinktais paketais. Palaukite." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." - msgstr "---> Grąžinama %s antraštė įpakavimui į transakcijos aibę." +-msgstr "---> Grąžinama %s antraštė įpakavimui į transakcijos aibę." ++msgstr "---> Grąžinama %s antraštė įpakavimui į tranzakcijos aibę." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Vykdoma" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Miegama" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Nepertraukiama" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombis" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Sekamas/Sustabdytas" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Nežinomas" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Kita programa yra: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Kita programa yra: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Atmintis : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Paleista: %s - prieš %s" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Būsena : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1440,7 +1530,7 @@ msgstr "" +@@ -1440,7 +1537,7 @@ msgstr "" "\n" "Išeinama naudotojui nutraukus" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1450,7 +1540,7 @@ msgstr "" +@@ -1450,7 +1547,7 @@ msgstr "" "\n" "Išeinama dėl nutraukto konvejerio" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1461,7 +1551,7 @@ msgstr "" +@@ -1461,7 +1558,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1469,35 +1559,35 @@ msgstr "" +@@ -1469,35 +1566,35 @@ msgstr "" "Kita programa šiuo metu turi yum užraktą; išeinama, kaip nustatyta parametru" " exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "PluginExit klaida: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum klaida: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Klaida: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " Galite mėginti --skip-broken problemai apeiti" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Galite pamėginti paleisti: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Nežinoma(-os) klaida(-os): išėjimo kodas: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1505,7 +1595,7 @@ msgstr "" +@@ -1505,7 +1602,7 @@ msgstr "" "\n" "Išspręstos priklausomybės" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Baigta!" -@@ -1517,7 +1607,7 @@ msgstr " Mini naudojimas:\n" +@@ -1517,7 +1614,7 @@ msgstr " Mini naudojimas:\n" msgid "You need to be root to perform this command." msgstr "Jūs turite būti root šiai komandai atlikti." @@ -77704,7 +78248,7 @@ index 4a1d933..3826bcf 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1547,54 +1637,54 @@ msgstr "" +@@ -1547,54 +1644,54 @@ msgstr "" "\n" "Daugiau informacijos gausite susisiekę su jūsų distribucijos ar paketo tiekėju.\n" @@ -77724,7 +78268,8 @@ index 4a1d933..3826bcf 100644 -#: ../yumcommands.py:86 +#: ../yumcommands.py:110 msgid "Error: Need an item to match" - msgstr "Klaida: reikia atitikimens" +-msgstr "Klaida: reikia atitikimens" ++msgstr "Klaida: reikia atitikmens" -#: ../yumcommands.py:92 +#: ../yumcommands.py:124 @@ -77771,7 +78316,7 @@ index 4a1d933..3826bcf 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1604,306 +1694,299 @@ msgstr "" +@@ -1604,306 +1701,295 @@ msgstr "" " Paleiskite „yum repolist all“ visam saugyklų sąrašui gauti.\n" " Jūs galite įjungti saugyklas su yum-config-manager --enable " @@ -77874,7 +78419,7 @@ index 4a1d933..3826bcf 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "" ++msgstr "Rodyti arba naudoti grupių informaciją" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -77903,7 +78448,7 @@ index 4a1d933..3826bcf 100644 +#: ../yumcommands.py:833 +#, python-format +msgid "Invalid groups sub-command, use: %s." -+msgstr "" ++msgstr "Netinkama grupių po-komanda, naudokite: %s." -#: ../yumcommands.py:550 +#: ../yumcommands.py:929 @@ -77971,155 +78516,155 @@ index 4a1d933..3826bcf 100644 msgstr "Nustatomas vietinio paketo procesas" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Nustatyti, kuris paketas teikia pateiktą priklausomybę" - +-msgid "Determine which package provides the given dependency" +-msgstr "Nustatyti, kuris paketas teikia pateiktą priklausomybę" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Ieškoti paketų priklausomybei:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Paleisti interaktyvų yum apvalkalą" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Nustatomas Yum apvalkalas" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Išvardinti paketo priklausomybes" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Randamos priklausomybės:" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Rodyti nustatytas programinės įrangos saugyklas" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "įjungta" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "išjungta" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Saugyklos id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Saugyklos pavadinimas: " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Saugyklos būsena: " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " - msgstr "Saugyklos poversijis: " +-msgstr "Saugyklos poversijis: " ++msgstr "Saugyklos po-versija: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Saugyklos žymos: " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Saugyklos distribucijos žymos: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Saugykla atnaujinta: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Saugyklos paketai: " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Saugyklos dydis: " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Saugyklos bazinis url: " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Saugyklos metasaitas: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Atnaujinta : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Saugyklos tinklavietės: " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Niekada (paskutinis: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Neatdėliotinas (paskutinis: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekundė(s) (paskutinis: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Saugykla pasensta: " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Saugykla išskiria: " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Saugykla įtraukia: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Saugykloje išskirta: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Saugyklos failas: " @@ -78127,192 +78672,200 @@ index 4a1d933..3826bcf 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "Saugyklos id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "būsena" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "saugyklos pavadinimas" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Parodyti naudingą naudojimo pranešimą" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Nėra pagalbos veiksmui %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1913,7 +1996,7 @@ msgstr "" +@@ -1913,7 +1999,7 @@ msgstr "" "\n" "alternatyvūs vardai: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1923,85 +2006,125 @@ msgstr "" +@@ -1923,88 +2009,128 @@ msgstr "" "\n" "alternatyvus vardas: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Nustatomas perdiegimo procesas" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "perdiegti paketą" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Nustatomas grąžinimo procesas" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "grąžinti paketą" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Parodyti mašinos ir prieinamų saugyklų versiją." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "Yum versijų grupės:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Grupė :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Paketai:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr " Įdiegti:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Įdiegti per grupes:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Prieinami:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Prieinami per grupes:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" - msgstr "Parodyti arba naudoti transakcijų istoriją" - --#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 +-msgstr "Parodyti arba naudoti transakcijų istoriją" ++msgstr "Parodyti arba naudoti tranzakcijų istoriją" ++ ++#: ../yumcommands.py:2461 +msgid "Transactions:" -+msgstr "" ++msgstr "Tranzakcijos:" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" -+msgstr "" ++msgstr "Pradžia :" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" -+msgstr "" -+ -+#: ../yumcommands.py:2438 ++msgstr "Pabaiga :" + +-#: ../yumcommands.py:1432 ++#: ../yumcommands.py:2464 +msgid "Counts :" -+msgstr "" ++msgstr "Kartai :" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" -+msgstr "" ++msgstr " NEVRAC :" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" -+msgstr "" ++msgstr " NEVRA :" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" -+msgstr "" ++msgstr " NA :" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" -+msgstr "" ++msgstr " NEVR :" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" -+msgstr "" ++msgstr " rpm DB :" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" -+msgstr "" ++msgstr " yum DB :" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Netinkama istorijos po-komanda, naudokite: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Jūs neturite priėjimo prie istorijos DB." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Ieškoti problemų rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" - msgstr "įkelti išsaugotą transakciją iš failo" +-msgstr "įkelti išsaugotą transakciją iš failo" ++msgstr "įkelti išsaugotą tranzakciją iš failo" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." - msgstr "Nenurodytas įšsaugotos transakcijos failas." +-msgstr "Nenurodytas įšsaugotos transakcijos failas." ++msgstr "Nenurodytas įšsaugotos tranzakcijos failas." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" - msgstr "įkeliama transakcija iš %s" +-msgstr "įkeliama transakcija iš %s" ++msgstr "įkeliama tranzakcija iš %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" - msgstr "Transakcija, įkelta iš %s su %s nariais" -@@ -2012,28 +2135,32 @@ msgstr "Transakcija, įkelta iš %s su %s nariais" +-msgstr "Transakcija, įkelta iš %s su %s nariais" ++msgstr "Tranzakcija, įkelta iš %s su %s nariais" + + #. This is mainly for PackageSackError from rpmdb. + #: ../yummain.py:84 +@@ -2012,28 +2138,34 @@ msgstr "Transakcija, įkelta iš %s su %s nariais" msgid " Yum checks failed: %s" msgstr " Yum ckeck nepavyko: %s" @@ -78321,8 +78874,8 @@ index 4a1d933..3826bcf 100644 -"Another app is currently holding the yum lock; waiting for it to exit..." -msgstr "Kita programa turi yum užraktą; laukiama jos pabaigos..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" -+msgstr "" ++msgid "No read/execute access in current directory, moving to /" ++msgstr "Nėra skaitymo/rašymo prieigos esamame kataloge, perkeliama į /" -#: ../yummain.py:120 +#: ../yummain.py:124 @@ -78349,283 +78902,285 @@ index 4a1d933..3826bcf 100644 +" yum load-transaction %s" msgstr "" -"Jūsų transakcija išsaugota, paleiskite ją su komanda: yum load-transaction " --"%s" ++"Jūsų tranzakcija buvo įrašyta, paleiskite iš jaujo su: yum load-transaction " + "%s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2043,74 +2170,74 @@ msgstr "" +@@ -2043,74 +2175,74 @@ msgstr "" "\n" "Išeinama po naudotojo atšaukimo." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() bus pašalinta ateities Yum versijose.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Nustatoma TransactionSets prieš konfigūracijos klasės pakrovimą" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Netinkama tsflag konfigūracijos faile: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Ieškoma pkgSack priklausomybei: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Narys: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s pakeistas diegimui" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Pridedamas paketas %s veiksenoje %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Šalinamas paketas %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s reikalauja: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s reikalauja %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Reikalingo reikalavimo jau ieškota, apgaunama" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Reikalavimas nėra paketo pavadinimas. Ieškoma: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Potencialus tiekėjas: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Veiksena %s %s tiekėjui : %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Veiksena paketui, teikiančiam %s: %s" -@@ -2118,114 +2245,114 @@ msgstr "Veiksena paketui, teikiančiam %s: %s" +@@ -2118,114 +2250,114 @@ msgstr "Veiksena paketui, teikiančiam %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Bandoma atnaujinti %s priklausomybių išsprendimui" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Nerasta %s atnaujinimo kelių. Klaida!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s paketas, reikalaujantis %s pažymėtas pašalinimui" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: %s žymimas pasenusiu su %s, siekiant išspręsti priklausomybę." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Atnaujinamas %s, siekiant išspręsti priklausomybę." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Nepavyko rasti priklausomybės atnaujinimo kelio: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Greitas atitikmuo %s %s reikalavimui" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s yra teikiančių paketų sąraše, bet jis jau įdiegtas, pašalinama." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Potencialiai sprendžiantis paketas %s ts turi naujesnį variantą." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Potencialiai sprendžiantis paketas %s turi įdiegtą naujesnį variantą." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s jau ts, praleidžiama" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: pažymima %s kaip %s atnaujinimą" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: pažymima %s kaip %s diegimą" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" - msgstr "Sėkminga - tuščia transakcija" +-msgstr "Sėkminga - tuščia transakcija" ++msgstr "Sėkminga - tuščia tranzakcija" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Iš naujo paleidžiamas ciklas" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Užbaigiamas priklausomybių procesas" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Sėkminga - priklausomybės išspręstos" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Ieškoma %s priklausomybių" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "ieškoma %s kaip %s reikalavimo" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "%s vykdoma compare_providers()" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "po %s geresnė architektūra" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s žymi pasenusiu %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2234,142 +2361,142 @@ msgstr "" +@@ -2234,164 +2366,164 @@ msgstr "" "archdist palygino %s su %s vietoje %s\n" " Nugalėtojas: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "bendras išeities rpm %s ir %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "bazinis paketas %s įdiegtas paketui %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "bendras priešdėlis %s abiems %s ir %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "reikalauja mažiausiai: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Nugalėtojas: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Pralaimėtojas (su %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Geriausia tvarka: %s" @@ -78758,8 +79313,9 @@ index 4a1d933..3826bcf 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2377,21 +2504,21 @@ msgstr "" - "Yra likusių nebaigtų transakcijų. Jūs turbūt norite paleisti yum-complete-" + msgstr "" +-"Yra likusių nebaigtų transakcijų. Jūs turbūt norite paleisti yum-complete-" ++"Yra likusių nebaigtų tranzakcijų. Jūs turbūt norite paleisti yum-complete-" "transaction joms užbaigti." -#: ../yum/__init__.py:983 @@ -78784,7 +79340,7 @@ index 4a1d933..3826bcf 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2399,88 +2526,91 @@ msgstr "" +@@ -2399,88 +2531,91 @@ msgstr "" "\n" "Paketai, praleisti dėl priklausomybių problemų:" @@ -78817,34 +79373,38 @@ index 4a1d933..3826bcf 100644 msgstr "įdiegtas konfliktas" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" - "Įspėjimas: scenarijaus arba kitos negalutinės klaidos įvyko transakcijos " +-"Įspėjimas: scenarijaus arba kitos negalutinės klaidos įvyko transakcijos " ++"Įspėjimas: scenarijaus arba kitos negalutinės klaidos įvyko tranzakcijos " "metu." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" - msgstr "Transakcijos paleisti nepavyko:" +-msgstr "Transakcijos paleisti nepavyko:" ++msgstr "Tranzakcijos paleisti nepavyko:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." - msgstr "Nepavyko paleisti transakcijos." +-msgstr "Nepavyko paleisti transakcijos." ++msgstr "Nepavyko paleisti tranzakcijos." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" - msgstr "Nepavyko pašalinti transakcijos failo %s" +-msgstr "Nepavyko pašalinti transakcijos failo %s" ++msgstr "Nepavyko pašalinti tranzakcijos failo %s" #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s turėjo būti įdiegtas, bet nebuvo!" @@ -78855,65 +79415,65 @@ index 4a1d933..3826bcf 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s turėjo būti pašalintas, bet nebuvo!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Nepavyko atverti užrakto %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Nepavyksta patikrinti, ar PID %s yra aktyvus" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Esamas užraktas %s: kito kopija veikia kaip pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Nepavyko sukurti užrakto %s: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2489,40 +2619,29 @@ msgstr "" +@@ -2489,40 +2624,29 @@ msgstr "" "Paketai nesutampa su pageidautu parsiuntimu. Pasiūlymas: paleisti yum " "--enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Nepavyko patikrinti kontrolinės sumos" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Paketo kontrolinė suma nesutampa" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "paketo kontrolinė suma nesutampa, bet %s podėlis yra įjungtas" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "naudojama vietinė %s kopija" @@ -78930,167 +79490,167 @@ index 4a1d933..3826bcf 100644 -" * reikia %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Antraštė nepilna." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2530,62 +2649,65 @@ msgstr "" +@@ -2530,62 +2654,65 @@ msgstr "" "Antraštė ne vietiniame podėlyje, o tik podėlio veiksena yra įjungta. " "Negalima parsiūsti %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "%s viešas raktas neįdiegtas" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problema atveriant paketą %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "%s viešasis raktas nepatikimas" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Paketas %s nepasirašytas" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Nepavyksta pašalinti %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s pašalintas" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Nepavyksta pašalinti %s failo %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s failas %s pašalintas" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s failai pašalinti" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d %s failas pašalintas" ++msgstr[1] "%d %s failai pašalintas" ++msgstr[2] "%d %s failų pašalintas" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Daugiau nei vienas identiškas atitikmuo ieškomam %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Nėra %s.%s %s:%s-%s atitikmenų atnaujinime" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2593,121 +2715,124 @@ msgstr "" +@@ -2593,121 +2720,125 @@ msgstr "" "searchPackages() bus pašalinta ateities Yum versijose. " "Naudokite searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Ieškoma %d paketų" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "Ieškoma %d paketo" ++msgstr[1] "Ieškoma %d paketų" ++msgstr[2] "Ieškoma %d paketų" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "ieškoma paketo %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "ieškoma failų įrašuose" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "ieškoma teikimo įrašuose" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Nėra prieinamų grupių duomenų nustatytose saugyklose" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Nėra grupės %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "paketas %s nebuvo pažymėtas grupėje %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Pridedamas paketas %s iš grupės %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Nėra paketo %s, prieinamo diegimui" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Įspėjimas: grupė %s neturi jokių paketų." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "Grupė %s turi %u sąlyginių paketų, kurie gali būti įdiegti." @@ -79098,142 +79658,144 @@ index 4a1d933..3826bcf 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Nepavyksta rasti paketų rinkinio %s krepšyje" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Nepavyksta rasti paketų rinkinio %s rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "Netinkamas versijos požymis iš: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Nerastas paketas %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Paketo objektas nebuvo paketo objekto egzempliorius" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Nieko nenurodyta įdiegti" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Tikrinamas virtualus tiekimas arba failo tiekimas %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Nėra atitikmens argumentui: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Paketas %s įdiegtas ir neprieinamas" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Nėra paketo(-ų), prieinamo diegimui" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" - msgstr "Paketas: %s - jau transakcijos aibėje" +-msgstr "Paketas: %s - jau transakcijos aibėje" ++msgstr "Paketas: %s - jau tranzakcijos aibėje" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Paketas %s yra pažymėtas pasenusiu paketo %s, kuris jau įdiegtas" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2716,95 +2841,101 @@ msgstr "" +@@ -2716,95 +2847,101 @@ msgstr "" "Paketas %s pažymėtas pasenusiu paketo %s, bet žymėjimas pasenusiu neatitinka" " reikalavimų" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Paketas %s pažymėtas pasenusiu paketo %s, todėl bandoma įdiegti %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Paketas %s jau įdiegtas ir paskutinės versijos" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Paketas, atitinkantis %s, jau įdiegtas. Tikrinamas atnaujinimas." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Atnaujinti viską" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Neatnaujinamas paketas, kuris jau yra pasenęs: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "" ++msgstr "Nerasta paketo atnaujinimui: %s" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paketas jau yra pasenęs: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Neatnaujinamas paketas, kuris yra pasenęs: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Neatnaujinamas paketas, kuris jau yra atnaujintas: %s.%s %s:%s-%s" @@ -79241,380 +79803,410 @@ index 4a1d933..3826bcf 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nėra paketo atitikmens pašalinimui" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "" ++msgstr "Nerasta paketo pašalinimui: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Praleidžiama ir vykdomas branduolys: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" - msgstr "Pašalinamas %s iš transakcijos" +-msgstr "Pašalinamas %s iš transakcijos" ++msgstr "Pašalinamas %s iš tranzakcijos" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Nepavyksta atverti: %s. Praleidžiama." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Tikrinama %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Nepavyksta vietinis deltarpm diegimas: %s. Praleidžiama." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" - "Nepavyksta pridėti paketo %s į transakciją. Nesuderinama architektūra: %s" +-"Nepavyksta pridėti paketo %s į transakciją. Nesuderinama architektūra: %s" ++"Nepavyksta pridėti paketo %s į tranzakciją. Nesuderinama architektūra: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" "Nepavyksta įdiegti paketo %s. Jis pažymėtas pasenusiu įdiegto paketo %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2813,7 +2944,7 @@ msgstr "" +@@ -2813,7 +2950,7 @@ msgstr "" "Paketas %s neįdiegtas, negalima jo atnaujinti. Paleiskite yum install jo " "įdiegimui." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2822,95 +2953,100 @@ msgstr "" +@@ -2822,137 +2959,146 @@ msgstr "" "Paketas %s.%s neįdiegtas, negalima jo atnaujinti. Paleiskite yum install jam" " įdiegti." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Išskiriamas %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Žymimas %s įdiegimui" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Žymimas %s kaip %s atnaujinimas" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: neatnaujina įdiegto paketo." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Nepavyksta atverti failo: %s. Praleidžiama." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Perdiegimo problema: nėra paketo atitikmens pašalinimui" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Perdiegimo problema: nėra paketo %s atitikmens diegimui" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Nėra paketo(-ų) grąžinimui" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Paketas %s leidžia daugkartinius diegimus, praleidžiama" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Nėra atitikmens prieinamam paketui: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Tik atnaujinimas yra prieinamas paketui: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Nepavyko grąžinti: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" -+msgstr "" ++msgstr "Nepavyko atnaujinti: %s" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "Gaunamas raktas iš %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "GPG rakto gavimas nepavyko: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "GPG rakto parašas raktui %s neatitinka saugyklos CA rakto: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "GPG rakto parašas patikrinas su CA raktu(-ais)." -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Netinkamas GPG raktas iš %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG rakto skaitymas nepavyko: raktas neturi %s reikšmės" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2923,7 +3059,7 @@ msgstr "" - " Paketas : %s (%s)\n" - " Iš : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" + msgstr "" + "Importuojamas %s raktas 0x%s:\n" +-" Naudotojo id: %s\n" +-" Paketas : %s (%s)\n" +-" Iš : %s" ++" Naudotojas : „%s“\n" ++" Atspaudas : %s\n" ++" Paketas : %s (%s)\n" ++" Iš : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2934,25 +3070,25 @@ msgstr "" - " Naudotojo id: \"%s\"\n" - " Iš : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" + msgstr "" + "Importuojamas %s raktas 0x%s:\n" +-" Naudotojo id: \"%s\"\n" +-" Iš : %s" ++" Naudotojas : „%s“\n" ++" Atspaudas : %s\n" ++" Iš : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG raktas iš %s (0x%s) jau įdiegtas" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Rakto importas neapvyko (kodas %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Raktas sėkmingai importuotas" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "Neįdiegta jokių raktų" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2961,25 +3097,25 @@ msgstr "" +@@ -2961,25 +3107,25 @@ msgstr "" "GPG raktai, išvardinti „%s“ saugyklai, jau yra įdiegti, bet nėra teisingi šiam paketui.\n" "Patikrinkite, ar teisingi URL yra nustatyti šiai saugyklai." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Rakto(-ų) importas nepadėjo, neteisingas(-i) raktas(-ai)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG raktas iš %s (0x%s) jau importuotas" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Rakto importas nepavyko" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Neįdiegta jokių raktų saugyklai %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2988,158 +3124,182 @@ msgstr "" +@@ -2988,158 +3134,182 @@ msgstr "" "GPG raktai, išvardinti „%s“ saugyklai, jau yra įdiegti, bet nėra teisingi.\n" "Patikrinkite, ar teisingi URL yra nustatyti šiai saugyklai." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Nepavyksta rasti tinkamos dubliuojančios tinklavietės." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Kilo klaidų parsiunčiant paketus." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Praneškite apie šią klaidą adresu %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " - msgstr "Transakcijos testavimo klaidos: " +-msgstr "Transakcijos testavimo klaidos: " ++msgstr "Tranzakcijos testavimo klaidos: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Nepavyko nustatyti podėlio katalogo: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "Priklausomybės neįšspręsto. Neišsaugoma neišspręsta transakcija." +-msgstr "Priklausomybės neįšspręsto. Neišsaugoma neišspręsta transakcija." ++msgstr "Priklausomybės neįšspręsto. Neišsaugoma neišspręsta tranzakcija." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" - msgstr "Nepavyko išsaugoti transakcijos į failą %s: %s" +-msgstr "Nepavyko išsaugoti transakcijos į failą %s: %s" ++msgstr "Nepavyko išsaugoti tranzakcijos į failą %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" - msgstr "Nepavyko pasiekti/perskaityti išsaugotos transakcijos %s : %s" +-msgstr "Nepavyko pasiekti/perskaityti išsaugotos transakcijos %s : %s" ++msgstr "Nepavyko pasiekti/perskaityti išsaugotos tranzakcijos %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " - msgstr "rpmdb versija nesutampa su išsaugotos transakcijos versija, " +-msgstr "rpmdb versija nesutampa su išsaugotos transakcijos versija, " ++msgstr "rpmdb versija nesutampa su išsaugotos tranzakcijos versija, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr " nepaisoma, kaip nurodyta." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr " atšaukiama." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "nepavyksta rasti tsflags arba tai nėra sveikas skaičius." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Rastas txmbr nežinomoje būsenoje: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Nepavyksta rasti txmbr: %s būsenoje %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Nepavyksta rasti txmbr: %s iš šaltinio: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," - msgstr "Trūksta transakcijos narių, ryšių arba transakcija buvo pakeista," +-msgstr "Trūksta transakcijos narių, ryšių arba transakcija buvo pakeista," ++msgstr "Trūksta tranzakcijos narių, ryšių arba transakcija buvo pakeista," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr " nepaisoma, kaip nurodyta. Jūs turite išspręsti priklausomybes!" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." -+msgstr "" ++msgstr "%s jau buvo aplankytas ir negali būti pašalintas." + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" -+msgstr "" ++msgstr "Tikrinama %s revdeps" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." -+msgstr "" ++msgstr "%s turi revdep %s, kuri yra naudotojo įdiegta." + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "" ++msgstr "%s neturi naudotojo įdiegtų revdeps." + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 @@ -79712,7 +80304,7 @@ index 4a1d933..3826bcf 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s teikia %s, bet nepavyksta jo rasti" -@@ -3148,6 +3308,17 @@ msgstr "%s teikia %s, bet nepavyksta jo rasti" +@@ -3148,6 +3318,17 @@ msgstr "%s teikia %s, bet nepavyksta jo rasti" msgid "Repackaging" msgstr "Perpakuojama" @@ -79731,10 +80323,10 @@ index 4a1d933..3826bcf 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/mr.po b/po/mr.po -index 5163eab..cb31b4a 100644 +index 5163eab..88cbe8e 100644 --- a/po/mr.po +++ b/po/mr.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -79745,11 +80337,13 @@ index 5163eab..cb31b4a 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Marathi (http://www.transifex.net/projects/p/yum/team/mr/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,413 +17,438 @@ msgstr "" "Language: mr\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -79767,30 +80361,30 @@ index 5163eab..cb31b4a 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "" @@ -79817,7 +80411,7 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "" @@ -79843,53 +80437,53 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -79900,98 +80494,98 @@ index 5163eab..cb31b4a 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -79999,7 +80593,7 @@ index 5163eab..cb31b4a 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -80008,13 +80602,13 @@ index 5163eab..cb31b4a 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -80024,12 +80618,12 @@ index 5163eab..cb31b4a 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -80039,12 +80633,12 @@ index 5163eab..cb31b4a 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -80054,14 +80648,14 @@ index 5163eab..cb31b4a 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -80069,13 +80663,13 @@ index 5163eab..cb31b4a 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -80083,7 +80677,7 @@ index 5163eab..cb31b4a 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -80091,151 +80685,151 @@ index 5163eab..cb31b4a 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -80245,18 +80839,18 @@ index 5163eab..cb31b4a 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -80266,37 +80860,37 @@ index 5163eab..cb31b4a 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -80305,153 +80899,153 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -80794,22 +81388,22 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -80847,351 +81441,357 @@ index 5163eab..cb31b4a 100644 #, python-format msgid "" "\n" -@@ -869,57 +901,52 @@ msgid "" +@@ -869,57 +901,58 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "" -@@ -927,7 +954,7 @@ msgstr "" +@@ -927,7 +960,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -935,484 +962,536 @@ msgid "" +@@ -935,484 +968,536 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -81200,17 +81800,17 @@ index 5163eab..cb31b4a 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -81223,224 +81823,224 @@ index 5163eab..cb31b4a 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -81448,7 +82048,7 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -81456,7 +82056,7 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -81464,7 +82064,7 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -81472,103 +82072,103 @@ index 5163eab..cb31b4a 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr "" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr "" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr "" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr "" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr "" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -81576,7 +82176,7 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -81584,68 +82184,68 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1420,47 +1499,47 @@ msgid "" +@@ -1420,47 +1505,47 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "" -@@ -1472,7 +1551,7 @@ msgstr "" +@@ -1472,7 +1557,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -81654,7 +82254,7 @@ index 5163eab..cb31b4a 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1568,484 @@ msgid "" +@@ -1489,451 +1574,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -81917,188 +82517,187 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -82106,7 +82705,7 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -82114,148 +82713,148 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2056,106 @@ msgstr "" +@@ -1944,100 +2058,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -82263,7 +82862,7 @@ index 5163eab..cb31b4a 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -82300,226 +82899,226 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,774 +2163,784 @@ msgstr "" +@@ -2045,991 +2165,1028 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -82527,43 +83126,43 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -82751,24 +83350,24 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -82776,7 +83375,7 @@ index 5163eab..cb31b4a 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -82787,40 +83386,40 @@ index 5163eab..cb31b4a 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -82828,23 +83427,23 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "" @@ -82858,67 +83457,67 @@ index 5163eab..cb31b4a 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -82928,26 +83527,26 @@ index 5163eab..cb31b4a 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -82957,62 +83556,62 @@ index 5163eab..cb31b4a 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -83020,78 +83619,79 @@ index 5163eab..cb31b4a 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -83099,118 +83699,118 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -83218,7 +83818,7 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -83226,158 +83826,166 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2821,7 +2949,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2829,207 +2957,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -83385,29 +83993,29 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -83415,117 +84023,117 @@ index 5163eab..cb31b4a 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -83625,7 +84233,7 @@ index 5163eab..cb31b4a 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3190,14 @@ msgstr "" +@@ -3038,6 +3195,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -83641,10 +84249,10 @@ index 5163eab..cb31b4a 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/ms.po b/po/ms.po -index 2b9119e..92cec5b 100644 +index 2b9119e..10fae84 100644 --- a/po/ms.po +++ b/po/ms.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -83655,11 +84263,13 @@ index 2b9119e..92cec5b 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,413 +17,429 @@ msgstr "" "Language: ms\n" "Plural-Forms: nplurals=1; plural=0\n" @@ -83677,30 +84287,30 @@ index 2b9119e..92cec5b 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "" @@ -83727,7 +84337,7 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "" @@ -83753,53 +84363,53 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -83809,98 +84419,98 @@ index 2b9119e..92cec5b 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -83908,7 +84518,7 @@ index 2b9119e..92cec5b 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -83916,13 +84526,13 @@ index 2b9119e..92cec5b 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -83931,12 +84541,12 @@ index 2b9119e..92cec5b 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -83945,12 +84555,12 @@ index 2b9119e..92cec5b 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -83959,27 +84569,27 @@ index 2b9119e..92cec5b 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -83987,158 +84597,158 @@ index 2b9119e..92cec5b 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -84147,18 +84757,18 @@ index 2b9119e..92cec5b 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -84167,37 +84777,37 @@ index 2b9119e..92cec5b 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -84206,153 +84816,153 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -84695,22 +85305,22 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -84747,351 +85357,356 @@ index 2b9119e..92cec5b 100644 #, python-format msgid "" "\n" -@@ -869,57 +891,52 @@ msgid "" +@@ -869,57 +891,57 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "" -@@ -927,7 +944,7 @@ msgstr "" +@@ -927,7 +949,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -935,484 +952,536 @@ msgid "" +@@ -935,484 +957,536 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -85100,17 +85715,17 @@ index 2b9119e..92cec5b 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -85123,224 +85738,224 @@ index 2b9119e..92cec5b 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -85348,7 +85963,7 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -85356,7 +85971,7 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -85364,7 +85979,7 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -85372,103 +85987,103 @@ index 2b9119e..92cec5b 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr "" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr "" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr "" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr "" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr "" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -85476,7 +86091,7 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -85484,68 +86099,68 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1420,47 +1489,47 @@ msgid "" +@@ -1420,47 +1494,47 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "" -@@ -1472,7 +1541,7 @@ msgstr "" +@@ -1472,7 +1546,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -85554,7 +86169,7 @@ index 2b9119e..92cec5b 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1558,484 @@ msgid "" +@@ -1489,451 +1563,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -85817,188 +86432,187 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -86006,7 +86620,7 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -86014,148 +86628,148 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2046,106 @@ msgstr "" +@@ -1944,100 +2047,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -86163,7 +86777,7 @@ index 2b9119e..92cec5b 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -86200,226 +86814,226 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,774 +2153,782 @@ msgstr "" +@@ -2045,991 +2154,1026 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -86427,43 +87041,43 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -86651,24 +87265,24 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -86676,7 +87290,7 @@ index 2b9119e..92cec5b 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -86687,40 +87301,40 @@ index 2b9119e..92cec5b 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -86728,23 +87342,23 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Tidak dapat melaksanakan checksum" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "menggunakan salinan tempatan bagi %s" @@ -86758,67 +87372,67 @@ index 2b9119e..92cec5b 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Pengepala tidak lengkap." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Masalah membuka pakej %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Pakej %s tidak ditandatangan" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Tidak dapat membuang %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Tidak dapat membuang %s fail %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s fail %s dibuang" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s fail dibuang" @@ -86827,26 +87441,26 @@ index 2b9119e..92cec5b 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Mencari %d pakej" @@ -86855,62 +87469,62 @@ index 2b9119e..92cec5b 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "mencari pakej %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -86918,78 +87532,79 @@ index 2b9119e..92cec5b 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Tiada Pakej dijumpai untuk %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -86997,118 +87612,118 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Mengemaskini Semuanya" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Memeriksa %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -87116,7 +87731,7 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -87124,158 +87739,166 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Menanda %s untuk dipasang" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Tidak dapat membuka fail: %s. Melangkau." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2821,7 +2937,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2829,207 +2945,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Kekunci berjaya diimport" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -87283,29 +87906,29 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -87313,117 +87936,117 @@ index 2b9119e..92cec5b 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Ralat Ujian Transaksi:" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -87523,7 +88146,7 @@ index 2b9119e..92cec5b 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3178,14 @@ msgstr "" +@@ -3038,6 +3182,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -87539,10 +88162,10 @@ index 2b9119e..92cec5b 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/nb.po b/po/nb.po -index d2ee996..389dafb 100644 +index d2ee996..a23b775 100644 --- a/po/nb.po +++ b/po/nb.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -87553,11 +88176,13 @@ index d2ee996..389dafb 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,122 +17,124 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -87575,30 +88200,30 @@ index d2ee996..389dafb 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installerer" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Utgått" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Oppdatert" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Fjernet" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Installert" @@ -87625,7 +88250,7 @@ index d2ee996..389dafb 100644 msgstr "Fjernet: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Fjerner" @@ -87651,53 +88276,53 @@ index d2ee996..389dafb 100644 msgstr "Leser inn data om lager fra lokale filer" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Feil i konfigurasjon: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Feil i flagg: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "Installert: %s-%s til %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Bygd : %s til %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "Sendt inn: %s til %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Du må oppgi en kommando" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Krav til disk:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -87708,7 +88333,7 @@ index d2ee996..389dafb 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -87717,73 +88342,73 @@ index d2ee996..389dafb 100644 "---------------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Prøver å kjøre transaksjonen, men den er tom. Avslutter." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Avslutter på grunn av kommando fra bruker" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Laster ned pakker:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Kunne ikke laste ned pakkene:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Vennligst rapporter denne feilen i %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Kjører test på transaksjonen" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Feil ved test av transaksjonen:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Test av transaksjonen var vellykket" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Utfører transaksjonen" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -87792,18 +88417,18 @@ index d2ee996..389dafb 100644 "Bruk «-y» for å overstyre." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Du mente kanskje:" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Pakken(e) %s%s%s er tilgjengelig, men ikke installert." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Pakke %s%s%s er ikke tilgjengelig." @@ -87811,7 +88436,7 @@ index d2ee996..389dafb 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Pakke(r) som skal installeres" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -87820,13 +88445,13 @@ index d2ee996..389dafb 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Ingenting å gjøre" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pakker merket for oppdatering" @@ -87836,12 +88461,12 @@ index d2ee996..389dafb 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Ingen pakker merket for oppdatering" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -87851,12 +88476,12 @@ index d2ee996..389dafb 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pakker merket for fjerning" @@ -87866,14 +88491,14 @@ index d2ee996..389dafb 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Ingen pakker merket for fjerning" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Pakke(r) som skal nedgraderes" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -87881,13 +88506,13 @@ index d2ee996..389dafb 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (fra %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Den installerte pakken %s%s%s%s er ikke tilgjengelig." @@ -87895,7 +88520,7 @@ index d2ee996..389dafb 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Pakke(r) som skal ominstalleres" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -87903,153 +88528,153 @@ index d2ee996..389dafb 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Ingen pakker ble tilbudt" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Pakke(r) som skal installeres" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Advarsel: Ingen treff funnet for: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Fant ingen treff" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Ingen pakke ble funnet for %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Rydder opp alt" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Rydder opp pakkehoder" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Rydder opp pakker" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Rydder opp i XML-metadata" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Rydder opp i mellomlager for database" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Rydder opp i metadata for expire-cache" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Rydder opp i programtillegg" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Installerte grupper:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Tilgjengelig grupper:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Ferdig" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Advarsel: Gruppe %s eksisterer ikke." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "Ingen pakker tilgjengelig for installering eller oppdatering i aktuelle " "grupper" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pakke(r) vil bli installert" @@ -88059,18 +88684,18 @@ index d2ee996..389dafb 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Det finnes ingen gruppe med navn %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Ingen pakker å fjerne fra grupper" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pakker vil bli fjernet" @@ -88080,20 +88705,20 @@ index d2ee996..389dafb 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Pakke %s er allerede lagt inn, hopper over" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Vraker pakke som ikke kan sammenlignes %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" @@ -88101,18 +88726,18 @@ index d2ee996..389dafb 100644 "pakker" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Programtilleggs valg" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Feil med kommandolinje: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -88121,153 +88746,153 @@ index d2ee996..389dafb 100644 "%s: flagg %s krever et argument" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color tar et av: auto, alltid, aldri" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "vis denne hjelpteksten og avslutt" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "vær tolerant ved feil" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "plassering av konfigurasjonsfil" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "maksimaltid for å vente på kommando" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "nivå for tilbakemeldinger ved avlusing" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "vis duplikater i lager og i kommandoer for å liste/søke i pakker" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "mengde tilbakemelding ved feil" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "stille operasjon" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "vis ekstra informasjon" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "svar Ja til alle spørsmål" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "vis Yum-versjon og avslutt" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "sett rot for installasjonen" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "legger til et eller flere lager (jokertegn er tillatt)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "slå av et eller flere lager (jokertegn er tillatt)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "overse pakke(r) ved navn eller mønster" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "fjerner ekskludering av pakker, for et lager eller alle pakker" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "ta med foreldede pakker i beregningen ved oppdatering" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "ikke bruk programtilleggene til Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "ikke sjekk GPG-signaturer" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "slå av tillegg til yum etter navn" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "slå av programtillegg til yum etter navn" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "hopp over pakker som har problemer med avhengigheter" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "kontroller om farger er brukt" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -88611,22 +89236,22 @@ index d2ee996..389dafb 100644 msgstr "Fjernes på grunn avhengigheter" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Hoppet over (problemer med avhengigheter)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Pakke" +msgid_plural "Packages" @@ -88664,351 +89289,357 @@ index d2ee996..389dafb 100644 #, python-format msgid "" "\n" -@@ -885,57 +917,52 @@ msgstr "" +@@ -885,57 +917,58 @@ msgstr "" "Transaksjonsammendrag\n" "%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Fjernet" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Fjernet på grunn avhengighet" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Lagt inn på grunn av avhengighet" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Oppdatert på grunn avhengighet" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Erstattet" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Feilet" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "to" -@@ -943,7 +970,7 @@ msgstr "to" +@@ -943,7 +976,7 @@ msgstr "to" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -954,470 +981,522 @@ msgstr "" +@@ -954,470 +987,522 @@ msgstr "" " Pågående nedlastning er avbrutt, %s avbryt (ved å trykke Ctrl-C) %s ganger til innen %s%s%s sekunder\n" "for å avslutte.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "avbrutt av bruker" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Totalt" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -89017,17 +89648,17 @@ index d2ee996..389dafb 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -89040,224 +89671,224 @@ index d2ee996..389dafb 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "installert" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "fjernet" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "oppdatert" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "foreldet" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Utfører sjekk av transaksjonen" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Starter løsing av avhengigheter på nytt med endringer" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Alle avhengigheter er løst" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Beregner avhengighet: %s for pakke: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Avhengigheter som ikke kunne bli tilfredstilt: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -89265,7 +89896,7 @@ index d2ee996..389dafb 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -89273,7 +89904,7 @@ index d2ee996..389dafb 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -89281,7 +89912,7 @@ index d2ee996..389dafb 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -89289,184 +89920,184 @@ index d2ee996..389dafb 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Beregner konflikter: %s er i konflikt med %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Fyller transaksjonen med valgte pakker. Vennligst vent." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Henter ned filhode for pakke %s for å fylle transaksjonen." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Kjører" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Sover" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombie" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Sporet/Stoppet" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Ukjent" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Det andre programmet er: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Det andre programmet er: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Minne : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Startet for %s - %s siden" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Status : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1427,7 +1506,7 @@ msgstr "" +@@ -1427,7 +1512,7 @@ msgstr "" "\n" "Avslutter etter ønske" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1437,7 +1516,7 @@ msgstr "" +@@ -1437,7 +1522,7 @@ msgstr "" "\n" "Avslutter på grunn av brutt rør" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1445,41 +1524,41 @@ msgid "" +@@ -1445,41 +1530,41 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Feil: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "Du kan prøve å bruke --skip-broken for å jobbe deg rundt problem" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Ukjent feil: feilkode: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1487,7 +1566,7 @@ msgstr "" +@@ -1487,7 +1572,7 @@ msgstr "" "\n" "Alle avhengigheter er løst" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Ferdig!" -@@ -1499,7 +1578,7 @@ msgstr "" +@@ -1499,7 +1584,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Du må være rootbruker for å utføre denne kommandoen." @@ -89475,7 +90106,7 @@ index d2ee996..389dafb 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1527,360 +1606,353 @@ msgstr "" +@@ -1527,360 +1612,349 @@ msgstr "" "\n" "Kontakt din distribusjon eller pakkeansvarlig for mer informasjon.\n" @@ -89740,347 +90371,346 @@ index d2ee996..389dafb 100644 msgstr "Klargjøring for pakker på lokalt filsystem" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Finner hvilken pakke som tilbyr den gitte avhengigheten" - +-msgid "Determine which package provides the given dependency" +-msgstr "Finner hvilken pakke som tilbyr den gitte avhengigheten" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Søker i pakker etter avhengighet:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Kjører det interaktive Yum-skallet" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Klargjør Yum-skallet" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Vis avhengigheter for en pakke" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Finner avhengigheter: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Viser de pakkeoversiktene som er satt opp" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "aktiv" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "inaktiv" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Arkivrevisjon: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Arkivdistribusjonsmerkelapper:" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Arkivmetalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Oppdatert : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "arkiv id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "arkiv navn" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Viser en hjelpetekst" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Ingen hjelp er tilgjengelig for %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1890,7 +1962,7 @@ msgstr "" +@@ -1890,7 +1964,7 @@ msgstr "" "\n" "alias:" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1900,85 +1972,125 @@ msgstr "" +@@ -1900,85 +1974,125 @@ msgstr "" "\n" "alias:" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Klargjør for å legge inn pakke(r) på nytt" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "ominstaller en pakke " -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Klargjør for oppdatering" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "nedgrader en pakke" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Vi sen versjon for maskinen og/eller tilgjengelige arkiver" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Installert:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Tilgjengelig:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1989,27 +2101,33 @@ msgstr "" +@@ -1989,27 +2103,33 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -90088,7 +90718,7 @@ index d2ee996..389dafb 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -"Et annet program holder en fillås for Yum, venter til fillåsen frigjøres..." @@ -90123,277 +90753,277 @@ index d2ee996..389dafb 100644 msgid "" "\n" "\n" -@@ -2019,74 +2137,74 @@ msgstr "" +@@ -2019,74 +2139,74 @@ msgstr "" "\n" "Avslutter etter ønske" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() vil forsvinne i en kommende utgave av Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Setter opp transaksjons-sett før config klassen er klar" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Ugyldig tsflag in konfigurasjonsfil: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Søker i pkgSack etter avhengighet: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Medlem: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s ble omdannet til installering" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Legger til pakke %s in modus %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Fjerner pakke %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s krever: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Nødvendig avhengighet har allerede blitt plukket opp, jukser" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Nødvendig avhengighet er ikke et navn på pakke. Ser etter: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Potensiell tilbyder: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Modus er %s for tilbyder av %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Modus for pakke som tilbyr %s: %s" -@@ -2094,115 +2212,115 @@ msgstr "Modus for pakke som tilbyr %s: %s" +@@ -2094,115 +2214,115 @@ msgstr "Modus for pakke som tilbyr %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: pakke %s som er nødvendig for %s vil bli fjernet" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: Bytter ut %s med %s for å løse opp i avhengighet." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Oppdaterer %s for å løse opp i avhengighet." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Kunne ikke finne måte å oppdatere sti for avhengighet: %s." -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Hurtigpasset %s for å tilfredstille %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s tilbyr pakker, men er allerede installert, fjerner denne." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" "Pakke %s som potensielt løser opp avhengighet har nyere instans in ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Pakke %s som potensielt løser opp avhengighet er allerde installert." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s er allerde i ts, hopper over denne" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Setter opp %s som oppdatering av %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Setter opp %s som pakke for installering av %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Suksess - transaksjonen er tom" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Starter sløyfe på nytt" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Beregning av avhengighet avsluttes" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Suksess - alle avhengigheter er tilfredstilt" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Sjekker avhengigheter for %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "leter etter %s som kreves av %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Kjører compare_providers() for %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "bedre arch i po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s faser ut %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2211,142 +2329,142 @@ msgstr "" +@@ -2211,142 +2331,142 @@ msgstr "" "archdist sammenlignet %s med %s på %s\n" " Vinner: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "felles kilderpm %s og %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "felles prefiks fra %s mellom %s og %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Beste rekkefølge: %s" @@ -90526,7 +91156,7 @@ index d2ee996..389dafb 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2354,21 +2472,21 @@ msgstr "" +@@ -2354,21 +2474,21 @@ msgstr "" "Det er uferdige transaksjoner igjen. Du vil kanskje vurdere å kjøre yum-" "complete-transaction først for å gjøre dem ferdig." @@ -90552,7 +91182,7 @@ index d2ee996..389dafb 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2376,128 +2494,120 @@ msgstr "" +@@ -2376,128 +2496,120 @@ msgstr "" "\n" "Pakker som ble oversett på grunn av problemer med avhengigheter:" @@ -90585,7 +91215,7 @@ index d2ee996..389dafb 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -90593,18 +91223,18 @@ index d2ee996..389dafb 100644 "transaksjonen." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Kunne ikke fjerne transaksjonsfil %s" @@ -90612,7 +91242,7 @@ index d2ee996..389dafb 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s var ment til å bli installert men er ikke!" @@ -90623,40 +91253,40 @@ index d2ee996..389dafb 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s var ment til å bli fjernet men er ikke!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Kunne ikke sjekke om PID %s er aktiv" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Det fins allerede en låsfil %s: en annen Yum kjører med PID %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -90664,23 +91294,23 @@ index d2ee996..389dafb 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Kunne ikke beregne sjekksum" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Pakken har ikke korrekt sjekksum" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "sjekksummen til pakken er feil, men mellomlagring er satt på for %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "bruker lokal kopi av %s" @@ -90697,69 +91327,69 @@ index d2ee996..389dafb 100644 -" * trenger %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Filhode er ikke fullstendig." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2505,62 +2615,64 @@ msgstr "" +@@ -2505,62 +2617,64 @@ msgstr "" "Filhode er ikke tilgjengelig lokalt og mellomlager-modus er aktivert Kan " "ikke hente ned %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Offentlig nøkkel for %s er ikke lagt inn" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problem ved åpning av pakke %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Offentlig nøkkel %s er ikke til å stole på" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Pakken %s er ikke signert" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Kan ikke fjerne %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s fjernet" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Kan ikke fjerne %s fra fil %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s fil %s er fjernet" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s filer fjernet" @@ -90769,28 +91399,28 @@ index d2ee996..389dafb 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Mer enn ett identisk passende treff i sekken %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ingenting passer %s.%s %s:%s-%s fra oppdatering" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2568,203 +2680,211 @@ msgstr "" +@@ -2568,203 +2682,212 @@ msgstr "" "searchPackages() vil forsvinne i en kommende utgave av Yum.\n" "Bruk heller searchGenerator()\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Søker etter %d pakker" @@ -90800,62 +91430,62 @@ index d2ee996..389dafb 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "søker etter pakke %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "søker i filoversikt" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "søker i oppføringer av tilbud" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Ingen gruppedata tilgjengelig for konfigurerte pakkelager" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Det eksisterer ingen gruppe med navn %s " -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "pakke %s var ikke med i gruppe %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Legger til pakke %s fra gruppe %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Ingen pakke med navn %s er tilgjendelig for installering" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -90863,78 +91493,79 @@ index d2ee996..389dafb 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Pakke tuppel %s ble ikke funnet i sekken med pakker" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Ingen pakke for %s er funnet" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Pakkeobjekt var ikke en pakkeobjektinstans" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Ingenting oppgitt for installasjon" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Sjekker for virtuelle tilbydere eller tilbydere av filer for %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Ingen treff for argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Pakke %s er installert og ikke tilgjengelig" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Ingen pakke(r) er tilgjengelig for installering" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pakke: %s - allerede i transaksjonensettet" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Pakke %s er foreldet av %s som allerede er installert" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -90942,62 +91573,62 @@ index d2ee996..389dafb 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Pakke %s er foreldet av %s, prøver å installere %s isteden." -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Pakke %s er allerede installert i siste versjon" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Pakke med treff på %s er allerede lagt inn. Ser etter oppdatering" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Oppdaterer alt" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Vil ikke oppdatere pakke som allerede er foreldet: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Pakka er allerede foreldet: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Oppdatere ikke pakken som allerede er oppdatert: %s.%s %s:%s-%s" @@ -91005,67 +91636,67 @@ index d2ee996..389dafb 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Kunne ikke finne noen passende pakke for fjerning" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Undersøker: %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2772,12 +2892,12 @@ msgstr "" +@@ -2772,12 +2895,12 @@ msgstr "" "Kan ikke legge til pakke %s til transaksjonen. Det er ikke en kompatibel " "arkitektur: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2786,102 +2906,107 @@ msgstr "" +@@ -2786,137 +2909,144 @@ msgstr "" "Pakka %s er ikke installert, så den kan ikke oppdateres. Bruk kommandoen yum" " install for å legge den inn." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -91073,189 +91704,197 @@ index d2ee996..389dafb 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Ekskluderer %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Setter av %s for kommende installering" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Setter av %s som en oppdatering av %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: vil ikke oppdatere installert pakke." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Kunne ikke åpne fil: %s. Hopper over." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Problem ved reinstall: kunne ikke finne passende pakke og fjerne" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problem i ominstalleringen: ingen pakke %s funnet for installering." -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Ingen pakke(r) er tilgjengelig for nedgradering" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Pakke %s er tillatt flere installeringer, hopper over." -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Ingen treff for tilgjengelig pakke: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Bare oppgraderinger tilgjengelig på pakke: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Henting av GPG-nøkkel feilet: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Analyse av GPG-nøkkel feilet: nøkkelen har ikke verdi %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2890,7 +3015,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2898,25 +3023,25 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG-nøkkel ved %s (0x%s) er allerede lagt inn" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Import av nøkkel feilet (kode %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Nøkler ble lagt inn med suksess" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2927,183 +3052,207 @@ msgstr "" +@@ -2927,183 +3057,207 @@ msgstr "" "Sjekk at korrekt URL (gpgkey opsjonen) er oppgitt for denne\n" "pakkeoversikten." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Import av nøkler hjalp ikke, feil nøkler?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG-nøkkel ved %s (0x%s) er allerede importert" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Import av nøkkel feilet" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -91263,117 +91902,117 @@ index d2ee996..389dafb 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Kunne ikke finne passende filspeil" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Det oppstod feil ved nedlastning av pakker." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Vennligst send en feilrapport til %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Feil ved testtransaksjon: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -91474,7 +92113,7 @@ index d2ee996..389dafb 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3112,6 +3261,17 @@ msgstr "" +@@ -3112,6 +3266,17 @@ msgstr "" msgid "Repackaging" msgstr "Pakker på nytt" @@ -91493,7 +92132,7 @@ index d2ee996..389dafb 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/pa.po b/po/pa.po -index e714500..942ca68 100644 +index e714500..71b2e15 100644 --- a/po/pa.po +++ b/po/pa.po @@ -2,14 +2,15 @@ @@ -91510,9 +92149,9 @@ index e714500..942ca68 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-09-19 15:01+0000\n" -+"Last-Translator: aalam \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Panjabi (Punjabi) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -91533,30 +92172,30 @@ index e714500..942ca68 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "ਅੱਪਡੇਟ ਕੀਤੇ" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "ਸਾਫ਼ ਕੀਤਾ" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "ਇੰਸਟਾਲ ਕੀਤਾ" @@ -91583,7 +92222,7 @@ index e714500..942ca68 100644 msgstr "ਸਾਫ਼ ਕੀਤਾ: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" @@ -91609,53 +92248,53 @@ index e714500..942ca68 100644 msgstr "ਲੋਕਲ ਫਾਇਲਾਂ ਤੋਂ ਰਿਪੋਜ਼ਟਰੀ ਮੇਟਾਡਾਟਾ ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "ਸੰਰਚਨਾ ਗਲਤੀ: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "ਚੋਣ ਗਲਤੀ: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " ਇੰਸਟਾਲ ਕੀਤਾ:%s-%s %s ਉੱਤੇ " -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " ਬਿਲਡ : %s %s ਉੱਤੇ " -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " ਕਮਿਟ ਕੀਤਾ: %s %s ਉੱਤੇ" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "ਤੁਹਾਨੂੰ ਕੁਝ ਕਮਾਂਡ ਦੇਣ ਦੀ ਲੋੜ ਹੈ" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "ਇੰਝ ਦੀ ਕੋਈ ਕਮਾਂਡ ਨਹੀਂ ਹੈ: %s। %s --help ਵਰਤੋਂ ਜੀ" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "ਡਿਸਕ ਲੋੜਾਂ:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " ਘੱਟੋ-ਘੱਟ %dMB ਹੋਰ ਖਾਲੀ ਥਾਂ %s ਫਾਇਲ ਸਿਸਟਮ ਉੱਤੇ ਚਾਹੀਦੀ ਹੈ।\n" @@ -91666,7 +92305,7 @@ index e714500..942ca68 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -91675,94 +92314,94 @@ index e714500..942ca68 100644 "------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" "ਟਰਾਂਸੈਕਸ਼ਨ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ, ਪਰ ਕੁਝ ਵੀ ਕਰਨ ਲਈ ਨਹੀਂ ਹੈ। ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ" " ਹੈ।" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "ਯੂਜ਼ਰ ਕਮਾਂਡ ਮੌਜੂਦ ਹੈ" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" -msgstr "" +msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਚੱਲ ਰਿਹਾ ਹੈ" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "ਗਲਤੀ, ਤੁਹਾਨੂੰ ਹੈਂਡਲ ਕਰਨ ਲਈ rpm ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "%s ਵਿੱਚ ਇਹ ਗਲਤੀ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਉ" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਟੈਸਟ ਚੱਲ ਰਿਹਾ ਹੈ" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਗਲਤੀ:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਟੈਸਟ ਸਫ਼ਲ ਰਿਹਾ" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੱਲ ਰਹੀ ਹੈ" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * ਸ਼ਾਇਦ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "ਪੈਕੇਜ %s%s%s ਉਪਲੱਬਧ ਹਨ, ਪਰ ਇੰਸਟਾਲ ਨਹੀਂ।" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "ਕੋਈ %s%s%s ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।" @@ -91770,37 +92409,37 @@ index e714500..942ca68 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" -+msgstr[1] "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "ਕਰਨ ਲਈ ਕੁਝ ਨਹੀਂ" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "ਅੱਪਡੇਟ ਕਰਨ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "%d ਪੈਕੇਜ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਪਛਾਣਿਆ ਗਿਆ" -+msgstr[1] "%d ਪੈਕੇਜ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਪਛਾਣੇ ਗਏ" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "ਅੱਪਡੇਟ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ" @@ -91810,29 +92449,29 @@ index e714500..942ca68 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਮਾਰਕ ਨਹੀਂ ਕੀਤਾ" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "%d ਪੈਕੇਜ ਹਟਾਉਣ ਲਈ ਪਛਾਣਿਆ ਗਿਆ" -+msgstr[1] "%d ਪੈਕੇਜ ਹਟਾਉਣ ਲਈ ਪਛਾਣੇ ਗਏ" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਪੈਕੇਜ" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -91840,13 +92479,13 @@ index e714500..942ca68 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (%s ਵਲੋਂ)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "ਇੰਸਟਾਲ ਹੋਏ ਪੈਕੇਜ %s%s%s%s ਉਪਲੱਬਧ ਨਹੀਂ।" @@ -91854,7 +92493,7 @@ index e714500..942ca68 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -91862,215 +92501,215 @@ index e714500..942ca68 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਦਿੰਦਾ" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "ਮਿਲਦੇ: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "ਚੇਤਾਵਨੀ: %s :ਲਈ ਕੋਈ ਮੇਲ ਨਹੀਂ ਲੱਭਿਆ" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "ਕੋਈ ਮਿਲਦਾ ਨਹੀਂ" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "%s ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਲੱਭਿਆ" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "ਰੈਪੋ ਸਾਫ਼ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ: " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "ਹਰ ਚੀਜ਼ ਸਾਫ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "ਹੈੱਡਰ ਸਾਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "ਪੈਕੇਜ ਸਾਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "xml ਮੇਟਾਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "ਡਾਟਾਬੇਸ ਕੈਸ਼ ਸਾਫ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "ਐਕਸਪਾਇਰ-ਕੈਸ਼ ਮੇਟਾਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "ਕੈਸ਼ ਕੀਤਾ rpmdb ਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "ਪਲੱਗਇਨ ਸਾਫ਼ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "ਸਾਵਧਾਨ: ਕੋਈ ਮਿਲਦਾ ਗਰੁੱਪ ਨਹੀਂ: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "ਇੰਸਟਾਲ ਹੋਏ ਗਰੁੱਪ:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" -msgstr "" +msgstr "ਇੰਸਟਾਲ ਹੋਏ ਭਾਸ਼ਾ ਗਰੁੱਪ:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "ਉਪਲੱਬਧ ਗਰੁੱਪ:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" -msgstr "" +msgstr "ਉਪਲੱਬਧ ਭਾਸ਼ਾ ਗਰੁੱਪ:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "ਮੁਕੰਮਲ" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "ਚੇਤਾਵਨੀ: ਗਰੁੱਪ %s ਮੌਜੂਦ ਨਹੀਂ ਹੈ।" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "ਮੰਗੇ ਗਏ ਗਰੁੱਪ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਪੈਕੇਜ ਇੰਸਟਾਲ ਜਾਂ ਅੱਪਡੇਟ ਲਈ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" -+msgstr[1] "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "%s ਨਾਂ ਦਾ ਕੋਈ ਗਰੁੱਪ ਮੌਜੂਦ ਨਹੀਂ" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "ਗਰੁੱਪ ਵਿੱਚੋਂ ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ" -+msgstr[1] "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "%s ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ, ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "ਪਲੱਗਇਨ ਚੋਣਾਂ" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "ਕਮਾਂਡ ਲਾਈਨ ਗਲਤੀ: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -92079,153 +92718,153 @@ index e714500..942ca68 100644 "%s:%s ਚੋਣ ਲਈ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ ਹੈ" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "ਇਹ ਮੱਦਦ ਸੁਨੇਹਾ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਿਸਟਮ ਕੈਸ਼ ਤੋਂ ਚਲਾਓ, ਕੈਸ਼ ਅੱਪਡੇਟ ਨਾ ਕਰੋ" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਟਿਕਾਣਾ" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "ਵੱਧੋ-ਵੱਧ ਕਮਾਂਡ ਉਡੀਕ ਸਮਾਂ" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਲੈਵਲ" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "ਡੁਪਲੀਕੇਟ ਵੇਖੋ, ਰਿਪੋ ਵਿੱਚ, ਲਿਸਟ/ਖੋਜ ਕਮਾਂਡ ਵਿੱਚ" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "ਗਲਤੀ ਆਉਟਪੁੱਟ ਲੈਵਲ" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "rpm ਲਈ ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਲੈਵਲ" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "ਚੁੱਪ-ਚਾਪ ਕਾਰਵਾਈ" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "ਜਾਣਕਾਰੀ ਸਮੇਤ ਕਾਰਵਾਈ" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "ਸਭ ਸਵਾਲਾਂ ਦੇ ਜਵਾਬ ਹਾਂ" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" -+msgstr "ਸਭ ਸਵਾਲਾਂ ਲਈ ਜਵਾਬ ਨਹੀਂ" ++msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "ਯੱਮ ਵਰਜਨ ਵੇਖਾਓ ਅਤੇ ਬੰਦ ਕਰੋ" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "install root ਸੈੱਟ ਕਰੋ" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "ਇੱਕ ਜਾਂ ਵੱਧ ਰਿਪੋਜ਼ਟਰੀਆਂ ਚਾਲੂ ਕਰੋ (ਵਾਈਲਡਕਾਰਡ ਮਨਜ਼ੂਰ ਹਨ)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "ਇੱਕ ਜਾਂ ਵੱਧ ਰਿਪੋਜ਼ਟਰੀਆਂ ਬੰਦ (ਵਾਇਲਡਕਾਰਡ ਮਨਜ਼ੂਰ)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "ਅੱਪਡੇਟ ਦੇ ਦੌਰਾਨ ਬਰਤਰਫ਼ ਕਾਰਵਾਈਆਂ ਚਾਲੂ" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "ਯੱਮ ਪਲੱਗਇਨ ਬੰਦ ਕਰੋ" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "gpg ਦਸਤਖਤ ਚੈੱਕ ਕਰਨਾ ਬੰਦ" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "ਨਾਂ ਨਾਲ ਪਲੱਗਇਨ ਬੰਦ ਕਰੋ" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "ਪਲੱਗਇਨ ਨਾਂ ਨਾਲ ਚਾਲੂ ਕਰੋ" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "ਨਿਰਭਰਤਾ ਸਮੱਸਿਆਵਾਂ ਵਾਲੇ ਪੈਕੇਜ ਛੱਡ ਦਿਉ" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "ਕੰਟਰੋਲ ਕਰੋ ਕਿ ਕੀ ਰੰਗ ਵਰਤਣੇ ਹਨ" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "ਯੱਮ ਸੰਰਚਨਾ ਤੇ ਰਿਪੋ ਫਾਇਲਾਂ 'ਚ $releasever ਦਾ ਮੁੱਲ ਸੈੱਟ ਕਰੋ" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -92570,23 +93209,23 @@ index e714500..942ca68 100644 msgstr "ਨਿਰਭਰਤਾ ਲਈ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ (ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "ਇੰਸਟਾਲ ਨਹੀਂ" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "ਪੈਕੇਜ" +msgid_plural "Packages" @@ -92624,7 +93263,7 @@ index e714500..942ca68 100644 #, python-format msgid "" "\n" -@@ -882,57 +914,52 @@ msgstr "" +@@ -882,57 +914,58 @@ msgstr "" "ਟਰਾਂਸੈਕਸ਼ਨ ਸੰਖੇਪ ਜਾਣਕਾਰੀ\n" "%s\n" @@ -92632,7 +93271,7 @@ index e714500..942ca68 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "ਇੰਸਟਾਲ" @@ -92640,23 +93279,23 @@ index e714500..942ca68 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "ਅੱਪਗਰੇਡ %5.5s ਪੈਕੇਜ\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" -+msgstr "ਅੱਪਗਰੇਡ" ++msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "ਹਟਾਉਣੇ %5.5s ਪੈਕੇਜ\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" -+msgstr "ਹਟਾਓ" ++msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "ਮੁੜ-ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "ਮੁੜ-ਇੰਸਟਾਲ" @@ -92664,323 +93303,329 @@ index e714500..942ca68 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "ਡਾਊਨਗਰੇਡ %5.5s ਪੈਕੇਜ\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "ਡਾਊਨਗਰੇਡ" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "ਹਟਾਏ" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "ਨਿਰਭਰਤਾ ਹਟਾਈ" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "ਨਿਰਭਰਤਾ ਇੰਸਟਾਲ ਕੀਤੀ" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "ਨਿਰਭਰਤਾ ਅੱਪਡੇਟ ਕੀਤੀ" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "ਬਦਲੇ ਗਏ" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "ਫੇਲ੍ਹ ਹੋਏ" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "ਦੋ" -@@ -940,7 +967,7 @@ msgstr "ਦੋ" +@@ -940,7 +973,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -951,364 +978,416 @@ msgstr "" +@@ -951,364 +984,416 @@ msgstr "" " ਮੌਜੂਦਾ ਡਾਊਨਲੋਡ ਰੱਦ ਕੀਤਾ ਗਿਆ, ਬੰਦ ਕਰਨ ਲਈ %sinterrupt (ctrl-c) %s %s%s%s ਸਕਿੰਟ ਵਿੱਚ\n" "ਦਬਾਉ\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "ਯੂਜ਼ਰ ਵਲੋਂ ਦਖ਼ਲ" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "ਕੁੱਲ" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "<ਅਣ-ਸੈੱਟ>" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "ਸਿਸਟਮ" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" -msgstr "" +msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ਨਹੀਂ" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "ਖ਼ਰਾਬ ਟਰਾਂਸੈਕਸ਼ਨ ID, ਜਾਂ ਪੈਕੇਜ ਦਿੱਤਾ" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" -msgstr "" +msgstr "ਕਮਾਂਡ ਲਾਈਨ" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "ਲਾਗਇਨ ਯੂਜ਼ਰ" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "ਐਕਸ਼ਨ" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "ਬਦਲੇ" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ID ਦਿੱਤਾ" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "ਖ਼ਰਾਬ ਟਰਾਂਸੈਕਸ਼ਨ ID ਦਿੱਤਾ" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "ਦਿੱਤਾ ਟਰਾਂਸੈਕਸ਼ਨ ID ਨਹੀਂ ਲੱਭਿਆ" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "ਇੱਕ ਤੋਂ ਵੱਧ ਟਰਾਂਸੈਕਸ਼ਨ ID ਲੱਭਿਆ!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ID, ਜਾਂ ਪੈਕੇਜ ਨਹੀਂ ਦਿੱਤਾ" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤੇ" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "ਪੁਰਾਣੇ" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "ਨਵੇਂ" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ID:" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "ਸ਼ੁਰੂ ਸਮਾਂ :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "rpmdb ਸ਼ੁਰੂ :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u ਸਕਿੰਟ)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u ਮਿੰਟ)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u ਘੰਟੇ)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u ਦਿਨ)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "ਅੰਤ ਸਮਾਂ :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "rpmdb ਅੰਤ :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "ਯੂਜ਼ਰ :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "ਰੀਟਰਨ-ਕੋਡ :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "ਅਧੂਰਾ ਛੱਡਿਆ" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" -msgstr "" +msgstr "ਫੇਲ੍ਹ:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "ਫੇਲ੍ਹ:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "ਸਫ਼ਲ" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "ਕਮਾਂਡ ਲਾਈਨ :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਕੀਤੀ ਗਈ ਇਸ ਨਾਲ:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "ਪੈਕੇਜ ਬਦਲੇ:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "ਪੈਕੇਜ ਛੱਡੇ ਗਏ:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Rpmdb ਸਮੱਸਿਆਵਾਂ:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Scriptlet ਆਉਟਪੁੱਟ:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "ਗਲਤੀਆਂ:" @@ -92989,17 +93634,17 @@ index e714500..942ca68 100644 -msgstr "ਇੰਸਟਾਲ" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "ਨਿਰਭ-ਇੰਸਟਾਲ" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "ਸਾਫ਼" @@ -93012,441 +93657,441 @@ index e714500..942ca68 100644 -msgstr "ਡਾਊਨਗਰੇਡ" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "ਅੱਪਡੇਟ" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "ਸਮਾਂ" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "ਪਿਛਲੇ ਦਿਨ" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "ਪਿਛਲੇ ਹਫ਼ਤੇ" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "ਪਿਛਲੇ ੨ ਹਫ਼ਤੇ" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "ਪਿਛਲੇ ੩ ਮਹੀਨੇ" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "ਪਿਛਲੇ ੬ ਮਹੀਨੇ" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "ਪਿਛਲੇ ਸਾਲ" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "ਲਗਭਗ ਸਾਲ ਪਹਿਲਾਂ" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ %s ਨਹੀਂ ਲੱਭੀ" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ID:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "ਉਪਲੱਬਧ ਹੋਰ ਅਤੀਤ ਜਾਣਕਾਰੀ:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: ਇਸ ਨਾਂ ਨਾਲ ਕੋਈ ਹੋਰ ਵਾਧੂ ਡਾਟਾ ਨਹੀਂ ਲੱਭਿਆ" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" -+msgstr "ਪੈਕੇਜ :" ++msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" -+msgstr "ਹਾਲਤ :" ++msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" -+msgstr "ਆਕਾਰ :" ++msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" -+msgstr "ਬਿਲਡ ਹੋਸਟ :" ++msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" -+msgstr "ਪੈਕੇਜਰ :" ++msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" -+msgstr "ਵੇਂਡਰ :" ++msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" -+msgstr "ਲਾਈਸੈਂਸ :" ++msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" -+msgstr "URL :" ++msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" -+msgstr "ਸਰੋਤ RPM :" ++msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" -+msgstr "ਕਾਰਨ :" ++msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" -+msgstr "ਰਿਪੋ ਤੋਂ :" ++msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" -+msgstr "ਇੰ:ਟਾਲ ਕੀਤਾ ਗਿਆ :" ++msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" -+msgstr "ਬਦਲਿਆ ਗਿਆ :" ++msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "ਇੰਸਟਾਲ ਕੀਤੇ" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" -msgstr "" +msgstr "ਇੱਕ ਅੱਪਡੇਟ" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "ਸਾਫ਼ ਕੀਤੇ" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤੇ" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" -msgstr "" +msgstr "ਡਾਊਨਗਰੇਡ" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" -msgstr "" +msgstr "ਬਰਤਰਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "ਅੱਪਡੇਟ ਕੀਤੇ" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" -msgstr "" +msgstr "---> ਪੈਕੇਜ %s.%s %s:%s-%s ਹੋਵੇਗਾ %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> ਨਵੇਂ ਬਦਲਾਅ ਨਾਲ ਨਿਰਭਰਤਾ ਹੱਲ਼ ਲਈ ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> ਨਿਰਭਰਤਾ ਹੱਲ ਮੁਕੰਮਲ ਹੋਇਆ" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> ਨਿਰਭਰਤਾ ਲਈ ਕਾਰਵਾਈ ਜਾਰੀ: %s ਪੈਕੇਜ ਲਈ: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> ਪੈਕੇਜ ਰੱਖਿਆ ਜਾਂਦਾ ਹੈ: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> ਨਾ-ਹੱਲ਼ ਹੋਈ ਨਿਰਭਰਤਾ: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "ਪੈਕੇਜ: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1317,7 +1396,7 @@ msgstr "" +@@ -1317,7 +1402,7 @@ msgstr "" "\n" " ਚਾਹੀਦਾ ਹੈ: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1326,7 +1405,7 @@ msgstr "" +@@ -1326,7 +1411,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1335,7 +1414,7 @@ msgstr "" +@@ -1335,7 +1420,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1344,87 +1423,87 @@ msgstr "" +@@ -1344,87 +1429,87 @@ msgstr "" " ਨਹੀਂ ਲੱਭਾ" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "ਅੱਪਡੇਟ ਕੀਤਾ" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤਾ" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "ਬਰਤਰਫ਼ ਕੀਤਾ" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "ਉਪਲੱਬਧ" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> ਅਪਵਾਦ ਹੱਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s ਦਾ %s ਨਾਲ ਟਕਰਾ" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> ਚੁਣੇ ਪੈਕੇਜਾਂ ਲਈ ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ ਪਾਪੂਲੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ।" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" "---> ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ 'ਚ ਪੈਕ ਕਰਨ ਲਈ %s ਵਾਸਤੇ ਹੈੱਡਰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "ਚੱਲ ਰਿਹਾ ਹੈ" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "ਸਲੀਪਿੰਗ" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "ਗ਼ੈਰ-ਰੁਕਾਵਟ-ਯੋਗ" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "ਜੋਮਬਿਈ" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "ਟਰੇਸ ਕੀਤਾ/ਰੋਕਿਆ" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "ਅਣਜਾਣ" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਹੈ: ਪੈਕੇਜਕਿੱਟ" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਹੈ: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " ਮੈਮੋਰੀ : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " ਸ਼ੁਰੂ ਹੋਇਆ: %s - %s ਪਹਿਲਾਂ" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " ਹਾਲਤ : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1434,7 +1513,7 @@ msgstr "" +@@ -1434,7 +1519,7 @@ msgstr "" "\n" "ਯੂਜ਼ਰ ਰੱਦ ਕਰਨ ਉੱਤੇ ਮੌਜੂਦ" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1444,7 +1523,7 @@ msgstr "" +@@ -1444,7 +1529,7 @@ msgstr "" "\n" "ਖਰਾਬ ਪਾਈਪ ਉੱਤੇ ਬੰਦ" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1455,7 +1534,7 @@ msgstr "" +@@ -1455,7 +1540,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1463,35 +1542,35 @@ msgstr "" +@@ -1463,35 +1548,35 @@ msgstr "" "ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; exit_on_lock ਵਲੋਂ ਸੰਰਚਨਾ ਮੁਤਾਬਕ " "ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "PluginExit ਗਲਤੀ: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "ਯੱਮ ਗਲਤੀ: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "ਗਲਤੀ: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " ਤੁਸੀਂ ਸਮੱਸਿਆ ਨਾਲ ਨਿਪਟ ਲਈ --skip-broken ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੰਮ ਚਲਾ ਸਕਦੇ ਹੋ" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " ਤੁਹਾਨੂੰ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "ਅਣਜਾਣ ਗਲਤੀ: ਬੰਦ ਕਰੋ: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1499,19 +1578,19 @@ msgstr "" +@@ -1499,19 +1584,19 @@ msgstr "" "\n" "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "ਮੁਕੰਮਲ!" @@ -93464,7 +94109,7 @@ index e714500..942ca68 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1528,360 +1607,353 @@ msgid "" +@@ -1528,360 +1613,349 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -93633,7 +94278,7 @@ index e714500..942ca68 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "ਗਰੁੱਪ ਜਾਣਕਾਰੀ ਵੇਖੋ ਜਾਂ ਵਰਤੋਂ" ++msgstr "" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -93730,157 +94375,156 @@ index e714500..942ca68 100644 msgstr "ਲੋਕਲ ਪੈਕੇਜ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "ਦੱਸੋ ਕਿ ਕਿਹੜਾ ਪੈਕੇਜ ਦਿੱਤੀ ਨਿਰਭਰਤਾ ਦਿੰਦਾ ਹੈ" - +-msgid "Determine which package provides the given dependency" +-msgstr "ਦੱਸੋ ਕਿ ਕਿਹੜਾ ਪੈਕੇਜ ਦਿੱਤੀ ਨਿਰਭਰਤਾ ਦਿੰਦਾ ਹੈ" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "ਨਿਰਭਰਤਾ ਲਈ ਪੈਕੇਜਾਂ ਦੀ ਖੋਜ ਜਾਰੀ:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "ਇੰਟਰ-ਐਕਟਿਵ ਯੱਮ ਸ਼ੈੱਲ ਚਲਾਓ" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "ਯੱਮ ਸ਼ੈੱਲ ਸੈੱਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "ਪੈਕੇਜਾਂ ਦੀ ਨਿਰਭਰਤਾ ਦੀ ਲਿਸਟ" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "ਨਿਰਭਰਤਾ ਲੱਭੀ ਜਾ ਰਹੀ ਹੈ: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "ਸੰਰਚਿਤ ਸਾਫਟਵੇਅਰ ਰਿਪੋਜ਼ਟਰੀਆਂ ਵੇਖੋ" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "ਚਾਲੂ" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "ਬੰਦ" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "ਰਿਪੋ-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "ਰਿਪੋ-ਨਾਂ : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "ਰਿਪੋ-ਹਾਲਤ : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "ਰਿਪੋ-ਰੀਵਿਜ਼ਨ: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "ਰਿਪੋ-ਟੈਗ : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Repo-distro-tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "ਰਿਪੋ-ਅੱਪਡੇਟ : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "ਰਿਪੋ-ਪੈਕੇਜ : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "ਰਿਪੋ-ਸਾਈਜ਼ : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "ਰਿਪੋ-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "ਰਿਪੋ-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " ਅੱਪਡੇਟ : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "ਰਿਪੋ-mirrors : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "ਕਦੇ ਨਹੀਂ (ਆਖਰੀ: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" -msgstr "" +msgstr "ਮੌਕਾ (ਪਿਛਲਾ: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s ਸਕਿੰਟ (ਆਖਰੀ: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "ਰਿਪੋ-expire : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Repo-ਨਾ-ਸ਼ਾਮਲ : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Repo-ਸ਼ਾਮਲ : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " -msgstr "" +msgstr "ਵੱਖ ਰੱਖੀ ਗਈ ਰਿਪੋ: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "ਰਿਪੋ-ਫਾਇਲਨਾਂ:" @@ -93888,202 +94532,202 @@ index e714500..942ca68 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "repo id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "ਹਾਲਤ" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "ਰਿਪੋ ਨਾਂ" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "%s ਲਈ ਕੋਈ ਮੱਦਦ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1891,7 +1963,7 @@ msgstr "" +@@ -1891,7 +1965,7 @@ msgstr "" "\n" "ਏਲੀਆਸ: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1901,85 +1973,125 @@ msgstr "" +@@ -1901,85 +1975,125 @@ msgstr "" "\n" "ਏਲੀਆਸ: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "ਪੈਕੇਜ ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "ਡਾਊਨਗਰੇਡ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "ਪੈਕੇਜ ਡਾਊਨਗਰੇਡ ਕਰੋ" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "ਮਸ਼ੀਨ ਤੇ / ਜਾਂ ਉਪਲੱਬਧ ਰਿਪੋ ਲਈ ਵਰਜਨ ਵੇਖੋ।" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " ਯੱਮ ਵਰਜਨ ਗਰੁੱਪ:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " ਗਰੁੱਪ :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " ਪੈਕੇਜ:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "ਇੰਸਟਾਲ ਹੋਏ:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "ਗਰੁੱਪ-ਇੰਸਟਾਲ ਹੋਏ:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "ਉਪਲੱਬਧ:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "ਉਪਲੱਬਧ-ਗਰੁੱਪ:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਅਤੀਤ ਵੇਖੋ ਜਾਂ ਵਰਤੋਂ" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" -+msgstr "ਟਰਾਂਸੈਕਸ਼ਨ:" ++msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" -+msgstr "ਸ਼ੁਰੂ ਸਮਾਂ :" ++msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" -+msgstr " NEVRAC :" ++msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" -+msgstr " NEVRA :" ++msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" -+msgstr " NA :" ++msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" -+msgstr " ਕਦੇ ਨਹੀਂ :" ++msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" -+msgstr " rpm DB :" ++msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" -+msgstr " yum DB :" ++msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "rpmdb ਵਿੱਚ ਸਮੱਸਿਆ ਲਈ ਚੈੱਕ ਕਰੋ" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" -msgstr "" +msgstr "ਸੰਭਾਲੀ ਹੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ਨੂੰ ਲੋਡ ਕਰੋ ਫਾਇਲ-ਨਾਂ ਵਿੱਚੋਂ" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." -msgstr "" +msgstr "ਕੋਈ ਸੰਭਾਲੀ ਹੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ਫਾਇਲ ਨਹੀਂ ਦਿੱਤੀ ਗਈ।" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "%s ਤੋਂ ਟਰਾਂਸੈਕਸ਼ਨ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1988,29 +2100,37 @@ msgstr "" +@@ -1988,29 +2102,35 @@ msgstr "" #: ../yummain.py:84 #, python-format msgid " Yum checks failed: %s" +msgstr "ਯਮ ਚੈੱਕ ਫੇਲ੍ਹ ਹੋਇਆ: %s" + +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:114 @@ -94115,8 +94759,6 @@ index e714500..942ca68 100644 +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" msgstr "" -+"ਤੁਹਾਡੀ ਟਰਾਂਸੈਕਸ਼ਨ ਸੰਭਾਲੀ ਗਈ ਹੈ, ਇਸ ਨੂੰ ਇੰਝ ਮੁੜ ਕੇ ਚਲਾਉ:⏎\n" -+"yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 @@ -94128,89 +94770,89 @@ index e714500..942ca68 100644 "ਯੂਜ਼ਰ ਵੱਲੋਂ ਬੰਦ ਕਰਨ ਉੱਤੇ ਬੰਦ।" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" -msgstr "" +msgstr "%s: ਨਿਰਭਰਤਾ ਲਈ pkgSack ਦੀ ਖੋਜ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "ਮੈਂਬਰ: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਬਦਲਿਆ" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s ਚਾਹੀਦਾ ਹੈ: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s ਨੂੰ ਚਾਹੀਦਾ ਹੈ %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "ਸੰਭਾਵਿਤ ਦੇਣ ਵਾਲਾ: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" @@ -94219,53 +94861,53 @@ index e714500..942ca68 100644 #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ %s ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" -msgstr "" +msgstr "%s ਲਈ ਕੋਈ ਅੱਪਡੇਟ ਮਾਰਗ ਨਹੀਂ ਲੱਭਿਆ। ਫੇਲ੍ਹ!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" -msgstr "" +msgstr "%s: ਲਈ ਨਿਰਭਰਤਾ ਵਾਸਤੇ ਅੱਪਡੇਟ ਮਾਰਗ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਦਾ" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" @@ -94273,87 +94915,87 @@ index e714500..942ca68 100644 +"ਰਿਹਾ ਹੈ।" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "ਸਫ਼ਲ - ਖਾਲੀ ਟਰਾਂਸੈਕਸ਼ਨ" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "ਚੱਕਰ ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "ਨਿਰਭਰਤਾ ਕਾਰਵਾਈ ਖਤਮ ਹੋ ਰਹੀ ਹੈ" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "ਸਫ਼ਲ - ਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "%s ਲਈ ਨਿਰਭਰਤਾ ਚੈੱਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s ਨੇ %s ਬਰਤਰਫ਼ ਕੀਤਾ" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -94361,43 +95003,43 @@ index e714500..942ca68 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "ਆਮ sourcerpm %s ਅਤੇ %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "ਬੇਸ ਪੈਕੇਜ %s %s ਲਈ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਂਦਾ ਹੈ" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "ਘੱਟੋ-ਘੱਟ ਲੋੜ ਹੈ: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " ਜੇਤੂ: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " ਹਾਰਿਆ(%d ਨਾਲ): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "ਵਧੀਆ ਕ੍ਰਮ: %s" @@ -94558,7 +95200,7 @@ index e714500..942ca68 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2374,405 +2496,407 @@ msgstr "" +@@ -2374,405 +2496,408 @@ msgstr "" "\n" "ਪੈਕੇਜ ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਕਰਕੇ ਛੱਡੇ ਗਏ:" @@ -94593,24 +95235,24 @@ index e714500..942ca68 100644 msgstr "ਇੰਸਟਾਲ ਨਾਲ ਟਕਰਾ" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚਲਾਈ ਨਹੀਂ ਜਾ ਸਕੀ।" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਫਾਇਲ %s ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ" @@ -94618,7 +95260,7 @@ index e714500..942ca68 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s ਇੰਸਟਾਲ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ, ਪਰ ਇਹ ਨਹੀਂ ਹੈ!" @@ -94629,20 +95271,20 @@ index e714500..942ca68 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s ਹਟਾਇਆ ਗਿਆ ਹੋਣਾ ਚਾਹੀਦਾ ਸੀ, ਪਰ ਨਹੀਂ ਗਿਆ!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "%s ਲਾਕ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s " #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" -msgstr "" @@ -94650,20 +95292,20 @@ index e714500..942ca68 100644 #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "ਮੌਜੂਦਾ ਲਾਕ %s: pid %s ਵਜੋਂ ਹੋਰ ਕਾਪੀ ਚੱਲ ਰਹੀ ਹੈ।" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "%s ਲਈ ਲਾਕ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -94671,23 +95313,23 @@ index e714500..942ca68 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "checksum ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "ਪੈਕੇਜ ਚੈਕਸਮ ਰਲਦਾ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "%s ਦੀ ਲੋਕਲ ਕਾਪੀ ਦੀ ਵਰਤੋਂ" @@ -94704,162 +95346,162 @@ index e714500..942ca68 100644 -" * ਚਾਹੀਦੀ %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "ਹੈੱਡਰ ਪੂਰਾ ਨਹੀਂ ਹੈ।" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "%s ਲਈ ਪਬਲਿਕ ਕੁੰਜੀ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "ਪੈਕੇਜ %s ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਸਮੱਸਿਆ" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "%s ਲਈ ਪਬਲਿਕ ਕੁੰਜੀ ਭਰੋਸੇਯੋਗ ਨਹੀਂ" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "ਪੈਕੇਜ %s ਸਾਈਨ ਨਹੀਂ ਕੀਤਾ" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "%s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s ਹਟਾਇਆ" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "%s ਫਾਇਲ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s ਫਾਇਲ %s ਹਟਾਈ" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਗਈਆਂ" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "%d %s ਫਾਇਲ ਹਟਾਈ ਗਈ" -+msgstr[1] "%d %s ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਗਈਆਂ" ++msgstr[0] "" ++msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "%d ਪੈਕੇਜਾਂ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "%d ਪੈਕੇਜ ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ" -+msgstr[1] "%d ਪੈਕੇਜ ਖੋਜੇ ਜਾ ਰਹੇ ਹਨ" ++msgstr[0] "" ++msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "ਪੈਕੇਜ %s ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "ਫਾਇਲ ਐਂਟਰੀਆਂ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "ਪਰੋਵਾਇਡਰ ਐਂਟਰੀਆਂ ਵਿੱਚ ਖੋਜ ਜਾਰੀ" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "ਸੰਰਚਿਤ ਰਿਪੋਜ਼ਟਰੀਆਂ ਵਿੱਚ ਕੋਈ ਗਰੁੱਪ ਡਾਟਾ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "%s ਨਾਂ ਦਾ ਕੋਈ ਗਰੁੱਪ ਮੌਜੂਦ ਨਹੀਂ" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "ਪੈਕੇਜ %s ਗਰੁੱਪ %s ਵਿੱਚ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "ਪੈਕੇਜ %s ਗਰੁੱਪ %s ਵਿੱਚੋਂ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਨਾਂ ਦਾ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "ਸਾਵਧਾਨ: %s ਗਰੁੱਪ ਵਿੱਚ ਕੋਈ ਵੀ ਪੈਕੇਜ ਨਹੀਂ ਹੈ।" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." -msgstr "" @@ -94868,79 +95510,80 @@ index e714500..942ca68 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "%s ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਲੱਭਿਆ" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਕੁਝ ਨਹੀਂ ਦਿੱਤਾ" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" -msgstr "" +msgstr "%s :ਨਾਲ ਮਿਲਦਾ ਕੋਈ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੈ ਤੇ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "ਪੈਕੇਜ: %s - ਪਹਿਲਾਂ ਹੀ ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ 'ਚ ਹੈ" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "ਪੈਕੇਜ %s ਨੂੰ %s ਵਲੋਂ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ ਹੈ, ਜੋ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -94948,63 +95591,63 @@ index e714500..942ca68 100644 msgstr "%s ਪੈਕੇਜ %s ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਗਿਆ, ਪਰ ਬਦਲਿਆ ਗਿਆ ਪੈਕੇਜ ਲੋੜ ਪੂਰੀ ਨਹੀਂ ਕਰਦਾ" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" "%s ਪੈਕੇਜ %s ਨਾਲ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ, %s ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "%s ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ ਅਤੇ ਨਵਾਂ ਵਰਜਨ ਹੈ" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "%s ਨਾਲ ਮਿਲਦਾ ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ। ਅੱਪਡੇਟ ਲਈ ਚੈਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "ਹਰ ਚੀਜ਼ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "ਕੋਈ ਪੈਕੇਜ ਅੱਪਗਰੇਡ ਲਈ ਨਹੀਂ ਮਿਲਿਆ: %s" ++msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਬਰਤਰਫ਼ ਕੀਤਾ: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ, ਜੋ ਬਰਤਰਫ਼ ਹੈ: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" @@ -95013,43 +95656,43 @@ index e714500..942ca68 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਮਿਲਦਾ" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਮਿਲਿਆ: %s" ++msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "ਚੱਲਦਾ ਕਰਨਲ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਤੋਂ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s। ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹ।" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "%s ਪੜਤਾਲ ਜਾਰੀ: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "deltarpm localinstall ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s। ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ।" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" @@ -95057,22 +95700,22 @@ index e714500..942ca68 100644 "ਟਰਾਂਸੈਕਸ਼ਨ ਲਈ %s ਪੈਕੇਜ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। %s: ਢਾਂਚੇ ਨਾਲ ਅਨੁਕੂਲ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2781,102 +2905,109 @@ msgstr "" +@@ -2781,327 +2906,371 @@ msgstr "" "ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ, ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਇਸ ਦੀ ਬਜਾਏ ਇਸ ਨੂੰ ਇੰਸਟਾਲ " "ਕਰਨ ਲਈ yum install ਚਲਾਓ।" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -95082,169 +95725,169 @@ index e714500..942ca68 100644 +"install ਚਲਾਉ।" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "%s ਅੱਡ ਕੀਤਾ" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸੈੱਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "%s ਨੂੰ %s ਦੇ ਲਈ ਅੱਪਡੇਟ ਵਜੋਂ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: ਇੰਸਟਾਲ ਹੋਏ ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੇ ਜਾਂਦੇ।" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "%s: ਫਾਇਲ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ। ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ।" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਸਮੱਸਿਆ: ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਮਿਲਦਾ" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "ਮੜ-ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਸਮੱਸਿਆ: ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਪੈਕੇਜ ਨਾਲ ਕੋਈ ਨਹੀਂ ਮਿਲਦਾ" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "%s ਪੈਕੇਜ ਕਈ ਇੰਸਟਾਲ ਲਈ ਮਨਜ਼ੂਰ ਹੈ, ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ ਲਈ ਕੋਈ ਮੇਲ ਨਹੀਂ: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "%s: ਪੈਕੇਜ ਲਈ ਕੇਵਲ ਅੱਪਗਰੇਡ ਉਪਲੱਬਧ" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 -+#, python-format -+msgid "Failed to upgrade: %s" -+msgstr "%s: ਅੱਪਗਰੇਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ:" -+ -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 #, python-format - msgid "Retrieving key from %s" --msgstr "" -+msgstr "%s ਤੋਂ ਕੁੰਜੀ ਲਈ ਜਾ ਰਹੀ ਹੈ" +-msgid "Retrieving key from %s" ++msgid "Failed to upgrade: %s" + msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5032 ++#, python-format ++msgid "Retrieving key from %s" ++msgstr "%s ਤੋਂ ਕੁੰਜੀ ਲਈ ਜਾ ਰਹੀ ਹੈ" ++ ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "GPG ਕੁੰਜੀ ਲੈਣ ਲਈ ਫੇਲ੍ਹ: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "%s ਤੋਂ ਗਲਤ GPG ਕੁੰਜੀ: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2884,224 +3015,266 @@ msgid "" - " Package: %s (%s)\n" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -+"%s ਕੁੰਜੀ 0x%s ਇੰਪੋਰਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ:\n" -+" Userid : %s\n" -+" ਪੈਕੇਜ: %s (%s)\n" -+" ਤੋਂ : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" - " Userid: \"%s\"\n" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -+"%s ਕੁੰਜੀ 0x%s ਇੰਪੋਰਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ:\n" -+" Userid: \"%s\"\n" -+" ਤੋਂ : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" -msgstr "" +msgstr "GPG ਕੁੰਜੀ %s (0x%s) ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ (ਕੋਡ %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "ਕੁੰਜੀ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਪੋਰਟ ਕੀਤੀ ਗਈ" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" -msgstr "" +msgstr "ਕੋਈ ਵੀ ਕੁੰਜੀ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੀ" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -95252,31 +95895,31 @@ index e714500..942ca68 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" -msgstr "" +msgstr "GPG ਕੁੰਜੀ %s (0x%s) ਨੂੰ ਪਹਿਲਾਂ ਹੀ ਇੰਪੋਰਟ ਕੀਤਾ ਗਿਆ ਹੈ" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ ਫੇਲ੍ਹ" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "%s ਰੈਪੋ ਲਈ ਕੋਈ ਵੀ ਕੁੰਜੀਆਂ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -95284,120 +95927,120 @@ index e714500..942ca68 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "ਢੁੱਕਵਾਂ ਮਿੱਰਰ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀਆਂ ਆਈਆਂ ਹਨ।" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "%s ਵਿੱਚ ਇਹ ਗਲਤੀ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਉ" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "ਟੈਸਟ ਟਰਾਂਸੈਕਸ਼ਨ ਗਲਤੀਆਂ: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਫਾਇਲ %s ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." -msgstr "" +msgstr " ਕੀਤੀ ਮੰਗ ਮੁਤਾਬਕ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." -msgstr "" +msgstr "ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -95518,7 +96161,7 @@ index e714500..942ca68 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/pl.po b/po/pl.po -index 0fe83a9..0fbddb8 100644 +index 0fe83a9..71b2075 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,14 +2,15 @@ @@ -95535,8 +96178,8 @@ index 0fe83a9..0fbddb8 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 16:31+0000\n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-11-06 16:04+0000\n" +"Last-Translator: raven \n" "Language-Team: Polish (http://www.transifex.net/projects/p/yum/team/pl/)\n" "MIME-Version: 1.0\n" @@ -95558,30 +96201,30 @@ index 0fe83a9..0fbddb8 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instalowanie" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Przestarzałe" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Zaktualizowano" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Usunięto" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Zainstalowano" @@ -95608,7 +96251,7 @@ index 0fe83a9..0fbddb8 100644 msgstr "Usunięto: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Usuwanie" @@ -95634,53 +96277,53 @@ index 0fe83a9..0fbddb8 100644 msgstr "Odczytywanie metadanych repozytoriów z lokalnych plików" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Błąd konfiguracji: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Błąd opcji: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Zainstalowane: %s-%s o %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Zbudowane : %s o %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Wysłane: %s o %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Należy podać polecenie" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Nie ma takiego polecenia: %s. Proszę użyć %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Wymagane miejsce na dysku:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -95695,7 +96338,7 @@ index 0fe83a9..0fbddb8 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -95704,75 +96347,75 @@ index 0fe83a9..0fbddb8 100644 "-------------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" "Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie " "działania." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Kończenie działania na polecenie użytkownika" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Pobieranie pakietów:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Błąd podczas pobierania pakietów:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "Wykonywanie sprawdzania transakcji" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "BŁĄD należy zaktualizować pakiet RPM, aby obsłużyć:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "BŁĄD sprawdzania transakcji i rozwiązywania zależności:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "Pakiet RPM musi zostać zaktualizowany" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Proszę zgłosić ten błąd na %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Wykonywanie testu transakcji" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Błąd podczas sprawdzania transakcji:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Test transakcji został ukończony powodzeniem" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Wykonywanie transakcji" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -95781,18 +96424,18 @@ index 0fe83a9..0fbddb8 100644 "Należy użyć \"-y\", aby wymusić." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Czy chodziło o: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, 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:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Nie ma pakietu %s%s%s." @@ -95800,23 +96443,23 @@ index 0fe83a9..0fbddb8 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Pakiety do zainstalowania" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "%d pakiet do instalacji" -+msgstr[1] "%d pakiety do instalacji" -+msgstr[2] "%d pakietów do instalacji" ++msgstr[0] "%d pakiet do zainstalowania" ++msgstr[1] "%d pakiety do zainstalowania" ++msgstr[2] "%d pakietów do zainstalowania" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nie ma niczego do zrobienia" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pakietów oznaczonych do aktualizacji" @@ -95827,12 +96470,12 @@ index 0fe83a9..0fbddb8 100644 +msgstr[2] "%d pakietów oznaczonych do aktualizacji" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Brak pakietów oznaczonych do aktualizacji" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pakietów oznaczonych do synchronizacji dystrybucji" @@ -95843,12 +96486,12 @@ index 0fe83a9..0fbddb8 100644 +msgstr[2] "%d pakietów oznaczonych do synchronizacji dystrybucji" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Brak pakietów oznaczonych do synchronizacji dystrybucji" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pakietów oznaczonych do usunięcia" @@ -95859,29 +96502,29 @@ index 0fe83a9..0fbddb8 100644 +msgstr[2] "%d pakietów oznaczonych do usunięcia" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Brak pakietów oznaczonych do usunięcia" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Pakiety do instalacji poprzedniej wersji" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "%d pakiet oznaczony do instalacji poprzedniej wersji" -+msgstr[1] "%d pakiety oznaczone do instalacji poprzedniej wersji" -+msgstr[2] "%d pakietów oznaczonych do instalacji poprzedniej wersji" ++msgstr[0] "%d pakiet do zainstalowania poprzedniej wersji" ++msgstr[1] "%d pakiety do zainstalowania poprzedniej wersji" ++msgstr[2] "%d pakietów do zainstalowania poprzedniej wersji" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (z %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Zainstalowany pakiet %s%s%s%s jest niedostępny." @@ -95889,31 +96532,31 @@ index 0fe83a9..0fbddb8 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Pakiety do ponownego zainstalowania" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" -+msgstr[0] "%d pakiet oznaczony do ponownej instalacji" -+msgstr[1] "%d pakiety oznaczone do ponownej instalacji" -+msgstr[2] "%d pakietów oznaczonych do ponownej instalacji" ++msgstr[0] "%d pakiet do ponownego zainstalowania" ++msgstr[1] "%d pakiety do ponownego zainstalowania" ++msgstr[2] "%d pakietów do ponownego zainstalowania" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Nie podano pakietów" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Pakiety do zainstalowania" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "N/S dopasowane: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -95921,7 +96564,7 @@ index 0fe83a9..0fbddb8 100644 "uzyskać wszystko." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -95930,13 +96573,13 @@ index 0fe83a9..0fbddb8 100644 "aby uzyskać wszystko." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Pasujące: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" @@ -95944,135 +96587,135 @@ index 0fe83a9..0fbddb8 100644 "uzyskać wszystko." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Ostrzeżenie: nie odnaleziono wyników dla: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Brak wyników" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Nie odnaleziono pakietów dla %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Czyszczenie repozytoriów: " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Czyszczenie wszystkiego" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Czyszczenie nagłówków" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Czyszczenie pakietów" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Czytanie metadanych XML" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Czyszczenie bazy danych w pamięci podręcznej" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Czyszczenie metadanych wygasłej pamięci podręcznej" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Czyszczenie bazy danych RPM w pamięci podręcznej" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Czyszczenie wtyczek" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "Ostrzeżenie: brak pasujących grup: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Zainstalowane grupy:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "Zainstalowane grupy języków:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Dostępne grupy:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "Dostępne grupy języków:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Ukończono" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Ostrzeżenie: grupa %s nie istnieje." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 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:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pakietów do instalacji" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "%d pakiet do instalacji" -+msgstr[1] "%d pakiety do instalacji" -+msgstr[2] "%d pakietów do instalacji" ++msgstr[0] "%d pakiet do zainstalowania" ++msgstr[1] "%d pakiety do zainstalowania" ++msgstr[2] "%d pakietów do zainstalowania" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Grupa o nazwie %s nie istnieje" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Brak pakietów do usunięcia z grup" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pakietów do usunięcia" @@ -96083,38 +96726,38 @@ index 0fe83a9..0fbddb8 100644 +msgstr[2] "%d pakietów do usunięcia" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Pakiet %s jest już zainstalowany, pomijanie" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, 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:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, 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:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Opcje wtyczki" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Błąd wiersza poleceń: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -96123,156 +96766,156 @@ index 0fe83a9..0fbddb8 100644 "%s: opcja %s wymaga parametru" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color przyjmuje jedną z: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot musi być ścieżką bezwzględną: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "wyświetla ten komunikat pomocy i kończy pracę" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "toleruje błędy" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 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:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "położenie pliku konfiguracji" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "maksymalny czas oczekiwania na polecenie" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "poziom wyjścia debugowania" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "wyświetla duplikaty w repozytoriach w poleceniach list/search" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "poziom wyjścia błędów" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "poziom wyjścia debugowania dla programu RPM" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "mało komunikatów" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "dużo komunikatów" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "odpowiada tak na wszystkie pytania" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "odpowiada nie na wszystkie pytania" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "wyświetla wersję programu yum i kończy pracę" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "ustawia roota instalacji" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "włącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "wyłącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "wyklucza pakiety po nazwie lub wyrażeniu regularnym" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "wyłącza wykluczanie z głównego, dla repozytorium lub wszystkiego" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "włącza przetwarzanie przestarzałych pakietów podczas aktualizacji" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "wyłącza wtyczki programu yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "wyłącza sprawdzanie podpisu GPG" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "wyłącza wtyczki po nazwie" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "włącza wtyczki po nazwie" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "pomija pakiety mające problemy z rozwiązaniem zależności" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "kontroluje użycie kolorów" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" "ustawia wartość zmiennej $releasever w konfiguracji programu yum i plikach " "repozytoriów" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "ustawia bezwzględne opcje konfiguracji i repozytoriów" @@ -96616,29 +97259,29 @@ index 0fe83a9..0fbddb8 100644 msgstr "Usuwanie, aby rozwiązać zależności" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Pominięto (problemy z zależnościami)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Nie zainstalowano" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Niedostępne" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Pakiet" +msgid_plural "Packages" +msgstr[0] "Pakiet" -+msgstr[1] "Pakiet" -+msgstr[2] "" ++msgstr[1] "Pakiety" ++msgstr[2] "Pakiety" -#: ../output.py:1075 +#: ../output.py:1393 @@ -96671,7 +97314,7 @@ index 0fe83a9..0fbddb8 100644 #, python-format msgid "" "\n" -@@ -897,57 +941,52 @@ msgstr "" +@@ -897,57 +941,59 @@ msgstr "" "Podsumowanie transakcji\n" "%s\n" @@ -96679,7 +97322,7 @@ index 0fe83a9..0fbddb8 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Instalacja %5.5s pakiet(y)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Instalacja" @@ -96687,7 +97330,7 @@ index 0fe83a9..0fbddb8 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Aktualizacja %5.5s pakiet(y)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" +msgstr "Aktualizacja" @@ -96695,7 +97338,7 @@ index 0fe83a9..0fbddb8 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Usunięcie %5.5s pakiet(y)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "Usunięcie" @@ -96703,7 +97346,7 @@ index 0fe83a9..0fbddb8 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Ponowna instalacja %5.5s pakiet(y)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Ponowna instalacja" @@ -96711,316 +97354,323 @@ index 0fe83a9..0fbddb8 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Instalacja poprzedniej wersji %5.5s pakiet(y)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Instalacja poprzedniej wersji" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "Zależny pakiet" ++msgstr[1] "Zależne pakiety" ++msgstr[2] "Zależne pakiety" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Usunięto" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Usunięto zależność" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Zainstalowano zależność" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Zaktualizowano zależność" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Zastąpiono" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Nie powiodło się" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "dwóch" -@@ -955,7 +994,7 @@ msgstr "dwóch" +@@ -955,7 +1001,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -965,364 +1004,416 @@ msgstr "" +@@ -965,364 +1011,416 @@ msgstr "" "\n" " 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:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "przerwane przez użytkownika" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Razem" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "System" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Pomijanie połączonej transakcji %d do %d, jako że nachodzą na siebie" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "Brak transakcji" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Podano błędne identyfikatory transakcji lub pakietów" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "Wiersz poleceń" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Zalogowany użytkownik" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "Identyfikator" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Data i czas" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Czynności" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Zmieniono" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Nie podano identyfikatora transakcji" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Podano błędny identyfikator transakcji" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Nie odnaleziono podanego identyfikatora transakcji" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Odnaleziono więcej niż jeden identyfikator transakcji." -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Podano błędny identyfikator transakcji lub pakietu" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Zainstalowano poprzednią wersję" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Starsze" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Nowsze" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "Identyfikator transakcji :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Czas rozpoczęcia :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Rozpoczęcie bazy danych RPM:" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "(%u sekund)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "(%u minut)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "(%u godzin)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "(%u dni)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Czas ukończenia :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Ukończenie bazy danych RPM :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Użytkownik :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Kod zwrotny :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Przerwano" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "Niepowodzenia:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Niepowodzenie:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Powodzenie" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Wiersz poleceń :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Przechowano dodatkowe niedomyślne informacje: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Wykonano transakcję za pomocą:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Zmienione pakiety:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Pominięte pakiety:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Problemy bazy danych RPM:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Wyjście skryptu:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Błędy:" @@ -97029,17 +97679,17 @@ index 0fe83a9..0fbddb8 100644 -msgstr "Instalacja" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Instalacja zależności" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Zastępowanie" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Usunięcie" @@ -97052,441 +97702,441 @@ index 0fe83a9..0fbddb8 100644 -msgstr "Instalacja poprzedniej wersji" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Aktualizacja" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Czas" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Ostatni dzień" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Ostatni tydzień" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Ostatnie dwa tygodnie" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Ostatnie trzy miesiące" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Ostatnie pół roku" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Ostatni rok" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Ponad rok temu" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Nie odnaleziono transakcji %s" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Identyfikator transakcji:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Dostępne są dodatkowe informacje o historii:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: nie odnaleziono dodatkowych danych dla tej nazwy" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "Pakiet :" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "Stan :" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "Rozmiar :" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "Komputer budujący :" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "Czas zbudowania :" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "Twórca pakietu :" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" -+msgstr "Dostawca :" ++msgstr "Producent :" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "Licencja :" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "Adres URL :" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "Źródłowy pakiet RPM:" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "Czas wysłania :" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" -+msgstr "Osoba wysyłająca :" ++msgstr "Wysyłający :" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "Przyczyna :" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "Z repozytorium :" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "Zainstalowane przez:" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "Zmienione przez :" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "zainstalowany" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "zaktualizowany" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "usunięty" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "ponownie zainstalowany" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "zainstalowana poprzednia wersja" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "zastępowany" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "zaktualizowany" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "zastąpiony" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Pakiet %s.%s %s:%s-%s zostanie %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Wykonywanie sprawdzania transakcji" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Ponowne uruchamianie rozwiązywania zależności z nowymi zmianami." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Ukończono rozwiązywanie zależności" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Przetwarzanie zależności: %s dla pakietu: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Utrzymywanie pakietu: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nierozwiązana zależność: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Pakiet: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1331,7 +1422,7 @@ msgstr "" +@@ -1331,7 +1429,7 @@ msgstr "" "\n" " Wymaga: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1340,7 +1431,7 @@ msgstr "" +@@ -1340,7 +1438,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1349,7 +1440,7 @@ msgstr "" +@@ -1349,7 +1447,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1358,87 +1449,87 @@ msgstr "" +@@ -1358,87 +1456,87 @@ msgstr "" " Nie odnaleziono" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Zaktualizowano przez" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Zainstalowano poprzednią wersję przez" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Zastąpiono przez" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Dostępne" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Przetwarzanie konfliktów: %s jest w konflikcie z %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, 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:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Wykonywanie" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Zasypianie" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Nie można przerywać" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombie" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Śledzone/zatrzymane" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Nieznane" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Inna aplikacja to PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Inna aplikacja to: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Pamięć: %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Uruchomiono: %s - %s temu" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Stan: %s, PID: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1448,7 +1539,7 @@ msgstr "" +@@ -1448,7 +1546,7 @@ msgstr "" "\n" "Kończenie działania na polecenie użytkownika" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1458,7 +1549,7 @@ msgstr "" +@@ -1458,7 +1556,7 @@ msgstr "" "\n" "Kończenie działania z powodu przerwanego potoku" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1469,7 +1560,7 @@ msgstr "" +@@ -1469,7 +1567,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1477,35 +1568,35 @@ msgstr "" +@@ -1477,35 +1575,35 @@ msgstr "" "Inna aplikacja obecnie blokuje program yum. Kończenie działania zgodnie z " "konfiguracją exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Błąd wyjścia wtyczki: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Błąd programu yum: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Błąd: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " Można spróbować użyć --skip-broken, aby obejść problem" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Można spróbować wykonać polecenie: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Nieznane błędy: kod wyjścia: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1513,7 +1604,7 @@ msgstr "" +@@ -1513,7 +1611,7 @@ msgstr "" "\n" "Rozwiązano zależności" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Ukończono." -@@ -1525,7 +1616,7 @@ msgstr " Małe użycie:\n" +@@ -1525,7 +1623,7 @@ msgstr " Małe użycie:\n" msgid "You need to be root to perform this command." msgstr "Należy być zalogowanym jako root, aby wykonać to polecenie." @@ -97495,7 +98145,7 @@ index 0fe83a9..0fbddb8 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1555,53 +1646,53 @@ msgstr "" +@@ -1555,53 +1653,53 @@ msgstr "" "Aby dowiedzieć się więcej, proszę skontaktować się z dostawcą dystrybucji\n" "lub pakietu.\n" @@ -97561,7 +98211,7 @@ index 0fe83a9..0fbddb8 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1611,306 +1702,299 @@ msgstr "" +@@ -1611,306 +1709,295 @@ msgstr "" " Wykonanie polecenia \"yum repolist all\" wyświetli wszystkie posiadane repozytoria.\n" " Można włączyć repozytoria za pomocą polecenia yum-config-manager --enable " @@ -97761,155 +98411,154 @@ index 0fe83a9..0fbddb8 100644 msgstr "Ustawianie procesu lokalnego pakietu" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Określa, który pakiet dostarcza podaną zależność" - +-msgid "Determine which package provides the given dependency" +-msgstr "Określa, który pakiet dostarcza podaną zależność" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Wyszukiwanie pakietów dla zależności:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Uruchamia interaktywną powłokę programu yum" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Ustawianie powłoki programu yum" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Wyświetla listę zależności pakietu" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Wyszukiwanie zależności: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Wyświetla skonfigurowane repozytoria oprogramowania" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "włączone" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "wyłączone" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Identyfikator repozytorium : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Nazwa repozytorium : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Stan repozytorium : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Wersja repozytorium : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Znaczniki repozytorium : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Znaczniki dystrybucji repozytorium: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Aktualizacje repozytorium : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Pakiety repozytorium : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Rozmiar repozytorium : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Podstawowy adres URL repozytorium : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Metaodnośnik repozytorium : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Zaktualizowano : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Serwery lustrzane repozytorium : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Nigdy (ostatnio: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Natychmiast (ostatnio: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekundy (ostatnio: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Wygaszenie repozytorium : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Wykluczenia z repozytorium : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Dołączone z repozytorium : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Wykluczenia z repozytorium : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Nazwa pliku repozytorium: " @@ -97917,199 +98566,201 @@ index 0fe83a9..0fbddb8 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "identyfikator repozytorium" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "stan" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "nazwa repozytorium" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Wyświetla pomocny komunikat o używaniu" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Brak dostępnej pomocy dla %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1920,7 +2004,7 @@ msgstr "" +@@ -1920,7 +2007,7 @@ msgstr "" "\n" "aliasy: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1930,85 +2014,125 @@ msgstr "" +@@ -1930,85 +2017,125 @@ msgstr "" "\n" "alias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Ustawianie procesu ponownej instalacji" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "Ponownie instaluje pakiet" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Ustawianie procesu instalacji poprzedniej wersji pakietu" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "Instaluje poprzednią wersję pakietu" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 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:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Grupy wersji programu yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Grupa :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Pakiety:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Zainstalowano:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Zainstalowana grupa:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Dostępne:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Dostępne grupy:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Wyświetla lub używa historii transakcji" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" -+msgstr "Transakcje :" ++msgstr "Transakcje:" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "Czas rozpoczęcia:" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "Czas ukończenia :" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" -+msgstr "Liczniki :" ++msgstr "Liczba :" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" -+msgstr " NEVRAC :" ++msgstr " NEVRAC :" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" -+msgstr " NEVRA :" ++msgstr " NEVRA :" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" -+msgstr " NA :" ++msgstr " NA :" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" -+msgstr " NEVR :" ++msgstr " NEVR :" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr " Baza danych RPM:" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr " Baza danych yum:" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Nieprawidłowe podpolecenie historii, należy użyć: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Brak dostępu do bazy danych historii." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" - msgstr "Proszę sprawdzić, czy występują problemy w bazie danych RPM" +-msgstr "Proszę sprawdzić, czy występują problemy w bazie danych RPM" ++msgstr "Sprawdza, czy występują problemy w bazie danych RPM" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "wczytuje zapisaną transakcję z nazwy pliku" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "Nie podano zapisanego pliku transakcji." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "wczytywanie transakcji z %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Wczytano transakcję z %s z %s elementami" -@@ -2019,30 +2143,36 @@ msgstr "Wczytano transakcję z %s z %s elementami" +@@ -2019,30 +2146,37 @@ msgstr "Wczytano transakcję z %s z %s elementami" msgid " Yum checks failed: %s" msgstr " Sprawdzanie programu yum nie powiodło się: %s" -#: ../yummain.py:114 +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" -+msgstr "Brak dostępu do odczytu/zapisu w bieżącym katalogu, przenoszenie do /" ++msgid "No read/execute access in current directory, moving to /" ++msgstr "" ++"Brak dostępu do odczytu/wykonania w bieżącym katalogu, przenoszenie do /" + +#: ../yummain.py:124 +msgid "Can't create lock file; exiting" @@ -98150,121 +98801,121 @@ index 0fe83a9..0fbddb8 100644 msgid "" "\n" "\n" -@@ -2052,75 +2182,75 @@ msgstr "" +@@ -2052,75 +2186,75 @@ msgstr "" "\n" "Kończenie działania na polecenie użytkownika." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Ustawianie zestawów transakcji przed włączeniem klasy konfiguracji" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" "Nieprawidłowa flaga zestawu transakcji tsflag w pliku konfiguracji: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Wyszukiwanie zestawu pakietów dla zależności: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Element: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s przekonwertowano do zainstalowania" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Dodawanie pakietu %s w trybie %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Usuwanie pakietu %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s wymaga: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s wymaga %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Wymagana zależność została już odnaleziona, oszukiwanie" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, 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:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Potencjalny dostawca: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Tryb to %s dla dostawcy %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Tryb dla pakietu dostarczającego %s: %s" -@@ -2128,118 +2258,118 @@ msgstr "Tryb dla pakietu dostarczającego %s: %s" +@@ -2128,118 +2262,118 @@ msgstr "Tryb dla pakietu dostarczającego %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Próba zaktualizowania %s, aby rozwiązać zależność" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Nie odnaleziono ścieżek aktualizacji dla %s. Niepowodzenie." -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, 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:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" @@ -98272,159 +98923,159 @@ index 0fe83a9..0fbddb8 100644 "zależność." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: aktualizowanie %s, aby rozwiązać zależność." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, 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:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Szybko dopasowano %s jako wymaganie %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, 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:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, 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:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, 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:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s jest już w zestawie transakcji, pomijanie" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: oznaczanie %s jako aktualizacji dla %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: oznaczanie %s jako do zainstalowania dla %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Powodzenie - pusta transakcja" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Ponowne uruchamianie pętli" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Kończenie procesu zależności" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Powodzenie - rozwiązano zależności" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Sprawdzanie zależności dla %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "wyszukiwanie %s jako wymagania %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Wykonywanie compare_providers() dla %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "lepsze arch w po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s zastępuje %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2248,144 +2378,144 @@ msgstr "" +@@ -2248,144 +2382,144 @@ msgstr "" "archdist porównało %s do %s na %s\n" " Zwycięzca: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "wspólny źródłowy pakiet RPM %s i %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "podstawowy pakiet %s jest zainstalowany dla %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "wspólny przedrostek %s dla %s i %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "wymaga minimum: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Zwycięzca: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Przegrany (za pomocą %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Najlepszy porządek: %s" @@ -98559,7 +99210,7 @@ index 0fe83a9..0fbddb8 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2393,21 +2523,21 @@ msgstr "" +@@ -2393,21 +2527,21 @@ msgstr "" "Pozostały nieukończone transakcje. Można rozważyć wykonanie najpierw " "polecenia yum-complete-transaction, aby je ukończyć." @@ -98585,7 +99236,7 @@ index 0fe83a9..0fbddb8 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2415,90 +2545,93 @@ msgstr "" +@@ -2415,90 +2549,93 @@ msgstr "" "\n" "Pakiety pominięto z powodu problemów z zależnościami:" @@ -98620,7 +99271,7 @@ index 0fe83a9..0fbddb8 100644 msgstr "zainstalowano konflikt" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -98628,18 +99279,18 @@ index 0fe83a9..0fbddb8 100644 "błędy." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Nie można rozpocząć transakcji:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Nie można wykonać transakcji." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Usunięcie pliku transakcji %s nie powiodło się" @@ -98647,7 +99298,7 @@ index 0fe83a9..0fbddb8 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s miało zostać zainstalowane, ale nie zostało." @@ -98658,59 +99309,59 @@ index 0fe83a9..0fbddb8 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s miało zostać usunięte, ale nie zostało." -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Nie można otworzyć blokady %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, 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:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, 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:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Nie można utworzyć blokady na %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2507,42 +2640,31 @@ msgstr "" +@@ -2507,42 +2644,31 @@ msgstr "" "Pakiet nie zgadza się z zamierzonym pobieraniem. Sugestia: proszę wykonać " "polecenie yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Nie można wykonać sprawdzenia sum kontrolnych" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Sumy kontrolne pakietu nie zgadzają się" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" @@ -98718,7 +99369,7 @@ index 0fe83a9..0fbddb8 100644 "pamięci podręcznej dla %s jest włączone" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "używanie lokalnej kopii %s" @@ -98735,101 +99386,101 @@ index 0fe83a9..0fbddb8 100644 -" * wymagane %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Nagłówek nie jest pełny." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2550,62 +2672,65 @@ msgstr "" +@@ -2550,62 +2676,65 @@ 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:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Klucz publiczny dla %s nie jest zainstalowany" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Wystąpił problem podczas otwierania pakietu %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Klucz publiczny dla %s nie jest zaufany" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Pakiet %s nie jest podpisany" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Nie można usunąć %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "Usunięto %s" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Nie można usunąć %s pliku %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "Usunięto %s plik %s" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "Usunięto %d %s plików" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "Usunięto %d %s plik" -+msgstr[1] "Usunięto %d %s pliki" -+msgstr[2] "Usunięto %d %s plików" ++msgstr[0] "%d %s plik został usunięty" ++msgstr[1] "%d %s pliki zostały usunięte" ++msgstr[2] "%d %s plików zostało usuniętych" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, 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:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, 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:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2613,56 +2738,59 @@ msgstr "" +@@ -2613,56 +2742,59 @@ msgstr "" "searchPackages() zostanie usunięte w przyszłych wersjach programu yum." " Zamiast tego należy użyć searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Wyszukiwanie %d pakietów" @@ -98840,164 +99491,165 @@ index 0fe83a9..0fbddb8 100644 +msgstr[2] "Wyszukiwanie %d pakietów" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "wyszukiwanie pakietu %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "wyszukiwanie we wpisach plików" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "wyszukiwanie we wpisach dostarczania" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Brak dostępnych danych grup dla skonfigurowanych repozytoriów" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Grupa o nazwie %s nie istnieje" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "pakiet %s nie został oznaczony w grupie %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Dodawanie pakietu %s z grupy %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Brak dostępnego pakietu o nazwie %s do zainstalowania" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Ostrzeżenie: grupa %s nie posiada żadnych pakietów." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" -@@ -2670,65 +2798,65 @@ msgstr "" +@@ -2670,65 +2802,66 @@ msgstr "" #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, 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:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, 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:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "Nieprawidłowa flaga wersji z: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Nie odnaleziono pakietu %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Obiekt pakietu nie był instancją obiektu pakietu" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Nie podano nic do zainstalowania" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, 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:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Brak wyników dla parametru: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Pakiet %s jest zainstalowany, ale nie jest dostępny" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Brak pakietów dostępnych do instalacji" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pakiet: %s - jest już w zestawie transakcji" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, 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:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2737,97 +2865,103 @@ msgstr "" +@@ -2737,97 +2870,103 @@ msgstr "" "Pakiet %s został zastąpiony przez %s, ale zastępujący pakiet nie spełnia " "wymagań" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, 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:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Pakiet %s jest już zainstalowany w najnowszej wersji" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" @@ -99005,43 +99657,43 @@ index 0fe83a9..0fbddb8 100644 #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Aktualizowanie wszystkiego" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, 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:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "Brak pasujących pakietów do zaktualizowania: %s" ++msgstr "Brak pakietów pasujących do aktualizacji: %s" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, 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:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, 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" @@ -99049,50 +99701,50 @@ index 0fe83a9..0fbddb8 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Brak pasujących pakietów do usunięcia" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "Brak pasujących pakietów do usunięcia: %s" ++msgstr "Brak pakietów pasujących do usunięcia: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Pomijanie uruchomionego jądra: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Usuwanie %s z transakcji" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Nie można otworzyć: %s. Pomijanie." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Sprawdzanie %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Nie można lokalnie zainstalować pakietu RPM delta: %s. Pomijanie." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, 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:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" @@ -99100,62 +99752,62 @@ index 0fe83a9..0fbddb8 100644 " %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2836,7 +2970,7 @@ msgstr "" +@@ -2836,7 +2975,7 @@ msgstr "" "Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Proszę wykonać" " polecenie yum install, aby go zainstalować." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2845,100 +2979,105 @@ msgstr "" +@@ -2845,142 +2984,151 @@ msgstr "" "Pakiet %s.%s nie jest zainstalowany, więc nie może zostać zaktualizowany. " "Należy wykonać polecenie yum install, aby go zainstalować." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Wykluczanie %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Oznaczanie %s do zainstalowania" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Oznaczanie %s jako aktualizacji %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: nie aktualizuj zainstalowanego pakietu." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Nie można otworzyć pliku: %s. Pomijanie." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 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:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" @@ -99163,276 +99815,295 @@ index 0fe83a9..0fbddb8 100644 "do zainstalowania" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Brak pakietów dostępnych do instalacji poprzedniej wersji" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Pakiet %s może być wielokrotnie instalowany, pomijanie" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Brak wyników dla dostępnych pakietów: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Dla pakietu dostępna jest tylko aktualizacja: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Zainstalowanie poprzedniej wersji nie powiodło się: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" -+msgstr "Aktualizacja nie powiodła się: %s" ++msgstr "Aktualizacja się nie powiodła: %s" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "Pobieranie klucza z %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Pobranie klucza GPG nie powiodło się: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "Podpis GPG klucza %s nie pasuje do klucza CA dla repozytorium: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "Podpis GPG klucza został sprawdzony za pomocą kluczy CA" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Nieprawidłowy klucz GPG z %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, 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:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2951,7 +3090,7 @@ msgstr "" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" + msgstr "" + "Importowanie %s klucza 0x%s:\n" +-" Identyfikator użytkownika: %s\n" ++" Identyfikator użytkownika: \"%s\"\n" ++" Odcisk palca : %s\n" " Pakiet : %s (%s)\n" - " Od : %s" +-" Od : %s" ++" Z : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2962,25 +3101,25 @@ msgstr "" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" + msgstr "" + "Importowanie %s klucza 0x%s:\n" " Identyfikator użytkownika: \"%s\"\n" - " Od : %s" +-" Od : %s" ++" Odcisk palca : %s\n" ++" Z : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "Klucz GPG %s (0x%s) jest już zainstalowany" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Zaimportowanie klucza nie powiodło się (kod %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Klucz został pomyślnie zaimportowany" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "Nie zainstalowano żadnych kluczy" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2989,25 +3128,25 @@ msgstr "" +@@ -2989,25 +3137,25 @@ msgstr "" "Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie są poprawne dla tego pakietu.\n" "Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne adresy URL do kluczy." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Zaimportowanie kluczy nie pomogło, błędne klucze?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "Klucz GPG %s (0x%s) został już zaimportowany" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Zaimportowanie klucza nie powiodło się" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Nie zainstalowano żadnych kluczy dla repozytorium %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3016,161 +3155,188 @@ msgstr "" +@@ -3016,161 +3164,187 @@ msgstr "" "Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie są poprawne.\n" "Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne adresy URL do kluczy." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Nie można odnaleźć odpowiedniego serwera lustrzanego." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Wystąpiły błędy podczas pobierania pakietów." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Proszę zgłosić ten błąd na %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Błędy testu transakcji: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Nie można ustawić katalogu pamięci podręcznej: %s " -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" "Zależności nie zostały rozwiązane. Nierozwiązana transakcja nie zostanie " "zapisana." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Nie można zapisać pliku transakcji %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Nie można uzyskać dostępu/odczytać zapisanej transakcji %s: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "wersja bazy danych RPM nie zgadza się z wersją zapisanej transakcji, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr " ignorowanie, jak zażądano." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr " przerywanie." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "nie można odnaleźć tsflags lub nie jest liczbą całkowitą." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Odnaleziono txmbr w nieznanym obecnym stanie: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Nie można odnaleźć txmbr: %s w stanie %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Nie można odnaleźć txmbr: %s z pierwotnego: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Brak elementów transakcji, związków lub ts zostało zmodyfikowane," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr " ignorowanie, jak zażądano. Należy rozwiązać zależności." +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "%s zostało już odwiedzone i nie może zostać usunięte." + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" -+msgstr "Sprawdzanie zależności odwrotnych %s" ++msgstr "Sprawdzanie odwrotnych zależności pakietu %s" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" -+"%s posiada zależność odwrotną %s, która została zainstalowana przez " -+"użytkownika." ++"Pakiet %s posiada odwrotną zależność %s zainstalowaną przez użytkownika." + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" -+"%s nie posiada zależności odwrotnych zainstalowanych przez użytkownika." ++"%s nie posiada odwrotnych zależności zainstalowanych przez użytkownika." + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 @@ -99531,7 +100202,7 @@ index 0fe83a9..0fbddb8 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s dostarcza %s, ale nie można go odnaleźć" -@@ -3179,6 +3345,17 @@ msgstr "%s dostarcza %s, ale nie można go odnaleźć" +@@ -3179,6 +3353,17 @@ msgstr "%s dostarcza %s, ale nie można go odnaleźć" msgid "Repackaging" msgstr "Ponowne tworzenie pakietu" @@ -99550,10 +100221,10 @@ index 0fe83a9..0fbddb8 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/pt.po b/po/pt.po -index 9e76ec0..76f6008 100644 +index 9e76ec0..d846dda 100644 --- a/po/pt.po +++ b/po/pt.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -99564,11 +100235,13 @@ index 9e76ec0..76f6008 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,413 +17,438 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -99586,30 +100259,30 @@ index 9e76ec0..76f6008 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "" @@ -99636,7 +100309,7 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "" @@ -99662,53 +100335,53 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Erro nas Opções: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -99719,98 +100392,98 @@ index 9e76ec0..76f6008 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -99818,7 +100491,7 @@ index 9e76ec0..76f6008 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -99827,13 +100500,13 @@ index 9e76ec0..76f6008 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -99843,12 +100516,12 @@ index 9e76ec0..76f6008 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -99858,12 +100531,12 @@ index 9e76ec0..76f6008 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -99873,14 +100546,14 @@ index 9e76ec0..76f6008 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -99888,13 +100561,13 @@ index 9e76ec0..76f6008 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -99902,7 +100575,7 @@ index 9e76ec0..76f6008 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -99910,151 +100583,151 @@ index 9e76ec0..76f6008 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -100064,18 +100737,18 @@ index 9e76ec0..76f6008 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -100085,37 +100758,37 @@ index 9e76ec0..76f6008 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -100124,153 +100797,153 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -100613,22 +101286,22 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -100666,351 +101339,357 @@ index 9e76ec0..76f6008 100644 #, python-format msgid "" "\n" -@@ -869,57 +901,52 @@ msgid "" +@@ -869,57 +901,58 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "" -@@ -927,7 +954,7 @@ msgstr "" +@@ -927,7 +960,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -935,484 +962,536 @@ msgid "" +@@ -935,484 +968,536 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -101019,17 +101698,17 @@ index 9e76ec0..76f6008 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -101042,224 +101721,224 @@ index 9e76ec0..76f6008 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -101267,7 +101946,7 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -101275,7 +101954,7 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -101283,7 +101962,7 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -101291,103 +101970,103 @@ index 9e76ec0..76f6008 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr "" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr "" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr "" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr "" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr "" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -101395,7 +102074,7 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -101403,68 +102082,68 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1420,47 +1499,47 @@ msgid "" +@@ -1420,47 +1505,47 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "" -@@ -1472,7 +1551,7 @@ msgstr "" +@@ -1472,7 +1557,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -101473,7 +102152,7 @@ index 9e76ec0..76f6008 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1568,484 @@ msgid "" +@@ -1489,451 +1574,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -101736,188 +102415,187 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -101925,7 +102603,7 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -101933,148 +102611,148 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2056,106 @@ msgstr "" +@@ -1944,100 +2058,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -102082,7 +102760,7 @@ index 9e76ec0..76f6008 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -102119,226 +102797,226 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,774 +2163,784 @@ msgstr "" +@@ -2045,991 +2165,1028 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -102346,43 +103024,43 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -102570,24 +103248,24 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -102595,7 +103273,7 @@ index 9e76ec0..76f6008 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -102606,40 +103284,40 @@ index 9e76ec0..76f6008 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Não é possível verificar se o PID %s está activo" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -102647,23 +103325,23 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "" @@ -102677,67 +103355,67 @@ index 9e76ec0..76f6008 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -102747,26 +103425,26 @@ index 9e76ec0..76f6008 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -102776,62 +103454,62 @@ index 9e76ec0..76f6008 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -102839,78 +103517,79 @@ index 9e76ec0..76f6008 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -102918,118 +103597,118 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -103037,7 +103716,7 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -103045,158 +103724,166 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2821,7 +2949,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2829,207 +2957,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -103204,29 +103891,29 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -103234,117 +103921,117 @@ index 9e76ec0..76f6008 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -103444,7 +104131,7 @@ index 9e76ec0..76f6008 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3190,14 @@ msgstr "" +@@ -3038,6 +3195,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -103460,7 +104147,7 @@ index 9e76ec0..76f6008 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/pt_BR.po b/po/pt_BR.po -index 493f090..643a4e5 100644 +index 493f090..36e8e5b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,14 +2,16 @@ @@ -103478,9 +104165,9 @@ index 493f090..643a4e5 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-26 02:18+0000\n" -+"Last-Translator: cleitonlima \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/yum/team/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -103501,30 +104188,30 @@ index 493f090..643a4e5 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instalando" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Obsoletos" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Atualizados" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Removidos" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Instalados" @@ -103551,7 +104238,7 @@ index 493f090..643a4e5 100644 msgstr "Removidos: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Removendo" @@ -103577,53 +104264,53 @@ index 493f090..643a4e5 100644 msgstr "Lendo metadados do repositório a partir dos arquivos locais" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Erro de configuração: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Erro nas opções: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Instalados: %s-%s em %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Construídos : %s em %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Enviados: %s em %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Você precisa dar algum comando" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Comando não encontrado: %s. Por favor, utilize %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Requisitos de disco:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Pelo menos mais %dMB são necessários no sistema de arquivos %s.\n" @@ -103634,7 +104321,7 @@ index 493f090..643a4e5 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -103643,74 +104330,74 @@ index 493f090..643a4e5 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Tentando executar a transação, mas não há nada a ser feito. Saindo." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Saindo pelo comando do usuário" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Baixando pacotes:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Erro ao baixar pacotes:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" -msgstr "" +msgstr "Executando Verificação da Transação" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "ERRO. Você precisa atualizar o rpm para manipular:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "O RPM precisa ser atualizado" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Por favor, relate esse erro em %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Executando teste de transação" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Erro na verificação da transação:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Teste de transação completo" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Executando a transação" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -103719,18 +104406,18 @@ index 493f090..643a4e5 100644 "Use \"-y\" para sobrescrever." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Talvez você queira dizer: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Pacotes %s%s%s disponíveis, mas já instalados." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Nenhum pacote %s%s%s disponível." @@ -103738,83 +104425,83 @@ index 493f090..643a4e5 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Pacotes a serem instalados" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "%d pacote para instalar" -+msgstr[1] "%d pacotes para instalar" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nada a ser feito" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pacotes marcados para atualização" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "%d pacote marcado para atualização" -+msgstr[1] "%d pacotes marcados para atualização" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Nenhum pacote marcado para atualização" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pacotes marcados para Sincronização da Distribuição" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" -+msgstr[0] "%d pacotes marcados para Sincronização de Distribuição" -+msgstr[1] "%d pacotes marcados para Sincronização de Distribuição" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Nenhum pacote marcado para a Sincronização da Distribuição" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pacotes marcados para remoção" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "%d pacote marcado para ser eliminado" -+msgstr[1] "%d pacotes marcados para serem eliminados" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Nenhum pacote marcado para remoção" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Pacote(s) a ser(em) desatualizados(s)" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "%d pacote para downgrade" -+msgstr[1] "%d pacotes para downgrade" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (a partir de %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "O pacote instalado %s%s%s%s não está disponível." @@ -103822,37 +104509,37 @@ index 493f090..643a4e5 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Pacote(s) a ser(em) reinstalado(s)" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" -+msgstr[0] "%d pacote para reinstalação" -+msgstr[1] "%d pacotes para reinstalação" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Nenhum pacote fornecido" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Pacotes a serem instalados" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." -msgstr "" +msgstr " Nome e sumário correspondem %sonly%s, use \"search all\" para tudo." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -103861,191 +104548,191 @@ index 493f090..643a4e5 100644 +"tudo." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Encontrado: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." -msgstr "" +msgstr " Nome e sumário correspondem %smostly%s, use \"search all\" para tudo." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Aviso: nenhum resultado para: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Nenhum pacote localizado" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Nenhum pacote localizado para %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Limpando repositórios:" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Limpando tudo" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Limpando cabeçalhos" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Limpando pacotes" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Limpando metadados em xml" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Limpando cache do banco de dados" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Limpando metadados expirados do cache" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Limpando dados rpmdb em cache" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Limpando plugins" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "Aviso: Nenhum grupo correspondente: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Grupos instalados:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" -msgstr "" +msgstr "Grupos de Idiomas Instalados:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Grupos disponíveis:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" -msgstr "" +msgstr "Grupos de Idiomas Disponíveis:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Concluído" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Aviso: O grupo %s não existe." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "Nenhum pacote disponível para instalação ou atualização nos grupos " "requisitados" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pacote(s) a ser(em) instalado(s)" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "%d pacote para Instalação" -+msgstr[1] "%d pacotes para Instalação" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Nenhum grupo de nome %s existe" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Nenhum pacote a ser removido a partir dos grupos" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pacote(s) a ser(em) removido(s)" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "%d pacote para remoção" -+msgstr[1] "%d pacotes para remoção" ++msgstr[0] "" ++msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "O pacote %s já está instalado, ignorando" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Descartando pacote não comparável %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" "Nenhum outro %s instalado, adicionado à lista para potencial instalação" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Opções do plugin" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Erro na linha de comando: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -104054,157 +104741,157 @@ index 493f090..643a4e5 100644 "%s: a opção %s requer um argumento" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color aceita uma destas opções: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "--installroot deve ser um caminho absoluto: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "mostrar essa mensagem ajuda e sai" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "ser tolerante com os erros" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" "executar por completo a partir do cache do sistema, não atualiza o cache" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "configurar localização do arquivo" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "Tempo máximo de espera do comando" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "nível de depuração na saída" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "mostrar duplicados em repos e em comandos de pesquisa/listagem" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "nível de erro na saída" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "nível de depuração na saída para o rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "operação discreta" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "operação detalhada" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "responder sim para todas as perguntas" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" -+msgstr "responder não para todas as perguntas" ++msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "mostrar versão do Yum ao sair" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "definir raiz de instalação" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "habilitar um ou mais repositórios (curingas são permitidos)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "desabilitar um ou mais repositórios (curingas são permitidos)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "excluir pacote(s) por nome ou glob" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" "desabilitar a exclusão a partir do principal, para um repositório ou para " "tudo" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "Habilitar processo de obsolescência durante as atualizações" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "desabilitar plugins do Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "desabilitar verificação de assinaturas gpg" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "desabilitar plugins pelo nome" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "habilita plugins pelo nome" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "ignorar pacotes com problemas de solução de dependências" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "controla o uso da cor" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "defina o valor de $releasever nos arquivos repo e yum config" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "Configurando opções arbitrárias de repositório e configurações. " @@ -104549,23 +105236,23 @@ index 493f090..643a4e5 100644 msgstr "Removendo para as dependências" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Ignorado (problemas de dependências)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Não instalado" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Não disponível" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Pacote" +msgid_plural "Packages" @@ -104603,7 +105290,7 @@ index 493f090..643a4e5 100644 #, python-format msgid "" "\n" -@@ -888,57 +923,52 @@ msgstr "" +@@ -888,57 +923,58 @@ msgstr "" "Resumo da transação\n" "%s\n" @@ -104611,7 +105298,7 @@ index 493f090..643a4e5 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Instalar %5.5s Pacote(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Instalar" @@ -104619,23 +105306,23 @@ index 493f090..643a4e5 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Atualizar %5.5s Pacote(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" -+msgstr "Atualizar" ++msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Remover %5.5s Pacote(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" -+msgstr "Remover" ++msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Reinstalar %5.5s Pacote(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Reinstalar" @@ -104643,323 +105330,329 @@ index 493f090..643a4e5 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Desatualizar %5.5s Pacote(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Desatualizar" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Removido(s)" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Dependência(s) removida(s)" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Dependência(s) instalada(s)" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Dependência(s) atualizada(s)" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Substituído(s)" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Falhou" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "dois" -@@ -946,7 +976,7 @@ msgstr "dois" +@@ -946,7 +982,7 @@ msgstr "dois" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -957,364 +987,416 @@ msgstr "" +@@ -957,364 +993,416 @@ msgstr "" " Download atual cancelado, %sinterrompa com (ctrl-c) novamente%s dentro de %s%s%s segundos\n" "para sair.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "interrupção do usuário" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Total" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Sistema" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" -msgstr "" +msgstr "Nenhuma transação" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "IDs de transação ou pacote(s) fornecido(s) inválido(s)" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" -msgstr "" +msgstr "Linha de comando" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Usuário de login" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Data e hora" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Ação(ões)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Alterado" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Nenhum ID de transação fornecido" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "O ID de transação fornecido é inválido" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "O ID de transação dado não foi localizado" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Foi localizado mais de um ID de transação!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Nenhum ID de transação ou pacote fornecido" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Desatualizados" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Antigo" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Recente" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "ID de transação:" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Horário de início:" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Início do rpmdb:" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u segundos)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u minutos)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u horas)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u dias)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Horário do fim:" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Fim do rpmdb:" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Usuário:" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Código de retorno:" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Interrompido" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" -msgstr "" +msgstr "Falhas:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Falha:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Sucesso" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Linha de comando :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "informações não-padrão adicionais armazenadas: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Transação realizada com:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Pacotes alterados:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Pacotes ignorados: " -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Problemas com Rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Saída do scriptlet:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Erros:" @@ -104968,17 +105661,17 @@ index 493f090..643a4e5 100644 -msgstr "Instalar" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Dep-Install" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Obsoletos" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Apagar" @@ -104991,446 +105684,446 @@ index 493f090..643a4e5 100644 -msgstr "Desatualizar" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Atualizar" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Hora" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Ontem" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Uma semana atrás" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "2 semanas atrás" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "3 meses atrás" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "6 meses atrás" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Ano passado" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Há mais de um ano" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Nenhuma transação %s achada" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "ID da transação:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Informação adicional do histórico disponível:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Não há dados adicionais encontrados por este nome" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" -+msgstr "Pacote :" ++msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" -+msgstr "Tamanho :" ++msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" -+msgstr "Empacotador :" ++msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" -+msgstr "Fornecedor :" ++msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" -+msgstr "Licença :" ++msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" -+msgstr "URL :" ++msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" -+msgstr "Source RPM :" ++msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" -+msgstr "Instalado por :" ++msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" -+msgstr "Modificado por :" ++msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "instalado" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" -msgstr "" +msgstr "uma atualização" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "removido" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "Reinstalado" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" -msgstr "" +msgstr "um downgrade" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" -msgstr "" +msgstr "obsoleto" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "atualizado" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "obsoleto" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" -msgstr "" +msgstr "---> O pacote %s.%s %s:%s-%s será %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Executando verificação da transação" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Reiniciando resolução de dependências com as novas alterações." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Resolução de dependências finalizada" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Processando dependência: %s para o pacote: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Manter os pacotes: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Dependência não resolvida: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Pacote: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1323,7 +1405,7 @@ msgstr "" +@@ -1323,7 +1411,7 @@ msgstr "" "\n" " Requer: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1332,7 +1414,7 @@ msgstr "" +@@ -1332,7 +1420,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1341,7 +1423,7 @@ msgstr "" +@@ -1341,7 +1429,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1350,87 +1432,87 @@ msgstr "" +@@ -1350,87 +1438,87 @@ msgstr "" " Não encontrado" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Atualizado por" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Desatualizado por" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Obsoletado por" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Disponível" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Processando conflito: %s conflita com %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> Construindo conjunto de transações com os pacotes selecionados. Por " "favor aguarde." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "--> Baixando cabeçalho do %s para inclusão no conjunto de transações." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Executando" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Dormindo" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Ininterrompível" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zumbi" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Rastreado/Parado" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Desconhecido" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " O outro aplicativo é: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " O outro aplicativo é: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Memória: %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Iniciado: %s - %s atrás" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Estado: %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1440,7 +1522,7 @@ msgstr "" +@@ -1440,7 +1528,7 @@ msgstr "" "\n" "Saindo pelo cancelamento do usuário" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1450,7 +1532,7 @@ msgstr "" +@@ -1450,7 +1538,7 @@ msgstr "" "\n" "Saindo por um pipe defeituoso" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1461,7 +1543,7 @@ msgstr "" +@@ -1461,7 +1549,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1469,36 +1551,36 @@ msgstr "" +@@ -1469,36 +1557,36 @@ msgstr "" "No momento outro aplicativo está com a posse da trava do yum; saindo " "conforme configurado pelo exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Erro PluginExit: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Error do Yum: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Error: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" " Você pode tentar usar o parâmetro --skip-broken para contornar o problema" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Você pode tentar executar: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Erro(s) desconhecido(s): código de saída: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1506,7 +1588,7 @@ msgstr "" +@@ -1506,7 +1594,7 @@ msgstr "" "\n" "Dependências resolvidas" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Concluído!" -@@ -1518,7 +1600,7 @@ msgstr "" +@@ -1518,7 +1606,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Você precisa ser root para executar este comando." @@ -105439,7 +106132,7 @@ index 493f090..643a4e5 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1548,53 +1630,53 @@ msgstr "" +@@ -1548,53 +1636,53 @@ msgstr "" "\n" "Para mais informações contate o fornecedor da sua distribuição ou do pacote.\n" @@ -105505,7 +106198,7 @@ index 493f090..643a4e5 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1604,306 +1686,299 @@ msgstr "" +@@ -1604,306 +1692,295 @@ msgstr "" "Execute \"yum repolist all\" para ver os repositórios que você tem.\n" "Você pode habilitar repositórios com yum-config-manager --enable " @@ -105608,7 +106301,7 @@ index 493f090..643a4e5 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "Exibir, ou utilizar, as informações dos grupos" ++msgstr "" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -105705,155 +106398,154 @@ index 493f090..643a4e5 100644 msgstr "Configurando o processo de pacote local" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Determina qual pacote fornece a dependência dada" - +-msgid "Determine which package provides the given dependency" +-msgstr "Determina qual pacote fornece a dependência dada" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Pesquisando pacotes por dependência:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Executa um shell interativo do yum" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Configurando o shell do Yum" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Lista as dependências de um pacote" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Localizando dependências:" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Exibe os repositórios de software configurados" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "habilitado" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "desabilitado" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Repo-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Repo-name : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Repo-status : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Repo-revision: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Repo-tags : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Repo-distro-tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Repo-updated : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Repo-pkgs : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Repo-size : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Repo-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Atualizados :" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Repo-mirrors : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Nunca (último: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Instante (último: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s segundo(s) (último: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Repo-expire : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Repo-exclude : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Repo-include : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Repo-excluded: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Nome do Arquivo repo: " @@ -105861,191 +106553,191 @@ index 493f090..643a4e5 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "id do repo" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "nome do repo" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Exibe uma mensagem de uso para ajuda" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Nenhuma ajuda disponível para %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1913,7 +1988,7 @@ msgstr "" +@@ -1913,7 +1990,7 @@ msgstr "" "\n" "apelidos: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1923,117 +1998,165 @@ msgstr "" +@@ -1923,117 +2000,163 @@ msgstr "" "\n" "apelido: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Configurando o processo de reinstalação" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "reinstala um pacote" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Configurando o processo de desatualização" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "desatualizando um pacote" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Exibe uma versão para a máquina e/ou os repositórios disponíveis." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Grupos da versão do Yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Grupo:" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Pacotes:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Instalados:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Grupos instalados:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Disponíveis:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Grupos disponíveis:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Exibir ou usar o histórico de transações" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" -+msgstr "Transações:" ++msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" -+msgstr " NEVRAC :" ++msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" -+msgstr " NEVRA :" ++msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" -+msgstr " NA :" ++msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" -+msgstr " NEVR :" ++msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" -+msgstr " rpm DB :" ++msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" -+msgstr " yum DB :" ++msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Subcomando de histórico inválido, use: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Você não tem acesso ao banco de dados do histórico." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Procurar por problemas no rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" -msgstr "" +msgstr "Carregar uma transação salva de um nome de arquivo" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." -msgstr "" +msgstr "Nenhum arquivo de transação salvo especificado." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "carregando transação de %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "" @@ -106055,18 +106747,17 @@ index 493f090..643a4e5 100644 #: ../yummain.py:84 #, python-format msgid " Yum checks failed: %s" --msgstr "" +msgstr "A verificação do yum falhou: %s" + +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" -+msgstr "Sem acesso de leitura/escrita no diretório atual, mudando para /" -+ ++msgid "No read/execute access in current directory, moving to /" + msgstr "" + +-#: ../yummain.py:114 +#: ../yummain.py:124 +msgid "Can't create lock file; exiting" +msgstr "Não é possível criar o arquivo de bloqueio; saindo" - --#: ../yummain.py:114 ++ +#: ../yummain.py:128 msgid "" "Another app is currently holding the yum lock; waiting for it to exit..." @@ -106092,8 +106783,6 @@ index 493f090..643a4e5 100644 +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" msgstr "" -+"Sua transação foi salva, reexcute-a com:\n" -+"yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 @@ -106105,89 +106794,89 @@ index 493f090..643a4e5 100644 "Saindo pelo cancelamento do usuário." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() será removida em uma futura versão do Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" "Configurando TransactionSets antes da ativação da classe de configuração" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "tsflag inválido no arquivo de configuração: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Pesquisando pkgSack para a dep.: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Membro: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s convertido para instalar" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Adicionando pacote %s no modo %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Removendo pacote %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s requer: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s requer %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "O requerimento necessário já foi localizado, enganando" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "O requerimento necessário não é o nome de um pacote. Localizando: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Fornecedor em potencial: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "O modo é %s para o fornecedor do %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Modo para o pacote que fornece o %s: %s" @@ -106196,141 +106885,141 @@ index 493f090..643a4e5 100644 #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "Tentando atualizar %s para resolver a dependência" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" -msgstr "" +msgstr "Sem caminhos de atualização encontrados para %s. Falha!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: o pacote %s que requer o %s foi marcado para remoção" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: Tornando %s obsoleto com o %s para resolver a dependência." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Atualizando %s para resolver a dependência." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" "Não foi possível encontrar um caminho de atualização para a dep. para: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "%s localizado rapidamente a ser requerido por %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s está nos pacotes fornecedores mas já está instalado, removendo." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" "O pacote de solução em potencial %s tem uma instância mais nova no ct." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" "O pacote de solução em potencial %s tem uma instância mais nova instalada." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s já está no ct, pulando esse" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Marcando %s como uma atualização para o %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Marcando %s como uma instalação para o %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Sucesso - transação vazia" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Reiniciando o loop" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Término do processo de dependências" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Sucesso - dependências resolvidas" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Verificando dependências para %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "procurando por %s como um requerimento do %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Executando compare_providers() para %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "melhor arquitetura no po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s torna %s obsoleto" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -106339,43 +107028,43 @@ index 493f090..643a4e5 100644 " Vencedor: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "Sourcerpm comum %s e %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "o pacote base %s está instalado para o %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "prefixo comum de %s entre %s e %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "requer mínimo: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "Vencedor: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "Perdedor(com %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Melhor ordem: %s" @@ -106570,25 +107259,25 @@ index 493f090..643a4e5 100644 msgstr "conflito instalado" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" "Aviso: scriptlet ou outros erros não fatais ocorreram durante a transação." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "A transação não pode ser iniciada." #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Não foi possível executar a transação." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Falha ao remover o arquivo de transação %s" @@ -106596,7 +107285,7 @@ index 493f090..643a4e5 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s deveria ter sido instalado mas não foi!" @@ -106607,40 +107296,40 @@ index 493f090..643a4e5 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s deveria ter sido removido mas não foi!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Não foi possível abrir a trava %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Não foi possível verificar se o PID %s está ativo" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Bloqueio existente em %s: outra cópia está em execução com o pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Não foi possível criar um bloqueio em %s: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -106649,24 +107338,24 @@ index 493f090..643a4e5 100644 "--enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Não foi possível realizar a soma de verificação" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "O pacote não corresponde à soma de verificação" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" "o pacote falhou na soma de verificação mas o cache está habilitado para o %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "usando cópia local do %s" @@ -106683,12 +107372,12 @@ index 493f090..643a4e5 100644 -" * necessário %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "O cabeçalho não está completo." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" @@ -106697,152 +107386,152 @@ index 493f090..643a4e5 100644 "habilitado. Não foi possível baixar o %s." -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "A chave pública para o %s não está instalada" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problema ao abrir o pacote %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "A chave pública para o %s não é confiável" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "O pacote %s não está assinado" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Não foi possível remover %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s removido" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Não foi possível remover %s arquivo %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s arquivo %s removido" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s arquivos removidos" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "%d %s arquivo removido" -+msgstr[1] "%d %s arquivos removidos" ++msgstr[0] "" ++msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Mais de uma correspondência idêntica no saco para %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Nada corresponde ao %s.%s %s:%s-%s a partir da atualização" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2599,121 +2716,123 @@ msgstr "" +@@ -2599,121 +2716,124 @@ msgstr "" "searchPackages() será removida em uma futura versão do Yum. Ao invés disso, " "use a searchGenerator().\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Pesquisando por %d pacotes" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "Procurando %d pacote" -+msgstr[1] "Procurando %d pacotes" ++msgstr[0] "" ++msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "pesquisando pelo pacote %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "pesquisando nas entradas do arquivo" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "pesquisando nas entradas dos fornecimentos" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Nenhum dado de grupos disponível para os repositório configurados" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Não existe nenhum grupo de nome %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "o pacote %s não foi marcado no grupo %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Adicionando o pacote %s do grupo %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Nenhum pacote de nome %s disponível para ser instalado" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "Aviso: O Grupo %s não tem nenhum pacote." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." -msgstr "" @@ -106851,143 +107540,144 @@ index 493f090..643a4e5 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "A tupla %s do pacote não pôde ser encontrada no packagesack" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "A tupla %s do pacote não pôde ser localizada no rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Nenhum pacote encontrado para %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "O pacote de objeto não era uma instância de pacote de objeto" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Nada especificado para instalar" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Verificando por fornecimento virtual ou de arquivo para %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Nenhuma correspondência para o argumento: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Pacote %s instalado, mas não disponível" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Nenhum pacote disponível para instalar" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pacote: %s - já está no conjunto de transações" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "O pacote %s foi tornado obsoleto pelo %s, o qual já está instalado" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2721,83 +2840,89 @@ msgid "" +@@ -2721,83 +2841,89 @@ msgid "" msgstr "" "O pacote %s foi tornado obsoleto por %s, mas este não provê os requisitos." -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" "O pacote %s foi tornado obsoleto por %s, tentando instalar %s ao invés disso" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "O pacote %s já está instalado em sua última versão" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "O pacote %s já está instalado. Verificando por uma atualização." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Atualizando tudo" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Pacote já obsoleto não será atualizado: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "Nenhum pacote correspondente para atualização: %s" ++msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "O pacote já está obsoleto: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Não atualizando o pacote que está obsoleto: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Pacote já atualizado não será atualizado novamente: %s.%s %s:%s-%s" @@ -106995,68 +107685,68 @@ index 493f090..643a4e5 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nenhum pacote encontrado para remoção" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "Nenhum pacote correspondente para remoção: %s" ++msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Ignorando o kernel em execução: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Removendo %s da transação" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Não foi possível abrir: %s. Ignorando." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Examinando %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Não é possível instalar localmente o deltarpm: %s. Ignorando." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2805,13 +2930,13 @@ msgstr "" +@@ -2805,13 +2931,13 @@ msgstr "" "Não foi possível adicionar o pacote %s à transação. %s não é uma arquitetura" " compatível." -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" "Não é possível instalar o pacote % s. É obsoleto pelo pacote instalado %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2820,102 +2945,111 @@ msgstr "" +@@ -2820,137 +2946,148 @@ msgstr "" "O pacote %s não está instalado, não é possível atualizá-lo. Execute o yum " "install para instalá-lo." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -107066,96 +107756,96 @@ index 493f090..643a4e5 100644 +"para instalá-lo em vez disso." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Excluindo %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Marcando %s para ser instalado" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Marcando %s como uma atualização do %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: não atualiza o pacote instalado." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Não foi possível abrir o arquivo: %s. Ignorando." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Problema na reinstalação: nenhum pacote encontrado para remoção" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problema na reinstalação: nenhum pacote %s encontrado para instalação" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Nenhum pacote disponível para ser desatualizado" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "O pacote %s permite múltiplas instalações, ignorando" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Nenhuma correspondência disponível para o pacote: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Somente a atualização está disponível para o pacote: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Falha ao desatualizar: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 -+#, python-format -+msgid "Failed to upgrade: %s" -+msgstr "Falha ao atualizar: %s" -+ -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 #, python-format - msgid "Retrieving key from %s" --msgstr "" -+msgstr "Recuperando chave de %s" +-msgid "Retrieving key from %s" ++msgid "Failed to upgrade: %s" + msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5032 ++#, python-format ++msgid "Retrieving key from %s" ++msgstr "Recuperando chave de %s" ++ ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "A obtenção da chave GPG falhou:" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" @@ -107163,232 +107853,232 @@ index 493f090..643a4e5 100644 +"repositório: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" -msgstr "" +msgstr "Assinatura da chave GPG verificada em relação a chave(s) CA" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "A chave GPG de %s é inválida: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Falha na análise da chave GPG: ela não tem o valor %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2923,34 +3057,41 @@ msgid "" - " Package: %s (%s)\n" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -+"Importando %s chave 0x%s:\n" -+"Id do usuário: %s\n" -+"Pacote: %s (%s)\n" -+"De : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" - " Userid: \"%s\"\n" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -+"Importando %s chave 0x%s:\n" -+"Id do Usuário: \"%s\"\n" -+"De : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "A chave GPG em %s (0x%s) já está instalada" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Falha na importação da chave (código %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Chave importada com sucesso" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" -msgstr "" +msgstr "Não instalar nenhuma das chaves" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2959,25 +3100,25 @@ msgstr "" +@@ -2959,25 +3096,25 @@ msgstr "" "As chaves GPG listadas para o repositório \"%s\" já estão instaladas, mas não estão corretas para este pacote.\n" "Verifique se as URLs corretas das chaves estão configuradas para esse repositório." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "A importação da(s) chave(s) não ajudou, chave(s) errada(s)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "A chave GPG em %s (0x%s) já foi importada" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Falha na importação da chave" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "Não instalar nenhuma das chaves para o repositório %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2986,159 +3127,185 @@ msgstr "" +@@ -2986,159 +3123,185 @@ msgstr "" "As chaves GPG listadas para o repositório \"%s\" já estão instaladas, mas não estão corretas.\n" "Verifique se as URLs das chaves estão configuradas corretamente para este repositório. " -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Não foi possível encontrar um espelho apropriado." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Foram encontrados erros ao baixar os pacotes." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Por favor, relate esse erro em %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Erros do teste de transação:" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Não foi possível definir a cachedir: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" +"Dependências não resolvidas. Transações não resolvidas não serão salvas." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "Não foi possível salvar o arquivo de transação %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "" +msgstr "Não foi possível acessar/ler a transação salva %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." -msgstr "" +msgstr "ignorando, conforme solicitado." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." -msgstr "" +msgstr "abortando." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" -msgstr "" +msgstr "Não foi possível encontrar txmbr: %s da origem: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +"ignorando, conforme pedido. Você deve rodar executar novamente o depsolve!" + +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -107490,7 +108180,7 @@ index 493f090..643a4e5 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s provê %s mas não pôde ser achado" -@@ -3147,6 +3314,17 @@ msgstr "%s provê %s mas não pôde ser achado" +@@ -3147,6 +3310,17 @@ msgstr "%s provê %s mas não pôde ser achado" msgid "Repackaging" msgstr "Reempacotando" @@ -107519,10 +108209,10 @@ index 276a433..7f13138 100644 # # minimally patched to make it even more xgettext compatible diff --git a/po/ru.po b/po/ru.po -index 52ba58b..5913e5d 100644 +index 52ba58b..afb414a 100644 --- a/po/ru.po +++ b/po/ru.po -@@ -2,14 +2,15 @@ +@@ -2,15 +2,16 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -107537,11 +108227,13 @@ index 52ba58b..5913e5d 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Russian (http://www.transifex.net/projects/p/yum/team/ru/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -18,122 +19,125 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" @@ -107559,30 +108251,30 @@ index 52ba58b..5913e5d 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Установка" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Исключено" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Обновлено" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Удалено" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Установлено" @@ -107609,7 +108301,7 @@ index 52ba58b..5913e5d 100644 msgstr "Удален: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Удаление" @@ -107635,53 +108327,53 @@ index 52ba58b..5913e5d 100644 msgstr "Чтение локальных метаданных для репозиториев" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Ошибка в настройке: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Ошибка в параметре: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Установлено: %s-%s из %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Собрано : %s из %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Передано : %s из %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Необходимо задать команду" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Не найдена команда: %s Пожалуйста, воспользуйтесь %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Требование к носителю:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Необходимо по меньшей мере %dМБ на разделе %s.\n" @@ -107693,7 +108385,7 @@ index 52ba58b..5913e5d 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -107702,73 +108394,73 @@ index 52ba58b..5913e5d 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Попытка предпринята, делать нечего. Завершение." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Выход по запросу пользователя" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Загрузка пакетов:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Ошибка загрузки пакетов:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "Проверка сценария" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "ОШИБКА — необходимо обновить RPM для обработки:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "ОШИБКА при проверке сценария на этапе зависимостей:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "Следует обновить RPM" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Пожалуйста, сообщите об ошибке в %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Проверяем сценарий" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Проверка сценария завершена с ошибкой:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Проверка сценария прошла успешно" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Выполнение сценария" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -107777,18 +108469,18 @@ index 52ba58b..5913e5d 100644 "Используйте \"-y\" для игнорирования." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Возможно, вы имели в виду: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Пакет %s%s%s доступен, но не установлен." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Пакета с названием %s%s%s не найдено." @@ -107796,7 +108488,7 @@ index 52ba58b..5913e5d 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Пакет(ы) для установки" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -107806,13 +108498,13 @@ index 52ba58b..5913e5d 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Выполнять нечего" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d пакеты отмечены для обновления" @@ -107823,12 +108515,12 @@ index 52ba58b..5913e5d 100644 +msgstr[2] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Пакетов, отмеченных для обновления, нет." -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "Отмечено пакетов для синхронизации: %d" @@ -107839,12 +108531,12 @@ index 52ba58b..5913e5d 100644 +msgstr[2] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Пакетов, отмеченных для синхронизации, нет" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d пакеты отмечены для удаления" @@ -107855,14 +108547,14 @@ index 52ba58b..5913e5d 100644 +msgstr[2] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Пакетов, отмеченных для удаления, нет." -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Пакет(ы) для отката версии" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -107871,13 +108563,13 @@ index 52ba58b..5913e5d 100644 +msgstr[2] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (из %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Установленный пакет %s%s%s%s недоступен." @@ -107885,7 +108577,7 @@ index 52ba58b..5913e5d 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Пакет(ы) для переустановки" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -107894,22 +108586,22 @@ index 52ba58b..5913e5d 100644 +msgstr[2] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Пакеты не предоставлены" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Пакет(ы) для установки" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "Совпадений: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -107919,7 +108611,7 @@ index 52ba58b..5913e5d 100644 +"используйте «search all»." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -107930,13 +108622,13 @@ index 52ba58b..5913e5d 100644 +"большего используйте «search all»." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Совпадений: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" @@ -107946,112 +108638,112 @@ index 52ba58b..5913e5d 100644 +"используйте «search all»." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Внимание: совпадений для %s не найдено" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Совпадений не найдено" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Пакет для %s не найден" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Сброс источников:" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Очистка всего" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Очистка заголовков" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Очистка пакетов" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Очистка xml метаданных" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Очистка кэша данных" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Очистка устаревшего кэша" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Очистка кэша данных базы RPM" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Сброс модулей" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "Предупреждение: Ни одна группа не совпадает: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Установлены коллекции:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "Установлены языковые пакеты:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Доступные коллекции:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "Доступные языковые пакеты:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Выполнено" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Внимание: коллекции %s не существует." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "Во всех указанных коллекциях пакеты для установки или обновления отсутствуют" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d Пакет(ы) для установки" @@ -108062,18 +108754,18 @@ index 52ba58b..5913e5d 100644 +msgstr[2] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Коллекции с названием %s не существует" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Нет пакетов для удаления из коллекций" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d Пакет(ы) для удаления" @@ -108084,37 +108776,37 @@ index 52ba58b..5913e5d 100644 +msgstr[2] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Пакет %s уже установлен, пропускаем" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Исключение несовместимого пакета %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "Других %s не установлено, добавляем в список для возможной установки" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Опции модуля" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Ошибка команды: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -108123,158 +108815,158 @@ index 52ba58b..5913e5d 100644 "%s: %s опцию необходимо указать с аргументом" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color возможное значение: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot должен указывать абсолютный путь: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "отобразить помощь и выйти" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "игнорировать ошибки" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "брать полностью из системного кэша, не обновлять его" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "расположение файла конфигурации" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "максимальное время ожидания команды" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "уровень отладочных сообщений" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" "показывать повторяющиеся в репозиториях пакеты, для команд list/search" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "уровень сообщений об ошибках" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "уровень отладочных сообщений для rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "работать без вывода сообщений" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "подробно описывать действия" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "Отвечать утвердительно на все вопросы" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "показать версию Yum и выйти" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "настройка корневой папки" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" "включение одного и более репозиториев (поиск по шаблону поддерживается)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" "выключение одного и более репозиториев (поиск по шаблону поддерживается)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "исключение пакета(ов) по имени или регулярному выражению" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "отключает исключения для конкретного репозитория или для всех" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "включить обработку устаревших во время обновления" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "отключить модули Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "отключить проверку подписи gpg" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "отключить модуль по названию" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "включить модуль по названию" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "пропускать пакеты, с проблемами в зависимостях" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "Использовать ли цветовые схемы" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" "установите значение $releasever в конфигурационном файле yum и в файлах " "репозиториев (repo)" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "другие настройки и свойства источников" @@ -108618,23 +109310,23 @@ index 52ba58b..5913e5d 100644 msgstr "Удаление зависимостей" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Пропущено (ошибка зависимостей)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Не установлено" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Недоступно" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Пакет" +msgid_plural "Packages" @@ -108673,7 +109365,7 @@ index 52ba58b..5913e5d 100644 #, python-format msgid "" "\n" -@@ -895,57 +937,52 @@ msgstr "" +@@ -895,57 +937,59 @@ msgstr "" "Результат операции\n" "%s\n" @@ -108681,7 +109373,7 @@ index 52ba58b..5913e5d 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Установить %5.5s пакет(а,ов)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Установка " @@ -108689,7 +109381,7 @@ index 52ba58b..5913e5d 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Обновить %5.5s пакет(а,ов)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" +msgstr "" @@ -108697,7 +109389,7 @@ index 52ba58b..5913e5d 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Удалить %5.5s пакет(а,ов)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "" @@ -108705,7 +109397,7 @@ index 52ba58b..5913e5d 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Переустановить %5.5s пакет(а,ов)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Переустановка" @@ -108713,316 +109405,323 @@ index 52ba58b..5913e5d 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Откатить %5.5s пакет(а,ов)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Откат версии" ++ ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1524 msgid "Removed" msgstr "Удалено" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Удалены зависимости" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Установлены зависимости" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Обновлены зависимости" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Заменено" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Неудача" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "двух" -@@ -953,7 +990,7 @@ msgstr "двух" +@@ -953,7 +997,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -964,364 +1001,416 @@ msgstr "" +@@ -964,364 +1008,416 @@ msgstr "" " Текущая загрузка отменена, %sпрервите (ctrl-c) повторно%s в течение %s%s%s секунд,\n" "чтобы выйти.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "прервано пользователем" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Общий размер" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Система" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Переход от %d к %d, т.к. сценарии пересекаются" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "Сценарии отсутствуют" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Заданы неверный код сценария или пакеты" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "Командная строка" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Вход пользователя" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Дата и время" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Действия" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Изменено" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Код действия не задан" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Код действия неверен" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Указанный код действия не найден" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Указано более одной операции!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Не задан код действия или пакет" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Откачено" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Старее" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Новее" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "Код операции :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Время начала :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Начало rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "(%u секунд)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "(%u минут)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "(%u часов)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "(%u дней)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Конечное время :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Конец rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Пользователь :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Код возврата :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Прекращено" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "Ошибки:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Неудача:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Успешно" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Команда:" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Имеется дополнительная информация: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Действие выполнено:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Пакеты изменены:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Пропущены пакеты:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Ошибки в rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Вывод сценария:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Ошибки:" @@ -109031,17 +109730,17 @@ index 52ba58b..5913e5d 100644 -msgstr "Установка " - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Установка зависимостей" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Исключаем" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Удаление" @@ -109054,438 +109753,438 @@ index 52ba58b..5913e5d 100644 -msgstr "Откат версии" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Обновление" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Время" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "За последний день" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "За последнюю неделю" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "За последние 2 недели" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "За последние 3 месяца" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "За последние 6 месяцев" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "За последний год" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Более года назад" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Действие %s не найдено" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Код операции:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Имеется информация о ранних действиях:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: По этому названию других данных нет" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "для установки" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "обновление" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "для удаления" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "для переустановки" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "откат" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "исключение" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "для обновления" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "как недействительный" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Пакет %s.%s %s:%s-%s помечен %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Проверка сценария" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Перепроверка зависимостей с новыми параметрами." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Проверка зависимостей окончена" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Обработка зависимостей: %s пакета: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Сохранен пакет: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Неразрешённая зависимость: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Пакет: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1330,7 +1419,7 @@ msgstr "" +@@ -1330,7 +1426,7 @@ msgstr "" "\n" " Необходимо: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1339,7 +1428,7 @@ msgstr "" +@@ -1339,7 +1435,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1348,7 +1437,7 @@ msgstr "" +@@ -1348,7 +1444,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1357,86 +1446,86 @@ msgstr "" +@@ -1357,86 +1453,86 @@ msgstr "" " Не найдено" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Обновил" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Откатил" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Заменил" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Доступно" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Обработка конфликта: %s конфликтует с %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> Заполнение списка действий выбранными пакетами. Подождите, пожалуйста." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Загрузка заголовка %s для включения в список." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Запуск" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Ожидание" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Непрерываемый" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Зомби" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Трассировано/Остановлено" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Неизвестно" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Другое приложение: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Другое приложение: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Память : %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Запущено : %s — %s назад" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Статус : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1446,7 +1535,7 @@ msgstr "" +@@ -1446,7 +1542,7 @@ msgstr "" "\n" "Выход по запросу пользователя" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1456,7 +1545,7 @@ msgstr "" +@@ -1456,7 +1552,7 @@ msgstr "" "\n" "Выход из-за разрыва связи" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1467,41 +1556,41 @@ msgstr "" +@@ -1467,41 +1563,41 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "Другое приложение удерживает данные yum; выход согласно exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Ошибка PluginExit: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Ошибка Yum: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Ошибка: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " Вы можете попробовать --skip-broken чтобы обойти проблему" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Вы можете попробовать запустить: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Неизвестная ошибка(ошибки): Код выхода: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1509,7 +1598,7 @@ msgstr "" +@@ -1509,7 +1605,7 @@ msgstr "" "\n" "Зависимости определены" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Выполнено!" -@@ -1521,7 +1610,7 @@ msgstr " Сокращённое использование:\n" +@@ -1521,7 +1617,7 @@ msgstr " Сокращённое использование:\n" msgid "You need to be root to perform this command." msgstr "Для выполнения этой команды необходимы привилегии суперпользователя." @@ -109494,7 +110193,7 @@ index 52ba58b..5913e5d 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1551,57 +1640,57 @@ msgstr "" +@@ -1551,57 +1647,57 @@ msgstr "" "\n" "Чтобы узнать больше, пожалуйста, свяжитесь с поставщиком дистрибутива или пакета.\n" @@ -109564,7 +110263,7 @@ index 52ba58b..5913e5d 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1611,306 +1700,299 @@ msgstr "" +@@ -1611,306 +1707,295 @@ msgstr "" "Выполните «yum repolist all» для вывода списка доступных.\n" "Включение производится командой yum-config-manager --enable [источник]" @@ -109764,155 +110463,154 @@ index 52ba58b..5913e5d 100644 msgstr "Подготовка действий с локальным пакетом" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Определяет какой пакет предоставляет данную зависимость" - +-msgid "Determine which package provides the given dependency" +-msgstr "Определяет какой пакет предоставляет данную зависимость" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Поиск зависимых пакетов" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Запуск интерактивной командной оболочки yum" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Настройка командной оболочки Yum" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Отображение зависимостей пакета" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Поиск зависимостей:" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Отобразить сконфигурированные репозитории ПО" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "включено" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "отключено" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Код репозитория : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Имя репозитория : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Состояние репозитория: " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Ревизия репозитория : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Метки репозитория : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Метки дистрибутива : " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Репозиторий обновлен : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Пакеты репозитория : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Размер репозитория : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "baseurl репозитория : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "metalink репозитория : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Обновлено : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Зеркала репозитория : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Никогда (последний: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "момент (осталось:%s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s секунд(а) (осталось: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Окончание срока репозитория: " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Исключения репозитория : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Включено в репозиторий : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Исключено из репозитория : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Файл репозитория:" @@ -109920,192 +110618,192 @@ index 52ba58b..5913e5d 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "Идентификатор репозитория" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "состояние" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "репозиторий" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Отобразить подсказку к использованию" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Помощь недоступна для %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1920,7 +2002,7 @@ msgstr "" +@@ -1920,7 +2005,7 @@ msgstr "" "\n" "альтернативные названия: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1930,85 +2012,125 @@ msgstr "" +@@ -1930,85 +2015,125 @@ msgstr "" "\n" "альтернативное название: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Подготовка к повторной установке" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "переустановка пакета" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Подготовка к откату версии" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "откат к предыдущей версии пакета" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Отображает версию для вашей архитектуры и/или доступные репозитории." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Группы версий Yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Коллекция :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Пакеты :" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Установлен(ы):" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Установлены коллекции:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Доступен(ы):" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Доступны коллекции :" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Отобразить (или использовать) журнал операций" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Неверная подкоманда журнала, используйте: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Нет доступа к спискам предыдущих действий." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Проверка проблем в базе данных RPM" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "загрузить сохранённый сценарий из файла" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "Не указан файл сценария." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "загрузка сценария из %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Сценарий загружен из %s с %s членами" -@@ -2019,26 +2141,32 @@ msgstr "Сценарий загружен из %s с %s членами" +@@ -2019,26 +2144,32 @@ msgstr "Сценарий загружен из %s с %s членами" msgid " Yum checks failed: %s" msgstr " Неудачных проверок Yum: %s" @@ -110114,7 +110812,7 @@ index 52ba58b..5913e5d 100644 -"Another app is currently holding the yum lock; waiting for it to exit..." -msgstr "Еще одно приложение, в настоящее время блокирует Yum. Подождите..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" +msgstr "" -#: ../yummain.py:120 @@ -110148,277 +110846,277 @@ index 52ba58b..5913e5d 100644 msgid "" "\n" "\n" -@@ -2048,74 +2176,74 @@ msgstr "" +@@ -2048,74 +2179,74 @@ msgstr "" "\n" "Выход по запросу пользователя" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() будет устранен в следующей версии Yum\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Составление списка действий до включения класса конфигурации" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Неверный tsflag в конфигурационном файле: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Поиск набора пакетов для зависимости: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Член: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s преобразован для установки" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Добавление пакета %s в режиме %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Удаление пакета %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s требуется: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s требуется %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Необходимое требование уже было было уже найдено, сжульничаем" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Требуемая зависимость не является именем пакета. Поиск: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Возможный поставщик: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Режим %s для поставщика %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Режим для пакета, предоставяющего %s: %s" -@@ -2123,115 +2251,115 @@ msgstr "Режим для пакета, предоставяющего %s: %s" +@@ -2123,115 +2254,115 @@ msgstr "Режим для пакета, предоставяющего %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Пробую обновить %s чтобы решить зависимость" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Не найдено путей обновления для %s. Срыв!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s пакет необходимый для %s был помечен для удаления" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" "TSINFO: Замена устаревшего %s пакета пакетом %s чтобы разрешить зависимости." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Обновление %s для разрешения зависимостей." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Не удается найти путь обновления зависимости для: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Быстро подобран пакет %s в качестве требуемого для %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "Зависимый пакет %s уже установлен и будет пропущен" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Пакет %s в сценарии новее доступного" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Более новый пакет %s уже установлен в систему." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s уже в списке к действию, пропускаем его" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: %s отмечен как обновление для %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Отмечен %s чтобы установить %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Успешно — пустой сценарий" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Перезапуск цикла" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Завершение процесса разрешения зависимостей" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Успешно — зависимости определены" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Проверка зависимостей для %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "поиск %s требуется для %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Запуск compare_providers() для %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "Лучший архив в %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s исключает %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2240,142 +2368,142 @@ msgstr "" +@@ -2240,142 +2371,142 @@ msgstr "" "Сравнение archdist %s с %s в %s\n" " Лучший: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "общий источник RPM %s и %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "базовый пакет %s установлен для %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "Общий префикс %s для %s и %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "минимально: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "Лучший: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "Худший (c %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Лучший выбор: %s" @@ -110551,7 +111249,7 @@ index 52ba58b..5913e5d 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2383,21 +2511,21 @@ msgstr "" +@@ -2383,21 +2514,21 @@ msgstr "" "Остались незавершенные действия. Возможно, сначала следует выполнить yum-" "complete-transaction для их завершения." @@ -110577,7 +111275,7 @@ index 52ba58b..5913e5d 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2405,86 +2533,89 @@ msgstr "" +@@ -2405,86 +2536,89 @@ msgstr "" "\n" "Пакеты пропущены из-за проблем с зависимостями:" @@ -110610,24 +111308,24 @@ index 52ba58b..5913e5d 100644 msgstr "установленный конфликтующий пакет" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "Внимание: в ходе операции возникли некоторые некритические ошибки." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Операция не начата:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Невозможно выполнить действие." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Невозможно удалить файл сценария %s" @@ -110635,7 +111333,7 @@ index 52ba58b..5913e5d 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s должен был быть установлен, но не был установлен!" @@ -110646,65 +111344,65 @@ index 52ba58b..5913e5d 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s должен был быть удален, но не был удален!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Невозможно открыть блокировку %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Невозможно проверить активен ли процесс %s" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Заблокировано %s: другая копия запущена pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Вы не можете создать блокировку %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2493,40 +2624,29 @@ msgstr "" +@@ -2493,40 +2627,29 @@ msgstr "" "Пакет не соответствует предложенному для загрузки.\r\n" "Предлагается запустить run yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Невозможно проверить контрольную сумму" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Пакет не совпадает с контрольной суммой" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "проверка контрольной суммы неудачна, но кэширование включено для %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "использование локальной копии %s" @@ -110721,69 +111419,69 @@ index 52ba58b..5913e5d 100644 -" * необходимо %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Заголовок не полный." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2534,62 +2654,65 @@ msgstr "" +@@ -2534,62 +2657,65 @@ msgstr "" "Заголовок не в локальном кэше. Включен режим только из кэша. Невозможно " "загрузить %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Публичный ключ для %s не установлен" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Проблема открытия пакета %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Публичный ключ для %s не заслуживает доверия" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Пакет %s не подписан" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Невозможно удалить %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s удален(ы)" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Невозможно удалить %s файл %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s файл %s удален" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s файлы удалены" @@ -110794,28 +111492,28 @@ index 52ba58b..5913e5d 100644 +msgstr[2] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Более одного идентичных совпадений найдено в наборе для %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Совпадений не найдено %s.%s %s:%s-%s из обновлений" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2597,56 +2720,59 @@ msgstr "" +@@ -2597,56 +2723,59 @@ msgstr "" "searchPackages() будет убрано в следующей версии Yum." " Используйте searchGenerator() взамен. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Поиск %d пакетов" @@ -110826,142 +111524,143 @@ index 52ba58b..5913e5d 100644 +msgstr[2] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "поиск пакета %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "поиск среди файлов" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "поиск по содержимому" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Для настроенных репозиториев данных коллекций нет" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Коллекции с названием %s не существует" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "пакет %s не отмечен в коллекции %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Добавление пакета %s из коллекции %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Пакет с именем %s не доступен для установки" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Предупреждение: Группа %s не имеет никаких пакетов." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" -@@ -2655,147 +2781,153 @@ msgstr "" +@@ -2655,147 +2784,154 @@ msgstr "" #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Кортеж пакетов %s не найден в наборе пакетов" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Кортеж пакетов %s не найден в базе RPM" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "Неверный флаг версии от: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Пакет %s не найден" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Package Object не является экземпляром объекта пакета" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Ничего не отмечено для установки" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Проверка виртуального провайдера или файлового провайдера для %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Совпадений с %s не найдено." -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Пакет %s уже установлен и недоступен" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Нет доступных для установки пакетов" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Пакет: %s — уже в списке к действию" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Пакет %s недействителен из-за установленного %s" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -110969,62 +111668,62 @@ index 52ba58b..5913e5d 100644 msgstr "Пакет %s заменен %s, но последний не отвечает зависимостям" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Пакет %s недействителен из-за %s, попытка установки %s взамен" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Пакет %s уже установлен, и это последняя версия." -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Пакет %s уже установлен. Проверка обновлений." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Полное обновление" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Устаревший и уже необновляемый пакет: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Пакет уже устарел: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Устаревший необновляемый пакет: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Необновленный пакет, который был обновлен ранее: %s.%s %s:%s-%s" @@ -111032,378 +111731,393 @@ index 52ba58b..5913e5d 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Нет пакетов для удаления" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Пропуск выполняющегося ядра: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Исключение %s из списка действий" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Невозможно открыть: %s. Пропуск." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Проверка %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Нельзя произвести localinstall deltarpm %s. Пропуск." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2803,12 +2935,12 @@ msgstr "" +@@ -2803,12 +2939,12 @@ msgstr "" "Невозможно добавить пакет %s в список действий. Несовместимая архитектура: " "%s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "Установка пакета %s невозможна. Его заменил установленный пакет %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2817,7 +2949,7 @@ msgstr "" +@@ -2817,7 +2953,7 @@ msgstr "" "Пакет %s не установлен, невозможно обновить его. Запустите yum install для " "его установки." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2826,96 +2958,101 @@ msgstr "" +@@ -2826,138 +2962,138 @@ msgstr "" "Пакет %s.%s не установлен, не возможно его обновить. Запустите yum install " "чтобы установить вместо него." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Исключаем %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "%s отмечен для установки" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "%s отмечен как обновление для %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: не обновляет установленный пакет." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Невозможно открыть файл %s. Пропуск." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Проблема при переустановке: не найден пакет для удаления" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Проблема при переустановке: пакет %s не найден для установки" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Пакеты для отката версии отсутствуют" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Пакет %s может быть повторно установлен, пропуск" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Пакеты недоступны: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Только переход к следующей версии доступен для пакета: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Ошибка отката версии: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "Получение ключа из %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Неудача получения ключа GPG:" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" "Подпись GPG ключа на ключе %s не совпадает с CA ключом для репозитория: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "Подпись GPG ключа проверена через CA ключ(и)" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Неверный GPG ключ %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Ошибка обработки GPG ключа: ключ не имеет значения %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2928,7 +3065,7 @@ msgstr "" - " Package: %s (%s)\n" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" + msgstr "" +-"Импорт %s ключа 0x%s:\n" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2939,25 +3076,25 @@ msgstr "" - " Userid: \"%s\"\n" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" + msgstr "" +-"Импорт %s ключа 0x%s:\n" +-" Userid: \"%s\"\n" +-" From : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG ключ %s (0x%s) уже установлен" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Неудача импорта ключа (code %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Импорт ключа успешно завершен" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "Не установлены какие-либо ключи" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2966,25 +3103,25 @@ msgstr "" +@@ -2966,25 +3102,25 @@ msgstr "" "GPG ключи включены для репозитория \"%s\", но они не является правильными для данного пакета.\n" "Пожалуйста, проверьте правильно ли настроены URL ключей для данного репозитория." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Импорт ключа(ключей) не помог, неверный ключ(ключи)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG ключ из %s (0x%s) уже был импортирован" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Импорт ключа неудачен" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Не установлены какие-либо ключи для репозитория %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2994,157 +3131,181 @@ msgstr "" +@@ -2994,157 +3130,181 @@ msgstr "" "\r\n" "Убедитесь в правильности заданных URL с ключами для этого источника." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Не удается найти подходящее зеркало" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Были обнаружены ошибки во время загрузки пакетов." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Пожалуйста, сообщите об этой ошибке в %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Ошибки проверки сценария:" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Невозможно задать кэш-папку: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "Зависимости не определены. Действие не будет сохранено." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Не удалось сохранить файл сценария %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Не удалось прочесть сохранённый сценарий %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "Версия базы данных RPM не совпала с версией сценария," -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr " игнорирование, как потребуется" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr " прерывание" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "tsflags не найдены или не целочисленные." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Найден txmbr в неопределенном состоянии: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Не найден txmbr: %s в состоянии %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Не найден txmbr: %s %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Отсутствует часть сценария, нарушены связи, или сценарий изменился," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr " пропущено по требованию. Проверьте зависимости!" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -111503,7 +112217,7 @@ index 52ba58b..5913e5d 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s предоставляет %s, но он не найден" -@@ -3153,6 +3314,17 @@ msgstr "%s предоставляет %s, но он не найден" +@@ -3153,6 +3313,17 @@ msgstr "%s предоставляет %s, но он не найден" msgid "Repackaging" msgstr "Переупаковка" @@ -111522,10 +112236,10 @@ index 52ba58b..5913e5d 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/sr.po b/po/sr.po -index 351d6db..ee0fdcb 100644 +index 351d6db..455d099 100644 --- a/po/sr.po +++ b/po/sr.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -111536,11 +112250,13 @@ index 351d6db..ee0fdcb 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,122 +17,125 @@ msgstr "" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" @@ -111558,30 +112274,30 @@ index 351d6db..ee0fdcb 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Инсталирам" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Превазиђени" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Ажурирани" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Обрисани" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Инсталирани" @@ -111608,7 +112324,7 @@ index 351d6db..ee0fdcb 100644 msgstr "Обрисано: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Уклањам" @@ -111634,53 +112350,53 @@ index 351d6db..ee0fdcb 100644 msgstr "Читам метаподатке ризница из локалних датотека" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Грешка при подешавању: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Грешка у опцијама: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Инсталиран : %s-%s %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Направио/ла: %s %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Објавио/ла : %s %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Морате да унесете неку команду" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Захтеви диска:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -111692,7 +112408,7 @@ index 351d6db..ee0fdcb 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -111701,73 +112417,73 @@ index 351d6db..ee0fdcb 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Покушавам да извршим трансакцију али нема шта да се ради. Излазим." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Излазим на команду корисника" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Преузимам пакете:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Грешка при преузимању пакета:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Пријавите ову грешку у %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Извршавам проверу трансакције" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Грешка при провери трансакције:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Провера трансакције је успела" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Извршавам трансакцију" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -111776,18 +112492,18 @@ index 351d6db..ee0fdcb 100644 "За превазилажење овога користите „-y“." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Можда сте мислили: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "%s%s%s пакет је доступан, али није инсталиран." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Не постоји доступан пакет %s%s%s." @@ -111795,7 +112511,7 @@ index 351d6db..ee0fdcb 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Пакет(и) који ће се инсталирати" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -111805,13 +112521,13 @@ index 351d6db..ee0fdcb 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Нема шта да се ради" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d пакети означени за ажурирање" @@ -111822,12 +112538,12 @@ index 351d6db..ee0fdcb 100644 +msgstr[2] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Нема пакета означених за ажурирање" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -111838,12 +112554,12 @@ index 351d6db..ee0fdcb 100644 +msgstr[2] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d пакети означени за уклањање" @@ -111854,14 +112570,14 @@ index 351d6db..ee0fdcb 100644 +msgstr[2] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Нема пакета означених за уклањање" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Пакет(и) који ће се уназадити" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -111870,13 +112586,13 @@ index 351d6db..ee0fdcb 100644 +msgstr[2] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -111884,7 +112600,7 @@ index 351d6db..ee0fdcb 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Пакет(и) који ће се поново инсталирати" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -111893,152 +112609,152 @@ index 351d6db..ee0fdcb 100644 +msgstr[2] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Ниједан пакет није добављен" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Пакет(и) који ће се инсталирати" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Упозорење: није нађено подударање за %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Нису пронађена подударања" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Нису пронађени пакети за %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Чистим све" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Чистим заглавља" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Чистим пакете" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Чистим xml метаподатке" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Чистим кеш базе података" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Чистим expire-cache метаподатке" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Чистим додатке" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Инсталиране групе:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Доступне групе:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Урађено" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Упозорење: група %s не постоји." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "Нема доступних пакета за инсталацију или ажурирање у свим захтеваним групама" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d пакет(и) за инсталацију" @@ -112049,18 +112765,18 @@ index 351d6db..ee0fdcb 100644 +msgstr[2] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Не постоји група под именом %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Нема пакета за уклањање из група" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d пакет(и) за уклањање" @@ -112071,20 +112787,20 @@ index 351d6db..ee0fdcb 100644 +msgstr[2] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Пакет %s је већ инсталиран, прескачем га" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Уклањам неупоредив пакет %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" @@ -112092,18 +112808,18 @@ index 351d6db..ee0fdcb 100644 "инсталацију" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Опције додатка" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Грешка командне линије: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -112112,154 +112828,154 @@ index 351d6db..ee0fdcb 100644 "%s: %s опција захтева аргумент" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color прима један од следећих: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "прикажи ову помоћну поруку и изађи" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "буди толерантан на грешке" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "место датотеке подешавања" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "најдуже време чекања на команду" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "ниво излазног приказа за проналажење грешака" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" "приказуј дупликате, у ризницама, у командама за излиставање/претраживање" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "ниво излазног приказа грешака" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "тиха радња" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "опширна радња" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "одговори са да на сва питања" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "прикажи Yum верзију и изађи" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "постави корени директоријум инсталације" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "укључи једну или више ризница (скраћенице су дозвољене)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "искључи једну или више ризница (скраћенице су дозвољене)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "изузми пакет(е) по имену или глобу" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "искључи изузимање из главног скупа, за ризницу или за све" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "укључи обраду застарелих пакета у току ажурирања" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "искључи додатке за Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "искључи проверу gpg потписа" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "искључи додатке по имену" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "укључи додатке по имену" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "прескочи пакете који имају проблема са решавањем зависности" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "контролише да ли се користи боја" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -112603,22 +113319,22 @@ index 351d6db..ee0fdcb 100644 msgstr "Уклањам због зависности" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Прескочено (проблеми са зависностима)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Пакет" +msgid_plural "Packages" @@ -112657,351 +113373,358 @@ index 351d6db..ee0fdcb 100644 #, python-format msgid "" "\n" -@@ -882,57 +924,52 @@ msgid "" +@@ -882,57 +924,59 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Уклоњено" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Зависност уклоњена" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Зависност инсталирана" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Зависност ажурирана" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Замењено" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Неуспех" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "два" -@@ -940,7 +977,7 @@ msgstr "два" +@@ -940,7 +984,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -948,471 +985,523 @@ msgid "" +@@ -948,471 +992,523 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "прекид од стране корисника" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Укупно" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -113010,17 +113733,17 @@ index 351d6db..ee0fdcb 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -113033,224 +113756,224 @@ index 351d6db..ee0fdcb 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "инсталиран" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "обрисан" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "ажуриран" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "превазиђен" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Извршава се провера трансакције" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Поновно покретање разрешавања зависности са новим променама." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Завршено је разрешавање зависности" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Обрађујем зависност: %s за пакет: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Неразрешена зависност: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -113258,7 +113981,7 @@ index 351d6db..ee0fdcb 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -113266,7 +113989,7 @@ index 351d6db..ee0fdcb 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -113274,7 +113997,7 @@ index 351d6db..ee0fdcb 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -113282,186 +114005,186 @@ index 351d6db..ee0fdcb 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Сукоб при обради: %s се сукоби са %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> Попуњавам скуп трансакције са изабраним пакетима. Молим вас, сачекајте." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Преузимам заглавље за %s ради паковања у скуп трансакције." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Извршава се" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Успаван" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Зомби" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Праћен/заустављен" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Непознат" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Други програм је: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Други програм је: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Меморија: %5s RSS (%5sБ VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Покренут: %s - %s раније" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Стање : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1422,7 +1511,7 @@ msgstr "" +@@ -1422,7 +1518,7 @@ msgstr "" "\n" "Излазим када корисник откаже" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1432,7 +1521,7 @@ msgstr "" +@@ -1432,7 +1528,7 @@ msgstr "" "\n" "Излазим када се сломи цев" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1440,42 +1529,42 @@ msgid "" +@@ -1440,42 +1536,42 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Грешка: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" " Можете да пробате употребу --skip-broken опције ради заобилажења проблема" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Непозната грешка(е): излазни код: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1483,7 +1572,7 @@ msgstr "" +@@ -1483,7 +1579,7 @@ msgstr "" "\n" "Зависности су разрешене" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Завршено!" -@@ -1495,7 +1584,7 @@ msgstr "" +@@ -1495,7 +1591,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Морате бити root корисник да бисте извршили ову команду." @@ -113470,7 +114193,7 @@ index 351d6db..ee0fdcb 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1525,362 +1614,355 @@ msgstr "" +@@ -1525,362 +1621,351 @@ msgstr "" "\n" "За више информација контактирајте добављача ваше дистрибуције или пакета.\n" @@ -113737,353 +114460,352 @@ index 351d6db..ee0fdcb 100644 msgstr "Постављам процес локалних пакета" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Одреди који пакети пружају дату зависност" - +-msgid "Determine which package provides the given dependency" +-msgstr "Одреди који пакети пружају дату зависност" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Претражујем пакете у потрази за зависностима:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Извршавај интерактивно yum командно окружење" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Постављам yum командно окружење" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Излистај зависности пакета" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Тражим зависности: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Прикажи подешене софтверске ризнице" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "укључена" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "искључена" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Ревизија ризнице : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Дистро ознаке ризнице: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Металинк ризнице : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Ажурирано : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "репо id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "статус" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "репо име" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Прикажи корисну поруку о употреби" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Није доступна помоћ за %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1890,7 +1972,7 @@ msgstr "" +@@ -1890,7 +1975,7 @@ msgstr "" "\n" "псеудоними: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1900,85 +1982,125 @@ msgstr "" +@@ -1900,85 +1985,125 @@ msgstr "" "\n" "псеудоним: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Постављам процес поновне инсталације" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "поновно инсталирам пакет" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Постављам процес уназађивања" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "уназади пакет" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1989,28 +2111,34 @@ msgstr "" +@@ -1989,28 +2114,34 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" -#: ../yummain.py:114 +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" +msgstr "" + +#: ../yummain.py:124 @@ -114121,276 +114843,276 @@ index 351d6db..ee0fdcb 100644 msgid "" "\n" "\n" -@@ -2020,74 +2148,74 @@ msgstr "" +@@ -2020,74 +2151,74 @@ msgstr "" "\n" "Излазим када корисник откаже." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() неће бити присутна у будућим верзијама Yum-а.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Постављам TransactionSets пре него што се подигне класа подешавања" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Погрешан tsflag у датотеци подешавања: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Претражујем pkgSack за зависност: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Члан: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s пребачен за инсталацију" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Додајем пакет %s у начину рада %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Уклањам пакет %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s захтева: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Потребан захтев је већ потражен, обмањујем" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Потребан захтев није име пакета. Тражим: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Могући снабдевач: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Режим је %s за снабдевача %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Режим за пакет који снабдева %s: %s" -@@ -2095,114 +2223,114 @@ msgstr "Режим за пакет који снабдева %s: %s" +@@ -2095,114 +2226,114 @@ msgstr "Режим за пакет који снабдева %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s пакет захтева да %s буде означен за брисање" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: мењам %s са %s ради разрешавања зависности." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: ажурирам %s ради разрешавања зависности." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Не могу да пронађем путању ажурирања за зависност за: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Брзо повезивање пакета %s као захтева за %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s је у пруженим пакетима али је већ инсталиран, уклањам га." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Потенцијално разрешавање пакета %s има новији примерак у ts-у." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Потенцијално разрешавање пакета %s има инсталиран новији примерак." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s је већ у ts-у, прескачем га" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: означавам %s као ажурирање за %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: означавам %s као инсталацију за %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Успех - празна трансакција" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Поново покрећем петљу" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Завршетак процеса зависности" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Успех - зависности су разрешене" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Проверавам зависности за %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "тражим %s као захтев за %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Покрећем compare_providers() за %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "боља архитектура у пакету %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s превазилази %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2211,142 +2339,142 @@ msgstr "" +@@ -2211,142 +2342,142 @@ msgstr "" "archdist упоредио %s са %s на %s\n" " Победник: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "заједнички изворни rpm %s и %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "заједнички префикс %s између %s и %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Најбољи редослед: %s" @@ -114523,7 +115245,7 @@ index 351d6db..ee0fdcb 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2354,21 +2482,21 @@ msgstr "" +@@ -2354,21 +2485,21 @@ msgstr "" "Остале су недовршене трансакције. Можда би прво требало да извршите yum-" "complete-transaction да бисте их завршили." @@ -114549,7 +115271,7 @@ index 351d6db..ee0fdcb 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2376,130 +2504,122 @@ msgstr "" +@@ -2376,130 +2507,122 @@ msgstr "" "\n" "Пакети су прескочени због проблема са зависностима:" @@ -114582,7 +115304,7 @@ index 351d6db..ee0fdcb 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -114590,18 +115312,18 @@ index 351d6db..ee0fdcb 100644 "током трансакције." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Није успело уклањање датотеке трансакције %s" @@ -114609,7 +115331,7 @@ index 351d6db..ee0fdcb 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -114620,40 +115342,40 @@ index 351d6db..ee0fdcb 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Нисам у могућности да проверим да ли је PID %s активан" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Постоји закључавање %s: друга копија се извршава као pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -114661,17 +115383,17 @@ index 351d6db..ee0fdcb 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Не могу да извршим контролу суме" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Пакет нема одговарајући контролну суму" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" @@ -114679,7 +115401,7 @@ index 351d6db..ee0fdcb 100644 "кеширање" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "користим локални %s умножак" @@ -114696,69 +115418,69 @@ index 351d6db..ee0fdcb 100644 -" * потребно је %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Заглавље није потпуно." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2507,62 +2627,65 @@ msgstr "" +@@ -2507,62 +2630,65 @@ msgstr "" "Заглавље није у локалном кешу и само начин рада са кеширањем је укључен. Не " "могу да преузмем %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Јавни кључ за %s није инсталиран" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Проблем са отварањем пакета %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Јавни кључ за %s није поверљив" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Пакет %s није потписан" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Не могу да уклоним %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s је уклоњен" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Не могу да уклоним %s датотеку %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s датотека %s је уклоњена" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s датотеке су уклоњене" @@ -114769,28 +115491,28 @@ index 351d6db..ee0fdcb 100644 +msgstr[2] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Постоји више од једног идентичног слагања у групи за %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ништа се не слаже са %s.%s %s:%s-%s из ажурирања" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2570,216 +2693,225 @@ msgstr "" +@@ -2570,216 +2696,226 @@ msgstr "" "searchPackages() неће бити присутна у будућим Yum верзијама." " Уместо ње користите searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Претражујем %d пакете" @@ -114801,62 +115523,62 @@ index 351d6db..ee0fdcb 100644 +msgstr[2] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "тражим пакет %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "тражим у уносима датотека" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "тражим у уносима достављача" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Нема доступних података о групама за подешене ризнице" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Не постоји група под именом %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "пакет %s није означен у групи %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Додајем пакет %s из групе %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Ниједан пакет под именом %s није доступан за инсталацију" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -114864,78 +115586,79 @@ index 351d6db..ee0fdcb 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Група пакета %s није нађена у packagesack-у" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Нема пронађених пакета за %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Објекат пакета није био примерак објекта пакета" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Није одређено ништа за инсталацију" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Проверавам виртуелну доставу или доставу датотеке за %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Не постоји слагање за аргумент: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Пакет %s је инсталиран и није доступан" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Нема пакета доступних за инсталацију" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Пакет: %s - већ је у скупу трансакције" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -114943,19 +115666,19 @@ index 351d6db..ee0fdcb 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Пакет %s је замењен пакетом %s, покушавам да наместо инсталирам %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Већ је инсталирана најновија верзија пакета %s" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" @@ -114963,43 +115686,43 @@ index 351d6db..ee0fdcb 100644 #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Ажурирам све" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Не ажурирам пакете који су већ превазиђени: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Пакет је већ превазиђен: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Не ажурирам пакете који су већ ажурирани: %s.%s %s:%s-%s" @@ -115007,43 +115730,43 @@ index 351d6db..ee0fdcb 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Ниједан пакет није одређен за уклањање" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Испитујем %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" @@ -115051,22 +115774,22 @@ index 351d6db..ee0fdcb 100644 "Не могу да додам пакет %s у трансакцију. Архитектура није усаглашена: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2788,103 +2920,108 @@ msgstr "" +@@ -2788,138 +2924,145 @@ msgstr "" "Пакет %s није инсталиран, не могу да га ажурирам. Извршите yum инсталацију " "да бисте га инсталирали." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -115074,190 +115797,198 @@ index 351d6db..ee0fdcb 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Изузимам %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Означавам %s за инсталацију" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Означавам %s као ажурирање за %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: не ажурира инсталирани пакет." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Не могу да отворим датотеку: %s. Прескачем је." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" "Проблем при поновној инсталацији: ниједан пакет није одређен за уклањање" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Нема пакета доступних за уназађивање" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Пакету %s су дозвољене многоструке инсталације, прескачем га" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Нема доступног одговарајућег пакета: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Само је надградња доступна за пакет: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Добављање GPG кључа није успело: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Рашчлањивање GPG кључа није успело: кључ нема вредност %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2893,7 +3030,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2901,25 +3038,25 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG кључ на %s (0x%s) је већ инсталиран" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Није успео увоз кључа (код %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Кључ је успешно увезен" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2928,184 +3065,208 @@ msgstr "" +@@ -2928,184 +3071,208 @@ msgstr "" "GPG кључеви излистани за „%s“ ризницу су већ инсталирани али нису одговарајући за овај пакет.\n" "Проверите да ли су подешени одговарајући УРЛ-ови кључева за ову ризницу." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Увоз кључа(кључева) није помогао, погрешан кључ(кључеви)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG кључ на %s (0x%s) је већ увезен" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Није успео увоз кључа" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -115265,117 +115996,117 @@ index 351d6db..ee0fdcb 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Не могу да пронађем одговарајући одраз." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Појавиле су се грешке за време преузимања пакета." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Пријавите ову грешку код %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Грешке при провери трансакције: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -115477,7 +116208,7 @@ index 351d6db..ee0fdcb 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3114,6 +3275,17 @@ msgstr "" +@@ -3114,6 +3281,17 @@ msgstr "" msgid "Repackaging" msgstr "Поновно паковање" @@ -115496,10 +116227,10 @@ index 351d6db..ee0fdcb 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/sr@latin.po b/po/sr@latin.po -index 2576fa8..0947531 100644 +index 2576fa8..cd9da35 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -115510,11 +116241,13 @@ index 2576fa8..0947531 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,122 +17,125 @@ msgstr "" "Language: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" @@ -115532,30 +116265,30 @@ index 2576fa8..0947531 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instaliram" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Prevaziđeni" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Ažurirani" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Obrisani" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Instalirani" @@ -115582,7 +116315,7 @@ index 2576fa8..0947531 100644 msgstr "Obrisano: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Uklanjam" @@ -115608,53 +116341,53 @@ index 2576fa8..0947531 100644 msgstr "Čitam metapodatke riznica iz lokalnih datoteka" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Greška pri podešavanju: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Greška u opcijama: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Instaliran : %s-%s %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Napravio/la: %s %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Objavio/la : %s %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Morate da unesete neku komandu" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Zahtevi diska:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -115666,7 +116399,7 @@ index 2576fa8..0947531 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -115675,73 +116408,73 @@ index 2576fa8..0947531 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Pokušavam da izvršim transakciju ali nema šta da se radi. Izlazim." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Izlazim na komandu korisnika" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Preuzimam pakete:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Greška pri preuzimanju paketa:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Prijavite ovu grešku u %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Izvršavam proveru transakcije" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Greška pri proveri transakcije:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Provera transakcije je uspela" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Izvršavam transakciju" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -115750,18 +116483,18 @@ index 2576fa8..0947531 100644 "Za prevazilaženje ovoga koristite „-y“." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Možda ste mislili: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "%s%s%s paket je dostupan, ali nije instaliran." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Ne postoji dostupan paket %s%s%s." @@ -115769,7 +116502,7 @@ index 2576fa8..0947531 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paket(i) koji će se instalirati" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -115779,13 +116512,13 @@ index 2576fa8..0947531 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nema šta da se radi" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paketi označeni za ažuriranje" @@ -115796,12 +116529,12 @@ index 2576fa8..0947531 100644 +msgstr[2] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Nema paketa označenih za ažuriranje" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -115812,12 +116545,12 @@ index 2576fa8..0947531 100644 +msgstr[2] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paketi označeni za uklanjanje" @@ -115828,14 +116561,14 @@ index 2576fa8..0947531 100644 +msgstr[2] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Nema paketa označenih za uklanjanje" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paket(i) koji će se unazaditi" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -115844,13 +116577,13 @@ index 2576fa8..0947531 100644 +msgstr[2] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -115858,7 +116591,7 @@ index 2576fa8..0947531 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paket(i) koji će se ponovo instalirati" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -115867,153 +116600,153 @@ index 2576fa8..0947531 100644 +msgstr[2] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Nijedan paket nije dobavljen" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Paket(i) koji će se instalirati" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Upozorenje: nije nađeno podudaranje za %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Nisu pronađena podudaranja" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Nisu pronađeni paketi za %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Čistim sve" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Čistim zaglavlja" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Čistim pakete" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Čistim xml metapodatke" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Čistim keš baze podataka" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Čistim expire-cache metapodatke" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Čistim dodatke" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Instalirane grupe:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Dostupne grupe:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Urađeno" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Upozorenje: grupa %s ne postoji." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "Nema dostupnih paketa za instalaciju ili ažuriranje u svim zahtevanim " "grupama" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d paket(i) za instalaciju" @@ -116024,18 +116757,18 @@ index 2576fa8..0947531 100644 +msgstr[2] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Ne postoji grupa pod imenom %s" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Nema paketa za uklanjanje iz grupa" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paket(i) za uklanjanje" @@ -116046,20 +116779,20 @@ index 2576fa8..0947531 100644 +msgstr[2] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paket %s je već instaliran, preskačem ga" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Uklanjam neuporediv paket %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" @@ -116067,18 +116800,18 @@ index 2576fa8..0947531 100644 "instalaciju" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Opcije dodatka" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Greška komandne linije: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -116087,154 +116820,154 @@ index 2576fa8..0947531 100644 "%s: %s opcija zahteva argument" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color prima jedan od sledećih: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "prikaži ovu pomoćnu poruku i izađi" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "budi tolerantan na greške" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "mesto datoteke podešavanja" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "najduže vreme čekanja na komandu" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "nivo izlaznog prikaza za pronalaženje grešaka" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" "prikazuj duplikate, u riznicama, u komandama za izlistavanje/pretraživanje" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "nivo izlaznog prikaza grešaka" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "tiha radnja" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "opširna radnja" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "odgovori sa da na sva pitanja" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "prikaži Yum verziju i izađi" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "postavi koreni direktorijum instalacije" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "uključi jednu ili više riznica (skraćenice su dozvoljene)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "isključi jednu ili više riznica (skraćenice su dozvoljene)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "izuzmi paket(e) po imenu ili globu" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "isključi izuzimanje iz glavnog skupa, za riznicu ili za sve" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "uključi obradu zastarelih paketa u toku ažuriranja" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "isključi dodatke za Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "isključi proveru gpg potpisa" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "isključi dodatke po imenu" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "uključi dodatke po imenu" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "preskoči pakete koji imaju problema sa rešavanjem zavisnosti" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "kontroliše da li se koristi boja" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -116578,22 +117311,22 @@ index 2576fa8..0947531 100644 msgstr "Uklanjam zbog zavisnosti" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Preskočeno (problemi sa zavisnostima)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Paket" +msgid_plural "Packages" @@ -116632,351 +117365,358 @@ index 2576fa8..0947531 100644 #, python-format msgid "" "\n" -@@ -883,57 +925,52 @@ msgid "" +@@ -883,57 +925,59 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++msgstr[2] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Uklonjeno" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Zavisnost uklonjena" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Zavisnost instalirana" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Zavisnost ažurirana" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Zamenjeno" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Neuspeh" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "dva" -@@ -941,7 +978,7 @@ msgstr "dva" +@@ -941,7 +985,7 @@ msgstr "dva" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -949,471 +986,523 @@ msgid "" +@@ -949,471 +993,523 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "prekid od strane korisnika" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Ukupno" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -116985,17 +117725,17 @@ index 2576fa8..0947531 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -117008,224 +117748,224 @@ index 2576fa8..0947531 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "instaliran" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "obrisan" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "ažuriran" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "prevaziđen" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Izvršava se provera transakcije" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Ponovno pokretanje razrešavanja zavisnosti sa novim promenama." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Završeno je razrešavanje zavisnosti" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Obrađujem zavisnost: %s za paket: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nerazrešena zavisnost: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -117233,7 +117973,7 @@ index 2576fa8..0947531 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -117241,7 +117981,7 @@ index 2576fa8..0947531 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -117249,7 +117989,7 @@ index 2576fa8..0947531 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -117257,186 +117997,186 @@ index 2576fa8..0947531 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Sukob pri obradi: %s se sukobi sa %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" "--> Popunjavam skup transakcije sa izabranim paketima. Molim vas, sačekajte." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Preuzimam zaglavlje za %s radi pakovanja u skup transakcije." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Izvršava se" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Uspavan" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombi" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Praćen/zaustavljen" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Nepoznat" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Drugi program je: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Drugi program je: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Memorija: %5s RSS (%5sB VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Pokrenut: %s - %s ranije" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Stanje : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1423,7 +1512,7 @@ msgstr "" +@@ -1423,7 +1519,7 @@ msgstr "" "\n" "Izlazim kada korisnik otkaže" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1433,7 +1522,7 @@ msgstr "" +@@ -1433,7 +1529,7 @@ msgstr "" "\n" "Izlazim kada se slomi cev" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1441,42 +1530,42 @@ msgid "" +@@ -1441,42 +1537,42 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Greška: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" " Možete da probate upotrebu --skip-broken opcije radi zaobilaženja problema" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Nepoznata greška(e): izlazni kod: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1484,7 +1573,7 @@ msgstr "" +@@ -1484,7 +1580,7 @@ msgstr "" "\n" "Zavisnosti su razrešene" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Završeno!" -@@ -1496,7 +1585,7 @@ msgstr "" +@@ -1496,7 +1592,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Morate biti root korisnik da biste izvršili ovu komandu." @@ -117445,7 +118185,7 @@ index 2576fa8..0947531 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1526,362 +1615,355 @@ msgstr "" +@@ -1526,362 +1622,351 @@ msgstr "" "\n" "Za više informacija kontaktirajte dobavljača vaše distribucije ili paketa.\n" @@ -117712,353 +118452,352 @@ index 2576fa8..0947531 100644 msgstr "Postavljam proces lokalnih paketa" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Odredi koji paketi pružaju datu zavisnost" - +-msgid "Determine which package provides the given dependency" +-msgstr "Odredi koji paketi pružaju datu zavisnost" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Pretražujem pakete u potrazi za zavisnostima:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Izvršavaj interaktivno yum komandno okruženje" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Postavljam yum komandno okruženje" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Izlistaj zavisnosti paketa" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Tražim zavisnosti: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Prikaži podešene softverske riznice" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "uključena" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "isključena" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Revizija riznice : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Distro oznake riznice: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Metalink riznice : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Ažurirano : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "repo id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "repo ime" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Prikaži korisnu poruku o upotrebi" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Nije dostupna pomoć za %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1891,7 +1973,7 @@ msgstr "" +@@ -1891,7 +1976,7 @@ msgstr "" "\n" "pseudonimi: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1901,85 +1983,125 @@ msgstr "" +@@ -1901,85 +1986,125 @@ msgstr "" "\n" "pseudonim: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Postavljam proces ponovne instalacije" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "ponovno instaliram paket" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Postavljam proces unazađivanja" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "unazadi paket" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1990,28 +2112,34 @@ msgstr "" +@@ -1990,28 +2115,34 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" -#: ../yummain.py:114 +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" +msgstr "" + +#: ../yummain.py:124 @@ -118096,276 +118835,276 @@ index 2576fa8..0947531 100644 msgid "" "\n" "\n" -@@ -2021,74 +2149,74 @@ msgstr "" +@@ -2021,74 +2152,74 @@ msgstr "" "\n" "Izlazim kada korisnik otkaže." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() neće biti prisutna u budućim verzijama Yuma.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Postavljam TransactionSets pre nego što se podigne klasa podešavanja" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Pogrešan tsflag u datoteci podešavanja: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Pretražujem pkgSack za zavisnost: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Član: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s prebačen za instalaciju" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Dodajem paket %s u načinu rada %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Uklanjam paket %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s zahteva: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Potreban zahtev je već potražen, obmanjujem" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Potreban zahtev nije ime paketa. Tražim: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Mogući snabdevač: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Režim je %s za snabdevača %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Režim za paket koji snabdeva %s: %s" -@@ -2096,114 +2224,114 @@ msgstr "Režim za paket koji snabdeva %s: %s" +@@ -2096,114 +2227,114 @@ msgstr "Režim za paket koji snabdeva %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s paket zahteva da %s bude označen za brisanje" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: menjam %s sa %s radi razrešavanja zavisnosti." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: ažuriram %s radi razrešavanja zavisnosti." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Ne mogu da pronađem putanju ažuriranja za zavisnost za: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Brzo povezivanje paketa %s kao zahteva za %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s je u pruženim paketima ali je već instaliran, uklanjam ga." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Potencijalno razrešavanje paketa %s ima noviji primerak u ts-u." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Potencijalno razrešavanje paketa %s ima instaliran noviji primerak." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s je već u ts-u, preskačem ga" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: označavam %s kao ažuriranje za %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: označavam %s kao instalaciju za %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Uspeh - prazna transakcija" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Ponovo pokrećem petlju" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Završetak procesa zavisnosti" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Uspeh - zavisnosti su razrešene" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Proveravam zavisnosti za %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "tražim %s kao zahtev za %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Pokrećem compare_providers() za %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "bolja arhitektura u paketu %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s prevazilazi %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2212,142 +2340,142 @@ msgstr "" +@@ -2212,142 +2343,142 @@ msgstr "" "archdist uporedio %s sa %s na %s\n" " Pobednik: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "zajednički izvorni rpm %s i %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "zajednički prefiks %s između %s i %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Najbolji redosled: %s" @@ -118498,7 +119237,7 @@ index 2576fa8..0947531 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2355,21 +2483,21 @@ msgstr "" +@@ -2355,21 +2486,21 @@ msgstr "" "Ostale su nedovršene transakcije. Možda bi prvo trebalo da izvršite yum-" "complete-transaction da biste ih završili." @@ -118524,7 +119263,7 @@ index 2576fa8..0947531 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2377,130 +2505,122 @@ msgstr "" +@@ -2377,130 +2508,122 @@ msgstr "" "\n" "Paketi su preskočeni zbog problema sa zavisnostima:" @@ -118557,7 +119296,7 @@ index 2576fa8..0947531 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -118565,18 +119304,18 @@ index 2576fa8..0947531 100644 "tokom transakcije." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Nije uspelo uklanjanje datoteke transakcije %s" @@ -118584,7 +119323,7 @@ index 2576fa8..0947531 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -118595,40 +119334,40 @@ index 2576fa8..0947531 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Nisam u mogućnosti da proverim da li je PID %s aktivan" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Postoji zaključavanje %s: druga kopija se izvršava kao pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -118636,17 +119375,17 @@ index 2576fa8..0947531 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Ne mogu da izvršim kontrolu sume" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Paket nema odgovarajući kontrolnu sumu" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" @@ -118654,7 +119393,7 @@ index 2576fa8..0947531 100644 "keširanje" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "koristim lokalni %s umnožak" @@ -118671,69 +119410,69 @@ index 2576fa8..0947531 100644 -" * potrebno je %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Zaglavlje nije potpuno." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2508,62 +2628,65 @@ msgstr "" +@@ -2508,62 +2631,65 @@ msgstr "" "Zaglavlje nije u lokalnom kešu i samo način rada sa keširanjem je uključen. " "Ne mogu da preuzmem %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Javni ključ za %s nije instaliran" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problem sa otvaranjem paketa %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Javni ključ za %s nije poverljiv" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Paket %s nije potpisan" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Ne mogu da uklonim %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s je uklonjen" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Ne mogu da uklonim %s datoteku %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s datoteka %s je uklonjena" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s datoteke su uklonjene" @@ -118744,28 +119483,28 @@ index 2576fa8..0947531 100644 +msgstr[2] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Postoji više od jednog identičnog slaganja u grupi za %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ništa se ne slaže sa %s.%s %s:%s-%s iz ažuriranja" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2571,216 +2694,225 @@ msgstr "" +@@ -2571,216 +2697,226 @@ msgstr "" "searchPackages() neće biti prisutna u budućim Yum verzijama." " Umesto nje koristite searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Pretražujem %d pakete" @@ -118776,62 +119515,62 @@ index 2576fa8..0947531 100644 +msgstr[2] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "tražim paket %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "tražim u unosima datoteka" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "tražim u unosima dostavljača" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Nema dostupnih podataka o grupama za podešene riznice" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Ne postoji grupa pod imenom %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "paket %s nije označen u grupi %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Dodajem paket %s iz grupe %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Nijedan paket pod imenom %s nije dostupan za instalaciju" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -118839,78 +119578,79 @@ index 2576fa8..0947531 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Grupa paketa %s nije nađena u packagesacku" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Nema pronađenih paketa za %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Objekat paketa nije bio primerak objekta paketa" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Nije određeno ništa za instalaciju" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Proveravam virtuelnu dostavu ili dostavu datoteke za %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Ne postoji slaganje za argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Paket %s je instaliran i nije dostupan" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Nema paketa dostupnih za instalaciju" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paket: %s - već je u skupu transakcije" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -118918,19 +119658,19 @@ index 2576fa8..0947531 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Paket %s je zamenjen paketom %s, pokušavam da namesto instaliram %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Već je instalirana najnovija verzija paketa %s" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" @@ -118938,43 +119678,43 @@ index 2576fa8..0947531 100644 #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Ažuriram sve" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Ne ažuriram pakete koji su već prevaziđeni: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paket je već prevaziđen: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Ne ažuriram pakete koji su već ažurirani: %s.%s %s:%s-%s" @@ -118982,43 +119722,43 @@ index 2576fa8..0947531 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nijedan paket nije određen za uklanjanje" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Ispitujem %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" @@ -119026,22 +119766,22 @@ index 2576fa8..0947531 100644 "Ne mogu da dodam paket %s u transakciju. Arhitektura nije usaglašena: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2789,103 +2921,108 @@ msgstr "" +@@ -2789,138 +2925,145 @@ msgstr "" "Paket %s nije instaliran, ne mogu da ga ažuriram. Izvršite yum instalaciju " "da biste ga instalirali." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -119049,190 +119789,198 @@ index 2576fa8..0947531 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Izuzimam %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Označavam %s za instalaciju" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Označavam %s kao ažuriranje za %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: ne ažurira instalirani paket." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Ne mogu da otvorim datoteku: %s. Preskačem je." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" "Problem pri ponovnoj instalaciji: nijedan paket nije određen za uklanjanje" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Nema paketa dostupnih za unazađivanje" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Paketu %s su dozvoljene mnogostruke instalacije, preskačem ga" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Nema dostupnog odgovarajućeg paketa: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Samo je nadgradnja dostupna za paket: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Dobavljanje GPG ključa nije uspelo: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Raščlanjivanje GPG ključa nije uspelo: ključ nema vrednost %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2894,7 +3031,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2902,25 +3039,25 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG ključ na %s (0x%s) je već instaliran" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Nije uspeo uvoz ključa (kod %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Ključ je uspešno uvezen" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2929,184 +3066,208 @@ msgstr "" +@@ -2929,184 +3072,208 @@ msgstr "" "GPG ključevi izlistani za „%s“ riznicu su već instalirani ali nisu odgovarajući za ovaj paket.\n" "Proverite da li su podešeni odgovarajući URL-ovi ključeva za ovu riznicu." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Uvoz ključa(ključeva) nije pomogao, pogrešan ključ(ključevi)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG ključ na %s (0x%s) je već uvezen" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Nije uspeo uvoz ključa" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -119240,117 +119988,117 @@ index 2576fa8..0947531 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Ne mogu da pronađem odgovarajući odraz." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Pojavile su se greške za vreme preuzimanja paketa." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Prijavite ovu grešku kod %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Greške pri proveri transakcije: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -119452,7 +120200,7 @@ index 2576fa8..0947531 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3115,6 +3276,17 @@ msgstr "" +@@ -3115,6 +3282,17 @@ msgstr "" msgid "Repackaging" msgstr "Ponovno pakovanje" @@ -119471,7 +120219,7 @@ index 2576fa8..0947531 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/sv.po b/po/sv.po -index b9c109b..3d93962 100644 +index b9c109b..fb61831 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,14 +2,15 @@ @@ -119488,8 +120236,8 @@ index b9c109b..3d93962 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-09-03 20:30+0000\n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-25 16:01+0000\n" +"Last-Translator: goeran \n" "Language-Team: Swedish (http://www.transifex.net/projects/p/yum/team/sv/)\n" "MIME-Version: 1.0\n" @@ -119511,30 +120259,30 @@ index b9c109b..3d93962 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installerar" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Utfasad" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Uppdaterade" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Raderade" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Installerade" @@ -119561,7 +120309,7 @@ index b9c109b..3d93962 100644 msgstr "Raderade: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Tar bort" @@ -119587,53 +120335,53 @@ index b9c109b..3d93962 100644 msgstr "Läser in förrådsmetadata från lokala filer" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Konfigurationsfel: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Fel bland flaggor: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installerade: %s-%s %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Byggde : %s %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Verkställde : %s %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Du måste ange något kommando" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Inget sådant kommando: %s. Använd %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Diskbehov:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Åtminstone %d MB mer utrymme behövs på filsystemet %s.\n" @@ -119644,7 +120392,7 @@ index b9c109b..3d93962 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -119653,73 +120401,73 @@ index b9c109b..3d93962 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Försöker köra transaktionen men det finns inget att göra. Avslutar." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Avslutar på användarens order" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Hämtar paket:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Fel när paket hämtades:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "Kör transaktionskontroll" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "FEL Du behöver uppdatera rpm för att hantera:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "FEL med transaktionskontroll mot depsolve:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM behöver uppdateras" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Vänligen rapportera detta fel i %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Kör transaktionstest" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Transaktionskontrollfel:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Transaktionskontrollen lyckades" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Kör transaktionen" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -119728,18 +120476,18 @@ index b9c109b..3d93962 100644 "Använd \"-y\" för att åsidosätta." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Du kanske menade: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Paket %s%s%s tillgängliga, men inte installerade." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Inget paket %s%s%s tillgängligt." @@ -119747,7 +120495,7 @@ index b9c109b..3d93962 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paket att installera" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -119756,13 +120504,13 @@ index b9c109b..3d93962 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Inget att göra" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paket noterade att uppdateras" @@ -119772,12 +120520,12 @@ index b9c109b..3d93962 100644 +msgstr[1] "%d paket noterade att uppdateras" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Inga paket noterade att uppdateras" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d paket noterade för distributionssynkronisering" @@ -119787,12 +120535,12 @@ index b9c109b..3d93962 100644 +msgstr[1] "%d paket noterade för distributionssynkronisering" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "Inga paket noterade för distributionssynkronisering" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paket noterade att tas bort" @@ -119802,14 +120550,14 @@ index b9c109b..3d93962 100644 +msgstr[1] "%d paket noterade att tas bort" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Inga paket noterade att tas bort" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paket att nedgradera" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -119817,13 +120565,13 @@ index b9c109b..3d93962 100644 +msgstr[1] "%d paket att nedgradera" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (från %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Installerat paket %s%s%s%s inte tillgängligt." @@ -119831,7 +120579,7 @@ index b9c109b..3d93962 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paket att ominstallera" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -119839,22 +120587,22 @@ index b9c109b..3d93962 100644 +msgstr[1] "%d paket att ominstallera" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Inga paket angivna" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Paket att installera" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "N/S matchade: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -119862,7 +120610,7 @@ index b9c109b..3d93962 100644 "allting." -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -119871,13 +120619,13 @@ index b9c109b..3d93962 100644 "all\" för allting." -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Matchade: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" @@ -119885,113 +120633,113 @@ index b9c109b..3d93962 100644 "för allting." -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Varning: Ingen matchning hittades för: %s" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Inga matchningar hittades" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Inga paket hittades för %s" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Rensar förråd: " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Rensar upp allt" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Rensar upp huvuden" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Rensar upp paket" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Rensar upp xml-metadata" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Rensar upp databas-cache" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Rensar upp expire-cache-metadata" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Rensar upp cachad rpmdb-data" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Rensar upp insticksmoduler" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "Varning: Inga grupper matchar: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Installerade grupper:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "Installerade språkgrupper:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Tillgängliga grupper:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "Tillgängliga språkgrupper:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Klart" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Varning: Grupp %s finns inte." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "Inget paket i någon begärd grupp är tillgängligt för installation eller " "uppdatering" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d paket att installera" @@ -120001,18 +120749,18 @@ index b9c109b..3d93962 100644 +msgstr[1] "%d paket att installera" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Ingen grupp med namnet %s finns" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Inget paket att ta bort från grupper" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paket att ta bort" @@ -120022,38 +120770,38 @@ index b9c109b..3d93962 100644 +msgstr[1] "%d paket att ta bort" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paket %s är redan installerat, hoppar över" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Kastar ojämförbart paket %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" "Ingen annat %s installerat, lägger till listan för potentiell installation" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Insticksmodulsalternativ" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Kommandoradsfel: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -120062,153 +120810,153 @@ index b9c109b..3d93962 100644 "%s: flaggan %s behöver ett argument" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color tar en av: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot måste vara en absolut sökväg: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "visa detta hjälpmeddelande och avsluta" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "var tolerant vid fel" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "kör helt från systemets cache, uppdatera inte cachen" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "konfigurationsfilens plats" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "maximal tid att vänta på kommandon" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "nivå på felsökningsutskrifter" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "visa dubletter, i förråd, i list-/search-kommandon" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "nivå på felutskrifter" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "nivå på felsökningsutskrifter för rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "tyst operation" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "utförlig operation" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "svara ja på alla frågor" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "svara nej på alla frågor" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "visa Yum-version och avsluta" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "ange installationsrot" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "aktivera ett eller flera förråd (jokrertecken tillåts)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "inaktivera ett eller flera förråd (jokertecken tillåts)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "uteslut paket via namn eller mönster" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "inaktivera uteslutningar från main, för ett förråd, eller för allt" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "aktivera bearbetning av utfasningar under uppdateringar" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "inaktivera Yum-insticksmoduler" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "inaktivera kontroll av gpg-signatur" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "inaktivera insticksmoduler efter namn" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "aktivera insticksmoduler efter namn" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "hoppa över paket med problem vid beroendeupplösning" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "styr om färg skall användas" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "sätt värdet på $releasever i yum-konfigurations- och repo-filer" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "sätt godtyckliga konfigurations- och förrådsalternativ" @@ -120552,23 +121300,23 @@ index b9c109b..3d93962 100644 msgstr "Tar bort på grund av beroenden" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Hoppas över (beroendeproblem)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Inte installerat" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Ej tillgängliga" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Paket" +msgid_plural "Packages" @@ -120606,7 +121354,7 @@ index b9c109b..3d93962 100644 #, python-format msgid "" "\n" -@@ -891,57 +923,52 @@ msgstr "" +@@ -891,57 +923,58 @@ msgstr "" "Transaktionssammanfattning\n" "%s\n" @@ -120614,7 +121362,7 @@ index b9c109b..3d93962 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Installerar %5.5s paket\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Installera" @@ -120622,7 +121370,7 @@ index b9c109b..3d93962 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Uppdaterar %5.5s Paket\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" +msgstr "Uppgradera" @@ -120630,7 +121378,7 @@ index b9c109b..3d93962 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Tar bort %5.5s paket\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "Ta bort" @@ -120638,7 +121386,7 @@ index b9c109b..3d93962 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Ominstallerar %5.5s paket\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Ominstallation" @@ -120646,317 +121394,323 @@ index b9c109b..3d93962 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Nedgraderar %5.5s paket\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Nedgradering" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "Beroende paket" ++msgstr[1] "Beroende paket" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Borttagna" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Borttagna beroenden" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Installerade beroenden" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Uppdaterade beroenden" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Ersatte" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Misslyckade" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "två" -@@ -949,7 +976,7 @@ msgstr "två" +@@ -949,7 +982,7 @@ msgstr "två" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -960,365 +987,417 @@ msgstr "" +@@ -960,365 +993,417 @@ msgstr "" " Aktuell nedladdning avbröts, %savbryt (ctrl-c) igen%s inom %s%s%s sekunder\n" "för att avsluta.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "avbrott från användaren" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Totalt" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "UF" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "R" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "O" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "N" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "System" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" "Hoppar över sammanslagen transaktion %d till %d, eftersom de överlappar" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "Inga transaktioner" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Felaktiga transaktions ID:n, eller paket, angivna" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "Kommandorad" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Inloggad användare" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Datum och tid" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Åtgärd(er)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Ändrade" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Inget transaktions-ID angivet" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Felaktigt transaktions-ID angivet" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Hittade inte angivet transaktions-ID" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Hittade mer än ett transaktions-ID!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Inget transaktions-ID, eller paket, angivet" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Nedgraderade" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Äldre" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Nyare" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "Transaktions-ID:" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Starttid :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Start-rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "(%u sekunder)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "(%u minuter)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "(%u timmar)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "(%u dagar)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Sluttid : " -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Slut-rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Användare :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Returkod :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Avbruten" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "Misslyckanden:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Misslyckades:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Lyckades" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Kommandoradsfel:" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Ytterligare icke-standardinformation lagrad: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Transaktionen utförd med:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Ändrade paket:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Överhoppade paket:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Rpmdb-problem:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Skriptutdata:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Fel:" @@ -120965,17 +121719,17 @@ index b9c109b..3d93962 100644 -msgstr "Installation" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Ber-inst" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Fasar ut" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Radering" @@ -120988,439 +121742,439 @@ index b9c109b..3d93962 100644 -msgstr "Nedgradering" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Uppdatering" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Tid" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Senaste dagen" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Senaste veckan" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Senaste 2 veckorna" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Senaste 3 månaderna" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Senaste 6 månaderna" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Senaste året" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Mer än ett år tillbaka" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Ingen transaktion %s funnen" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Transaktions-ID:" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Tillgänglig ytterligare historieinformation" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Inga ytterligare data finns med detta namn" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "Paket :" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "Tillstånd :" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "Storlek :" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "Byggvärd :" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "Byggtid :" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "Paketerare : " + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "Leverantör :" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "Licens : " + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "URL :" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "Käll-RPM : " + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "Verkställt :" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "Verkställare :" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "Orsak :" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "Från förråd :" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "Installerat av :" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "Ändrat av :" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "installerat" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "en uppdatering" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "raderat" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "ominstallerat" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "en nedgradering" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "utfasning" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "uppdaterat" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "utfasat" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Paket %s.%s %s:%s-%s blir %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Kör transaktionskontroll" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Startar om beroendeupplösning med nya ändringar." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Avslutade beroendeupplösning" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Bearbetar beroende: %s för paket: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Behåller paketet: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Ej upplöst beroende: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Paket: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1327,7 +1406,7 @@ msgstr "" +@@ -1327,7 +1412,7 @@ msgstr "" "\n" " Behöver: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1336,7 +1415,7 @@ msgstr "" +@@ -1336,7 +1421,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1345,7 +1424,7 @@ msgstr "" +@@ -1345,7 +1430,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1354,85 +1433,85 @@ msgstr "" +@@ -1354,85 +1439,85 @@ msgstr "" " Finns inte" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Uppdaterat av" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Nedgraderat av" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Utfasat av" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Tillgängliga" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Bearbetar konflikt: %s står i konflikt med %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Fyller transaktionsmängden med valda paket. Var god dröj." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Hämtar huvud för %s för att paketera i transaktionsmängden." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Kör" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Sover" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Oavbrytbar" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Zombie" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "Spårad/Stoppad" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Okänd" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Det andra programmet är: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Det andra programmet är: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Minne : %5s RSS (%5s B VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Startade: %s - för %s sedan" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Status : %s, pid: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1442,7 +1521,7 @@ msgstr "" +@@ -1442,7 +1527,7 @@ msgstr "" "\n" "Slutar efter att användaren avbröt" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1452,7 +1531,7 @@ msgstr "" +@@ -1452,7 +1537,7 @@ msgstr "" "\n" "Slutar med brutet rör (pipe)" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1463,7 +1542,7 @@ msgstr "" +@@ -1463,7 +1548,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1471,35 +1550,35 @@ msgstr "" +@@ -1471,35 +1556,35 @@ msgstr "" "Ett annat program håller för närvarande yum-låset, avslutar som konfigurerad" " av exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Insticksmodulsavslutsfel: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum-fel: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Fel: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " Du kan försöka använda --skip-broken för att gå runt problemet" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Du kan försöka köra: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Okänt fel: Felkod: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1507,7 +1586,7 @@ msgstr "" +@@ -1507,7 +1592,7 @@ msgstr "" "\n" "Beroenden upplösta" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Klart!" -@@ -1519,7 +1598,7 @@ msgstr " Minianvändning:\n" +@@ -1519,7 +1604,7 @@ msgstr " Minianvändning:\n" msgid "You need to be root to perform this command." msgstr "Du måste vara root för att utföra detta kommando." @@ -121429,7 +122183,7 @@ index b9c109b..3d93962 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1549,53 +1628,53 @@ msgstr "" +@@ -1549,53 +1634,53 @@ msgstr "" "\n" "För mer information, kontakta leverantören av din distribution eller paket.\n" @@ -121495,7 +122249,7 @@ index b9c109b..3d93962 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1605,307 +1684,300 @@ msgstr "" +@@ -1605,307 +1690,296 @@ msgstr "" " Kör ”yum repolist all” för att se vilka förråd du har.\n" " Du kan aktivera förråd med yum-config-manager --enable " @@ -121696,155 +122450,154 @@ index b9c109b..3d93962 100644 msgstr "Förbereder den lokala paketprocessen" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Avgör vilket paket som tillhandahåller ett angivet beroende" - +-msgid "Determine which package provides the given dependency" +-msgstr "Avgör vilket paket som tillhandahåller ett angivet beroende" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Söker i paketen efter beroende:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Kör ett interactivt yum-skal" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Förbereder ett yum-skal" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Lista ett pakets beroenden" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Letar efter beroenden: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Visa konfigurerade programvaruförråd" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "aktivt" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "inaktivt" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Förråds-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Förrådsnamn : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Förrådsstatus : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Förrådsversion : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Förrådstaggar : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Förråds-distro-taggar: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Förråd uppdaterat: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Förrådspaket : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Förrådstorlek : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Förrådsbasurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Förrådsmetalänk : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Uppdaterat :" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Förrådspeglar : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Aldrig (senast: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Omedelbart (senast: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekunder (senast: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Förråd går ut : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Förråd utesluter : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Förråd inkluderar: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Förråd uteslutet : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Förrådfilnamn: " @@ -121852,199 +122605,199 @@ index b9c109b..3d93962 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "förråds-id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "förrådsnamn" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Visa ett hjälpsamt meddelande om användning" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Ingen hjälp tillgänglig för %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1915,7 +1987,7 @@ msgstr "" +@@ -1915,7 +1989,7 @@ msgstr "" "\n" "alias: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1925,85 +1997,125 @@ msgstr "" +@@ -1925,85 +1999,125 @@ msgstr "" "\n" "alias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Förbereder ominstallationsprocessen" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "ominstallera ett paket" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Förbereder nedgraderingsprocessen" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "nedgradera ett paket" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Visa en version för maskinen och/eller tillgängliga förråd." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Yum versionsgrupper:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Grupp:" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Paket:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Installerade:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Gruppinstallerade:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Tillgängliga:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Grupptillgängliga:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Visa, eller använd, transaktionshistorien" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "Transaktioner:" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "Starttid :" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "Sluttid : " + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "Antal :" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr " rpm-DB :" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr " yum-DB :" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Ogiltigt underkommando till history, använd: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "Du har inte tillgång till historie-DB:n." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Kontrollera om det finns problem i rpmdb:n" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "läs in en sparad transaktion från filnamn" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "Ingen fil med sparad transaktion angiven." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "läser in transaktionen från %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Transaktionen inläst från %s med %s medlemmar" -@@ -2014,28 +2126,36 @@ msgstr "Transaktionen inläst från %s med %s medlemmar" +@@ -2014,28 +2128,36 @@ msgstr "Transaktionen inläst från %s med %s medlemmar" msgid " Yum checks failed: %s" msgstr " Yums kontroller misslyckades: %s" -#: ../yummain.py:114 +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" -+msgstr "Inga läs-/skrivrättigheter i aktuell katalog, flyttar till /" ++msgid "No read/execute access in current directory, moving to /" ++msgstr "Inga läs-/körrättigheter i aktuell katalog, flyttar till /" + +#: ../yummain.py:124 +msgid "Can't create lock file; exiting" @@ -122084,145 +122837,145 @@ index b9c109b..3d93962 100644 msgid "" "\n" "\n" -@@ -2045,74 +2165,74 @@ msgstr "" +@@ -2045,74 +2167,74 @@ msgstr "" "\n" "Slutar efter att användaren avbröt." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() kommer att försvinna i en framtida version av Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Förbereder transaktionsmängder före konfigurationsklass är uppe" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Ogiltig tsflag i konfigurationsfil: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Söker pkgSack efter beroende: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Medlem: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s konverterad till att installera" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Lägger till paket %s i läge %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Tar bort paket %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s behöver: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s behöver %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Nödvändigt behov har redan slagits upp, fuskar" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Nödvändigt behov är inte ett paketnamn. Slår upp: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Potentiell tillhandahållare: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Läget är %s för tillhandahållare av %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Läge för paket som tillhandahåller %s: %s" -@@ -2120,116 +2240,116 @@ msgstr "Läge för paket som tillhandahåller %s: %s" +@@ -2120,116 +2242,116 @@ msgstr "Läge för paket som tillhandahåller %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Försöker uppdatera %s för att lösa upp beroenden" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Hittar ingen uppdateringsväg för %s. Misslyckat!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: paket %s behöver %s noteras att raderas" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: Fasar ut %s med %s för att lösa upp beroenden." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Uppdaterar %s för att lösa upp beroenden" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Hittar ingen uppdateringsväg för beroende för: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Snabb matcning av %s mot behov för %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" @@ -122230,132 +122983,132 @@ index b9c109b..3d93962 100644 "bort." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Potentiellt upplösande paket %s har nyare instans i ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Potentiellt upplösande paket %s har nyare instans installerad." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s är redan i ts, hoppar över denna" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Noterar %s som en uppdatering av %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Noterar %s som en installation av %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Klart - tom transaktion" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Startar om slingan" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Beroendeprocessen avslutas" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Klart - beroenden upplösta" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Kontrollerar beroenden för %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "letar efter %s som ett behov för %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Kör compare_providers() för %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "bättre arkitektur i po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s fasar ut %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2238,142 +2358,142 @@ msgstr "" +@@ -2238,142 +2360,142 @@ msgstr "" "arkitekturavstånd jämför %s med %s på %s\n" " Vinnare: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "samma käll-rpm %s och %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "baspaket %s är installerat för %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "gemensamt prefix för %s mellan %s och %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "behöver minst: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "Vinnare: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Förlorare(med %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Bästa ordning: %s" @@ -122488,7 +123241,7 @@ index b9c109b..3d93962 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2381,21 +2501,21 @@ msgstr "" +@@ -2381,21 +2503,21 @@ msgstr "" "Det finns oavslutade transaktioner kvar. Du kan överväga att köra yum-" "complete-transaction först för att avsluta dem." @@ -122514,7 +123267,7 @@ index b9c109b..3d93962 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2403,90 +2523,93 @@ msgstr "" +@@ -2403,90 +2525,93 @@ msgstr "" "\n" "Paket hoppades över på grund av beroendeproblem:" @@ -122549,7 +123302,7 @@ index b9c109b..3d93962 100644 msgstr "installerade konflikter" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -122557,18 +123310,18 @@ index b9c109b..3d93962 100644 "transaktionen." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Transaktionen kunde inte starta:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Kunde inte köra transaktionen." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Kunde inte ta bort transaktionsfilen %s" @@ -122576,7 +123329,7 @@ index b9c109b..3d93962 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s skulle installerats men gjordes det inte!" @@ -122587,66 +123340,66 @@ index b9c109b..3d93962 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s skulle tagits bort men det gjordes inte!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Kunde inte öppna låset %s: %s " #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Kan inte kontrollera om PID %s är aktiv" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Existerande lås %s: en annan kopia kör som pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Kunde inte skapa lås av %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2495,41 +2618,30 @@ msgstr "" +@@ -2495,41 +2620,30 @@ msgstr "" "Paketet matchar inte den avsedda hämtningen. Förslag: kör yum " "--enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Kunde inte utföra kontrollsummering" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Paketet stämmer inte med kontrollsumman" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" "paketet misslyckas med kontrollsumman men cachning är aktiverat för %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "använder lokal kopia av %s" @@ -122663,69 +123416,69 @@ index b9c109b..3d93962 100644 -" * behovet %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Huvudet är inte komplett." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2537,62 +2649,64 @@ msgstr "" +@@ -2537,62 +2651,64 @@ msgstr "" "Huvudet finns inte i den lokala cachen och endast-cache-läget är aktiverat." " Kan inte hämta %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Den publika nyckeln för %s är inte installerad" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Problem att öppna paketet %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Den publika nyckeln för %s är inte betrodd" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Paket %s är inte signerat" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Det går inte att ta bort %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s borttaget" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Det går inte att ta bort %s-filen %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s-filen %s borttagen" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s-filer borttagna" @@ -122735,28 +123488,28 @@ index b9c109b..3d93962 100644 +msgstr[1] "%d %s-filer borttagna" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "Mer än en identisk matchning i säcken för %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ingenting matchar %s.%s %s:%s-%s från uppdateringarna" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2600,122 +2714,124 @@ msgstr "" +@@ -2600,122 +2716,125 @@ msgstr "" "searchPackages() kommer att försvinna i en framtida version av Yum." " Använd searchGenerator() istället. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Söker i %d paket" @@ -122766,62 +123519,62 @@ index b9c109b..3d93962 100644 +msgstr[1] "Söker i %d paket" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "söker i paketet %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "söker i filposter" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "söker i tillhandahållandeposter" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Inga gruppdata är tillgängliga för de konfigurerade förråden" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Det finns ingen grupp med namnet %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "paket %s noterades inte i gruppen %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Lägger till paket %s från grupp %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Inget paket med namnet %s är tillgängligt för installation" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Varning: Gruppen %s har inte några paket." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "Gruppen %s har %u villkorliga paket, vilka kan komma att installeras." @@ -122829,41 +123582,42 @@ index b9c109b..3d93962 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Pakettupel %s fanns inte i paketsäcken" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Pakettupel %s fanns inte i rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "Ogiltig versionsflagga från: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Inga paket hittades för %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Paketobjektet var inte en paketobjektinstans" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Inget angivet att installeras" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" @@ -122871,101 +123625,101 @@ index b9c109b..3d93962 100644 -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Ingen matchning för argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Paket %s installerat och inte tillgänligt" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Inga paket tillgängliga att installera" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paket: %s - redan i transaktionsmängden" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Paket %s fasas ut av %s, som redan är installerat" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2724,82 +2840,88 @@ msgstr "" +@@ -2724,82 +2843,88 @@ msgstr "" "Paket %s fasas ut av %s, men paketet som fasar ut tillhandahåller inte " "behoven" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Paket %s fasas ut av %s, försöker installera %s istället" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Paket %s är redan installerat och senaste version" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Paket som matchar %s är redan installerat. Letar efter uppdatering." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Uppdaterar allt" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Uppdaterar inte paket som redan är utfasade: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "Inget paket att uppgradera matchar: %s" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paketet är redan utfasat: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Uppdaterar inte paket som fasas ut: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Uppdaterar inte paket som redan är uppdaterat: %s.%s %s:%s-%s" @@ -122973,52 +123727,52 @@ index b9c109b..3d93962 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Inget paket att tas bort matchar" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "Inget paket att ta bort matchar: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Hoppar över den körande kärnan: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Ta bort %s från transaktionen" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Det går inte att öppna: %s. Hoppar över." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Undersöker %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Det går inte att lokalinstallera deltarpm: %s. Hoppar över." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2807,14 +2929,14 @@ msgstr "" +@@ -2807,14 +2932,14 @@ msgstr "" "Kan inte lägga till paket %s till transaktionen. Inte en kompatibel " "arkitektur: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" @@ -123026,113 +123780,113 @@ index b9c109b..3d93962 100644 " paketet %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2823,7 +2945,7 @@ msgstr "" +@@ -2823,7 +2948,7 @@ msgstr "" "Paket %s är inte installerat, kan inte uppdatera det. Kör yum install för " "att installera det istället." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2832,97 +2954,102 @@ msgstr "" +@@ -2832,139 +2957,148 @@ msgstr "" "Paketet %s.%s är inte installerat, kan inte uppdatera det. Kör yum install " "för att installera det istället." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Utesluter %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Noterar %s för installation" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Noterar %s som en uppdatering av %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: uppdaterar inte ett installerat paket." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Det går inte att öppna filen: %s. Hoppar över." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Problem att ominstallera: inget paket matchades att tas bort" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problem att ominstallera: inget paket %s matchades att installera" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Inga paket tillgängliga att nedgradera" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Paket %s tillåts multipla installationer, hoppar över" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Ingen matchning för tillgängliga paket: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Endast uppgradering tillgängliga för paket: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Misslyckades nedgradera: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "Misslyckades att uppgradera: %s" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "Hämtar nyckel från %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Hämtandet av GPG-nyckeln misslyckades: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" @@ -123140,215 +123894,237 @@ index b9c109b..3d93962 100644 "förrådet: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "GPG-nyckelsignatur verifierad mot CA-nycklar" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Ogiltig GPG-nyckel från %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG-nyckeltolkning misslyckades: nyckeln har inte värde %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2935,7 +3062,7 @@ msgstr "" - " Paket : %s (%s)\n" - " Från : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" + msgstr "" + "Importerar %s-nyckel 0x%s:\n" +-" Användarid: %s\n" +-" Paket : %s (%s)\n" +-" Från : %s" ++" Användarid : ”%s”\n" ++" Fingeravtryck: %s\n" ++" Paket : %s (%s)\n" ++" Från : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2946,25 +3073,25 @@ msgstr "" - " Användarid: ”%s”\n" - " Från : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" + msgstr "" + "Importerar %s-nyckel 0x%s:\n" +-" Användarid: ”%s”\n" +-" Från : %s" ++" Användarid : ”%s”\n" ++" Fingeravtryck: %s\n" ++" Från : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG-nyckel vid %s (0x%s) är redan installerad" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Nyckelimport misslyckades (kod %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Nyckelimport lyckades" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "Installerade inte några nycklar" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2973,25 +3100,25 @@ msgstr "" +@@ -2973,25 +3107,25 @@ msgstr "" "GPG-nycklarna uppräknade för förrådet \"%s\" är redan installerade men de är inte korrekta för detta paket.\n" "Kontrollera att de rätta nyckel-URL:erna är konfigurerade för detta förråd." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Import av nycklar hjälpte inte, fel nycklar?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG-nyckel vid %s (0x%s) är redan importerad" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Nyckelimport misslyckades" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Installerade inte några nycklar för förrådet %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3000,160 +3127,184 @@ msgstr "" +@@ -3000,160 +3134,184 @@ msgstr "" "GPG-nycklarna uppräknade för förrådet \"%s\" är redan installerade men de är inte korrekta.\n" "Kontrollera att rätt nyckel-URL:ar är konfigurerade för detta förråd." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Kan inte hitta en lämplig spegel." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Fel uppstod när paket hämtades." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Rapportera gärna detta fel till %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Transaktionstestfel: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Kunde inte sätta cache-katalog: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" "Beroenden inte upplösta. Kommer inte att spara ouppklarad transaktion." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Kunde inte spara transaktionsfilen %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Kunde inte komma åt/läsa sparad transaktion %s: %s " -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "rpmdb-version stämmer inte med sparad transaktionsversion, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr " bortser ifrån, som begärt." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr " avbryter." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "det går inte att hitta tsflags eller så är tsflags inte ett heltal." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Hittade txmbr i okänt aktuellt tillstånd: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Kunde inte hitta txmbr: %s i tillstånd %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Kunde inte hitta txmbr: %s från ursprung: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Transaktionsmedlemmar, -relationer saknas eller ts har ändrats," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr " bortser ifrån, som begärt. Du måste göra redepsolve!" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "%s har redan besökts och kan inte tas bort." + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Undersöker versionsberoenden för %s" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "%s har versionsberoende %s som var var användarinstallerat." + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "%s: uppdaterar inga användarinstallerade versionsberoenden." @@ -123450,7 +124226,7 @@ index b9c109b..3d93962 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s tillhandahåller %s men det kan inte hittas" -@@ -3162,6 +3313,17 @@ msgstr "%s tillhandahåller %s men det kan inte hittas" +@@ -3162,6 +3320,17 @@ msgstr "%s tillhandahåller %s men det kan inte hittas" msgid "Repackaging" msgstr "Paketerar om" @@ -123469,7 +124245,7 @@ index b9c109b..3d93962 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/uk.po b/po/uk.po -index f5a658d..f534582 100644 +index f5a658d..bb96267 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2,14 +2,15 @@ @@ -123486,8 +124262,8 @@ index f5a658d..f534582 100644 -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-24 14:54+0000\n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-18 15:55+0000\n" +"Last-Translator: yurchor \n" "Language-Team: Ukrainian (http://www.transifex.net/projects/p/yum/team/uk/)\n" "MIME-Version: 1.0\n" @@ -123509,30 +124285,30 @@ index f5a658d..f534582 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Встановлення" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Став застарілим" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "Оновлено" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "Вилучено" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "Встановлено" @@ -123559,7 +124335,7 @@ index f5a658d..f534582 100644 msgstr "Вилучено: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "Вилучення" @@ -123585,53 +124361,53 @@ index f5a658d..f534582 100644 msgstr "Читання метаданих сховища з локальних файлів" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Помилка налаштування: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Помилка у параметрах: %s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " Встановлено: %s-%s у %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " Зібрано : %s о %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " Надіслано : %s о %s" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "Вам слід вказати якусь команду" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Команди %s не виявлено. Будь ласка, скористайтеся командою %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "Вимоги до диска:\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -123646,7 +124422,7 @@ index f5a658d..f534582 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -123655,75 +124431,75 @@ index f5a658d..f534582 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" "Спроба виконання операції за умови порожнього списку операцій. Завершуємо " "роботу." -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "Завершення роботи за бажанням користувача" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "Звантаження пакунків:" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "Помилка завантаження пакетів:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "Виконання перевірки операції" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "ПОМИЛКА. Вам слід оновити rpm для обробки:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "ПОМИЛКА перевірки дії під час розв’язання залежностей:" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM слід оновити" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "Будь ласка, повідомте про цю помилку за адресою %s" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "Запускається операція з перевірки" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "Помилка під час перевірки операції:\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "Операцію з перевірки успішно завершено" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "Виконання операції" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -123732,18 +124508,18 @@ index f5a658d..f534582 100644 "Скасувати заборону можна параметром «-y»." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * Можливо, ви хотіли використати: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Доступні невстановлені пакунки %s%s%s." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "Пакунок %s%s%s недоступний." @@ -123751,7 +124527,7 @@ index f5a658d..f534582 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Пакунки, які слід встановити" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -123761,64 +124537,64 @@ index f5a658d..f534582 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Нічого виконувати" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "%d пакунків позначено для оновлення" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" +msgstr[0] "%d пакунок позначено для оновлення" -+msgstr[1] "%d пакунки позначено для оновлення" ++msgstr[1] "%d пакунків позначено для оновлення" +msgstr[2] "%d пакунків позначено для оновлення" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "Для оновлення не позначено жодного пакунка" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d пакунків позначено для виконання синхронізації дистрибутивів" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" +msgstr[0] "%d пакунок позначено для виконання синхронізації дистрибутивів" -+msgstr[1] "%d пакунки позначено для виконання синхронізації дистрибутивів" ++msgstr[1] "%d пакунків позначено для виконання синхронізації дистрибутивів" +msgstr[2] "%d пакунків позначено для виконання синхронізації дистрибутивів" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" "Для виконання синхронізації дистрибутивів не позначено жодного пакунка" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "%d пакунків позначено для вилучення" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" +msgstr[0] "%d пакунок позначено для вилучення" -+msgstr[1] "%d пакунки позначено для вилучення" ++msgstr[1] "%d пакунків позначено для вилучення" +msgstr[2] "%d пакунків позначено для вилучення" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "Для вилучення не позначено жодного пакунка" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Пакунки, версію яких слід знизити" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -123827,13 +124603,13 @@ index f5a658d..f534582 100644 +msgstr[2] "%d пакунків зі зниженням версії" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr " (з %s)" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Встановлений пакунок %s%s%s%s недоступний." @@ -123841,7 +124617,7 @@ index f5a658d..f534582 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Пакунки для перевстановлення" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -123850,22 +124626,22 @@ index f5a658d..f534582 100644 +msgstr[2] "%d пакунків для перевстановлення" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "Не надано жодного пакунка" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "Пакунки, які слід встановити" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "Відповідність Н/Р: %s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" @@ -123873,7 +124649,7 @@ index f5a658d..f534582 100644 " пошуку у всіх даних" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -123882,13 +124658,13 @@ index f5a658d..f534582 100644 "all» для пошуку у всіх даних" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "Відповідники: %s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" @@ -123896,112 +124672,112 @@ index f5a658d..f534582 100644 "all» для пошуку у всіх даних" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "Попередження: відповідників %s не знайдено" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "Не знайдено відповідників" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "Пакунків з %s не знайдено" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "Спорожнення записів сховищ: " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "Вилучення всього" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "Вилучення заголовків" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "Вилучення зайвих пакунків" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "Вилучення метаданих xml" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "Вилучення кешу бази даних" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "Вилучення метаданих застарілого кешу" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "Вилучення кешованих даних rpmdb" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "Вилучення додатків" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "Попередження: відповідних груп не знайдено: %s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "Встановлені групи:" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "Встановлені групи мов:" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "Наявні групи:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "Доступні групи мов:" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "Виконано" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "Попередження: групи з назвою %s не існує." -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" "У жодній з вказаних груп немає пакунків для встановлення або оновлення" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d пакунків для встановлення" @@ -124012,18 +124788,18 @@ index f5a658d..f534582 100644 +msgstr[2] "%d пакунків для встановлення" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "Групи з назвою %s не існує" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "Пакунків для вилучення з груп не знайдено" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d пакунків для вилучення" @@ -124034,37 +124810,37 @@ index f5a658d..f534582 100644 +msgstr[2] "%d пакунків для вилучення" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "Пакунок %s вже встановлено, пропускаємо" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Відкинуто несумісний пакунок %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "Не встановлено інших %s, додаємо до списку потенційного встановлення" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "Параметри додатка" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "Помилка виконання команди: %s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -124073,156 +124849,156 @@ index f5a658d..f534582 100644 "%s: для параметра %s потрібен аргумент" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color повинен мати один з аргументів: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "Аргументом --installroot має бути абсолютний шлях: %s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "показати це довідкове повідомлення і завершити роботу" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "ігнорувати помилки" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "запустити на основі системного кешу, не оновлювати кеш" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "розташування файла налаштувань" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "максимальний час очікування на завершення команди" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "рівень докладності діагностичних повідомлень" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "показати дублікати у сховищах та командах побудови списку та пошуку" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "рівень докладності повідомлень про помилки" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "рівень докладності діагностичних повідомлень rpm" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "обробка без виведення повідомлень" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "докладна обробка команд" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "відповісти «так» на всі питання" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "відповідати «ні» на всі питання" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "показати версію Yum і завершити роботу" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "встановити кореневий каталог встановлення" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" "увімкнути одне або декілька сховищ (можна використовувати шаблони заміни)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" "вимкнути одне або декілька сховищ (можна використовувати шаблони заміни)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "виключити пакунки за назвою або формальним виразом" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "вимкнути виключення з main для сховища або на загальному рівні" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "увімкнути обробку застарілих пакунків під час оновлень" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "вимкнути додатки Yum" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "вимкнути перевірку підписів gpg" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "вимкнути додатки за назвою" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "увімкнути додатки за назвою" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "пропустити пакунки з помилками у розв’язанні залежностей" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "визначає, чи слід використовувати розфарбовування" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" "встановити значення $releasever у налаштуванні yum config and repo files" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "встановити довільні параметри налаштування і сховищ" @@ -124566,23 +125342,23 @@ index f5a658d..f534582 100644 msgstr "Вилучення для залежностей" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "Пропущено (проблеми з залежностями)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "Не встановлено" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "Недоступний" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "Пакунок" +msgid_plural "Packages" @@ -124621,7 +125397,7 @@ index f5a658d..f534582 100644 #, python-format msgid "" "\n" -@@ -896,57 +940,52 @@ msgstr "" +@@ -896,57 +940,59 @@ msgstr "" "Резюме операції\n" "%s\n" @@ -124629,7 +125405,7 @@ index f5a658d..f534582 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Встановлення %5.5s пакунків\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "Встановити" @@ -124637,23 +125413,23 @@ index f5a658d..f534582 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Оновлення %5.5s пакунків\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" -+msgstr "Оновлення" ++msgstr "Оновити" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Вилучення %5.5s пакунків\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" -+msgstr "Вилучення" ++msgstr "Вилучити" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Перевстановлення %5.5s пакунків\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "Перевстановлення" @@ -124661,316 +125437,323 @@ index f5a658d..f534582 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Зниження версії %5.5s пакунків\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "Понизити" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "Залежні пакунки" ++msgstr[1] "Залежні пакунки" ++msgstr[2] "Залежні пакунки" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "Вилучено" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "Вилучено залежності" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "Встановлено залежності" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "Оновлено залежності" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "Замінено" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "Помилка" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "два" -@@ -954,7 +993,7 @@ msgstr "два" +@@ -954,7 +1000,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -965,364 +1004,416 @@ msgstr "" +@@ -965,364 +1011,416 @@ msgstr "" " Поточне звантаження скасовано, %sперервіть роботу (ctrl-c) ще раз%s протягом %s%s%s секунд,\n" "щоб завершити операцію.\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "перервано користувачем" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "Загалом" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "<не встановлено>" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "Система" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Пропущено операцію з об’єднання %d з %d через перекриття даних" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "Немає операцій" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "Вказано помилкові ідентифікатори операцій або пакунки" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "Командний рядок" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "Користувач" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "Ід." -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "Дата і час" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "Дії" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "Змінено" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "Не вказано ідентифікатора операції" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "Вказано помилковий ідентифікатор операції" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "Не виявлено вказаного ідентифікатора операції" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "Виявлено більше одного ідентифікатора операції!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "Не вказано ідентифікатора операції або назви пакунка" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "Знижено версію" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "Старіший" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "Новіший" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "Ід. операції :" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "Час початку :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "Початок rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "(%u секунд)" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "(%u хвилин)" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "(%u годин)" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "(%u днів)" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "Час завершення :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "Завершення rpmdb:" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "Користувач :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "Повернутий код :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "Перервано" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "Помилки:" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "Помилка:" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "Успіх" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "Командний рядок :" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "Збережені додаткові нетипові дані : %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "Результат виконання операції:" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "Змінено пакунків:" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "Пропущено пакунків:" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Проблеми з rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Виведено скриптом:" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "Помилки:" @@ -124979,17 +125762,17 @@ index f5a658d..f534582 100644 -msgstr "Встановити" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "Встановлення з залежностями" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "Робить застарілим" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "Стерти" @@ -125002,440 +125785,440 @@ index f5a658d..f534582 100644 -msgstr "Понизити" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "Оновити" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "Час" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "Протягом дня" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "Попереднього тижня" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "Попередні 2 тижні" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "Попередні 3 місяці" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "Попередні 6 місяців" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "Попередній рік" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "Понад рік тому" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "Не знайдено операції %s" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "Ід. операції :" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "Доступні додаткові дані з журналу:" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: для цієї назви додаткових даних не знайдено" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "Пакунок :" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "Стан :" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "Розмір :" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "Вузол збирання :" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "Час збирання :" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "Пакувальник :" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "Постачальник :" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" -+msgstr "Ліцензування :" ++msgstr "Ліцензія :" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "Адреса :" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "RPM з кодом :" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "Час надсилання :" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "Автор внеску :" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "Причина :" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" -+msgstr "Зі сховища :" ++msgstr "Зі сховища :" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "Встановлено :" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "Автор змін :" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" -msgstr "встановлення" +msgstr "встановлено" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "оновленням" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "вилучено" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "перевстановлено" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "зниженням версії" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "робити застарілим" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "оновлено" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "визнано застарілим" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Пакунок %s.%s %s:%s-%s буде %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> Виконання перевірки операції" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Перезапускається визначення залежностей з урахуванням змін." -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> Визначення залежностей завершено" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Обробка залежності: %s для пакунка: %s" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> Збережено пакунок: %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Нерозв'язана залежність: %s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "Пакунок: %s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1331,7 +1422,7 @@ msgstr "" +@@ -1331,7 +1429,7 @@ msgstr "" "\n" " Потребує: %s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1340,7 +1431,7 @@ msgstr "" +@@ -1340,7 +1438,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1349,7 +1440,7 @@ msgstr "" +@@ -1349,7 +1447,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1358,85 +1449,85 @@ msgstr "" +@@ -1358,85 +1456,85 @@ msgstr "" " Не знайдено" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "Оновлено" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "Знижено версію" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "Став застарілим" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "Наявні" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Обробка конфлікту: %s конфліктів %s" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Додавання вибраних пакунків до операції. Зачекайте, будь ласка." -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> У список операцій звантажується заголовок пакунка %s." -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "Виконання" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "Сплю" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "Безперервний" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "Зомбі" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "З трасуванням/зупинкою" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "Невідомо" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " Сторонньою програмою є: PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " Сторонньою програмою є: %s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " Пм’ять : %5s RSS (%5sБ VSZ)" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " Почато: %s - %s тому" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " Стан : %s, PID: %d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1446,7 +1537,7 @@ msgstr "" +@@ -1446,7 +1544,7 @@ msgstr "" "\n" "Завершення роботи на запит користувача" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1456,7 +1547,7 @@ msgstr "" +@@ -1456,7 +1554,7 @@ msgstr "" "\n" "Завершення роботи через розрив зв’язку" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1467,7 +1558,7 @@ msgstr "" +@@ -1467,7 +1565,7 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1475,35 +1566,35 @@ msgstr "" +@@ -1475,35 +1573,35 @@ msgstr "" "Зараз yum блокує стороння програма. Завершуємо роботу відповідно до " "налаштування exit_on_lock" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "Помилка PluginExit: %s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Помилка Yum: %s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "Помилка: %s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " Щоб обійти проблему, спробуйте скористатися параметром --skip-broken" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " Спробуйте віддати команду: rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "Невідомі помилки: код виходу: %d:" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1511,7 +1602,7 @@ msgstr "" +@@ -1511,7 +1609,7 @@ msgstr "" "\n" "Залежності розв’язано" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Завершено!" -@@ -1525,7 +1616,7 @@ msgstr "" +@@ -1525,7 +1623,7 @@ msgstr "" "Для виконання цієї команди вам слід набути прав доступу адміністративного " "користувача." @@ -125444,7 +126227,7 @@ index f5a658d..f534582 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1556,53 +1647,53 @@ msgstr "" +@@ -1556,53 +1654,53 @@ msgstr "" "Докладніші відомості може бути отримано з довідки до вашого дистрибутива або від\n" "постачальника пакунків.\n" @@ -125510,7 +126293,7 @@ index f5a658d..f534582 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1612,309 +1703,302 @@ msgstr "" +@@ -1612,309 +1710,298 @@ msgstr "" " Для перегляду списку всіх сховищ віддайте команду «yum repolist all».\n" " Увімкнути сховище можна за допомогою команди yum-config-manager --enable " @@ -125713,155 +126496,154 @@ index f5a658d..f534582 100644 msgstr "Налаштування обробки локального пакунка" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "Визначення пакунка, що містить вказану залежність" - +-msgid "Determine which package provides the given dependency" +-msgstr "Визначення пакунка, що містить вказану залежність" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "Пошук пакунків для задоволення залежності:" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "Запуск інтерактивної оболонки yum" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "Налаштування оболонки Yum" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "Показ списку залежностей пакунків" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "Пошук залежностей: " -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "Показ списку увімкнених сховищ програмного забезпечення" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "увімкнено" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "вимкнено" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "Ід. сховища : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "Назва сховища : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "Стан сховища : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "Версія сховища: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "Мітки сховища : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "Мітки дистрибутива сховища: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "Оновлення сховища: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "Пакунки сховища: " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "Розмір сховища: " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "Адреса сховища: " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "Метапосилання сховища: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr " Оновлено : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "Дзеркала сховищ: " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "Ніколи (востаннє: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "Негайно (лишилося: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s секунд (лишилося: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "Строк дії сховища: " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "Виключення сховища: " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "Включення сховища: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "Виключені сховища: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "Назва файла сховища: " @@ -125869,192 +126651,192 @@ index f5a658d..f534582 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "ід. сховища" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "стан" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "назва сховища" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "Показати корисну підказку щодо використання" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "Довідки щодо %s не виявлено" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1924,7 +2008,7 @@ msgstr "" +@@ -1924,7 +2011,7 @@ msgstr "" "\n" "інші назви: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1934,85 +2018,125 @@ msgstr "" +@@ -1934,85 +2021,125 @@ msgstr "" "\n" "інша назва: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "Налаштування процесу перевстановлення" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "перевстановлення пакунка" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "Налаштування процесу зниження версії" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "зниження версії пакунка" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "Показ версії для вашої архітектури і/або списку доступних сховищ." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Групи версій Yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " Група :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " Пакунки:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "Встановлено:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "Встановлені групи:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "Доступні:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "Доступні групи:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "Показ або використання журналу операцій" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "Операції:" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "Час початку :" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "Час закінч. :" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "Лічильники :" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr " rpm DB :" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr " yum DB :" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Некоректна підкоманда журналу, скористайтеся: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "У вас немає права доступу до бази даних журналу." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "Пошук проблем у rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "завантажити збережену операцію з файла з вказаною назвою" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "Не вказано файла збережених записів операцій" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "завантаження операції з %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Операцію завантажено з %s, кількість дій — %s" -@@ -2023,29 +2147,36 @@ msgstr "Операцію завантажено з %s, кількість дій +@@ -2023,29 +2150,37 @@ msgstr "Операцію завантажено з %s, кількість дій msgid " Yum checks failed: %s" msgstr " Спроба перевірки yum зазнала невдачі: %s" @@ -126062,10 +126844,11 @@ index f5a658d..f534582 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -"Зараз yum блокує стороння програма. Зачекаємо на завершення її роботи..." -+"Немає доступу до читання або запису до поточного каталогу, пересуваємо до /" ++"Немає доступу до читання або виконання до поточного каталогу, пересуваємо до" ++" /" -#: ../yummain.py:120 +#: ../yummain.py:124 @@ -126102,120 +126885,120 @@ index f5a658d..f534582 100644 msgid "" "\n" "\n" -@@ -2055,74 +2186,74 @@ msgstr "" +@@ -2055,74 +2190,74 @@ msgstr "" "\n" "Завершення роботи на запит користувача." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() буде усунуто у майбутніх версіях Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "Налаштування наборів операцій до включення класу налаштувань" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Некоректне значення tsflag у файлі налаштувань: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Пошук pkgSack для залежності: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "Частина: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s перетворено для встановлення" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "Додавання пакунка %s у режимі %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "Вилучення пакунка %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s потребує: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s потребує %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "Потрібний пакунок вже знайдено, обхідний маневр" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Потрібна залежність задана не яка назва пакунка. Шукаємо: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "Можливе джерело залежності: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Режим %s для надання %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Режим надання пакунка %s: %s" -@@ -2130,117 +2261,117 @@ msgstr "Режим надання пакунка %s: %s" +@@ -2130,117 +2265,117 @@ msgstr "Режим надання пакунка %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Спроба оновлення %s з метою розв’язання залежностей" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Не знайдено шляхів оновлення %s. Помилка!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: пакунок %s, потрібний для %s, позначено для вилучення" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" @@ -126223,158 +127006,158 @@ index f5a658d..f534582 100644 "залежностей." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: оновлення %s для розв’язання залежностей." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Не вдалося знайти шлях оновлення для залежності %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "Встановлено швидку відповідність %s пакунку потрібному для пакунка %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" "%s належить до списку супутніх пакунків, його вже встановлено, пропускаємо." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Потенційний пакунок розв’язання %s має новішу версію у ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Встановлено новішу версію потенційного пакунка розв’язання %s." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s вже перебуває у списку, пропускаємо його" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: позначення %s як оновлення для %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: позначення %s як такий, який слід встановити для %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "Успіх — порожня операція" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "Перезапуск циклу" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "Завершення процесу розв’язання залежностей" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "Успіх — залежності розв’язано" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "Перевірка залежностей для %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "пошук %s, потрібного для %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "Виконання compare_providers() для %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "краща архітектура у po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s робить застарілим %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2249,144 +2380,144 @@ msgstr "" +@@ -2249,144 +2384,144 @@ msgstr "" "archdist порівняно %s з %s у %s\n" " Кращий варіант: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "загальний sourcerpm %s і %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "базовий пакунок %s встановлено для %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "загальний префікс %s для %s і %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "мінімальна вимога: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " Переможець: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " Невдаха(з %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "Найкращий порядок: %s" @@ -126509,7 +127292,7 @@ index f5a658d..f534582 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2394,21 +2525,21 @@ msgstr "" +@@ -2394,21 +2529,21 @@ msgstr "" "Залишилися незавершені операції. Для їх завершення вам слід спочатку " "запустити yum-complete-transaction." @@ -126535,7 +127318,7 @@ index f5a658d..f534582 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2416,90 +2547,93 @@ msgstr "" +@@ -2416,90 +2551,93 @@ msgstr "" "\n" "Пакунки, пропущені через проблеми з залежностями:" @@ -126570,7 +127353,7 @@ index f5a658d..f534582 100644 msgstr "конфлікт встановлення" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" @@ -126578,18 +127361,18 @@ index f5a658d..f534582 100644 "та інші некритичні помилки." -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "Не вдалося розпочати операцію:" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "Не вдалося розпочати операцію." -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "Не вдалося вилучити файл операції %s" @@ -126597,7 +127380,7 @@ index f5a658d..f534582 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s мало бути встановлено, але цю дію не було виконано!" @@ -126608,65 +127391,65 @@ index f5a658d..f534582 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s мало бути вилучено, але цього не сталося!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "Не вдалося вилучити блокування %s: %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "Не вдалося перевірити, чи є активним PID %s" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "Блокування %s: запущено іншу копію з PID %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "Не вдалося створити блокування %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2508,40 +2642,29 @@ msgstr "" +@@ -2508,40 +2646,29 @@ msgstr "" "Пакунок не відповідає тому, який програма має намір звантажити. Пропозиція: " "віддайте команду yum -enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "Не вдалося перевірити контрольну суму" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "Контрольна сума пакунка не збігається з еталонною" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "контрольна сума пакунка не збігається, кешування для %s увімкнено" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "використано локальну копію %s" @@ -126683,101 +127466,101 @@ index f5a658d..f534582 100644 -" * потрібно %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "Заголовок не завершено." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2549,62 +2672,65 @@ msgstr "" +@@ -2549,62 +2676,65 @@ msgstr "" "Заголовка немає у локальному кеші, увімкнено режим «лише кешування». Не " "вдалося звантажити %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "Відкритий ключ для %s не встановлено" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "Проблеми з відкриттям пакунка %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "Відкритий ключ %s не є надійним" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "Пакунок %s не підписано" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "Не вдалося вилучити %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s вилучено" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "Не вдалося вилучити файл %s, %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "Файл %s, %s, вилучено" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "Вилучено %d файлів %s" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" +msgstr[0] "%d файл %s вилучено" -+msgstr[1] "%d файли %s вилучено" -+msgstr[2] "%d файлів %s вилучено" ++msgstr[1] "Вилучено %d файлів %s" ++msgstr[2] "Вилучено %d файлів %s" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "У наборі для %s знайдено декілька ідентичних відповідників" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Немає відповідників %s.%s %s:%s-%s з оновлення" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2612,121 +2738,124 @@ msgstr "" +@@ -2612,121 +2742,125 @@ msgstr "" "searchPackages() буде усунуто у майбутніх версіях Yum. " "Використовуйте краще searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "Пошук %d пакунків" @@ -126788,62 +127571,62 @@ index f5a658d..f534582 100644 +msgstr[2] "Пошук %d пакунків" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "пошук пакунка %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "пошук серед файлів" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "пошук у супутніх записах" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "Для налаштованих сховищ дані груп недоступні" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "Групи з назвою %s не існує" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "пакунок %s було позначено у групі %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "Додавання пакунка %s з групи %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "Не вдалося знайти пакунок з назвою %s для встановлення" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Попередження: у групі %s немає жодного пакунка." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "У групі %s %u необов’язкових пакунки, які може бути встановлено." @@ -126851,87 +127634,88 @@ index f5a658d..f534582 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "У наборі пакунків не вдалося знайти кортеж пакунків %s" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "У базі даних RPM не вдалося знайти кортеж пакунків %s" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "Некоректний прапорець версії від: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "Пакунків з %s не знайдено" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "Об’єкт пакунка не був екземпляром об’єкта пакунка" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "Список встановлення порожній" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Пошук віртуальних супутніх пакунків або файлів для %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "Відповідника параметра не знайдено: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "Пакунок %s вже встановлено, його не можна позначити" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "Немає доступних для встановлення пакунків" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "Пакунок: %s — вже у наборі операцій" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Пакунок %s став застарілим після встановлення %s" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2735,97 +2864,103 @@ msgstr "" +@@ -2735,97 +2869,103 @@ msgstr "" "Пакунок %s став застарілим після встановлення %s, але застарілий пакунок не " "містить вимог до інших пакунків" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" @@ -126939,56 +127723,56 @@ index f5a658d..f534582 100644 "замість нього %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "Пакунок %s вже встановлено, його версія є найсвіжішою" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Відповідник пакунка %s вже встановлено. Перевірка існування оновлень." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "Повне оновлення" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Неоновлюваний пакунок, який вже застарів: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "Відповідного пакунка для оновлення не знайдено: %s" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Пакунок вже застарілий: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Неоновлюваний пакунок, який застарів: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Неоновлюваний пакунок, який було оновлено раніше: %s.%s %s:%s-%s" @@ -126996,50 +127780,50 @@ index f5a658d..f534582 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Відповідного пакунка для вилучення не знайдено" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "Відповідного пакунка для вилучення не знайдено: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "Пропущено поточне робоче ядро: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "Вилучення %s з запису операції" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Не вдалося відкрити: %s. Пропускаємо." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "Перевірка %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Не вдалося виконати локальне встановлення deltarpm: %s. Пропущено." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "Не вдалося додати пакунок %s до операції. Несумісна архітектура: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" @@ -127047,60 +127831,60 @@ index f5a658d..f534582 100644 "пакунка %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2834,7 +2969,7 @@ msgstr "" +@@ -2834,7 +2974,7 @@ msgstr "" "Пакунок %s не встановлено, не вдалося оновити його. Віддайте команду yum " "install, щоб встановити цей пакунок." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2843,98 +2978,103 @@ msgstr "" +@@ -2843,140 +2983,149 @@ msgstr "" "Пакунок %s.%s не встановлено, його не можна оновити. Вам слід скористатися " "командою «yum install» для його встановлення." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "Виключення %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "Позначення %s для встановлення" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "Позначення %s як оновлення %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s: не оновлює встановлений пакунок." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Не вдалося відкрити файл %s. Пропускаємо." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "Проблема з перевстановленням: не виявлено пакунків для вилучення" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" @@ -127108,273 +127892,295 @@ index f5a658d..f534582 100644 "встановлення" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "Немає доступних для зниження версії пакунків" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" "Пакунок %s можна встановлювати паралельно з іншими версіями, пропускаємо" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "Немає відповідників для доступного пакунка: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Для пакунка доступне лише оновлення: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "Не вдалося знизити версію: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "Не вдалося оновити: %s" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "Отримання ключа з %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "Невдала спроба отримання ключа GPG: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "Ключ підпису GPG ключа %s не збігається з ключем CA сховища: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "Перевірено відповідність підпису ключа GPG ключам CA" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Некоректний ключ GPG з %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Помилка обробник ключа GPG: у ключі немає значення %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2947,7 +3087,7 @@ msgstr "" - " Пакунок : %s (%s)\n" - " Джерело : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" + msgstr "" + "Імпортування ключа %s 0x%s:\n" +-" Ідентифікатор: «%s»\n" +-" Пакунок : %s (%s)\n" +-" Джерело : %s" ++" Ід. корист.: «%s»\n" ++" Відбиток : %s\n" ++" Пакунок : %s (%s)\n" ++" Походження : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2958,25 +3098,25 @@ msgstr "" - " Ідентифікатор: «%s»\n" - " Джерело : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" + msgstr "" + "Імпортування ключа %s 0x%s:\n" +-" Ідентифікатор: «%s»\n" +-" Джерело : %s" ++" Ід. корист.: «%s»\n" ++" Відбиток : %s\n" ++" Походження : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "Ключ GPG у %s (0x%s) вже встановлено" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "Помилка імпортування ключа (код %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "Ключ успішно імпортовано" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "Не встановлено жодного ключа" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2985,25 +3125,25 @@ msgstr "" +@@ -2985,25 +3134,25 @@ msgstr "" "Ключі GPG зі списку сховища «%s» вже встановлено, але вони є некоректними для цього пакунка.\n" "Перевірте, чи правильно вказано адреси URL для цього сховища." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Імпортування ключів не допомогло, помилкові ключі?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "Ключ GPG у %s (0x%s) вже імпортовано" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "Помилка імпортування ключа" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Не встановлено жодного ключа для сховища %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3012,162 +3152,186 @@ msgstr "" +@@ -3012,162 +3161,186 @@ msgstr "" "Ключі GPG зі списку сховища «%s» вже встановлено, але вони є некоректними.\n" "Перевірте, чи правильно вказано адреси URL для цього сховища." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "Не вдалося знайти відповідного дзеркала." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "Під час спроби звантаження пакунків сталися помилки." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "Повідомте про цю помилку за адресою %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "Помилки під час тестування: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "Не вдалося визначити теку кешування: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" "Залежності не розв’язано. Запис операції з нерозв’язаними залежностями не " "буде збережено." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Не вдалося зберегти файл операцій %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" "Не вдалося отримати доступ або прочитати збережений запис операції %s: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "версія rpmdb не відповідає збереженим даним щодо версії у операції, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr " ігнорується у відповідь на запит." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr " завершення роботи." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "не вдалося знайти tsflags або tsflags не є цілим числом." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Знайдено txmbr у невідомому поточному стані: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Не вдалося знайти txmbr: %s у стані %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Не вдалося знайти txmbr: %s з джерела: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Не вистачає дій операції, зв’язків або ts було змінено," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" " ігнорується у відповідь на запит. Вам слід повторно виконати розв’язання " "залежностей!" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "%s вже було перевірено, його не можна вилучати." + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Перевірка залежностей версій %s" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "%s має залежність від версії %s, яку було встановлено користувачем." + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "%s немає залежностей від версій, встановлених користувачем." @@ -127474,7 +128280,7 @@ index f5a658d..f534582 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s містить %s, але його не вдалося знайти" -@@ -3176,6 +3340,17 @@ msgstr "%s містить %s, але його не вдалося знайти" +@@ -3176,6 +3349,17 @@ msgstr "%s містить %s, але його не вдалося знайти" msgid "Repackaging" msgstr "Перепакування" @@ -127493,10 +128299,10 @@ index f5a658d..f534582 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/ur.po b/po/ur.po -index 40bd619..da11e70 100644 +index 40bd619..7c958d8 100644 --- a/po/ur.po +++ b/po/ur.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -127507,11 +128313,13 @@ index 40bd619..da11e70 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Urdu (http://www.transifex.net/projects/p/yum/team/ur/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,413 +17,438 @@ msgstr "" "Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -127529,30 +128337,30 @@ index 40bd619..da11e70 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "" @@ -127579,7 +128387,7 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "" @@ -127605,53 +128413,53 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -127662,98 +128470,98 @@ index 40bd619..da11e70 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -127761,7 +128569,7 @@ index 40bd619..da11e70 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -127770,13 +128578,13 @@ index 40bd619..da11e70 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -127786,12 +128594,12 @@ index 40bd619..da11e70 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -127801,12 +128609,12 @@ index 40bd619..da11e70 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -127816,14 +128624,14 @@ index 40bd619..da11e70 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -127831,13 +128639,13 @@ index 40bd619..da11e70 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -127845,7 +128653,7 @@ index 40bd619..da11e70 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -127853,151 +128661,151 @@ index 40bd619..da11e70 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -128007,18 +128815,18 @@ index 40bd619..da11e70 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -128028,37 +128836,37 @@ index 40bd619..da11e70 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -128067,153 +128875,153 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -128556,22 +129364,22 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -128609,351 +129417,357 @@ index 40bd619..da11e70 100644 #, python-format msgid "" "\n" -@@ -869,57 +901,52 @@ msgid "" +@@ -869,57 +901,58 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "" -@@ -927,7 +954,7 @@ msgstr "" +@@ -927,7 +960,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -935,484 +962,536 @@ msgid "" +@@ -935,484 +968,536 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -128962,17 +129776,17 @@ index 40bd619..da11e70 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -128985,224 +129799,224 @@ index 40bd619..da11e70 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -129210,7 +130024,7 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -129218,7 +130032,7 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -129226,7 +130040,7 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -129234,103 +130048,103 @@ index 40bd619..da11e70 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr "" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr "" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr "" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr "" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr "" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -129338,7 +130152,7 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -129346,68 +130160,68 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1420,47 +1499,47 @@ msgid "" +@@ -1420,47 +1505,47 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "" -@@ -1472,7 +1551,7 @@ msgstr "" +@@ -1472,7 +1557,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -129416,7 +130230,7 @@ index 40bd619..da11e70 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1568,484 @@ msgid "" +@@ -1489,451 +1574,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -129679,188 +130493,187 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -129868,7 +130681,7 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -129876,148 +130689,148 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2056,106 @@ msgstr "" +@@ -1944,100 +2058,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -130025,7 +130838,7 @@ index 40bd619..da11e70 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -130062,226 +130875,226 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,774 +2163,784 @@ msgstr "" +@@ -2045,991 +2165,1028 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -130289,43 +131102,43 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -130513,24 +131326,24 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -130538,7 +131351,7 @@ index 40bd619..da11e70 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -130549,40 +131362,40 @@ index 40bd619..da11e70 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -130590,23 +131403,23 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "" @@ -130620,67 +131433,67 @@ index 40bd619..da11e70 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -130690,26 +131503,26 @@ index 40bd619..da11e70 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -130719,62 +131532,62 @@ index 40bd619..da11e70 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -130782,78 +131595,79 @@ index 40bd619..da11e70 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -130861,118 +131675,118 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -130980,7 +131794,7 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -130988,158 +131802,166 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2821,7 +2949,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2829,207 +2957,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -131147,29 +131969,29 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -131177,117 +131999,117 @@ index 40bd619..da11e70 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -131387,7 +132209,7 @@ index 40bd619..da11e70 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3190,14 @@ msgstr "" +@@ -3038,6 +3195,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -131403,7 +132225,7 @@ index 40bd619..da11e70 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/yum.pot b/po/yum.pot -index 97ae91a..bf24412 100644 +index 97ae91a..1c5004a 100644 --- a/po/yum.pot +++ b/po/yum.pot @@ -8,7 +8,7 @@ msgid "" @@ -131411,7 +132233,7 @@ index 97ae91a..bf24412 100644 "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -131422,7 +132244,7 @@ index 97ae91a..bf24412 100644 +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "" @@ -131433,31 +132255,31 @@ index 97ae91a..bf24412 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "" @@ -131484,7 +132306,7 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "" @@ -131494,69 +132316,69 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -131567,98 +132389,98 @@ index 97ae91a..bf24412 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -131666,7 +132488,7 @@ index 97ae91a..bf24412 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -131675,13 +132497,13 @@ index 97ae91a..bf24412 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -131691,12 +132513,12 @@ index 97ae91a..bf24412 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -131706,12 +132528,12 @@ index 97ae91a..bf24412 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -131721,14 +132543,14 @@ index 97ae91a..bf24412 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -131736,13 +132558,13 @@ index 97ae91a..bf24412 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -131750,7 +132572,7 @@ index 97ae91a..bf24412 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -131758,152 +132580,152 @@ index 97ae91a..bf24412 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid "" " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -131913,18 +132735,18 @@ index 97ae91a..bf24412 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -131934,37 +132756,37 @@ index 97ae91a..bf24412 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" @@ -131973,353 +132795,353 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" @@ -132327,157 +133149,157 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr "" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr "" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -132485,33 +133307,33 @@ index 97ae91a..bf24412 100644 +msgstr[1] "" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" @@ -132522,77 +133344,77 @@ index 97ae91a..bf24412 100644 -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "" @@ -132601,271 +133423,271 @@ index 97ae91a..bf24412 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -938,484 +971,536 @@ msgid "" +@@ -938,484 +971,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -132874,17 +133696,17 @@ index 97ae91a..bf24412 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -132897,224 +133719,224 @@ index 97ae91a..bf24412 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -133122,7 +133944,7 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -133130,7 +133952,7 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -133138,7 +133960,7 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -133146,43 +133968,49 @@ index 97ae91a..bf24412 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "" @@ -133208,7 +134036,7 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "" @@ -133262,7 +134090,7 @@ index 97ae91a..bf24412 100644 #, python-format msgid "" "\n" -@@ -1423,47 +1508,47 @@ msgid "" +@@ -1423,47 +1514,47 @@ msgid "" "%s" msgstr "" @@ -133319,7 +134147,7 @@ index 97ae91a..bf24412 100644 msgid "Complete!" msgstr "" -@@ -1475,7 +1560,7 @@ msgstr "" +@@ -1475,7 +1566,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -133328,7 +134156,7 @@ index 97ae91a..bf24412 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1493,451 +1578,480 @@ msgid "" +@@ -1493,451 +1584,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -133494,18 +134322,18 @@ index 97ae91a..bf24412 100644 -#: ../yumcommands.py:435 -msgid "Setting up Group Process" --msgstr "" -- ++#: ../yumcommands.py:773 ++msgid "Display, or use, the groups information" + msgstr "" + -#: ../yumcommands.py:441 -msgid "No Groups on which to run command" -msgstr "" - -#: ../yumcommands.py:454 -msgid "List available package groups" -+#: ../yumcommands.py:773 -+msgid "Display, or use, the groups information" - msgstr "" - +-msgstr "" +- -#: ../yumcommands.py:474 -msgid "Install the packages in a group on your system" +#: ../yumcommands.py:776 @@ -133625,153 +134453,153 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -133779,7 +134607,7 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -133787,148 +134615,148 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1948,908 +2062,927 @@ msgstr "" +@@ -1948,908 +2068,928 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -133973,88 +134801,88 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" @@ -134062,136 +134890,136 @@ index 97ae91a..bf24412 100644 #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -134199,43 +135027,43 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -134448,7 +135276,7 @@ index 97ae91a..bf24412 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -134459,40 +135287,46 @@ index 97ae91a..bf24412 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" +-msgid "Unable to check if PID %s is active" ++msgid "Could not create lock at %s: %s " msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " +-msgid "Could not create lock at %s: %s " ++msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum --enablerepo=" @@ -134500,23 +135334,23 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "" @@ -134530,67 +135364,67 @@ index 97ae91a..bf24412 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -134600,26 +135434,26 @@ index 97ae91a..bf24412 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of " "Yum. Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -134629,62 +135463,62 @@ index 97ae91a..bf24412 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -134692,79 +135526,79 @@ index 97ae91a..bf24412 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -134772,117 +135606,117 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -134890,7 +135724,7 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it " @@ -134898,118 +135732,118 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -135023,7 +135857,7 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -135035,179 +135869,179 @@ index 97ae91a..bf24412 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2857,25 +2990,25 @@ msgid "" +@@ -2857,25 +2997,25 @@ msgid "" "Check that the correct key URLs are configured for this repository." msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2883,158 +3016,182 @@ msgid "" +@@ -2883,158 +3023,182 @@ msgid "" "Check that the correct key URLs are configured for this repository." msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -135308,10 +136142,15 @@ index 97ae91a..bf24412 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3043,6 +3200,14 @@ msgstr "" +@@ -3043,6 +3207,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -135324,10 +136163,10 @@ index 97ae91a..bf24412 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/zh_CN.po b/po/zh_CN.po -index 9fe1a5c..f5d9391 100644 +index 9fe1a5c..f40bfa3 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po -@@ -2,14 +2,15 @@ +@@ -2,15 +2,16 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -135342,11 +136181,13 @@ index 9fe1a5c..f5d9391 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/yum/team/zh_CN/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -18,122 +19,123 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0\n" @@ -135364,30 +136205,30 @@ index 9fe1a5c..f5d9391 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "正在安装" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "被取代" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "更新完毕" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "已删除" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "已安装" @@ -135414,7 +136255,7 @@ index 9fe1a5c..f5d9391 100644 msgstr "已删除：%s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "正在删除" @@ -135440,53 +136281,53 @@ index 9fe1a5c..f5d9391 100644 msgstr "从本地文件读入仓库元数据" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "配置错误：%s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "属性错误：%s" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr " 已安装： %s-%s 在 %s" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr " 构建 ：%s 在 %s" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr " 已经提交：%s ，共 %s " -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "你需要给出命令" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "没有命令: %s。请使用 %s --help" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "磁盘要求：\n" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " 至少需要 %d MB 以上的空间在文件系统 %s 上。\n" @@ -135496,7 +136337,7 @@ index 9fe1a5c..f5d9391 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" @@ -135505,75 +136346,75 @@ index 9fe1a5c..f5d9391 100644 "-------------\n" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "尝试执行事务但无须任何处理。现在退出。" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "在用户的命令下退出" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "下载软件包：" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "下载软件包出错：\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" -msgstr "" +msgstr "运行事务检查" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "错误：您需要更新 rpm 以处理：" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" -msgstr "" +msgstr "事务检查与依赖解决错误：" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "RPM 需要更新" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "请在%s报告此错误" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "执行事务测试" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "事务检验出错：\n" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "事务测试成功" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "执行事务" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." @@ -135582,18 +136423,18 @@ index 9fe1a5c..f5d9391 100644 "指定 \"-y\" 改变这个行为。" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr " * 也许您希望：" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "包 %s%s%s 可用，但未安装。" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "没有可用的包 %s%s%s。" @@ -135601,7 +136442,7 @@ index 9fe1a5c..f5d9391 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "将安装的软件包" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -135609,13 +136450,13 @@ index 9fe1a5c..f5d9391 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "无须任何处理" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "升级 %d 个软件包" @@ -135624,12 +136465,12 @@ index 9fe1a5c..f5d9391 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "不升级任何软件包" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "已标记的欲分布同步的%d个包" @@ -135638,12 +136479,12 @@ index 9fe1a5c..f5d9391 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "没有已标记的欲分布同步的包" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "删除 %d 个软件包" @@ -135652,27 +136493,27 @@ index 9fe1a5c..f5d9391 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "不删除任何软件包" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "要降级的包" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "（来自 %s）" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "安装的包 %s%s%s%s 不可用。" @@ -135680,37 +136521,37 @@ index 9fe1a5c..f5d9391 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "重装的包" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "未指定软件包" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "将安装的软件包" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" -msgstr "" +msgstr "N/S 匹配：%s" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." -msgstr "" +msgstr " 名称和简介匹配 %sonly%s，使用“search all”试试。" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -135718,127 +136559,127 @@ index 9fe1a5c..f5d9391 100644 +msgstr " 全名和简介匹配 %sonly%s，使用“search all”试试。" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "匹配：%s" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." -msgstr "" +msgstr " 名称和简介匹配 %smonstly%s，使用“search all”试试。" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "警告：没有匹配 %s 的软件包" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "没有找到匹配的软件包" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "没有找到 %s 软件包" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "正在清理仓库： " -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "清理一切" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "清理文件头缓存" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "清理软件包" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "清理 XML 元数据" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "清理数据库缓存" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "清理过期缓存元数据" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "正在清理缓存rpmdb数据" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "清理插件" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "警告：无组匹配：%s" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "已安装的组：" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" -msgstr "" +msgstr "安装了的语言组：" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "有效的组:" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" -msgstr "" +msgstr "可用语言组：" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "完成" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "警告：组 %s 不存在。" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "指定组中没有可安装或升级的软件包" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "安装 %d 个软件包" @@ -135847,18 +136688,18 @@ index 9fe1a5c..f5d9391 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "没有名为 %s 的组" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "指定组中没有要删除的软件包" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "删除 %d 个软件包" @@ -135867,37 +136708,37 @@ index 9fe1a5c..f5d9391 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "略过已安装的 %s 软件包" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "丢弃不可比较的软件包 %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "%s 未安装，加入列表以备安装" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "插件选项" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "命令行错误：%s" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -135906,154 +136747,154 @@ index 9fe1a5c..f5d9391 100644 "%s: %s 选项需要参数" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "--color 需要参数：auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "-- 安装根必须是绝对路径：%s" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "显示此帮助消息并退出" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "容忍错误" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "完全从系统缓存运行，不升级缓存" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "配置文件路径" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "命令最长等待时间" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "调试输出级别" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "在 list/search 命令下，显示仓库里重复的条目" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "错误输出级别" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "rpm调试输出等级" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "安静的操作" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "详尽的操作过程" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "回答所有的问题为是" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "显示 Yum 版本信息并退出" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "设置目标根目录" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "启用一个或多个仓库(支持通配符)" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "禁用一个或多个仓库(支持通配符)" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "用全名或通配符排除软件包" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "禁止从主配置，从仓库或者从任何位置排除" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "升级时考虑软件包取代关系" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "禁用 Yum 插件" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "禁用 gpg 签名检测" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "禁用指定名称的插件" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "由名称启用插件" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "跳过有依赖问题的软件包" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "配置是否使用颜色" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "在yum配置和repo文件里设置$releasever的值" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "设置任意配置和仓库选项" @@ -136398,23 +137239,23 @@ index 9fe1a5c..f5d9391 100644 msgstr "为依赖而移除" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "跳过（依赖问题）" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "未安装" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" -msgstr "" +msgstr "不可用" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "软件包" +msgid_plural "Packages" @@ -136451,7 +137292,7 @@ index 9fe1a5c..f5d9391 100644 #, python-format msgid "" "\n" -@@ -883,57 +905,52 @@ msgstr "" +@@ -883,57 +905,57 @@ msgstr "" "事务概要\n" "%s\n" @@ -136459,7 +137300,7 @@ index 9fe1a5c..f5d9391 100644 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "安装 %5.5s 个包\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" +msgstr "安装" @@ -136467,7 +137308,7 @@ index 9fe1a5c..f5d9391 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "升级 %5.5s 个包\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" +msgstr "" @@ -136475,7 +137316,7 @@ index 9fe1a5c..f5d9391 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "移除 %5.5s 个包\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" +msgstr "" @@ -136483,7 +137324,7 @@ index 9fe1a5c..f5d9391 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "重新安装 %5.5s 个包\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" +msgstr "重新安装" @@ -136491,324 +137332,329 @@ index 9fe1a5c..f5d9391 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "降级 %5.5s 个包\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" +msgstr "降级" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "删除" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "作为依赖被删除" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "作为依赖被安装" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "作为依赖被升级" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "替代" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "失败" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "二" -@@ -941,7 +958,7 @@ msgstr "二" +@@ -941,7 +963,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -952,364 +969,416 @@ msgstr "" +@@ -952,364 +974,416 @@ msgstr "" " 当前下载已取消，再次输入%s个中断(ctrl-c)%s于 %s%s%s 秒内\n" "以退出。\n" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "用户中断" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "总计" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "<空>" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "系统" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" -msgstr "" +msgstr "跳过合并事务 %d 到 %d，因为它俩重叠" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" -msgstr "" +msgstr "没有事务" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "错误的事务 ID 或软件包" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" -msgstr "" +msgstr "命令行" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "登陆用户" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "日期和时间" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "操作" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "更改" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "没有事务 ID" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "错误的事务 ID" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "未能找到指定事务 ID" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "找到多个事务 ID!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "未指定事务 ID、或者软件包" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "降级" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "较老的" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "较早的" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "事务 ID：" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "起始时间 ：" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "启动 rpmdb ：" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "（%u 秒）" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "（%u 分钟）" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "（%u 小时）" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" -msgstr "" +msgstr "（%u 天）" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "结束时间 ：" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "结束 rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "用户 ：" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "返回码 ：" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "已终止" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" -msgstr "" +msgstr "失败：" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "失败：" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "成功" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "命令行 ：" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "其他非默认信息已保存：%d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "事务完成由：" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "已改变的包：" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "已跳过的包：" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "Rpmdb 问题：" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "Scriptlet 输出：" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "错误：" @@ -136817,17 +137663,17 @@ index 9fe1a5c..f5d9391 100644 -msgstr "安装" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "依赖安装" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "取代中" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "抹去" @@ -136840,437 +137686,437 @@ index 9fe1a5c..f5d9391 100644 -msgstr "降级" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "更新" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "时间" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "最近一天" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "最近一周" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "最近2周" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "最近3个月" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "最近6个月" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "最近一年" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "一年以前" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "未找到事务 %s" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "事务 ID：" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "可用的额外历史信息：" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: 未找到符合该名称的额外数据" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "安装" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" -msgstr "" +msgstr "一个更新" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "删除" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "已重新安装" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" -msgstr "" +msgstr "一个降级" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" -msgstr "" +msgstr "舍弃" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "升级" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "取代" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" -msgstr "" +msgstr "---> 软件包 %s.%s.%s.%s-%s 将被 %s" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "--> 执行事务检查" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> 使用新的信息重新计算依赖关系。" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "--> 完成依赖关系计算" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> 处理依赖关系 %s，它被软件包 %s 需要" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "---> 保留软件包： %s" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> 无法解决的依赖：%s" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "软件包：%s" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" -@@ -1318,7 +1387,7 @@ msgstr "" +@@ -1318,7 +1392,7 @@ msgstr "" "\n" " 需要：%s" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" -@@ -1327,7 +1396,7 @@ msgstr "" +@@ -1327,7 +1401,7 @@ msgstr "" "\n" " %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" -@@ -1336,7 +1405,7 @@ msgstr "" +@@ -1336,7 +1410,7 @@ msgstr "" "\n" " %s" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" -@@ -1345,85 +1414,85 @@ msgstr "" +@@ -1345,85 +1419,85 @@ msgstr "" " 未找到" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "更新，由" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "降级，由" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "取代，由" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "可用" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> 处理 %s 与 %s 的冲突" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> 根据指定的软件包创建事务，请等待。" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> 下载 %s 的文件头作为事务的一部分。" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "运行中" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "睡眠中" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "不可中断" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "僵死" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "跟踪/停止" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "未知" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr " 另一个应用程序是：PackageKit" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr " 另一个应用程序是：%s" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr " 内存：%5s RSS （%5sB VSZ）" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr " 已启动： %s - %s之前" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr " 状态 ：%s，进程ID：%d" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" -@@ -1433,7 +1502,7 @@ msgstr "" +@@ -1433,7 +1507,7 @@ msgstr "" "\n" "由于用户取消而退出" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1443,7 +1512,7 @@ msgstr "" +@@ -1443,7 +1517,7 @@ msgstr "" "\n" "由于管道被破坏而退出" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1454,41 +1523,41 @@ msgstr "" +@@ -1454,41 +1528,41 @@ msgstr "" "\n" "%s" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "另外一个程序锁定了 yum；遵循 exit_on_lock 设置退出" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "插件退出错误：%s" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "Yum 错误：%s" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "错误：%s" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr " 您可以尝试用 --skip-broken 来解决该问题" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr " 您可以尝试运行： rpm -Va --nofiles --nodigest" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "未知错误：退出码 %d：" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" -@@ -1496,19 +1565,19 @@ msgstr "" +@@ -1496,19 +1570,19 @@ msgstr "" "\n" "依赖关系解决" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "完毕！" @@ -137288,7 +138134,7 @@ index 9fe1a5c..f5d9391 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1533,53 +1602,53 @@ msgstr "" +@@ -1533,53 +1607,53 @@ msgstr "" "\n" "详情请联系您的发行版或软件包制作人。\n" @@ -137354,7 +138200,7 @@ index 9fe1a5c..f5d9391 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1589,306 +1658,299 @@ msgstr "" +@@ -1589,306 +1663,295 @@ msgstr "" "执行 \"yum repolist all\" 查看您拥有的仓库。\n" "您可以用 yum-config-manager --enable <仓库名> 来启用仓库" @@ -137554,155 +138400,154 @@ index 9fe1a5c..f5d9391 100644 msgstr "设置本地安装进程" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "判断哪个包提供了指定的依赖" - +-msgid "Determine which package provides the given dependency" +-msgstr "判断哪个包提供了指定的依赖" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "查找依赖的软件包：" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "运行交互式的 yum 外壳" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "设置 Yum 外壳" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "列出软件包的依赖关系" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "查找依赖：" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "显示已配置的仓库" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "启用" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "禁用" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "仓库ID ： " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "仓库名 ： " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "仓库状态 ： " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "仓库版本： " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "仓库标志 ： " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "仓库发行版标签： " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "仓库更新： " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "仓库包 ： " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "仓库大小 ： " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "仓库基本地址： " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "仓库元链接：" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "更新：" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "仓库镜像：" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "从不 （最后 %s）" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "瞬间（最后%s）" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s 秒 （最后 %s）" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "仓库到期：" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "仓库排除：" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "仓库包括：" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "仓库除外：" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " -msgstr "" +msgstr "仓库文件名：" @@ -137710,191 +138555,191 @@ index 9fe1a5c..f5d9391 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "仓库标识" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "状态" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "仓库名称" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "显示用法信息" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "没有关于 %s 的帮助" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" -@@ -1898,7 +1960,7 @@ msgstr "" +@@ -1898,7 +1961,7 @@ msgstr "" "\n" "别名：" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" -@@ -1908,115 +1970,161 @@ msgstr "" +@@ -1908,115 +1971,161 @@ msgstr "" "\n" "别名：" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "设置覆盖安装进程" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "覆盖安装一个包" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "设置降级过程" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "降级包" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "显示机器和/或可用的仓库版本。" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr " Yum版本组：" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr " 组 ：" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr " 包：" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "已安装：" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "组已安装：" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "可用：" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "组内现有：" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "显示或使用事务历史" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "无效的历史子命令，使用：%s。" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "你没有权限到历史数据。" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "检查rpmdb里的问题" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" -msgstr "" +msgstr "从文件名中加载一个已存事务" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." -msgstr "" +msgstr "指定文件中没有已存事务。" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "正在从 %s 中加载事务" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "" @@ -137907,7 +138752,7 @@ index 9fe1a5c..f5d9391 100644 +msgstr " Yum 检查失败：%s" + +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:114 @@ -137944,278 +138789,278 @@ index 9fe1a5c..f5d9391 100644 msgid "" "\n" "\n" -@@ -2026,74 +2134,74 @@ msgstr "" +@@ -2026,74 +2135,74 @@ msgstr "" "\n" "由于用户取消而退出。" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() 将从未来版本的 Yum 中去掉。\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "在配置可用前设置事务集" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "配置文件 %s 中使用 tsflag 是错误的" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "搜索群集中 %s 的依赖关系" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "成员：%s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "%s 转为安装" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "添加软件包 %s 到 %s 模式" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "正在删除软件包 %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "%s 需要：%s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "%s 需要 %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "已查询过所需的依赖关系，跳过" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "所需的依赖关系并非软件包名称。搜索：%s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr " 可能的提供者：%s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "模式 %s 被用于提供 %s 的软件包：%s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "提供 %s 的软件包使用的模式：%s" -@@ -2101,114 +2209,114 @@ msgstr "提供 %s 的软件包使用的模式：%s" +@@ -2101,114 +2210,114 @@ msgstr "提供 %s 的软件包使用的模式：%s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "尝试升级 %s 来解决依赖" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" -msgstr "" +msgstr "未为 %s 找到更新路径。失败！" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "事务：%s 软件包要求删除 %s" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "事务：令 %s 被 %s 取代以解决依赖关系。" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "事务：更新 %s 以解决依赖。" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "无法找到 %s 依赖的更新路径" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "快速匹配 %s 到 %s 的需求" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "提供 %s 的软件包存在而且已被安装，不再检测。" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "可能解决依赖的 %s 软件包已经有更新的版本存在于事务中了。" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "可能解决依赖的 %s 软件包已经有更新的版本安装过了。" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s 已包含在事务中，不再重复" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "事务：将 %s 作为 %s 的更新" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "事务：将 %s 作为 %s 安装" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "成功 - 空的事务" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "重新开始循环" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "依赖进程即将完成" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "成功 - 依赖关系解决" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "检查 %s 的依赖关系" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "搜索 %s 作为 %s 的依赖关系" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "为 %s 运行 compare_providers()" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "%s 提供了更好的架构选择" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "%s 取代 %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2217,162 +2325,162 @@ msgstr "" +@@ -2217,162 +2326,162 @@ msgstr "" "比较 %s 与 %s 架构差异，在 %s\n" " 胜者：%s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "%s 和 %s 具有共同的源代码 rpm" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "基础软件包 %s 由于 %s 已经安装" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "共同的前缀 %s 存在于 %s 和 %s 之间" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "最小需求： %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr " 胜者：%s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr " 负者( %d)：%s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "最佳顺序：%s" @@ -138374,7 +139219,7 @@ index 9fe1a5c..f5d9391 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2380,502 +2488,507 @@ msgstr "" +@@ -2380,562 +2489,570 @@ msgstr "" "\n" "因为依赖关系问题而跳过的软件包：" @@ -138407,24 +139252,24 @@ index 9fe1a5c..f5d9391 100644 msgstr "安装冲突" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "警告：事务过程中出现 scriptlet 或其他非致命性错误。" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "事务无法启动：" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "不能执行事务。" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "移除事务文件 %s 失败" @@ -138432,7 +139277,7 @@ index 9fe1a5c..f5d9391 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s 假定被安装但并非这样！" @@ -138443,40 +139288,40 @@ index 9fe1a5c..f5d9391 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s 假定被移除但并非这样！" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "不能打开锁 %s ： %s" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "无法检测 PID %s 是否激活" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "%s 已被锁定，PID 为 %s 的另一个程序正在运行。" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "无法在 %s 创建锁：%s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -138484,23 +139329,23 @@ index 9fe1a5c..f5d9391 100644 msgstr "软件包与预期下载的不符。建议：运行 yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "无法执行校验和" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "软件包校验和不匹配" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "软件包校验和失败但是 %s 已启用缓存" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "使用本地的 %s 副本" @@ -138517,67 +139362,67 @@ index 9fe1a5c..f5d9391 100644 -" * 需要 %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "文件头不完整。" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "文件头不在本地缓存中，但是因为处于只使用缓存的模式，无法下载 %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "%s 的公钥没有安装" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "打开软件包 %s 出现问题" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "%s 的公钥不可信任" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "软件包 %s 没有签名" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "无法删除 %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "%s 已删除" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "无法删除 %s 文件 %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "%s 文件 %s 已删除" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "%d %s 文件已删除" @@ -138586,26 +139431,26 @@ index 9fe1a5c..f5d9391 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "群集中有超过一个相同的匹配 %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "更新不包括匹配 %s.%s %s:%s-%s 的内容" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "searchPackages() 将从未来版本的 Yum 中去掉，被searchGenerator() 替代。\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "搜索 %d 个软件包" @@ -138614,63 +139459,63 @@ index 9fe1a5c..f5d9391 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "搜索 %s 软件包" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "在文件中搜索" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "在可提供的依赖中搜索" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "配置的软件仓库不包含组数据" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "不存在 %s 组" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "软件包 %s 没有包含在 %s 组中" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "添加包 %s 从组 %s 中" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "找不到名为 %s 的软件包来安装" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "警告：%s 组不包含任何包。" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." -msgstr "" @@ -138679,79 +139524,80 @@ index 9fe1a5c..f5d9391 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "群集中找不到软件包 %s" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "rpmdb 中找不到软件包元组 %s" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" -msgstr "" +msgstr "来自 %s 的无效版本标志" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "找不到 %s 软件包" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "不是一个软件包对象的实例" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "没有指定要安装的内容" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "检测 %s 提供的依赖或文件" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "参数 %s 没有匹配" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "包 %s 已安装且不可用" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "没有包可供安装" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "软件包 %s 已包含在事务中" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "软件包 %s 被已安装的 %s 取代" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -138759,62 +139605,62 @@ index 9fe1a5c..f5d9391 100644 msgstr "软件包 %s 已经被 %s 取代，但是取代的软件包并未满足需求" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "软件包 %s 已经被 %s 取代，改为尝试安装 %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "包 %s 已安装并且是最新版本" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "匹配 %s 的软件包已经安装。检查更新。" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "全部升级" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "不更新已被取代的软件包：%s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "包已被取代：%s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "未更新已被废除的软件包：%s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "未更新已被更新的软件包：%s.%s %s:%s-%s" @@ -138822,56 +139668,56 @@ index 9fe1a5c..f5d9391 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "没有匹配的要删除的包" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "跳过正在运行的内核：%ss" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "从操作中移除 %s" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "无法打开 %s ，跳过。" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "诊断 %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "无法本地安装 deltarpm %s ，跳过。" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "无法添加软件包 %s 到操作中。不属于可兼容的架构：%s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "无法安装软件包 %s 。被已安装软件包 %s 标识为废除" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -138879,7 +139725,7 @@ index 9fe1a5c..f5d9391 100644 msgstr "软件包 %s 没有安装，不能更新。运行 yum install 安装它。" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -138888,170 +139734,170 @@ index 9fe1a5c..f5d9391 100644 +msgstr "软件包 %s.%s 未安装，不能更新它。替代方案是运行 yum install 安装。" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "排除 %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "%s 将被安装" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "%s 将作为 %s 的更新" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "%s：不更新已安装的软件包。" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "无法打开文件：%s。跳过。" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "覆盖安装出错：没有匹配的要删除的软件包" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "重新安装出错：没有匹配的软件包 %s 来安装" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "没有可供降级的软件包" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "软件包 %s 允许同时安装多个版本，跳过" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "未找到匹配的可用软件包：%s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "只更新可用软件包：%s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "降级失败：%s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 #, python-format -msgid "Retrieving key from %s" +msgid "Failed to upgrade: %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 +#, python-format +msgid "Retrieving key from %s" +msgstr "从 %s 检索密钥" + -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "获取 GPG 密钥失败：" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" -msgstr "" +msgstr "密钥 %s 上的 GPG 密钥签名与 %s 仓库的 CA 密钥不匹配" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" -msgstr "" +msgstr "GPG 密钥签名验证与 CA 密钥冲突" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "来自 %s 的不可用 GPG 密钥：%s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG 密钥传递失败：密钥未包含值 %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2883,59 +2996,66 @@ msgid "" - " Package: %s (%s)\n" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -+"导入 %s 键 0x%s：\n" -+" 用户ID：%s\n" -+" 软件包：%s（%s）\n" -+" 来自 ：%s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" - " Userid: \"%s\"\n" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -+"导入 %s 键 0x%s：\n" -+" 用户ID：“%s”\n" -+" 来自 ：%s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "%s 的 GPG 密钥(0x%s)已安装" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "导入密钥失败(代码 %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "导入密钥成功" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" -msgstr "" +msgstr "没有安装任何键" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -139059,160 +139905,160 @@ index 9fe1a5c..f5d9391 100644 msgstr "仓库 \"%s\" 的 GPG 密钥已安装，但是不适用于此软件包。请检查仓库的公钥 URL 是否配置正确。" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "导入的密钥没有用处，错误的密钥?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "位于 %s 的 GPG 密钥 （0x%s） 已经导入" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "导入密钥失败" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "没有对 %s 仓库安装任何键" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2944,157 +3064,181 @@ msgstr "" +@@ -2944,157 +3061,181 @@ msgstr "" "\"%s\" 仓库列出的 GPG 密钥已经安装但并不正确。\n" "请检查此仓库正确的密钥 URL 配置。" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "不能发现合适的镜像。" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "下载软件包时出错。" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "请在 %s 报告这个错误" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "事务测试出错：" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "不能置缓存目录：%s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." -msgstr "" +msgstr "依赖没有解决。将不会保存未解决事务。" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "不能保存事务文件 %s：%s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "" +msgstr "不能访问或都去已存事务 %s：%s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " -msgstr "" +msgstr "RPM数据库版本与已存事务版本不匹配， " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." -msgstr "" +msgstr " 忽略，作为请求。" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." -msgstr "" +msgstr " 终止。" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." -msgstr "" +msgstr "不能找到 tsflags 或 tsflags 非整数。" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" -msgstr "" +msgstr "在未知当前状态找到 txmbr：%s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" -msgstr "" +msgstr "不能找到 txmbr：在 %s 状态中 %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" -msgstr "" +msgstr "不能找到 txmbr：来自原地 %s 的 %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," -msgstr "" +msgstr "事务成员、关系缺失或 ts 已被修改，" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" +msgstr " 忽略，作为请求。您必须解决依赖！" + +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." msgstr "" @@ -139312,7 +140158,7 @@ index 9fe1a5c..f5d9391 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s 提供 %s 但不能被找到" -@@ -3103,6 +3247,17 @@ msgstr "%s 提供 %s 但不能被找到" +@@ -3103,6 +3244,17 @@ msgstr "%s 提供 %s 但不能被找到" msgid "Repackaging" msgstr "正在重新包装" @@ -139331,10 +140177,10 @@ index 9fe1a5c..f5d9391 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/zh_TW.po b/po/zh_TW.po -index 704a726..a1f1dd0 100644 +index 704a726..c970fec 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po -@@ -2,12 +2,13 @@ +@@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -139345,11 +140191,13 @@ index 704a726..a1f1dd0 100644 "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -+"POT-Creation-Date: 2011-08-23 11:08-0400\n" -+"PO-Revision-Date: 2011-08-23 15:09+0000\n" - "Last-Translator: skvidal \n" +-"Last-Translator: skvidal \n" ++"POT-Creation-Date: 2011-10-17 17:36-0400\n" ++"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Last-Translator: james \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/yum/team/zh_TW/)\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" @@ -16,413 +17,429 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0\n" @@ -139367,30 +140215,30 @@ index 704a726..a1f1dd0 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 +#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2720 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2177 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1476 ../output.py:2023 ../output.py:2184 ++#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2022 ++#: ../callback.py:52 ../output.py:2074 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1474 -+#: ../output.py:2022 ../output.py:2024 ../output.py:2692 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 ++#: ../output.py:2074 ../output.py:2076 ../output.py:2748 msgid "Installed" msgstr "" @@ -139417,7 +140265,7 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2695 ++#: ../callback.py:229 ../output.py:1356 ../output.py:2751 msgid "Removing" msgstr "" @@ -139443,53 +140291,53 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:252 ../utils.py:340 ++#: ../cli.py:269 ../cli.py:273 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:255 ../cli.py:1897 ../utils.py:343 ++#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:302 ++#: ../cli.py:323 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:304 ++#: ../cli.py:325 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:306 ++#: ../cli.py:327 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:347 ++#: ../cli.py:368 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:361 ++#: ../cli.py:382 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:419 ++#: ../cli.py:440 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:421 ++#: ../cli.py:442 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -139499,98 +140347,98 @@ index 704a726..a1f1dd0 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:426 ++#: ../cli.py:447 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:474 ++#: ../cli.py:495 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:521 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:525 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:530 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:549 ../yum/__init__.py:5413 ++#: ../cli.py:570 ../yum/__init__.py:5491 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:558 ../yum/__init__.py:5422 ++#: ../cli.py:579 ../yum/__init__.py:5500 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:560 ../yum/__init__.py:5425 ++#: ../cli.py:581 ../yum/__init__.py:5503 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:566 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:567 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:573 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:585 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:592 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:624 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:657 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:676 ../cli.py:719 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:702 ../cli.py:710 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:716 ../cli.py:760 ../cli.py:998 ++#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -139598,7 +140446,7 @@ index 704a726..a1f1dd0 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:768 ++#: ../cli.py:830 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -139606,13 +140454,13 @@ index 704a726..a1f1dd0 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:771 ../cli.py:772 ../cli.py:1005 ../cli.py:1051 ../cli.py:1086 ++#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:824 ++#: ../cli.py:884 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -139621,12 +140469,12 @@ index 704a726..a1f1dd0 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:826 ++#: ../cli.py:886 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:937 ++#: ../cli.py:997 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -139635,12 +140483,12 @@ index 704a726..a1f1dd0 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:939 ++#: ../cli.py:999 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:965 ++#: ../cli.py:1025 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -139649,27 +140497,27 @@ index 704a726..a1f1dd0 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:967 ++#: ../cli.py:1027 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1004 ++#: ../cli.py:1064 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1040 ++#: ../cli.py:1101 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1041 ++#: ../cli.py:1102 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -139677,158 +140525,158 @@ index 704a726..a1f1dd0 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1050 ++#: ../cli.py:1114 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1072 ++#: ../cli.py:1136 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1085 ++#: ../cli.py:1149 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1192 ++#: ../cli.py:1256 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1209 ++#: ../cli.py:1273 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1211 ++#: ../cli.py:1275 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1229 ++#: ../cli.py:1293 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1236 ++#: ../cli.py:1300 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1240 ++#: ../cli.py:1304 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1243 ++#: ../cli.py:1307 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1339 ++#: ../cli.py:1411 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1377 ++#: ../cli.py:1450 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1382 ++#: ../cli.py:1455 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1398 ++#: ../cli.py:1471 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1401 ++#: ../cli.py:1474 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1404 ++#: ../cli.py:1477 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1407 ++#: ../cli.py:1480 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1410 ++#: ../cli.py:1483 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1413 ++#: ../cli.py:1486 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1416 ++#: ../cli.py:1489 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1452 ++#: ../cli.py:1525 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1469 ../cli.py:1527 ++#: ../cli.py:1542 ../cli.py:1600 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1475 ../cli.py:1533 ++#: ../cli.py:1548 ../cli.py:1606 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1481 ../cli.py:1539 ++#: ../cli.py:1554 ../cli.py:1612 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1487 ../cli.py:1545 ++#: ../cli.py:1560 ../cli.py:1618 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1490 ../cli.py:1547 ++#: ../cli.py:1563 ../cli.py:1620 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1570 ../cli.py:1598 ../cli.py:1604 ../yum/__init__.py:3648 ++#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1608 ++#: ../cli.py:1681 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1610 ++#: ../cli.py:1683 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -139837,18 +140685,18 @@ index 704a726..a1f1dd0 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1630 ../yum/__init__.py:3660 ++#: ../cli.py:1703 ../yum/__init__.py:3701 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1636 ++#: ../cli.py:1709 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1638 ++#: ../cli.py:1711 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -139857,37 +140705,37 @@ index 704a726..a1f1dd0 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1679 ++#: ../cli.py:1752 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1690 ++#: ../cli.py:1763 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1716 ++#: ../cli.py:1789 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1736 ++#: ../cli.py:1809 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1748 ++#: ../cli.py:1821 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1770 ++#: ../cli.py:1843 #, python-format msgid "" "\n" @@ -139896,153 +140744,153 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1834 ++#: ../cli.py:1907 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1909 ++#: ../cli.py:1982 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:1963 ++#: ../cli.py:2036 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:1967 ++#: ../cli.py:2040 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:1970 ++#: ../cli.py:2043 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:1973 ++#: ../cli.py:2046 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:1976 ++#: ../cli.py:2049 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:1978 ++#: ../cli.py:2051 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:1982 ++#: ../cli.py:2055 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:1984 ++#: ../cli.py:2057 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:1987 ++#: ../cli.py:2060 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:1990 ++#: ../cli.py:2063 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:1992 ++#: ../cli.py:2065 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:1994 ++#: ../cli.py:2067 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:1996 ++#: ../cli.py:2069 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2000 ++#: ../cli.py:2073 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2001 ++#: ../cli.py:2074 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2005 ++#: ../cli.py:2078 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2009 ++#: ../cli.py:2082 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2012 ++#: ../cli.py:2085 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2014 ++#: ../cli.py:2087 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2017 ++#: ../cli.py:2090 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2019 ++#: ../cli.py:2092 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2021 ++#: ../cli.py:2094 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2023 ++#: ../cli.py:2096 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2026 ++#: ../cli.py:2099 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2029 ++#: ../cli.py:2102 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2031 ++#: ../cli.py:2104 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2033 ++#: ../cli.py:2106 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2035 ++#: ../cli.py:2108 msgid "set arbitrary config and repo options" msgstr "" @@ -140385,22 +141233,22 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1478 ++#: ../output.py:1368 ../output.py:1429 ../output.py:1530 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:2024 ++#: ../output.py:1370 ../output.py:1430 ../output.py:2076 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ++#: ../output.py:1371 ../output.py:1431 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1428 ../output.py:2379 ++#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -140437,351 +141285,356 @@ index 704a726..a1f1dd0 100644 #, python-format msgid "" "\n" -@@ -869,57 +891,52 @@ msgid "" +@@ -869,57 +891,57 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2174 ../output.py:2175 ++#: ../output.py:1421 ../output.py:2230 ../output.py:2231 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1422 ++#: ../output.py:1423 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1425 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1424 ../output.py:2180 ++#: ../output.py:1427 ../output.py:2236 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1425 ../output.py:2181 ++#: ../output.py:1428 ../output.py:2237 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1472 ++#: ../output.py:1464 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "" ++ ++#: ../output.py:1524 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1473 ++#: ../output.py:1525 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1475 ++#: ../output.py:1527 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1477 ++#: ../output.py:1529 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1479 ++#: ../output.py:1531 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1480 ++#: ../output.py:1532 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1567 ++#: ../output.py:1619 msgid "two" msgstr "" -@@ -927,7 +944,7 @@ msgstr "" +@@ -927,7 +949,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:1271 -+#: ../output.py:1578 ++#: ../output.py:1630 #, python-format msgid "" "\n" -@@ -935,484 +952,536 @@ msgid "" +@@ -935,484 +957,536 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1589 ++#: ../output.py:1641 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1615 ++#: ../output.py:1667 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1637 ++#: ../output.py:1689 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1638 ++#: ../output.py:1690 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1639 ++#: ../output.py:1691 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1640 ++#: ../output.py:1692 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1641 ++#: ../output.py:1693 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1642 ++#: ../output.py:1694 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1656 ++#: ../output.py:1708 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1657 ++#: ../output.py:1709 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1726 ++#: ../output.py:1778 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1736 ../output.py:1926 ++#: ../output.py:1788 ../output.py:1978 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1761 ../output.py:2368 ../output.py:2458 ++#: ../output.py:1813 ../output.py:2424 ../output.py:2514 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1808 ++#: ../output.py:1860 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1810 ../output.py:2256 ++#: ../output.py:1862 ../output.py:2312 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1811 ../output.py:2377 ++#: ../output.py:1863 ../output.py:2433 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1813 ++#: ../output.py:1865 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1814 ../output.py:2258 ../output.py:2378 ++#: ../output.py:1866 ../output.py:2314 ../output.py:2434 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1815 ../output.py:2259 ++#: ../output.py:1867 ../output.py:2315 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1862 ++#: ../output.py:1914 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1888 ../output.py:2324 ++#: ../output.py:1940 ../output.py:2380 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1893 ++#: ../output.py:1945 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1901 ++#: ../output.py:1953 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:1952 ../output.py:2332 ++#: ../output.py:2004 ../output.py:2388 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2023 ../output.py:2182 ++#: ../output.py:2075 ../output.py:2238 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2025 ++#: ../output.py:2077 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2061 ../output.py:2063 ../output.py:2480 ++#: ../output.py:2115 ../output.py:2117 ../output.py:2536 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2065 ../output.py:2482 ++#: ../output.py:2119 ../output.py:2538 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2068 ../output.py:2070 ++#: ../output.py:2122 ../output.py:2124 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2086 ++#: ../output.py:2140 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2088 ++#: ../output.py:2142 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2090 ++#: ../output.py:2144 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2092 ++#: ../output.py:2146 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2093 ++#: ../output.py:2147 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2096 ../output.py:2098 ++#: ../output.py:2150 ../output.py:2152 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2101 ../output.py:2103 ++#: ../output.py:2155 ../output.py:2157 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2107 ../output.py:2110 ../output.py:2112 ../output.py:2114 -+#: ../output.py:2116 ++#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 ++#: ../output.py:2170 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2107 ../output.py:2112 ++#: ../output.py:2161 ../output.py:2166 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2110 ++#: ../output.py:2164 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2114 ++#: ../output.py:2168 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2116 ++#: ../output.py:2170 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2511 ++#: ../output.py:2175 ../output.py:2177 ../output.py:2567 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2132 ++#: ../output.py:2186 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2137 ++#: ../output.py:2191 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2141 ++#: ../output.py:2195 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2145 ++#: ../output.py:2199 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2151 ++#: ../output.py:2207 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2162 ++#: ../output.py:2218 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2168 ++#: ../output.py:2224 msgid "Errors:" msgstr "" @@ -140790,17 +141643,17 @@ index 704a726..a1f1dd0 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2176 ++#: ../output.py:2232 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2178 ++#: ../output.py:2234 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2179 ++#: ../output.py:2235 msgid "Erase" msgstr "" @@ -140813,224 +141666,224 @@ index 704a726..a1f1dd0 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2183 ++#: ../output.py:2239 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2257 ++#: ../output.py:2313 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2283 ++#: ../output.py:2339 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2284 ++#: ../output.py:2340 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2285 ++#: ../output.py:2341 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2286 ++#: ../output.py:2342 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2287 ++#: ../output.py:2343 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2288 ++#: ../output.py:2344 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2289 ++#: ../output.py:2345 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2336 ++#: ../output.py:2392 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2342 ++#: ../output.py:2398 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2343 ++#: ../output.py:2399 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2356 ++#: ../output.py:2412 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2483 ++#: ../output.py:2539 +msgid "Package :" +msgstr "" + -+#: ../output.py:2484 ++#: ../output.py:2540 +msgid "State :" +msgstr "" + -+#: ../output.py:2487 ++#: ../output.py:2543 +msgid "Size :" +msgstr "" + -+#: ../output.py:2489 ++#: ../output.py:2545 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2492 ++#: ../output.py:2548 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2494 ++#: ../output.py:2550 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2496 ++#: ../output.py:2552 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2498 ++#: ../output.py:2554 +msgid "License :" +msgstr "" + -+#: ../output.py:2500 ++#: ../output.py:2556 +msgid "URL :" +msgstr "" + -+#: ../output.py:2502 ++#: ../output.py:2558 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2505 ++#: ../output.py:2561 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2507 ++#: ../output.py:2563 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2509 ++#: ../output.py:2565 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2513 ++#: ../output.py:2569 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2517 ++#: ../output.py:2573 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2521 ++#: ../output.py:2577 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2566 ++#: ../output.py:2622 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2567 ++#: ../output.py:2623 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2568 ++#: ../output.py:2624 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2569 ++#: ../output.py:2625 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2570 ++#: ../output.py:2626 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2571 ++#: ../output.py:2627 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2572 ++#: ../output.py:2628 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2573 ++#: ../output.py:2629 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2577 ++#: ../output.py:2633 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2588 ++#: ../output.py:2644 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2594 ++#: ../output.py:2650 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2600 ++#: ../output.py:2656 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2613 ../output.py:2626 ++#: ../output.py:2669 ../output.py:2682 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2639 ++#: ../output.py:2695 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2648 ++#: ../output.py:2704 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2665 ++#: ../output.py:2721 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2667 ++#: ../output.py:2723 #, python-format msgid "" "\n" @@ -141038,7 +141891,7 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2676 ++#: ../output.py:2732 #, python-format msgid "" "\n" @@ -141046,7 +141899,7 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2681 ++#: ../output.py:2737 #, python-format msgid "" "\n" @@ -141054,7 +141907,7 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2683 ++#: ../output.py:2739 msgid "" "\n" " Not found" @@ -141062,103 +141915,103 @@ index 704a726..a1f1dd0 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2698 ++#: ../output.py:2754 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2699 ++#: ../output.py:2755 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2700 ++#: ../output.py:2756 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2718 ++#: ../output.py:2774 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2753 ../output.py:2766 ++#: ../output.py:2809 ../output.py:2822 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2772 ++#: ../output.py:2828 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2781 ++#: ../output.py:2837 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 -+#: ../utils.py:123 ++#: ../utils.py:129 msgid "Running" msgstr "" -#: ../utils.py:100 -+#: ../utils.py:124 ++#: ../utils.py:130 msgid "Sleeping" msgstr "" -#: ../utils.py:101 -+#: ../utils.py:125 ++#: ../utils.py:131 msgid "Uninterruptible" msgstr "" -#: ../utils.py:102 -+#: ../utils.py:126 ++#: ../utils.py:132 msgid "Zombie" msgstr "" -#: ../utils.py:103 -+#: ../utils.py:127 ++#: ../utils.py:133 msgid "Traced/Stopped" msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:128 ../yumcommands.py:1792 ++#: ../utils.py:134 ../yumcommands.py:1796 msgid "Unknown" msgstr "" -#: ../utils.py:115 -+#: ../utils.py:149 ++#: ../utils.py:155 msgid " The other application is: PackageKit" msgstr "" -#: ../utils.py:117 -+#: ../utils.py:151 ++#: ../utils.py:157 #, python-format msgid " The other application is: %s" msgstr "" -#: ../utils.py:120 -+#: ../utils.py:154 ++#: ../utils.py:160 #, python-format msgid " Memory : %5s RSS (%5sB VSZ)" msgstr "" -#: ../utils.py:125 -+#: ../utils.py:159 ++#: ../utils.py:165 #, python-format msgid " Started: %s - %s ago" msgstr "" -#: ../utils.py:127 -+#: ../utils.py:161 ++#: ../utils.py:167 #, python-format msgid " State : %s, pid: %d" msgstr "" -#: ../utils.py:170 ../yummain.py:43 -+#: ../utils.py:190 ../yummain.py:43 ++#: ../utils.py:196 ../yummain.py:43 msgid "" "\n" "\n" @@ -141166,7 +142019,7 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../utils.py:176 ../yummain.py:49 -+#: ../utils.py:202 ../yummain.py:49 ++#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" @@ -141174,68 +142027,68 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../utils.py:178 ../yummain.py:51 -+#: ../utils.py:204 ../yummain.py:51 ++#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1420,47 +1489,47 @@ msgid "" +@@ -1420,47 +1494,47 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:280 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" msgstr "" -#: ../utils.py:287 -+#: ../utils.py:346 ++#: ../utils.py:352 #, python-format msgid "PluginExit Error: %s" msgstr "" -#: ../utils.py:290 -+#: ../utils.py:349 ++#: ../utils.py:355 #, python-format msgid "Yum Error: %s" msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:407 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:411 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" msgstr "" -#: ../utils.py:348 ../yummain.py:87 -+#: ../utils.py:413 ../yummain.py:87 ++#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:420 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:426 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:219 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:442 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "" -@@ -1472,7 +1541,7 @@ msgstr "" +@@ -1472,7 +1546,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -141244,7 +142097,7 @@ index 704a726..a1f1dd0 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1558,484 @@ msgid "" +@@ -1489,451 +1563,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -141507,188 +142360,187 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yumcommands.py:764 -+#: ../yumcommands.py:1437 - msgid "Determine which package provides the given dependency" - msgstr "" - +-msgid "Determine which package provides the given dependency" +-msgstr "" +- -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1453 ++#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1484 ++#: ../yumcommands.py:1488 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1510 ++#: ../yumcommands.py:1514 msgid "Setting up Yum Shell" msgstr "" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1553 ++#: ../yumcommands.py:1557 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1580 ++#: ../yumcommands.py:1584 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1612 ++#: ../yumcommands.py:1616 msgid "Display the configured software repositories" msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1691 ../yumcommands.py:1692 ++#: ../yumcommands.py:1695 ../yumcommands.py:1696 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1718 ../yumcommands.py:1719 ++#: ../yumcommands.py:1722 ../yumcommands.py:1723 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1735 ++#: ../yumcommands.py:1739 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1736 ++#: ../yumcommands.py:1740 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1743 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1742 ++#: ../yumcommands.py:1746 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1750 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1752 ++#: ../yumcommands.py:1756 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1761 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1759 ++#: ../yumcommands.py:1763 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1760 ++#: ../yumcommands.py:1764 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1767 ../yumcommands.py:1788 ++#: ../yumcommands.py:1771 ../yumcommands.py:1792 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1775 ++#: ../yumcommands.py:1779 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1783 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1782 ++#: ../yumcommands.py:1786 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1798 ++#: ../yumcommands.py:1802 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1800 ++#: ../yumcommands.py:1804 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1803 ++#: ../yumcommands.py:1807 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1805 ++#: ../yumcommands.py:1809 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1808 ++#: ../yumcommands.py:1812 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1816 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1820 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1824 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1830 ../yumcommands.py:1859 ++#: ../yumcommands.py:1834 ../yumcommands.py:1863 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1847 ../yumcommands.py:1848 ../yumcommands.py:1866 ++#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1860 ++#: ../yumcommands.py:1864 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1922 ++#: ../yumcommands.py:1926 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1964 ++#: ../yumcommands.py:1968 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1969 ++#: ../yumcommands.py:1973 msgid "" "\n" "\n" @@ -141696,7 +142548,7 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1971 ++#: ../yumcommands.py:1975 msgid "" "\n" "\n" @@ -141704,148 +142556,148 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2056 ++#: ../yumcommands.py:2060 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2068 ++#: ../yumcommands.py:2072 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2131 ++#: ../yumcommands.py:2135 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2146 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2181 ++#: ../yumcommands.py:2185 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2233 ++#: ../yumcommands.py:2237 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2243 ++#: ../yumcommands.py:2247 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2248 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2273 ++#: ../yumcommands.py:2277 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2281 ++#: ../yumcommands.py:2285 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2290 ++#: ../yumcommands.py:2294 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2299 ++#: ../yumcommands.py:2303 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2363 ++#: ../yumcommands.py:2367 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2435 ++#: ../yumcommands.py:2461 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2436 ++#: ../yumcommands.py:2462 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2437 ++#: ../yumcommands.py:2463 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2438 ++#: ../yumcommands.py:2464 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2439 ++#: ../yumcommands.py:2465 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2440 ++#: ../yumcommands.py:2466 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2441 ++#: ../yumcommands.py:2467 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2442 ++#: ../yumcommands.py:2468 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2443 ++#: ../yumcommands.py:2469 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2444 ++#: ../yumcommands.py:2470 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2503 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2482 ++#: ../yumcommands.py:2510 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2574 ++#: ../yumcommands.py:2602 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2639 ++#: ../yumcommands.py:2667 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2656 ++#: ../yumcommands.py:2684 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2660 ++#: ../yumcommands.py:2688 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2666 ++#: ../yumcommands.py:2694 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2046,106 @@ msgstr "" +@@ -1944,100 +2047,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -141853,7 +142705,7 @@ index 704a726..a1f1dd0 100644 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 -+msgid "No read/write access in current directory, moving to /" ++msgid "No read/execute access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 @@ -141890,226 +142742,226 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:83 ++#: ../yum/depsolve.py:86 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:98 ++#: ../yum/depsolve.py:101 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:152 ++#: ../yum/depsolve.py:155 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:170 ++#: ../yum/depsolve.py:173 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:221 ++#: ../yum/depsolve.py:224 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:235 ../yum/depsolve.py:831 ++#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:247 ++#: ../yum/depsolve.py:250 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:263 ++#: ../yum/depsolve.py:266 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:285 ++#: ../yum/depsolve.py:288 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:326 ++#: ../yum/depsolve.py:329 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:353 ++#: ../yum/depsolve.py:356 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:363 ++#: ../yum/depsolve.py:366 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:371 ++#: ../yum/depsolve.py:374 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:394 ++#: ../yum/depsolve.py:397 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:398 ++#: ../yum/depsolve.py:401 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,774 +2153,782 @@ msgstr "" +@@ -2045,991 +2154,1026 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:403 ../yum/depsolve.py:420 ++#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:414 ../yum/depsolve.py:424 ++#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:430 ++#: ../yum/depsolve.py:451 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:443 ++#: ../yum/depsolve.py:464 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:446 ++#: ../yum/depsolve.py:467 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:454 ++#: ../yum/depsolve.py:475 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:485 ++#: ../yum/depsolve.py:506 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:527 ++#: ../yum/depsolve.py:548 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:543 ++#: ../yum/depsolve.py:564 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:554 ++#: ../yum/depsolve.py:575 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:572 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:621 ++#: ../yum/depsolve.py:642 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:630 ++#: ../yum/depsolve.py:651 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:765 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:805 ../yum/depsolve.py:821 ++#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:841 ++#: ../yum/depsolve.py:881 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:863 ++#: ../yum/depsolve.py:903 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:887 ++#: ../yum/depsolve.py:927 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:973 ++#: ../yum/depsolve.py:1013 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1216 ++#: ../yum/depsolve.py:1256 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1243 ../yum/depsolve.py:1249 ++#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1345 ++#: ../yum/depsolve.py:1385 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1357 ++#: ../yum/depsolve.py:1397 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -142117,43 +142969,43 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1365 ++#: ../yum/depsolve.py:1405 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1369 ++#: ../yum/depsolve.py:1409 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1375 ++#: ../yum/depsolve.py:1415 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1406 ++#: ../yum/depsolve.py:1446 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1410 ++#: ../yum/depsolve.py:1450 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1455 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1431 ++#: ../yum/depsolve.py:1471 #, python-format msgid "Best Order: %s" msgstr "" @@ -142341,24 +143193,24 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1617 ++#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1627 ++#: ../yum/__init__.py:1640 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1643 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1644 ++#: ../yum/__init__.py:1657 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -142366,7 +143218,7 @@ index 704a726..a1f1dd0 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1687 ++#: ../yum/__init__.py:1700 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -142377,40 +143229,40 @@ index 704a726..a1f1dd0 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1756 ++#: ../yum/__init__.py:1769 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1883 ++#: ../yum/__init__.py:1896 #, python-format msgid "Could not open lock %s: %s" msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1900 ++#: ../yum/__init__.py:1913 #, python-format msgid "Unable to check if PID %s is active" msgstr "" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1904 ++#: ../yum/__init__.py:1917 #, python-format msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1952 ++#: ../yum/__init__.py:1965 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2005 ++#: ../yum/__init__.py:2018 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -142418,23 +143270,23 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2028 ++#: ../yum/__init__.py:2041 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2031 ++#: ../yum/__init__.py:2044 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2094 ++#: ../yum/__init__.py:2107 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2097 ../yum/__init__.py:2127 ++#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 #, python-format msgid "using local copy of %s" msgstr "" @@ -142448,67 +143300,67 @@ index 704a726..a1f1dd0 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2205 ++#: ../yum/__init__.py:2218 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2258 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2305 ++#: ../yum/__init__.py:2318 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2309 ++#: ../yum/__init__.py:2322 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2317 ++#: ../yum/__init__.py:2330 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2321 ++#: ../yum/__init__.py:2334 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2363 ++#: ../yum/__init__.py:2376 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2367 ++#: ../yum/__init__.py:2380 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2426 ++#: ../yum/__init__.py:2439 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2430 ++#: ../yum/__init__.py:2443 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2432 ++#: ../yum/__init__.py:2445 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -142517,26 +143369,26 @@ index 704a726..a1f1dd0 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2522 ++#: ../yum/__init__.py:2535 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2528 ++#: ../yum/__init__.py:2541 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2892 ++#: ../yum/__init__.py:2905 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2948 ++#: ../yum/__init__.py:2961 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -142545,62 +143397,62 @@ index 704a726..a1f1dd0 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2952 ++#: ../yum/__init__.py:2965 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2964 ++#: ../yum/__init__.py:2977 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2971 ++#: ../yum/__init__.py:2984 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3056 ++#: ../yum/__init__.py:3069 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3092 ../yum/__init__.py:3112 ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3153 ../yum/__init__.py:3246 ../yum/__init__.py:3250 -+#: ../yum/__init__.py:3674 ++#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 ++#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 ++#: ../yum/__init__.py:3715 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3124 ../yum/__init__.py:3266 ++#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3176 ++#: ../yum/__init__.py:3189 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3180 ++#: ../yum/__init__.py:3193 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3230 ++#: ../yum/__init__.py:3243 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3232 ++#: ../yum/__init__.py:3245 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -142608,78 +143460,79 @@ index 704a726..a1f1dd0 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3304 ++#: ../yum/__init__.py:3317 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3332 ++#: ../yum/__init__.py:3345 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3395 ../yum/__init__.py:3457 ++#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3419 ../yum/__init__.py:3424 ++#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 ++#: ../yum/__init__.py:3499 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3758 ++#: ../yum/__init__.py:3799 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3762 ++#: ../yum/__init__.py:3803 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3781 ../yum/__init__.py:4683 ++#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3787 ../yum/__init__.py:4151 ../yum/__init__.py:4353 -+#: ../yum/__init__.py:4689 ++#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 ++#: ../yum/__init__.py:4730 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3864 ++#: ../yum/__init__.py:3905 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3867 ++#: ../yum/__init__.py:3908 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3879 ++#: ../yum/__init__.py:3920 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3907 ++#: ../yum/__init__.py:3948 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3912 ++#: ../yum/__init__.py:3953 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -142687,118 +143540,118 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3915 ++#: ../yum/__init__.py:3956 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3923 ++#: ../yum/__init__.py:3964 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3937 ++#: ../yum/__init__.py:3978 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4060 ++#: ../yum/__init__.py:4101 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4084 ../yum/__init__.py:4226 ../yum/__init__.py:4256 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 ++#: ../yum/__init__.py:4333 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4129 ../yum/__init__.py:4349 ++#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4169 ++#: ../yum/__init__.py:4210 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4215 ++#: ../yum/__init__.py:4256 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4251 ++#: ../yum/__init__.py:4292 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4260 ../yum/__init__.py:4296 ++#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4366 ++#: ../yum/__init__.py:4407 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4372 ++#: ../yum/__init__.py:4413 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4378 ++#: ../yum/__init__.py:4419 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4415 ++#: ../yum/__init__.py:4456 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4418 ../yum/__init__.py:4535 ../yum/__init__.py:4620 ++#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4422 ++#: ../yum/__init__.py:4463 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4431 ../yum/__init__.py:4538 ../yum/__init__.py:4623 ++#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4437 ++#: ../yum/__init__.py:4478 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4445 ++#: ../yum/__init__.py:4486 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -142806,7 +143659,7 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4464 ../yum/__init__.py:4471 ++#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -142814,158 +143667,166 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4480 ../yum/__init__.py:4543 ../yum/__init__.py:4628 ++#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4485 ++#: ../yum/__init__.py:4526 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4491 ++#: ../yum/__init__.py:4532 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4498 ++#: ../yum/__init__.py:4539 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4617 ++#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4572 ++#: ../yum/__init__.py:4613 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4598 ++#: ../yum/__init__.py:4639 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4711 ++#: ../yum/__init__.py:4752 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4719 ++#: ../yum/__init__.py:4760 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4765 ++#: ../yum/__init__.py:4806 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4772 ++#: ../yum/__init__.py:4813 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4874 ../yum/__init__.py:4919 ++#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4880 ../yum/__init__.py:4925 ++#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4958 ++#: ../yum/__init__.py:5032 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:4976 ++#: ../yum/__init__.py:5050 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:4999 ++#: ../yum/__init__.py:5073 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5001 ++#: ../yum/__init__.py:5075 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5009 ++#: ../yum/__init__.py:5083 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5018 ++#: ../yum/__init__.py:5092 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5034 ++#: ../yum/__init__.py:5108 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2821,7 +2937,7 @@ msgid "" - " From : %s" +-" Userid : %s\n" +-" Package: %s (%s)\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5042 ++#: ../yum/__init__.py:5118 #, python-format msgid "" "Importing %s key 0x%s:\n" -@@ -2829,207 +2945,231 @@ msgid "" - " From : %s" +-" Userid: \"%s\"\n" +-" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5153 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5114 ++#: ../yum/__init__.py:5192 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5115 ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5197 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5123 ++#: ../yum/__init__.py:5201 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -142973,29 +143834,29 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5132 ++#: ../yum/__init__.py:5210 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5156 ++#: ../yum/__init__.py:5234 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5200 ++#: ../yum/__init__.py:5278 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5216 ++#: ../yum/__init__.py:5294 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5220 ++#: ../yum/__init__.py:5298 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -143003,117 +143864,117 @@ index 704a726..a1f1dd0 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5370 ++#: ../yum/__init__.py:5448 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5372 ++#: ../yum/__init__.py:5450 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5427 ++#: ../yum/__init__.py:5505 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5444 ++#: ../yum/__init__.py:5522 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5556 ++#: ../yum/__init__.py:5634 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5617 ../yum/__init__.py:5619 ++#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5648 ../yum/__init__.py:5650 ++#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5674 ++#: ../yum/__init__.py:5752 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5703 ++#: ../yum/__init__.py:5781 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5705 ++#: ../yum/__init__.py:5783 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5708 ../yum/__init__.py:5843 ++#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5717 ++#: ../yum/__init__.py:5795 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5756 ++#: ../yum/__init__.py:5834 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5760 ++#: ../yum/__init__.py:5838 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5796 ../yum/__init__.py:5813 ++#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5916 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5840 ++#: ../yum/__init__.py:5918 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5915 ../yum/__init__.py:5934 ++#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5996 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5939 ++#: ../yum/__init__.py:6017 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5953 ++#: ../yum/__init__.py:6031 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -143213,7 +144074,7 @@ index 704a726..a1f1dd0 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3178,14 @@ msgstr "" +@@ -3038,6 +3182,14 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -143229,19 +144090,20 @@ index 704a726..a1f1dd0 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py -index 6082005..ad7bbb1 100644 +index 6082005..732f962 100644 --- a/rpmUtils/arch.py +++ b/rpmUtils/arch.py -@@ -3,6 +3,8 @@ +@@ -2,6 +2,9 @@ + # import os - -+_ppc64_native_is_best = False ++import rpm + ++_ppc64_native_is_best = False + # dict mapping arch -> ( multicompat, best personality, biarch personality ) multilibArches = { "x86_64": ( "athlon", "x86_64", "athlon" ), - "sparc64v": ( "sparcv9v", "sparcv9v", "sparc64v" ), -@@ -10,6 +12,8 @@ multilibArches = { "x86_64": ( "athlon", "x86_64", "athlon" ), +@@ -10,6 +13,8 @@ multilibArches = { "x86_64": ( "athlon", "x86_64", "athlon" ), "ppc64": ( "ppc", "ppc", "ppc64" ), "s390x": ( "s390", "s390x", "s390" ), } @@ -143250,7 +144112,41 @@ index 6082005..ad7bbb1 100644 arches = { # ia32 -@@ -339,7 +343,7 @@ def getBestArch(myarch=None): +@@ -61,6 +66,10 @@ arches = { + "armv5tejl": "armv5tel", + "armv5tel": "noarch", + ++ #arm hardware floating point ++ "armv7hnl": "armv7hl", ++ "armv7hl": "noarch", ++ + # super-h + "sh4a": "sh4", + "sh4": "noarch", +@@ -231,6 +240,13 @@ def getCanonX86Arch(arch): + + return arch + ++def getCanonARMArch(arch): ++ # the %{_target_arch} macro in rpm will let us know the abi we are using ++ target = rpm.expandMacro('%{_target_cpu}') ++ if target.startswith('armv7h'): ++ return target ++ return arch ++ + def getCanonPPCArch(arch): + # FIXME: should I do better handling for mac, etc? + if arch != "ppc64": +@@ -308,6 +324,8 @@ def getCanonArch(skipRpmPlatform = 0): + if (len(arch) == 4 and arch[0] == "i" and arch[2:4] == "86"): + return getCanonX86Arch(arch) + ++ if arch.startswith("arm"): ++ return getCanonARMArch(arch) + if arch.startswith("ppc"): + return getCanonPPCArch(arch) + if arch.startswith("sparc"): +@@ -339,7 +357,7 @@ def getBestArch(myarch=None): if arch.startswith("sparc64"): arch = multilibArches[arch][1] @@ -143259,25 +144155,24 @@ index 6082005..ad7bbb1 100644 arch = 'ppc' return arch -@@ -357,7 +361,7 @@ def getBaseArch(myarch=None): +@@ -357,8 +375,10 @@ def getBaseArch(myarch=None): if myarch.startswith("sparc64"): return "sparc" - elif myarch.startswith("ppc64"): + elif myarch.startswith("ppc64") and not _ppc64_native_is_best: return "ppc" ++ elif myarch.startswith("armv7h"): ++ return "armhfp" elif myarch.startswith("arm"): return "arm" + diff --git a/shell.py b/shell.py -index 999bffc..34a492e 100644 +index 999bffc..2232b03 100644 --- a/shell.py +++ b/shell.py -@@ -23,16 +23,14 @@ import cmd - import shlex - import logging - --from yum import Errors -+from yum import Errors, _ +@@ -26,13 +26,11 @@ import logging + from yum import Errors from yum.constants import * import yum.logginglevels as logginglevels - @@ -143675,6 +144570,403 @@ index d0f22be..c185a7f 100644 class FakeSack: """ Fake PackageSack to use with FakeRepository""" +diff --git a/test/yum-pylintrc b/test/yum-pylintrc +index fa3e57c..ea4e683 100644 +--- a/test/yum-pylintrc ++++ b/test/yum-pylintrc +@@ -1,11 +1,3 @@ +-# lint Python modules using external checkers. +-# +-# This is the main checker controling the other ones and the reports +-# generation. It is itself both a raw checker and an astng checker in order +-# to: +-# * handle message activation / deactivation at the module level +-# * handle some basic but necessary stats'data (number of classes, methods...) +-# + [MASTER] + + # Specify a configuration file. +@@ -13,7 +5,7 @@ + + # Python code to execute, usually for sys.path manipulation such as + # pygtk.require(). +-#init-hook=="execfile('test/pylint-setup.py')" ++#init-hook= + + # Profiled execution. + profile=no +@@ -25,9 +17,6 @@ ignore=CVS + # Pickle collected data for later comparisons. + persistent=yes + +-# Set the cache size for astng objects. +-cache-size=500 +- + # List of plugins (as comma separated values of python modules names) to load, + # usually to register additional checkers. + load-plugins= +@@ -35,24 +24,15 @@ load-plugins= + + [MESSAGES CONTROL] + +-# Enable only checker(s) with the given id(s). This option conflicts with the +-# disable-checker option +-#enable-checker= +- +-# Enable all checker(s) except those with the given id(s). This option +-# conflicts with the enable-checker option +-#disable-checker= +- +-# Enable all messages in the listed categories. +-#enable-msg-cat= +- +-# Disable all messages in the listed categories. +-disable-msg-cat=C,R ++# Enable the message, report, category or checker with the given id(s). You can ++# either give multiple identifier separated by comma (,) or put this option ++# multiple time. ++#enable= + +-# Enable the message(s) with the given id(s). +-#enable-msg= ++# Disable the message, report, category or checker with the given id(s). You ++# can either give multiple identifier separated by comma (,) or put this option ++# multiple time. + +-# Disable the message(s) with the given id(s). + # E1101: *%s %r has no %r member* (The init-hook for do sys.path manipulation don't, so we cant find the utils module) + # F0401: *Unable to import %r (%s)* (See above) + # W0704: *Except doesn't do anything* ( Except xxxxxx,e : pass is ok) +@@ -83,12 +63,13 @@ disable-msg-cat=C,R + # W0710: *Exception doesn't inherit from standard "Exception" class* (give false positives on ex. KeyboardInterrupt) + # W0631: *Using possibly undefined loop variable %r* (Gives to many false positives) + # E1103: *%s %r has no %r member (but some types could not be inferred)* +-disable-msg=E1101,F0401,W0704,W0612,W0212,W0613,W0602,W0511,W0401,W0614,W0232,W0201,W0603,W0621,W0142,W0102,W0105,W0702,W0231,E0202,W0622,W0403,W0223,W0104,W1001,W0221,W0703,W0710,W0631,E1103 ++ ++disable=C,R,I,E1101,F0401,W0704,W0612,W0212,W0613,W0602,W0511,W0401,W0614,W0232,W0201,W0603,W0621,W0142,W0102,W0105,W0702,W0231,E0202,W0622,W0403,W0223,W0104,W1001,W0221,W0703,W0710,W0631,E1103 + + + [REPORTS] + +-# set the output format. Available formats are text, parseable, colorized, msvs ++# Set the output format. Available formats are text, parseable, colorized, msvs + # (visual studio) and html + output-format=colorized + +@@ -100,12 +81,12 @@ include-ids=yes + # written in a file name "pylint_global.[txt|html]". + files-output=no + +-# Tells wether to display a full report or only the messages ++# Tells whether to display a full report or only the messages + reports=yes + + # Python expression which should return a note less than 10 (10 is the highest +-# note).You have access to the variables errors warning, statement which +-# respectivly contain the number of errors / warnings messages and the total ++# note). You have access to the variables errors warning, statement which ++# respectively contain the number of errors / warnings messages and the total + # number of statements analyzed. This is used by the global evaluation report + # (R0004). + evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) +@@ -114,79 +95,94 @@ evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / stateme + # evaluation report (R0004). + comment=no + +-# Enable the report(s) with the given id(s). +-#enable-report= + +-# Disable the report(s) with the given id(s). +-#disable-report= ++[MISCELLANEOUS] ++ ++# List of note tags to take in consideration, separated by a comma. ++notes=FIXME,XXX,TODO ++ ++ ++[TYPECHECK] ++ ++# Tells whether missing members accessed in mixin class should be ignored. A ++# mixin class is detected if its name ends with "mixin" (case insensitive). ++ignore-mixin-members=yes ++ ++# List of classes names for which member attributes should not be checked ++# (useful for classes with attributes dynamically set). ++ignored-classes=SQLObject ++ ++# When zope mode is activated, add a predefined set of Zope acquired attributes ++# to generated-members. ++zope=no ++ ++# List of members which are set dynamically and missed by pylint inference ++# system, and so shouldn't trigger E0201 when accessed. ++generated-members=REQUEST,acl_users,aq_parent + + +-# checks for : +-# * doc strings +-# * modules / classes / functions / methods / arguments / variables name +-# * number of arguments, local variables, branchs, returns and statements in +-# functions, methods +-# * required module attributes +-# * dangerous default values as arguments +-# * redefinition of function / method / class +-# * uses of the global statement +-# + [BASIC] + + # Required attributes for module, separated by a comma + required-attributes= + +-# Regular expression which should only match functions or classes name which do +-# not require a docstring +-no-docstring-rgx=__.*__ ++# List of builtins function names that should not be used, separated by a comma ++bad-functions=input + + # Regular expression which should only match correct module names +-module-rgx=(([a-z_][a-z0-9_\-]*)|([A-Z][a-zA-Z0-9]+))$ ++module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ + + # Regular expression which should only match correct module level names +-const-rgx=(([A-Z_a-z][A-Z1-9_a-z]*)|(__.*__))$ ++const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ + + # Regular expression which should only match correct class names + class-rgx=[A-Z_][a-zA-Z0-9]+$ + + # Regular expression which should only match correct function names +-function-rgx=[a-z_][a-z0-9_A-Z]{2,30}$ ++function-rgx=[a-z_][a-z0-9_]{2,30}$ + + # Regular expression which should only match correct method names +-method-rgx=[a-z_][a-z0-9_A-Z]{2,30}$ ++method-rgx=[a-z_][a-z0-9_]{2,30}$ + + # Regular expression which should only match correct instance attribute names +-attr-rgx=[a-z_][a-z0-9_A-Z]{2,30}$ ++attr-rgx=[a-z_][a-z0-9_]{2,30}$ + + # Regular expression which should only match correct argument names +-argument-rgx=[a-z_][a-z0-9_A-Z]{0,30}$ ++argument-rgx=[a-z_][a-z0-9_]{2,30}$ + + # Regular expression which should only match correct variable names +-variable-rgx=[a-z_][a-z0-9_A-Z]{0,30}$ ++variable-rgx=[a-z_][a-z0-9_]{2,30}$ + + # Regular expression which should only match correct list comprehension / + # generator expression variable names + inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ + + # Good variable names which should always be accepted, separated by a comma +-good-names=i,j,k,ex,Run,_,n,e,r,v,a,po,f,m,u,h,l ++good-names=i,j,k,ex,Run,_ + + # Bad variable names which should always be refused, separated by a comma + bad-names=foo,bar,baz,toto,tutu,tata + +-# List of builtins function names that should not be used, separated by a comma +-bad-functions=input ++# Regular expression which should only match functions or classes name which do ++# not require a docstring ++no-docstring-rgx=__.*__ ++ ++ ++[SIMILARITIES] ++ ++# Minimum lines number of a similarity. ++min-similarity-lines=4 ++ ++# Ignore comments when computing similarities. ++ignore-comments=yes ++ ++# Ignore docstrings when computing similarities. ++ignore-docstrings=yes + + +-# checks for +-# * unused variables / imports +-# * undefined variables +-# * redefinition of variable from builtins or from an outer scope +-# * use of variable before assigment +-# + [VARIABLES] + +-# Tells wether we should check for unused import in __init__ files. ++# Tells whether we should check for unused import in __init__ files. + init-import=no + + # A regular expression matching names used for dummy variables (i.e. not used). +@@ -197,89 +193,67 @@ dummy-variables-rgx=_|dummy + additional-builtins= + + +-# try to find bugs in the code using type inference +-# +-[TYPECHECK] ++[FORMAT] + +-# Tells wether missing members accessed in mixin class should be ignored. A +-# mixin class is detected if its name ends with "mixin" (case insensitive). +-ignore-mixin-members=yes ++# Maximum number of characters on a single line. ++max-line-length=80 + +-# List of classes names for which member attributes should not be checked +-# (useful for classes with attributes dynamicaly set). +-ignored-classes=SQLObject,NullTranslations ++# Maximum number of lines in a module ++max-module-lines=1000 + +-# When zope mode is activated, consider the acquired-members option to ignore +-# access to some undefined attributes. +-zope=no ++# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 ++# tab). ++indent-string=' ' + +-# List of members which are usually get through zope's acquisition mecanism and +-# so shouldn't trigger E0201 when accessed (need zope=yes to be considered). +-acquired-members=REQUEST,acl_users,aq_parent ++ ++[CLASSES] ++ ++# List of interface methods to ignore, separated by a comma. This is used for ++# instance to not check methods defines in Zope's Interface base class. ++ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by ++ ++# List of method names used to declare (i.e. assign) instance attributes. ++defining-attr-methods=__init__,__new__,setUp + + +-# checks for +-# * external modules dependencies +-# * relative / wildcard imports +-# * cyclic imports +-# * uses of deprecated modules +-# + [IMPORTS] + + # Deprecated modules which should not be used, separated by a comma + deprecated-modules=regsub,TERMIOS,Bastion,rexec + + # Create a graph of every (i.e. internal and external) dependencies in the +-# given file (report R0402 must not be disabled) ++# given file (report RP0402 must not be disabled) + import-graph= + +-# Create a graph of external dependencies in the given file (report R0402 must ++# Create a graph of external dependencies in the given file (report RP0402 must + # not be disabled) + ext-import-graph= + +-# Create a graph of internal dependencies in the given file (report R0402 must ++# Create a graph of internal dependencies in the given file (report RP0402 must + # not be disabled) + int-import-graph= + + +-# checks for : +-# * methods without self as first argument +-# * overridden methods signature +-# * access only to existant members via self +-# * attributes not defined in the __init__ method +-# * supported interfaces implementation +-# * unreachable code +-# +-[CLASSES] +- +-# List of interface methods to ignore, separated by a comma. This is used for +-# instance to not check methods defines in Zope's Interface base class. +-ignore-iface-methods=interrupt_callback +- +-# List of method names used to declare (i.e. assign) instance attributes. +-defining-attr-methods=__init__,__new__,setUp +- +- +-# checks for sign of poor/misdesign: +-# * number of methods, attributes, local variables... +-# * size, complexity of functions, methods +-# + [DESIGN] + + # Maximum number of arguments for function / method + max-args=5 + ++# Argument names that match this expression will be ignored. Default to name ++# with leading underscore ++ignored-argument-names=_.* ++ + # Maximum number of locals for function / method body +-max-locals=30 ++max-locals=15 + + # Maximum number of return / yield for function / method body +-max-returns=10 ++max-returns=6 + + # Maximum number of branch for function / method body +-max-branchs=25 ++max-branchs=12 + + # Maximum number of statements in function / method body +-max-statements=100 ++max-statements=50 + + # Maximum number of parents for a class (see R0901). + max-parents=7 +@@ -291,49 +265,4 @@ max-attributes=7 + min-public-methods=2 + + # Maximum number of public methods for a class (see R0904). +-max-public-methods=100 +- +- +-# checks for : +-# * unauthorized constructions +-# * strict indentation +-# * line length +-# * use of <> instead of != +-# +-[FORMAT] +- +-# Maximum number of characters on a single line. +-max-line-length=80 +- +-# Maximum number of lines in a module +-max-module-lines=1000 +- +-# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +-# tab). +-indent-string=' ' +- +- +-# checks for similarities and duplicated code. This computation may be +-# memory / CPU intensive, so you should disable it if you experiments some +-# problems. +-# +-[SIMILARITIES] +- +-# Minimum lines number of a similarity. +-min-similarity-lines=4 +- +-# Ignore comments when computing similarities. +-ignore-comments=yes +- +-# Ignore docstrings when computing similarities. +-ignore-docstrings=yes +- +- +-# checks for: +-# * warning notes in the code like FIXME, XXX +-# * PEP 263: source code with non ascii character but no encoding declaration +-# +-[MISCELLANEOUS] +- +-# List of note tags to take in consideration, separated by a comma. +-notes=FIXME,XXX,TODO ++max-public-methods=20 diff --git a/utils.py b/utils.py old mode 100644 new mode 100755 @@ -145293,7 +146585,7 @@ index abd203f..b78a9f6 100644 - 3.4.1 - umask bug fix. diff --git a/yum/__init__.py b/yum/__init__.py -index 99039e0..3ede145 100644 +index 99039e0..5c7e511 100644 --- a/yum/__init__.py +++ b/yum/__init__.py @@ -82,7 +82,7 @@ from packages import YumAvailablePackage, YumLocalPackage, YumInstalledPackage @@ -145725,13 +147017,22 @@ index 99039e0..3ede145 100644 # make resultobject - just a plain yumgenericholder object resultobject = misc.GenericHolder() -@@ -1571,9 +1671,14 @@ class YumBase(depsolve.Depsolve): +@@ -1567,13 +1667,22 @@ class YumBase(depsolve.Depsolve): + self.plugins.run('posttrans') + # sync up what just happened versus what is in the rpmdb + if not self.ts.isTsFlagSet(rpm.RPMTRANS_FLAG_TEST): +- self.verifyTransaction(resultobject) ++ vTcb = None ++ if hasattr(cb, 'verify_txmbr'): ++ vTcb = cb.verify_txmbr ++ self.verifyTransaction(resultobject, vTcb) return resultobject - def verifyTransaction(self, resultobject=None): +- def verifyTransaction(self, resultobject=None): - """checks that the transaction did what we expected it to do. Also - propagates our external yumdb info""" - ++ def verifyTransaction(self, resultobject=None, txmbr_cb=None): + """Check that the transaction did what was expected, and + propagate external yumdb information. Output error messages + if the transaction did not do what was expected. @@ -145739,11 +147040,39 @@ index 99039e0..3ede145 100644 + :param resultobject: the :class:`yum.misc.GenericHolder` + object returned from the :func:`runTransaction` call that + ran the transaction ++ :param txmbr_cb: the callback for the rpm transaction members + """ # check to see that the rpmdb and the tsInfo roughly matches # push package object metadata outside of rpmdb into yumdb # delete old yumdb metadata entries -@@ -1645,6 +1750,9 @@ class YumBase(depsolve.Depsolve): +@@ -1584,9 +1693,16 @@ class YumBase(depsolve.Depsolve): + # that there is not also an install of this pkg in the tsInfo (reinstall) + # for any kind of install add from_repo to the yumdb, and the cmdline + # and the install reason ++ ++ def _call_txmbr_cb(txmbr, count): ++ if txmbr_cb is not None: ++ count += 1 ++ txmbr_cb(txmbr, count) ++ return count + + vt_st = time.time() + self.plugins.run('preverifytrans') ++ count = 0 + for txmbr in self.tsInfo: + if txmbr.output_state in TS_INSTALL_STATES: + if not self.rpmdb.contains(po=txmbr.po): +@@ -1596,7 +1712,9 @@ class YumBase(depsolve.Depsolve): + ' but is not!' % txmbr.po)) + # Note: Get Panu to do te.Failed() so we don't have to + txmbr.output_state = TS_FAILED ++ count = _call_txmbr_cb(txmbr, count) + continue ++ count = _call_txmbr_cb(txmbr, count) + po = self.getInstalledPackageObject(txmbr.pkgtup) + rpo = txmbr.po + po.yumdb_info.from_repo = rpo.repoid +@@ -1645,6 +1763,9 @@ class YumBase(depsolve.Depsolve): elif loginuid is not None: po.yumdb_info.installed_by = str(loginuid) @@ -145753,7 +147082,21 @@ index 99039e0..3ede145 100644 # Remove old ones after installing new ones, so we can copy values. for txmbr in self.tsInfo: if txmbr.output_state in TS_INSTALL_STATES: -@@ -1680,10 +1788,11 @@ class YumBase(depsolve.Depsolve): +@@ -1662,10 +1783,13 @@ class YumBase(depsolve.Depsolve): + ' but is not!' % txmbr.po)) + # Note: Get Panu to do te.Failed() so we don't have to + txmbr.output_state = TS_FAILED ++ count = _call_txmbr_cb(txmbr, count) + continue ++ count = _call_txmbr_cb(txmbr, count) + yumdb_item = self.rpmdb.yumdb.get_package(po=txmbr.po) + yumdb_item.clean() + else: ++ count = _call_txmbr_cb(txmbr, count) + self.verbose_logger.log(logginglevels.DEBUG_2, 'What is this? %s' % txmbr.po) + + self.plugins.run('postverifytrans') +@@ -1680,10 +1804,11 @@ class YumBase(depsolve.Depsolve): self.verbose_logger.debug('VerifyTransaction time: %0.3f' % (time.time() - vt_st)) def costExcludePackages(self): @@ -145769,7 +147112,7 @@ index 99039e0..3ede145 100644 # if all the repo.costs are equal then don't bother running things costs = {} for r in self.repos.listEnabled(): -@@ -1705,10 +1814,12 @@ class YumBase(depsolve.Depsolve): +@@ -1705,10 +1830,12 @@ class YumBase(depsolve.Depsolve): done = True def excludePackages(self, repo=None): @@ -145785,7 +147128,7 @@ index 99039e0..3ede145 100644 if "all" in self.conf.disable_excludes: return -@@ -1735,9 +1846,11 @@ class YumBase(depsolve.Depsolve): +@@ -1735,9 +1862,11 @@ class YumBase(depsolve.Depsolve): self.pkgSack.addPackageExcluder(repoid, exid,'exclude.match', match) def includePackages(self, repo): @@ -145800,7 +147143,7 @@ index 99039e0..3ede145 100644 includelist = repo.getIncludePkgList() if len(includelist) == 0: -@@ -1757,8 +1870,11 @@ class YumBase(depsolve.Depsolve): +@@ -1757,8 +1886,11 @@ class YumBase(depsolve.Depsolve): self.pkgSack.addPackageExcluder(repo.id, exid, 'exclude.marked') def doLock(self, lockfile = YUM_PID_FILE): @@ -145814,7 +147157,46 @@ index 99039e0..3ede145 100644 if self.conf.uid != 0: # If we are a user, assume we are using the root cache ... so don't # bother locking. -@@ -1804,8 +1920,12 @@ class YumBase(depsolve.Depsolve): +@@ -1774,38 +1906,26 @@ class YumBase(depsolve.Depsolve): + + mypid=str(os.getpid()) + while not self._lock(lockfile, mypid, 0644): +- try: +- fd = open(lockfile, 'r') +- except (IOError, OSError), e: +- msg = _("Could not open lock %s: %s") % (lockfile, e) +- raise Errors.LockError(errno.EPERM, msg) +- +- try: oldpid = int(fd.readline()) +- except ValueError: +- # bogus data in the pid file. Throw away. ++ oldpid = self._get_locker(lockfile) ++ if not oldpid: ++ # Invalid locker: unlink lockfile and retry + self._unlock(lockfile) +- else: +- if oldpid == os.getpid(): # if we own the lock, we're fine +- break +- try: os.kill(oldpid, 0) +- except OSError, e: +- if e[0] == errno.ESRCH: +- # The pid doesn't exist +- self._unlock(lockfile) +- else: +- # Whoa. What the heck happened? +- msg = _('Unable to check if PID %s is active') % oldpid +- raise Errors.LockError(errno.EPERM, msg, oldpid) +- else: +- # Another copy seems to be running. +- msg = _('Existing lock %s: another copy is running as pid %s.') % (lockfile, oldpid) +- raise Errors.LockError(0, msg, oldpid) ++ continue ++ if oldpid == os.getpid(): # if we own the lock, we're fine ++ break ++ # Another copy seems to be running. ++ msg = _('Existing lock %s: another copy is running as pid %s.') % (lockfile, oldpid) ++ raise Errors.LockError(0, msg, oldpid) + # We've got the lock, store it so we can auto-unlock on __del__... self._lockfile = lockfile def doUnlock(self, lockfile=None): @@ -145829,7 +147211,15 @@ index 99039e0..3ede145 100644 # if we're not root then we don't lock - just return nicely # Note that we can get here from __del__, so if we haven't created # YumBase.conf we don't want to do so here as creating stuff inside -@@ -1836,25 +1956,36 @@ class YumBase(depsolve.Depsolve): +@@ -1830,31 +1950,69 @@ class YumBase(depsolve.Depsolve): + self._unlock(lockfile) + self._lockfile = None + +- def _lock(self, filename, contents='', mode=0777): ++ @staticmethod ++ def _lock(filename, contents='', mode=0777): + lockdir = os.path.dirname(filename) + try: if not os.path.exists(lockdir): os.makedirs(lockdir, mode=0755) fd = os.open(filename, os.O_EXCL|os.O_CREAT|os.O_WRONLY, mode) @@ -145847,9 +147237,36 @@ index 99039e0..3ede145 100644 - os.close(fd) - return 1 - def _unlock(self, filename): +- def _unlock(self, filename): ++ @staticmethod ++ def _unlock(filename): misc.unlink_f(filename) ++ @staticmethod ++ def _get_locker(lockfile): ++ try: fd = open(lockfile, 'r') ++ except (IOError, OSError), e: ++ msg = _("Could not open lock %s: %s") % (lockfile, e) ++ raise Errors.LockError(errno.EPERM, msg) ++ try: oldpid = int(fd.readline()) ++ except ValueError: ++ return None # Bogus pid ++ ++ try: ++ stat = open("/proc/%d/stat" % oldpid).readline() ++ if stat.split()[2] == 'Z': ++ return None # The pid is a zombie ++ except IOError: ++ # process dead or /proc not mounted ++ try: os.kill(oldpid, 0) ++ except OSError, e: ++ if e[0] == errno.ESRCH: ++ return None # The pid doesn't exist ++ # Whoa. What the heck happened? ++ msg = _('Unable to check if PID %s is active') % oldpid ++ raise Errors.LockError(errno.EPERM, msg, oldpid) ++ return oldpid ++ def verifyPkg(self, fo, po, raiseError): - """verifies the package is what we expect it to be - raiseError = defaults to 0 - if 1 then will raise @@ -145874,7 +147291,7 @@ index 99039e0..3ede145 100644 failed = False if type(fo) is types.InstanceType: -@@ -1894,9 +2025,16 @@ class YumBase(depsolve.Depsolve): +@@ -1894,9 +2052,16 @@ class YumBase(depsolve.Depsolve): def verifyChecksum(self, fo, checksumType, csum): @@ -145894,7 +147311,7 @@ index 99039e0..3ede145 100644 try: filesum = misc.checksum(checksumType, fo) except Errors.MiscError, e: -@@ -1908,6 +2046,17 @@ class YumBase(depsolve.Depsolve): +@@ -1908,6 +2073,17 @@ class YumBase(depsolve.Depsolve): return 0 def downloadPkgs(self, pkglist, callback=None, callback_total=None): @@ -145912,7 +147329,7 @@ index 99039e0..3ede145 100644 def mediasort(apo, bpo): # FIXME: we should probably also use the mediaid; else we # could conceivably ping-pong between different disc1's -@@ -1998,16 +2147,6 @@ class YumBase(depsolve.Depsolve): +@@ -1998,16 +2174,6 @@ class YumBase(depsolve.Depsolve): os.unlink(local) checkfunc = (self.verifyPkg, (po, 1), {}) @@ -145929,7 +147346,7 @@ index 99039e0..3ede145 100644 try: if i == 1 and not local_size and remote_size == po.size: text = os.path.basename(po.relativepath) -@@ -2032,7 +2171,7 @@ class YumBase(depsolve.Depsolve): +@@ -2032,7 +2198,7 @@ class YumBase(depsolve.Depsolve): done_repos.add(po.repoid) except Errors.RepoError, e: @@ -145938,7 +147355,7 @@ index 99039e0..3ede145 100644 else: po.localpath = mylocal if po in errors: -@@ -2052,7 +2191,22 @@ class YumBase(depsolve.Depsolve): +@@ -2052,7 +2218,22 @@ class YumBase(depsolve.Depsolve): return errors def verifyHeader(self, fo, po, raiseError): @@ -145962,7 +147379,7 @@ index 99039e0..3ede145 100644 if type(fo) is types.InstanceType: fo = fo.filename -@@ -2076,9 +2230,12 @@ class YumBase(depsolve.Depsolve): +@@ -2076,9 +2257,12 @@ class YumBase(depsolve.Depsolve): return 1 def downloadHeader(self, po): @@ -145977,7 +147394,7 @@ index 99039e0..3ede145 100644 if hasattr(po, 'pkgtype') and po.pkgtype == 'local': return -@@ -2122,15 +2279,17 @@ class YumBase(depsolve.Depsolve): +@@ -2122,15 +2306,17 @@ class YumBase(depsolve.Depsolve): return def sigCheckPkg(self, po): @@ -146003,7 +147420,7 @@ index 99039e0..3ede145 100644 if self._override_sigchecks: check = False hasgpgkey = 0 -@@ -2181,6 +2340,9 @@ class YumBase(depsolve.Depsolve): +@@ -2181,6 +2367,9 @@ class YumBase(depsolve.Depsolve): return result, msg def cleanUsedHeadersPackages(self): @@ -146013,7 +147430,7 @@ index 99039e0..3ede145 100644 filelist = [] for txmbr in self.tsInfo: if txmbr.po.state not in TS_INSTALL_STATES: -@@ -2218,27 +2380,40 @@ class YumBase(depsolve.Depsolve): +@@ -2218,27 +2407,40 @@ class YumBase(depsolve.Depsolve): _('%s removed'), fn) def cleanHeaders(self): @@ -146054,7 +147471,7 @@ index 99039e0..3ede145 100644 cachedir = self.conf.persistdir + "/rpmdb-indexes/" if not os.path.exists(cachedir): filelist = [] -@@ -2272,8 +2447,29 @@ class YumBase(depsolve.Depsolve): +@@ -2272,8 +2474,29 @@ class YumBase(depsolve.Depsolve): def doPackageLists(self, pkgnarrow='all', patterns=None, showdups=None, ignore_case=False): @@ -146086,7 +147503,7 @@ index 99039e0..3ede145 100644 if showdups is None: showdups = self.conf.showdupesfromrepos ygh = misc.GenericHolder(iter=pkgnarrow) -@@ -2461,14 +2657,13 @@ class YumBase(depsolve.Depsolve): +@@ -2461,14 +2684,13 @@ class YumBase(depsolve.Depsolve): def findDeps(self, pkgs): @@ -146106,7 +147523,7 @@ index 99039e0..3ede145 100644 results = {} for pkg in pkgs: -@@ -2495,10 +2690,22 @@ class YumBase(depsolve.Depsolve): +@@ -2495,10 +2717,22 @@ class YumBase(depsolve.Depsolve): # pre 3.2.10 API used to always showdups, so that's the default atm. def searchGenerator(self, fields, criteria, showdups=True, keys=False, searchtags=True, searchrpmdb=True): @@ -146133,7 +147550,7 @@ index 99039e0..3ede145 100644 sql_fields = [] for f in fields: sql_fields.append(RPM_TO_SQLITE.get(f, f)) -@@ -2661,6 +2868,14 @@ class YumBase(depsolve.Depsolve): +@@ -2661,6 +2895,14 @@ class YumBase(depsolve.Depsolve): yield (po, vs) def searchPackageTags(self, criteria): @@ -146148,7 +147565,7 @@ index 99039e0..3ede145 100644 results = {} # name = [(criteria, taglist)] for c in criteria: c = c.lower() -@@ -2677,11 +2892,16 @@ class YumBase(depsolve.Depsolve): +@@ -2677,11 +2919,16 @@ class YumBase(depsolve.Depsolve): return results def searchPackages(self, fields, criteria, callback=None): @@ -146170,7 +147587,7 @@ index 99039e0..3ede145 100644 warnings.warn(_('searchPackages() will go away in a future version of Yum.\ Use searchGenerator() instead. \n'), Errors.YumFutureDeprecationWarning, stacklevel=2) -@@ -2700,6 +2920,19 @@ class YumBase(depsolve.Depsolve): +@@ -2700,6 +2947,19 @@ class YumBase(depsolve.Depsolve): def searchPackageProvides(self, args, callback=None, callback_has_matchfor=False): @@ -146190,7 +147607,7 @@ index 99039e0..3ede145 100644 def _arg_data(arg): if not misc.re_glob(arg): isglob = False -@@ -2818,11 +3051,17 @@ class YumBase(depsolve.Depsolve): +@@ -2818,11 +3078,17 @@ class YumBase(depsolve.Depsolve): return matches def doGroupLists(self, uservisible=0, patterns=None, ignore_case=True): @@ -146213,7 +147630,7 @@ index 99039e0..3ede145 100644 installed = [] available = [] -@@ -2852,8 +3091,13 @@ class YumBase(depsolve.Depsolve): +@@ -2852,8 +3118,13 @@ class YumBase(depsolve.Depsolve): def groupRemove(self, grpid): @@ -146229,7 +147646,7 @@ index 99039e0..3ede145 100644 txmbrs_used = [] thesegroups = self.comps.return_groups(grpid) -@@ -2872,9 +3116,10 @@ class YumBase(depsolve.Depsolve): +@@ -2872,9 +3143,10 @@ class YumBase(depsolve.Depsolve): return txmbrs_used def groupUnremove(self, grpid): @@ -146242,7 +147659,7 @@ index 99039e0..3ede145 100644 thesegroups = self.comps.return_groups(grpid) if not thesegroups: raise Errors.GroupsError, _("No Group named %s exists") % to_unicode(grpid) -@@ -2899,12 +3144,16 @@ class YumBase(depsolve.Depsolve): +@@ -2899,12 +3171,16 @@ class YumBase(depsolve.Depsolve): def selectGroup(self, grpid, group_package_types=[], enable_group_conditionals=None): @@ -146265,7 +147682,7 @@ index 99039e0..3ede145 100644 """ if not self.comps.has_group(grpid): -@@ -2939,7 +3188,7 @@ class YumBase(depsolve.Depsolve): +@@ -2939,7 +3215,7 @@ class YumBase(depsolve.Depsolve): self.verbose_logger.log(logginglevels.DEBUG_2, _('Adding package %s from group %s'), pkg, thisgroup.groupid) try: @@ -146274,7 +147691,7 @@ index 99039e0..3ede145 100644 except Errors.InstallError, e: self.verbose_logger.debug(_('No package named %s available to be installed'), pkg) -@@ -2997,10 +3246,14 @@ class YumBase(depsolve.Depsolve): +@@ -2997,10 +3273,14 @@ class YumBase(depsolve.Depsolve): return txmbrs_used def deselectGroup(self, grpid, force=False): @@ -146293,7 +147710,7 @@ index 99039e0..3ede145 100644 if not self.comps.has_group(grpid): raise Errors.GroupsError, _("No Group named %s exists") % to_unicode(grpid) -@@ -3035,12 +3288,21 @@ class YumBase(depsolve.Depsolve): +@@ -3035,12 +3315,21 @@ class YumBase(depsolve.Depsolve): self.tsInfo.remove(pkg.pkgtup) def getPackageObject(self, pkgtup, allow_missing=False): @@ -146321,7 +147738,7 @@ index 99039e0..3ede145 100644 # look it up in the self.localPackages first: for po in self.localPackages: if po.pkgtup == pkgtup: -@@ -3049,7 +3311,7 @@ class YumBase(depsolve.Depsolve): +@@ -3049,7 +3338,7 @@ class YumBase(depsolve.Depsolve): pkgs = self.pkgSack.searchPkgTuple(pkgtup) if len(pkgs) == 0: @@ -146330,7 +147747,7 @@ index 99039e0..3ede145 100644 if allow_missing: # This can happen due to excludes after .up has return None # happened. raise Errors.DepError, _('Package tuple %s could not be found in packagesack') % str(pkgtup) -@@ -3065,13 +3327,21 @@ class YumBase(depsolve.Depsolve): +@@ -3065,13 +3354,21 @@ class YumBase(depsolve.Depsolve): return result def getInstalledPackageObject(self, pkgtup): @@ -146357,7 +147774,7 @@ index 99039e0..3ede145 100644 raise Errors.RpmDBError, _('Package tuple %s could not be found in rpmdb') % str(pkgtup) # Dito. FIXME from getPackageObject() for len() > 1 ... :) -@@ -3079,9 +3349,11 @@ class YumBase(depsolve.Depsolve): +@@ -3079,9 +3376,11 @@ class YumBase(depsolve.Depsolve): return po def gpgKeyCheck(self): @@ -146371,7 +147788,7 @@ index 99039e0..3ede145 100644 gpgkeyschecked = self.conf.cachedir + '/.gpgkeyschecked.yum' if os.path.exists(gpgkeyschecked): return 1 -@@ -3106,9 +3378,13 @@ class YumBase(depsolve.Depsolve): +@@ -3106,9 +3405,13 @@ class YumBase(depsolve.Depsolve): return 1 def returnPackagesByDep(self, depstring): @@ -146387,7 +147804,7 @@ index 99039e0..3ede145 100644 if not depstring: return [] -@@ -3135,9 +3411,16 @@ class YumBase(depsolve.Depsolve): +@@ -3135,9 +3438,16 @@ class YumBase(depsolve.Depsolve): return self.pkgSack.getProvides(depname, depflags, depver).keys() def returnPackageByDep(self, depstring): @@ -146407,7 +147824,7 @@ index 99039e0..3ede145 100644 # we get all sorts of randomness here errstring = depstring if type(depstring) not in types.StringTypes: -@@ -3156,9 +3439,14 @@ class YumBase(depsolve.Depsolve): +@@ -3156,9 +3466,14 @@ class YumBase(depsolve.Depsolve): return result def returnInstalledPackagesByDep(self, depstring): @@ -146425,7 +147842,7 @@ index 99039e0..3ede145 100644 if not depstring: return [] -@@ -3184,6 +3472,34 @@ class YumBase(depsolve.Depsolve): +@@ -3184,6 +3499,34 @@ class YumBase(depsolve.Depsolve): return self.rpmdb.getProvides(depname, depflags, depver).keys() @@ -146460,7 +147877,7 @@ index 99039e0..3ede145 100644 def _bestPackageFromList(self, pkglist): """take list of package objects and return the best package object. If the list is empty, return None. -@@ -3202,10 +3518,17 @@ class YumBase(depsolve.Depsolve): +@@ -3202,10 +3545,17 @@ class YumBase(depsolve.Depsolve): return bestlist[0][0] def bestPackagesFromList(self, pkglist, arch=None, single_name=False): @@ -146482,7 +147899,7 @@ index 99039e0..3ede145 100644 returnlist = [] compatArchList = self.arch.get_arch_list(arch) multiLib = [] -@@ -3438,13 +3761,35 @@ class YumBase(depsolve.Depsolve): +@@ -3438,13 +3788,35 @@ class YumBase(depsolve.Depsolve): self.tsInfo.probFilterFlags.append(flag) def install(self, po=None, **kwargs): @@ -146524,7 +147941,7 @@ index 99039e0..3ede145 100644 pkgs = [] was_pattern = False if po: -@@ -3600,23 +3945,23 @@ class YumBase(depsolve.Depsolve): +@@ -3600,23 +3972,23 @@ class YumBase(depsolve.Depsolve): already_obs = pkgs[0] if already_obs: @@ -146555,7 +147972,7 @@ index 99039e0..3ede145 100644 continue # make sure we don't have a name.arch of this already installed -@@ -3630,7 +3975,7 @@ class YumBase(depsolve.Depsolve): +@@ -3630,7 +4002,7 @@ class YumBase(depsolve.Depsolve): found = True break if not found: @@ -146564,7 +147981,7 @@ index 99039e0..3ede145 100644 txmbrs = self.update(po=po) tx_return.extend(txmbrs) continue -@@ -3719,14 +4064,33 @@ class YumBase(depsolve.Depsolve): +@@ -3719,14 +4091,33 @@ class YumBase(depsolve.Depsolve): return txmbr def update(self, po=None, requiringPo=None, update_to=False, **kwargs): @@ -146605,7 +148022,7 @@ index 99039e0..3ede145 100644 # check for args - if no po nor kwargs, do them all # if po, do it, ignore all else # if no po do kwargs -@@ -3985,11 +4349,18 @@ class YumBase(depsolve.Depsolve): +@@ -3985,11 +4376,18 @@ class YumBase(depsolve.Depsolve): return tx_return def remove(self, po=None, **kwargs): @@ -146629,7 +148046,7 @@ index 99039e0..3ede145 100644 if not po and not kwargs: raise Errors.RemoveError, 'Nothing specified to remove' -@@ -4055,17 +4426,19 @@ class YumBase(depsolve.Depsolve): +@@ -4055,17 +4453,19 @@ class YumBase(depsolve.Depsolve): return tx_return def installLocal(self, pkg, po=None, updateonly=False): @@ -146659,7 +148076,7 @@ index 99039e0..3ede145 100644 # read in the package into a YumLocalPackage Object # append it to self.localPackages # check if it can be installed or updated based on nevra versus rpmdb -@@ -4183,16 +4556,15 @@ class YumBase(depsolve.Depsolve): +@@ -4183,16 +4583,15 @@ class YumBase(depsolve.Depsolve): return tx_return def reinstallLocal(self, pkg, po=None): @@ -146684,7 +148101,7 @@ index 99039e0..3ede145 100644 if not po: try: po = YumUrlPackage(self, ts=self.rpmdb.readOnlyTS(), url=pkg, -@@ -4215,9 +4587,19 @@ class YumBase(depsolve.Depsolve): +@@ -4215,9 +4614,19 @@ class YumBase(depsolve.Depsolve): return self.reinstall(po=po) def reinstall(self, po=None, **kwargs): @@ -146707,7 +148124,7 @@ index 99039e0..3ede145 100644 self._add_prob_flags(rpm.RPMPROB_FILTER_REPLACEPKG, rpm.RPMPROB_FILTER_REPLACENEWFILES, rpm.RPMPROB_FILTER_REPLACEOLDFILES) -@@ -4259,16 +4641,15 @@ class YumBase(depsolve.Depsolve): +@@ -4259,16 +4668,15 @@ class YumBase(depsolve.Depsolve): return tx_mbrs def downgradeLocal(self, pkg, po=None): @@ -146732,7 +148149,7 @@ index 99039e0..3ede145 100644 if not po: try: po = YumUrlPackage(self, ts=self.rpmdb.readOnlyTS(), url=pkg, -@@ -4309,13 +4690,19 @@ class YumBase(depsolve.Depsolve): +@@ -4309,13 +4717,19 @@ class YumBase(depsolve.Depsolve): return False def downgrade(self, po=None, **kwargs): @@ -146759,7 +148176,16 @@ index 99039e0..3ede145 100644 if not po and not kwargs: raise Errors.DowngradeError, 'Nothing specified to downgrade' -@@ -4500,12 +4887,24 @@ class YumBase(depsolve.Depsolve): +@@ -4457,7 +4871,7 @@ class YumBase(depsolve.Depsolve): + if e and v and r: + evr = '%s:%s-%s' % (e, v, r) + elif v and r: +- evr = '%s-%s' % (e, v, r) ++ evr = '%s-%s' % (v, r) + elif e and v: + evr = '%s:%s' % (e, v) + elif v: # e and r etc. is just too weird to print +@@ -4500,12 +4914,24 @@ class YumBase(depsolve.Depsolve): return returndict @@ -146787,7 +148213,7 @@ index 99039e0..3ede145 100644 old_conf_obs = self.conf.obsoletes self.conf.obsoletes = False done = False -@@ -4515,19 +4914,46 @@ class YumBase(depsolve.Depsolve): +@@ -4515,19 +4941,46 @@ class YumBase(depsolve.Depsolve): done = True for pkg in transaction.trans_data: if pkg.state == 'Downgrade': @@ -146834,7 +148260,7 @@ index 99039e0..3ede145 100644 if self.install(pkgtup=pkg.pkgtup): done = True for pkg in transaction.trans_data: -@@ -4538,8 +4964,14 @@ class YumBase(depsolve.Depsolve): +@@ -4538,8 +4991,14 @@ class YumBase(depsolve.Depsolve): return done def history_undo(self, transaction): @@ -146851,7 +148277,7 @@ index 99039e0..3ede145 100644 # NOTE: This is somewhat basic atm. ... for instance we don't check # that we are going from the old new version. However it's still # better than the RHN rollback code, and people pay for that :). -@@ -4674,34 +5106,37 @@ class YumBase(depsolve.Depsolve): +@@ -4674,34 +5133,37 @@ class YumBase(depsolve.Depsolve): if pkgs: pkgs = sorted(pkgs)[-1] msg = (_('Importing %s key 0x%s:\n' @@ -146907,7 +148333,7 @@ index 99039e0..3ede145 100644 """ repo = self.repos.getRepo(po.repoid) keyurls = repo.gpgkey -@@ -4725,7 +5160,9 @@ class YumBase(depsolve.Depsolve): +@@ -4725,7 +5187,9 @@ class YumBase(depsolve.Depsolve): # Try installing/updating GPG key self._getKeyImportMessage(info, keyurl) rc = False @@ -146918,7 +148344,7 @@ index 99039e0..3ede145 100644 rc = True # grab the .sig/.asc for the keyurl, if it exists -@@ -4819,8 +5256,11 @@ class YumBase(depsolve.Depsolve): +@@ -4819,8 +5283,11 @@ class YumBase(depsolve.Depsolve): if not key_installed: self._getKeyImportMessage(info, keyurl, keytype) rc = False @@ -146931,7 +148357,7 @@ index 99039e0..3ede145 100644 elif callback: rc = callback({"repo": repo, "userid": info['userid'], "hexkeyid": info['hexkeyid'], "keyurl": keyurl, -@@ -4861,26 +5301,23 @@ class YumBase(depsolve.Depsolve): +@@ -4861,26 +5328,23 @@ class YumBase(depsolve.Depsolve): 'this repository.') % (repo.name) def getKeyForRepo(self, repo, callback=None): @@ -146970,7 +148396,7 @@ index 99039e0..3ede145 100644 self._getAnyKeyForRepo(repo, repo.gpgcadir, repo.gpgcakey, is_cakey=True, callback=callback) def _limit_installonly_pkgs(self): -@@ -4959,19 +5396,22 @@ class YumBase(depsolve.Depsolve): +@@ -4959,19 +5423,22 @@ class YumBase(depsolve.Depsolve): txmbr.depends_on.append(rel) def processTransaction(self, callback=None,rpmTestDisplay=None, rpmDisplay=None): @@ -147006,7 +148432,7 @@ index 99039e0..3ede145 100644 if not callback: callback = callbacks.ProcessTransNoOutputCallback() -@@ -5114,13 +5554,19 @@ class YumBase(depsolve.Depsolve): +@@ -5114,13 +5581,19 @@ class YumBase(depsolve.Depsolve): return results def add_enable_repo(self, repoid, baseurls=[], mirrorlist=None, **kwargs): @@ -147033,7 +148459,7 @@ index 99039e0..3ede145 100644 # out of place fixme - maybe we should make this the default repo addition # routine and use it from getReposFromConfigFile(), etc. newrepo = yumRepo.YumRepository(repoid) -@@ -5167,9 +5613,15 @@ class YumBase(depsolve.Depsolve): +@@ -5167,9 +5640,15 @@ class YumBase(depsolve.Depsolve): def setCacheDir(self, force=False, tmpdir=None, reuse=True, suffix='/$basearch/$releasever'): @@ -147052,7 +148478,7 @@ index 99039e0..3ede145 100644 if not force and os.geteuid() == 0: return True # We are root, not forced, so happy with the global dir. if tmpdir is None: -@@ -5220,13 +5672,24 @@ class YumBase(depsolve.Depsolve): +@@ -5220,13 +5699,24 @@ class YumBase(depsolve.Depsolve): self.history.write_addon_data('config-repos', myrepos) def verify_plugins_cb(self, verify_package): @@ -147080,7 +148506,7 @@ index 99039e0..3ede145 100644 if self.tsInfo._unresolvedMembers: if auto: self.logger.critical(_("Dependencies not solved. Will not save unresolved transaction.")) -@@ -5234,7 +5697,7 @@ class YumBase(depsolve.Depsolve): +@@ -5234,7 +5724,7 @@ class YumBase(depsolve.Depsolve): raise Errors.YumBaseError(_("Dependencies not solved. Will not save unresolved transaction.")) if not filename: @@ -147089,7 +148515,7 @@ index 99039e0..3ede145 100644 fd,filename = tempfile.mkstemp(suffix='.yumtx', prefix=prefix) f = os.fdopen(fd, 'w') else: -@@ -5266,7 +5729,17 @@ class YumBase(depsolve.Depsolve): +@@ -5266,7 +5756,17 @@ class YumBase(depsolve.Depsolve): def load_ts(self, filename, ignorerpm=None, ignoremissing=None): @@ -147108,7 +148534,7 @@ index 99039e0..3ede145 100644 # check rpmversion - if not match throw a fit # check repoversions (and repos)- if not match throw a fit # load each txmbr - if pkgs being updated don't exist, bail w/error -@@ -5292,6 +5765,16 @@ class YumBase(depsolve.Depsolve): +@@ -5292,6 +5792,16 @@ class YumBase(depsolve.Depsolve): # 3+numrepos = num pkgs # 3+numrepos+1 -> EOF= txmembers @@ -147125,6 +148551,14 @@ index 99039e0..3ede145 100644 # rpm db ver rpmv = data[0].strip() if rpmv != str(self.rpmdb.simpleVersion(main_only=True)[0]): +@@ -5329,6 +5839,7 @@ class YumBase(depsolve.Depsolve): + pkgcount = 0 + pkgprob = False + curpkg = None ++ missingany = False + for l in data[pkgstart:]: + l = l.rstrip() + # our main txmbrs diff --git a/yum/callbacks.py b/yum/callbacks.py index 7ad25ce..a9a8e53 100644 --- a/yum/callbacks.py @@ -147273,11 +148707,16 @@ index 7ad25ce..a9a8e53 100644 pass diff --git a/yum/config.py b/yum/config.py -index d09511f..f9789de 100644 +index d09511f..6c09ee9 100644 --- a/yum/config.py +++ b/yum/config.py -@@ -47,13 +47,12 @@ __pkgs_gpgcheck_default__ = False +@@ -45,15 +45,17 @@ from misc import get_uuid, read_in_items_from_dot_dir + # Alter/patch these to change the default checking... + __pkgs_gpgcheck_default__ = False __repo_gpgcheck_default__ = False ++__main_multilib_policy_default__ = 'all' ++__main_failovermethod_default__ = 'roundrobin' ++__main_installonly_limit_default__ = 0 class Option(object): - ''' @@ -147293,7 +148732,7 @@ index d09511f..f9789de 100644 def __init__(self, default=None, parse_default=False): self._setattrname() -@@ -63,19 +62,19 @@ class Option(object): +@@ -63,19 +65,19 @@ class Option(object): self.default = default def _setattrname(self): @@ -147321,7 +148760,7 @@ index d09511f..f9789de 100644 # xemacs highlighting hack: ' if obj is None: return self -@@ -83,12 +82,11 @@ class Option(object): +@@ -83,12 +85,11 @@ class Option(object): return getattr(obj, self._attrname, None) def __set__(self, obj, value): @@ -147338,7 +148777,7 @@ index d09511f..f9789de 100644 # Only try to parse if it's a string if isinstance(value, basestring): try: -@@ -100,62 +98,59 @@ class Option(object): +@@ -100,62 +101,59 @@ class Option(object): setattr(obj, self._attrname, value) def setup(self, obj, name): @@ -147427,7 +148866,7 @@ index d09511f..f9789de 100644 def __init__(self, default=None, parse_default=False): if default is None: -@@ -163,10 +158,12 @@ class ListOption(Option): +@@ -163,10 +161,12 @@ class ListOption(Option): super(ListOption, self).__init__(default, parse_default) def parse(self, s): @@ -147443,7 +148882,7 @@ index d09511f..f9789de 100644 """ # we need to allow for the '\n[whitespace]' continuation - easier # to sub the \n with a space and then read the lines -@@ -183,12 +180,18 @@ class ListOption(Option): +@@ -183,12 +183,18 @@ class ListOption(Option): return results def tostring(self, value): @@ -147465,7 +148904,7 @@ index d09511f..f9789de 100644 def __init__(self, default=None, schemes=('http', 'ftp', 'file', 'https'), allow_none=False): -@@ -197,6 +200,13 @@ class UrlOption(Option): +@@ -197,6 +203,13 @@ class UrlOption(Option): self.allow_none = allow_none def parse(self, url): @@ -147479,7 +148918,7 @@ index d09511f..f9789de 100644 url = url.strip() # Handle the "_none_" special case -@@ -224,10 +234,9 @@ class UrlOption(Option): +@@ -224,10 +237,9 @@ class UrlOption(Option): return '%s or %s' % (', '.join(self.schemes[:-1]), self.schemes[-1]) class UrlListOption(ListOption): @@ -147493,7 +148932,7 @@ index d09511f..f9789de 100644 def __init__(self, default=None, schemes=('http', 'ftp', 'file', 'https'), parse_default=False): super(UrlListOption, self).__init__(default, parse_default) -@@ -236,6 +245,13 @@ class UrlListOption(ListOption): +@@ -236,6 +248,13 @@ class UrlListOption(ListOption): self._urloption = UrlOption(schemes=schemes) def parse(self, s): @@ -147507,7 +148946,7 @@ index d09511f..f9789de 100644 out = [] s = s.replace('\n', ' ') s = s.replace(',', ' ') -@@ -254,10 +270,7 @@ class UrlListOption(ListOption): +@@ -254,10 +273,7 @@ class UrlListOption(ListOption): class IntOption(Option): @@ -147519,7 +148958,7 @@ index d09511f..f9789de 100644 def __init__(self, default=None, range_min=None, range_max=None): super(IntOption, self).__init__(default) -@@ -265,6 +278,13 @@ class IntOption(Option): +@@ -265,6 +281,13 @@ class IntOption(Option): self._range_max = range_max def parse(self, s): @@ -147533,7 +148972,7 @@ index d09511f..f9789de 100644 try: val = int(s) except (ValueError, TypeError), e: -@@ -276,39 +296,56 @@ class IntOption(Option): +@@ -276,39 +299,56 @@ class IntOption(Option): return val class PositiveIntOption(IntOption): @@ -147604,7 +149043,7 @@ index d09511f..f9789de 100644 if len(s) < 1: raise ValueError("no value specified") -@@ -335,14 +372,20 @@ class SecondsOption(Option): +@@ -335,14 +375,20 @@ class SecondsOption(Option): return int(n * mult) class BoolOption(Option): @@ -147630,7 +149069,7 @@ index d09511f..f9789de 100644 s = s.lower() if s in ('0', 'no', 'false'): return False -@@ -352,30 +395,49 @@ class BoolOption(Option): +@@ -352,30 +398,49 @@ class BoolOption(Option): raise ValueError('invalid boolean value') def tostring(self, value): @@ -147685,7 +149124,7 @@ index d09511f..f9789de 100644 if s in self._mapper: s = self._mapper[s] if s not in self._allowed: -@@ -383,18 +445,21 @@ class SelectionOption(Option): +@@ -383,18 +448,21 @@ class SelectionOption(Option): return s class CaselessSelectionOption(SelectionOption): @@ -147715,7 +149154,7 @@ index d09511f..f9789de 100644 """ # Multipliers for unit symbols MULTS = { -@@ -404,20 +469,18 @@ class BytesOption(Option): +@@ -404,20 +472,18 @@ class BytesOption(Option): } def parse(self, s): @@ -147746,7 +149185,7 @@ index d09511f..f9789de 100644 """ if len(s) < 1: raise ValueError("no value specified") -@@ -443,25 +506,23 @@ class BytesOption(Option): +@@ -443,25 +509,23 @@ class BytesOption(Option): return int(n * mult) class ThrottleOption(BytesOption): @@ -147786,7 +149225,7 @@ index d09511f..f9789de 100644 """ if len(s) < 1: raise ValueError("no value specified") -@@ -479,10 +540,9 @@ class ThrottleOption(BytesOption): +@@ -479,10 +543,9 @@ class ThrottleOption(BytesOption): return BytesOption.parse(self, s) class BaseConfig(object): @@ -147800,7 +149239,7 @@ index d09511f..f9789de 100644 def __init__(self): self._section = None -@@ -499,13 +559,14 @@ class BaseConfig(object): +@@ -499,13 +562,14 @@ class BaseConfig(object): return '\n'.join(out) def populate(self, parser, section, parent=None): @@ -147821,7 +149260,7 @@ index d09511f..f9789de 100644 self.cfg = parser self._section = section -@@ -527,8 +588,19 @@ class BaseConfig(object): +@@ -527,8 +591,19 @@ class BaseConfig(object): setattr(self, name, value) def optionobj(cls, name, exceptions=True): @@ -147843,7 +149282,7 @@ index d09511f..f9789de 100644 obj = getattr(cls, name, None) if isinstance(obj, Option): return obj -@@ -539,37 +611,41 @@ class BaseConfig(object): +@@ -539,37 +614,41 @@ class BaseConfig(object): optionobj = classmethod(optionobj) def isoption(cls, name): @@ -147900,7 +149339,7 @@ index d09511f..f9789de 100644 # Write section heading if section is None: if self._section is None: -@@ -586,6 +662,14 @@ class BaseConfig(object): +@@ -586,6 +665,14 @@ class BaseConfig(object): self.cfg.write(fileobj) def getConfigOption(self, option, default=None): @@ -147915,7 +149354,7 @@ index d09511f..f9789de 100644 warnings.warn('getConfigOption() will go away in a future version of Yum.\n' 'Please access option values as attributes or using getattr().', DeprecationWarning) -@@ -594,6 +678,12 @@ class BaseConfig(object): +@@ -594,6 +681,12 @@ class BaseConfig(object): return default def setConfigOption(self, option, value): @@ -147928,7 +149367,7 @@ index d09511f..f9789de 100644 warnings.warn('setConfigOption() will go away in a future version of Yum.\n' 'Please set option values as attributes or using setattr().', DeprecationWarning) -@@ -603,11 +693,10 @@ class BaseConfig(object): +@@ -603,11 +696,10 @@ class BaseConfig(object): raise Errors.ConfigError, 'No such option %s' % option class StartupConf(BaseConfig): @@ -147944,7 +149383,7 @@ index d09511f..f9789de 100644 # xemacs highlighting hack: ' debuglevel = IntOption(2, 0, 10) errorlevel = IntOption(2, 0, 10) -@@ -625,13 +714,13 @@ class StartupConf(BaseConfig): +@@ -625,13 +717,13 @@ class StartupConf(BaseConfig): persistdir = Option('/var/lib/yum') class YumConf(StartupConf): @@ -147958,11 +149397,30 @@ index d09511f..f9789de 100644 + """ retries = PositiveIntOption(10, names_of_0=[""]) recent = IntOption(7, range_min=0) -+ reset_nice = BoolOption(False) ++ reset_nice = BoolOption(True) cachedir = Option('/var/cache/yum') -@@ -664,6 +753,7 @@ class YumConf(StartupConf): +@@ -641,7 +733,7 @@ class YumConf(StartupConf): + + commands = ListOption() + exclude = ListOption() +- failovermethod = Option('roundrobin') ++ failovermethod = Option(__main_failovermethod_default__) + proxy = UrlOption(schemes=('http', 'ftp', 'https'), allow_none=True) + proxy_username = Option() + proxy_password = Option() +@@ -654,7 +746,8 @@ class YumConf(StartupConf): + # 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(__main_installonly_limit_default__, ++ range_min=2, + names_of_0=["0", ""]) + kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise', + 'kernel-bigmem', 'kernel-BOOT', 'kernel-PAE', 'kernel-PAE-debug']) +@@ -664,6 +757,7 @@ class YumConf(StartupConf): tsflags = ListOption() assumeyes = BoolOption(False) @@ -147970,7 +149428,7 @@ index d09511f..f9789de 100644 alwaysprompt = BoolOption(True) exactarch = BoolOption(True) tolerant = BoolOption(True) -@@ -686,6 +776,9 @@ class YumConf(StartupConf): +@@ -686,6 +780,9 @@ class YumConf(StartupConf): bandwidth = BytesOption(0) throttle = ThrottleOption(0) @@ -147980,7 +149438,15 @@ index d09511f..f9789de 100644 http_caching = SelectionOption('all', ('none', 'packages', 'all')) metadata_expire = SecondsOption(60 * 60 * 6) # Time in seconds (6h). -@@ -703,7 +796,7 @@ class YumConf(StartupConf): +@@ -698,12 +795,14 @@ class YumConf(StartupConf): + # Note that "instant" is the old behaviour, but group:primary is very + # similar but better :). + mdpolicy = ListOption(['group:primary']) ++ mddownloadpolicy = SelectionOption('sqlite', ('sqlite', 'xml')) + # ('instant', 'group:all', 'group:main', 'group:small', 'group:primary')) +- multilib_policy = SelectionOption('all',('best', 'all')) ++ multilib_policy = SelectionOption(__main_multilib_policy_default__, ++ ('best', 'all')) # all == install any/all arches you can # best == use the 'best arch' for the system @@ -147989,7 +149455,7 @@ index d09511f..f9789de 100644 color = SelectionOption('auto', ('auto', 'never', 'always'), mapper={'on' : 'always', 'yes' : 'always', -@@ -747,6 +840,7 @@ class YumConf(StartupConf): +@@ -747,6 +846,7 @@ class YumConf(StartupConf): clean_requirements_on_remove = BoolOption(False) @@ -147997,7 +149463,7 @@ index d09511f..f9789de 100644 history_list_view = SelectionOption('single-user-commands', ('single-user-commands', 'users', -@@ -756,6 +850,12 @@ class YumConf(StartupConf): +@@ -756,6 +856,12 @@ class YumConf(StartupConf): _reposlist = [] def dump(self): @@ -148010,7 +149476,7 @@ index d09511f..f9789de 100644 output = '[main]\n' # we exclude all vars which start with _ or are in this list: excluded_vars = ('cfg', 'uid', 'yumvar', 'progress_obj', 'failure_obj', -@@ -778,14 +878,12 @@ class YumConf(StartupConf): +@@ -778,14 +884,12 @@ class YumConf(StartupConf): return output class RepoConf(BaseConfig): @@ -148028,7 +149494,7 @@ index d09511f..f9789de 100644 ck = self.__cached_keys if not isinstance(self, RepoConf): ck = set() -@@ -823,6 +921,8 @@ class RepoConf(BaseConfig): +@@ -823,12 +927,15 @@ class RepoConf(BaseConfig): bandwidth = Inherit(YumConf.bandwidth) throttle = Inherit(YumConf.throttle) timeout = Inherit(YumConf.timeout) @@ -148037,7 +149503,14 @@ index d09511f..f9789de 100644 http_caching = Inherit(YumConf.http_caching) metadata_expire = Inherit(YumConf.metadata_expire) mirrorlist_expire = Inherit(YumConf.mirrorlist_expire) -@@ -839,23 +939,23 @@ class RepoConf(BaseConfig): + # NOTE: metalink expire _must_ be the same as metadata_expire, due to the + # checksumming of the repomd.xml. + mdpolicy = Inherit(YumConf.mdpolicy) ++ mddownloadpolicy = Inherit(YumConf.mddownloadpolicy) + cost = IntOption(1000) + + sslcacert = Inherit(YumConf.sslcacert) +@@ -839,23 +946,23 @@ class RepoConf(BaseConfig): skip_if_unavailable = BoolOption(False) class VersionGroupConf(BaseConfig): @@ -148072,7 +149545,7 @@ index d09511f..f9789de 100644 # ' xemacs syntax hack -@@ -876,20 +976,24 @@ def readStartupConfig(configfile, root): +@@ -876,20 +983,24 @@ def readStartupConfig(configfile, root): raise Errors.ConfigError("All plugin search paths must be absolute") # Stuff this here to avoid later re-parsing startupconf._parser = parser @@ -148103,7 +149576,7 @@ index d09511f..f9789de 100644 # ' xemacs syntax hack -@@ -956,6 +1060,12 @@ def readMainConfig(startupconf): +@@ -956,6 +1067,12 @@ def readMainConfig(startupconf): return yumconf def readVersionGroupsConfig(configfile="/etc/yum/version-groups.conf"): @@ -148116,7 +149589,7 @@ index d09511f..f9789de 100644 parser = ConfigParser() confpp_obj = ConfigPreProcessor(configfile) try: -@@ -970,17 +1080,16 @@ def readVersionGroupsConfig(configfile="/etc/yum/version-groups.conf"): +@@ -970,17 +1087,16 @@ def readVersionGroupsConfig(configfile="/etc/yum/version-groups.conf"): def getOption(conf, section, name, option): @@ -148144,7 +149617,7 @@ index d09511f..f9789de 100644 try: val = conf.get(section, name) except (NoSectionError, NoOptionError): -@@ -1028,7 +1137,10 @@ def _getsysver(installroot, distroverpkg): +@@ -1028,7 +1144,10 @@ def _getsysver(installroot, distroverpkg): if idx.count() == 0: releasever = '$releasever' else: @@ -148156,7 +149629,7 @@ index d09511f..f9789de 100644 releasever = hdr['version'] del hdr del idx -@@ -1036,13 +1148,12 @@ def _getsysver(installroot, distroverpkg): +@@ -1036,13 +1155,12 @@ def _getsysver(installroot, distroverpkg): return releasever def writeRawRepoFile(repo,only=None): @@ -148175,7 +149648,7 @@ index d09511f..f9789de 100644 if not _use_iniparse: return -@@ -1069,7 +1180,7 @@ def writeRawRepoFile(repo,only=None): +@@ -1069,7 +1187,7 @@ def writeRawRepoFile(repo,only=None): # If the value is the same, but just interpreted ... when we don't want # to keep the interpreted values. if (name in ini[section_id] and @@ -148185,10 +149658,18 @@ index d09511f..f9789de 100644 if name not in cfgOptions and option.default == value: diff --git a/yum/depsolve.py b/yum/depsolve.py -index 6d744c0..c518311 100644 +index 6d744c0..720188c 100644 --- a/yum/depsolve.py +++ b/yum/depsolve.py -@@ -58,12 +58,12 @@ flags = {"GT": rpm.RPMSENSE_GREATER, +@@ -32,7 +32,6 @@ import rpm + + from packageSack import ListPackageSack + from constants import * +-import packages + import logginglevels + import Errors + import warnings +@@ -58,12 +57,12 @@ flags = {"GT": rpm.RPMSENSE_GREATER, "LE": rpm.RPMSENSE_LESS | rpm.RPMSENSE_EQUAL, "EQ": rpm.RPMSENSE_EQUAL, None: 0 } @@ -148205,7 +149686,7 @@ index 6d744c0..c518311 100644 def __init__(self): self._ts = None -@@ -81,6 +81,8 @@ class Depsolve(object): +@@ -81,6 +80,8 @@ class Depsolve(object): self.installedUnresolvedFileRequires = None def doTsSetup(self): @@ -148214,7 +149695,7 @@ index 6d744c0..c518311 100644 warnings.warn(_('doTsSetup() will go away in a future version of Yum.\n'), Errors.YumFutureDeprecationWarning, stacklevel=2) return self._getTs() -@@ -131,7 +133,7 @@ class Depsolve(object): +@@ -131,7 +132,7 @@ class Depsolve(object): def initActionTs(self): @@ -148223,7 +149704,7 @@ index 6d744c0..c518311 100644 self._ts = rpmUtils.transaction.TransactionWrapper(self.conf.installroot) ts_flags_to_rpm = { 'noscripts': rpm.RPMTRANS_FLAG_NOSCRIPTS, -@@ -158,19 +160,31 @@ class Depsolve(object): +@@ -158,19 +159,31 @@ class Depsolve(object): self._ts.setProbFilter(probfilter) def whatProvides(self, name, flags, version): @@ -148262,7 +149743,7 @@ index 6d744c0..c518311 100644 iopkgs = set(self.conf.installonlypkgs) if po.name in iopkgs: return True -@@ -182,8 +196,11 @@ class Depsolve(object): +@@ -182,8 +195,11 @@ class Depsolve(object): return False def populateTs(self, test=0, keepold=1): @@ -148275,7 +149756,7 @@ index 6d744c0..c518311 100644 if self.dsCallback: self.dsCallback.transactionPopulation() ts_elem = {} -@@ -393,9 +410,27 @@ class Depsolve(object): +@@ -393,9 +409,27 @@ class Depsolve(object): self.conf.obsoletes = 0 txmbrs = self.update(po=requiringPo, requiringPo=requiringPo) self.conf.obsoletes = origobs @@ -148305,7 +149786,7 @@ index 6d744c0..c518311 100644 msg = self._err_missing_requires(requiringPo, requirement) self.verbose_logger.log(logginglevels.DEBUG_2, _('No update paths found for %s. Failure!'), requiringPo) return self._requiringFromTransaction(requiringPo, requirement, errorlist) -@@ -696,6 +731,13 @@ class Depsolve(object): +@@ -696,6 +730,13 @@ class Depsolve(object): self.tsInfo.remove(txmbr.pkgtup) def prof_resolveDeps(self): @@ -148319,7 +149800,7 @@ index 6d744c0..c518311 100644 fn = "anaconda.prof.0" import hotshot, hotshot.stats prof = hotshot.Profile(fn) -@@ -709,6 +751,13 @@ class Depsolve(object): +@@ -709,6 +750,13 @@ class Depsolve(object): return rc def cprof_resolveDeps(self): @@ -148333,7 +149814,7 @@ index 6d744c0..c518311 100644 import cProfile, pstats prof = cProfile.Profile() rc = prof.runcall(self.resolveDeps) -@@ -722,7 +771,17 @@ class Depsolve(object): +@@ -722,7 +770,17 @@ class Depsolve(object): return rc def resolveDeps(self, full_check=True, skipping_broken=False): @@ -148352,7 +149833,7 @@ index 6d744c0..c518311 100644 if not len(self.tsInfo): return (0, [_('Success - empty transaction')]) -@@ -778,6 +837,25 @@ class Depsolve(object): +@@ -778,6 +836,25 @@ class Depsolve(object): if checkdep: break # The next conflict might be the same pkg @@ -148378,7 +149859,7 @@ index 6d744c0..c518311 100644 if CheckDeps: if self.dsCallback: self.dsCallback.restartLoop() self.verbose_logger.log(logginglevels.DEBUG_1, _('Restarting Loop')) -@@ -1150,6 +1228,11 @@ class Depsolve(object): +@@ -1150,6 +1227,11 @@ class Depsolve(object): return ret def isPackageInstalled(self, pkgname): @@ -148390,7 +149871,7 @@ index 6d744c0..c518311 100644 lst = self.tsInfo.matchNaevr(name = pkgname) for txmbr in lst: if txmbr.output_state in TS_INSTALL_STATES: -@@ -1393,42 +1476,52 @@ class Depsolve(object): +@@ -1393,42 +1475,52 @@ class Depsolve(object): class DepCheck(object): @@ -148593,7 +150074,7 @@ index bca9651..00c17ad 100644 index = self.failures else: diff --git a/yum/history.py b/yum/history.py -index 5385bd1..d27fa44 100644 +index 5385bd1..cc06f0a 100644 --- a/yum/history.py +++ b/yum/history.py @@ -97,9 +97,58 @@ def _setupHistorySearchSQL(patterns=None, ignore_case=False): @@ -148738,7 +150219,7 @@ index 5385bd1..d27fa44 100644 npkg = YumHistoryPackageState(pkg.name, pkg.arch, - pkg.epoch,pkg.version,pkg.release, state) + pkg.epoch,pkg.version,pkg.release, state, -+ pkg._history) ++ history=pkg._history) npkg._checksums = pkg._checksums npkg.done = pkg.done if _sttxt2stcode[npkg.state] in TS_INSTALL_STATES: @@ -149004,7 +150485,7 @@ index 5385bd1..d27fa44 100644 def _yieldSQLDataList(self, patterns, fields, ignore_case): """Yields all the package data for the given params. """ -@@ -1220,6 +1458,47 @@ class YumHistory: +@@ -1220,6 +1458,48 @@ class YumHistory: tids.add(row[0]) return tids @@ -149025,6 +150506,7 @@ index 5385bd1..d27fa44 100644 + CREATE INDEX i_pkgkey_yumdb ON pkg_yumdb (pkgtupid, yumdb_key); +'''] + ++# pylint: disable-msg=E0203 + def _update_db_file_3(self): + """ Update to version 3 of history, rpmdb/yumdb data. """ + if not self._update_db_file_2(): @@ -149052,7 +150534,16 @@ index 5385bd1..d27fa44 100644 _update_ops_2 = ['''\ \ CREATE TABLE trans_skip_pkgs ( -@@ -1374,6 +1653,8 @@ class YumHistory: +@@ -1307,6 +1587,8 @@ class YumHistory: + self._cached_updated_2 = True + return True + ++# pylint: enable-msg=E0203 ++ + def _create_db_file(self): + """ Create a new history DB file, populating tables etc. """ + +@@ -1374,6 +1656,8 @@ class YumHistory: cur.execute(op) for op in self._update_ops_2: cur.execute(op) @@ -149062,7 +150553,7 @@ index 5385bd1..d27fa44 100644 # Pasted from sqlitesack diff --git a/yum/i18n.py b/yum/i18n.py -index 9889bf6..85ad15e 100755 +index 9889bf6..76a258d 100755 --- a/yum/i18n.py +++ b/yum/i18n.py @@ -462,6 +462,34 @@ def str_eq(a, b): @@ -149091,7 +150582,7 @@ index 9889bf6..85ad15e 100755 + pass + + try: -+ return str(e) ++ return to_unicode(str(e)) + except: + pass + return "" @@ -149165,6 +150656,27 @@ index 2f6ddfe..5321003 100644 return out +diff --git a/yum/packageSack.py b/yum/packageSack.py +index 4af563a..47832fc 100644 +--- a/yum/packageSack.py ++++ b/yum/packageSack.py +@@ -445,6 +445,7 @@ class MetaSack(PackageSackBase): + nobsdict = {} + last_name = '' + last_pkg = None ++ last_pkgtup = None + # It takes about 0.2 of a second to convert these into packages, just + # so we can sort them, which is ~40% of this functions time. So we sort + # the pkgtups "by hand". +@@ -624,6 +625,8 @@ class MetaSack(PackageSackBase): + class PackageSack(PackageSackBase): + """represents sets (sacks) of Package Objects""" + def __init__(self): ++ PackageSackBase.__init__(self) ++ + self.nevra = {} #nevra[(Name, Epoch, Version, Release, Arch)] = [] + self.obsoletes = {} #obs[obsoletename] = [pkg1, pkg2, pkg3] + #the package lists are packages that obsolete the key name diff --git a/yum/packages.py b/yum/packages.py index 5ef9951..15316c8 100644 --- a/yum/packages.py @@ -149907,7 +151419,7 @@ index bfc49b7..9ddcae6 100644 b = parsever(b) diff --git a/yum/rpmsack.py b/yum/rpmsack.py -index e289a7a..635f03f 100644 +index e289a7a..424b821 100644 --- a/yum/rpmsack.py +++ b/yum/rpmsack.py @@ -48,6 +48,17 @@ def _open_no_umask(*args): @@ -149938,6 +151450,15 @@ index e289a7a..635f03f 100644 continue pkg = pkg[0] +@@ -993,7 +1005,7 @@ class RPMDBPackageSack(PackageSackBase): + return + + if not load_packages: +- return checksum_data ++ return checksum_data + + for pkgtup in checksum_data: + if checksum_data[pkgtup] is None: @@ -1002,7 +1014,8 @@ class RPMDBPackageSack(PackageSackBase): (n, a, e, v, r) = pkgtup pkg = self.searchNevra(n, e, v, r, a) @@ -149990,6 +151511,59 @@ index e289a7a..635f03f 100644 if info is None: raise AttributeError, "%s has no attribute %s" % (self, attr) +diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py +index 9b265f9..24a1f9e 100644 +--- a/yum/rpmtrans.py ++++ b/yum/rpmtrans.py +@@ -119,7 +119,11 @@ class RPMBaseCallback: + else: + msg = '%s: %s' % (package, action) + self.logger.info(msg) +- ++ ++ def verify_txmbr(self, base, txmbr, count): ++ " Callback for post transaction when we are in verifyTransaction(). " ++ pass ++ + + class SimpleCliCallBack(RPMBaseCallback): + def __init__(self): +@@ -140,6 +144,10 @@ class SimpleCliCallBack(RPMBaseCallback): + if msgs: + print msgs, + ++ def verify_txmbr(self, base, txmbr, count): ++ " Callback for post transaction when we are in verifyTransaction(). " ++ print _("Verify: %u/%u: %s") % (count, len(base.tsInfo), txmbr) ++ + # This is ugly, but atm. rpm can go insane and run the "cleanup" phase + # without the "install" phase if it gets an exception in it's callback. The + # following means that we don't really need to know/care about that in the +@@ -157,8 +165,12 @@ class _WrapNoExceptions: + def newFunc(*args, **kwargs): + try: + func(*args, **kwargs) +- except: +- pass ++ except Exception, e: ++ # It's impossible to debug stuff without this: ++ try: ++ print "Error:", "display callback failed:", e ++ except: ++ pass + + newFunc.__name__ = func.__name__ + newFunc.__doc__ = func.__doc__ +@@ -621,3 +633,9 @@ class RPMTransaction: + self.display.errorlog(msg) + # FIXME - what else should we do here? raise a failure and abort? + ++ def verify_txmbr(self, txmbr, count): ++ " Callback for post transaction when we are in verifyTransaction(). " ++ if not hasattr(self.display, 'verify_txmbr'): ++ return ++ ++ self.display.verify_txmbr(self.base, txmbr, count) diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py index 8a6f6f3..19193ad 100644 --- a/yum/sqlitesack.py @@ -150004,7 +151578,7 @@ index 8a6f6f3..19193ad 100644 prco_set = (_share_data(ob['name']), _share_data(ob['flags']), (_share_data(ob['epoch']), diff --git a/yum/yumRepo.py b/yum/yumRepo.py -index e5e9ece..91b7dde 100644 +index e5e9ece..f645a1a 100644 --- a/yum/yumRepo.py +++ b/yum/yumRepo.py @@ -24,6 +24,7 @@ urlparse.uses_fragment.append("media") @@ -150057,7 +151631,17 @@ index e5e9ece..91b7dde 100644 misc.unlink_f(tfname) if grab_can_fail: return None -@@ -1614,7 +1627,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -1260,6 +1273,9 @@ class YumRepository(Repository, config.RepoConf): + return True + + def _check_db_version(self, mdtype, repoXML=None): ++ if self.mddownloadpolicy == 'xml': ++ return False ++ + if repoXML is None: + repoXML = self.repoXML + if mdtype in repoXML.repoData: +@@ -1614,7 +1630,7 @@ class YumRepository(Repository, config.RepoConf): text=text, cache=self.http_caching == 'all', size=thisdata.size) @@ -150067,7 +151651,7 @@ index e5e9ece..91b7dde 100644 return None raise diff --git a/yumcommands.py b/yumcommands.py -index 4dcbea7..a862064 100644 +index 4dcbea7..2ff9562 100644 --- a/yumcommands.py +++ b/yumcommands.py @@ -43,16 +43,22 @@ def _err_mini_usage(base, basecmd): @@ -150715,7 +152299,7 @@ index 4dcbea7..a862064 100644 cmd, extcmds = self._grp_cmd(basecmd, extcmds) if cmd in ('list', 'info', 'remove', 'summary'): -@@ -536,6 +887,14 @@ class GroupsCommand(YumCommand): +@@ -536,27 +887,71 @@ class GroupsCommand(YumCommand): return True def needTsRemove(self, base, basecmd, extcmds): @@ -150730,7 +152314,8 @@ index 4dcbea7..a862064 100644 cmd, extcmds = self._grp_cmd(basecmd, extcmds) if cmd in ('remove',): -@@ -543,20 +902,56 @@ class GroupsCommand(YumCommand): +- return True ++ return True return False class MakeCacheCommand(YumCommand): @@ -151409,7 +152994,21 @@ index 4dcbea7..a862064 100644 def _repo_size(repo): ret = 0 for pkg in repo.sack.returnPackages(): -@@ -1088,21 +1886,54 @@ class RepoListCommand(YumCommand): +@@ -866,6 +1664,13 @@ class RepoListCommand(YumCommand): + except yum.Errors.RepoError: + if verbose: + raise ++ # populate them by hand, so one failure doesn't kill everything ++ # after it. ++ for repo in base.repos.listEnabled(): ++ try: ++ base.repos.populateSack(repo.id) ++ except yum.Errors.RepoError: ++ pass + + repos = base.repos.repos.values() + repos.sort() +@@ -1088,21 +1893,54 @@ class RepoListCommand(YumCommand): return 0, ['repolist: ' +to_unicode(locale.format("%d", tot_num, True))] def needTs(self, base, basecmd, extcmds): @@ -151464,7 +153063,7 @@ index 4dcbea7..a862064 100644 if len(extcmds) == 0: base.usage() raise cli.CliError -@@ -1147,28 +1978,85 @@ class HelpCommand(YumCommand): +@@ -1147,28 +1985,85 @@ class HelpCommand(YumCommand): return help_output def doCommand(self, base, basecmd, extcmds): @@ -151550,7 +153149,7 @@ index 4dcbea7..a862064 100644 self.doneCommand(base, _("Setting up Reinstall Process")) try: return base.reinstallPkgs(extcmds) -@@ -1177,25 +2065,73 @@ class ReInstallCommand(YumCommand): +@@ -1177,25 +2072,73 @@ class ReInstallCommand(YumCommand): return 1, [to_unicode(e)] def getSummary(self): @@ -151624,7 +153223,7 @@ index 4dcbea7..a862064 100644 self.doneCommand(base, _("Setting up Downgrade Process")) try: return base.downgradePkgs(extcmds) -@@ -1203,23 +2139,65 @@ class DowngradeCommand(YumCommand): +@@ -1203,23 +2146,65 @@ class DowngradeCommand(YumCommand): return 1, [str(e)] def getSummary(self): @@ -151690,7 +153289,7 @@ index 4dcbea7..a862064 100644 vcmd = 'installed' if extcmds: vcmd = extcmds[0] -@@ -1344,6 +2322,14 @@ class VersionCommand(YumCommand): +@@ -1344,6 +2329,14 @@ class VersionCommand(YumCommand): return 0, ['version'] def needTs(self, base, basecmd, extcmds): @@ -151705,7 +153304,7 @@ index 4dcbea7..a862064 100644 vcmd = 'installed' if extcmds: vcmd = extcmds[0] -@@ -1354,23 +2340,62 @@ class VersionCommand(YumCommand): +@@ -1354,23 +2347,62 @@ class VersionCommand(YumCommand): class HistoryCommand(YumCommand): @@ -151769,7 +153368,7 @@ index 4dcbea7..a862064 100644 return 2, ["Repeating transaction %u" % (old.tid,)] def _hcmd_undo(self, base, extcmds): -@@ -1426,12 +2451,54 @@ class HistoryCommand(YumCommand): +@@ -1426,12 +2458,54 @@ class HistoryCommand(YumCommand): def _hcmd_new(self, base, extcmds): base.history._create_db_file() @@ -151825,7 +153424,7 @@ index 4dcbea7..a862064 100644 if extcmds and extcmds[0] not in cmds: base.logger.critical(_('Invalid history sub-command, use: %s.'), ", ".join(cmds)) -@@ -1444,6 +2511,19 @@ class HistoryCommand(YumCommand): +@@ -1444,6 +2518,19 @@ class HistoryCommand(YumCommand): raise cli.CliError def doCommand(self, base, basecmd, extcmds): @@ -151845,7 +153444,7 @@ index 4dcbea7..a862064 100644 vcmd = 'list' if extcmds: vcmd = extcmds[0] -@@ -1468,12 +2548,26 @@ class HistoryCommand(YumCommand): +@@ -1468,12 +2555,26 @@ class HistoryCommand(YumCommand): ret = self._hcmd_rollback(base, extcmds) elif vcmd == 'new': ret = self._hcmd_new(base, extcmds) @@ -151872,7 +153471,7 @@ index 4dcbea7..a862064 100644 vcmd = 'list' if extcmds: vcmd = extcmds[0] -@@ -1481,16 +2575,46 @@ class HistoryCommand(YumCommand): +@@ -1481,16 +2582,46 @@ class HistoryCommand(YumCommand): class CheckRpmdbCommand(YumCommand): @@ -151919,7 +153518,7 @@ index 4dcbea7..a862064 100644 chkcmd = 'all' if extcmds: chkcmd = extcmds -@@ -1505,19 +2629,57 @@ class CheckRpmdbCommand(YumCommand): +@@ -1505,19 +2636,57 @@ class CheckRpmdbCommand(YumCommand): return rc, ['%s %s' % (basecmd, chkcmd)] def needTs(self, base, basecmd, extcmds): @@ -151977,7 +153576,7 @@ index 4dcbea7..a862064 100644 if not extcmds: base.logger.critical(_("No saved transaction file specified.")) raise cli.CliError -@@ -1533,5 +2695,13 @@ class LoadTransactionCommand(YumCommand): +@@ -1533,5 +2702,13 @@ class LoadTransactionCommand(YumCommand): def needTs(self, base, basecmd, extcmds): @@ -151992,7 +153591,7 @@ index 4dcbea7..a862064 100644 return True diff --git a/yummain.py b/yummain.py -index 9f79f4f..58179d2 100755 +index 9f79f4f..12582d2 100755 --- a/yummain.py +++ b/yummain.py @@ -29,13 +29,13 @@ from yum import Errors @@ -152000,7 +153599,7 @@ index 9f79f4f..58179d2 100755 from yum import logginglevels from yum import _ -from yum.i18n import to_unicode, utf8_width -+from yum.i18n import to_unicode, utf8_width, exception2msg ++from yum.i18n import utf8_width, exception2msg import yum.misc import cli -from utils import suppress_keyboard_interrupt_message, show_lock_owner, exception2msg @@ -152121,62 +153720,3 @@ index 9f79f4f..58179d2 100755 errcode = None if 'YUM_PROF' in os.environ: if os.environ['YUM_PROF'] == 'cprof': -commit aa1b063446d28a3ba002c12b255653a9a20a134c -Author: James Antill -Date: Fri Sep 16 16:56:11 2011 -0400 - - verifyTransaction progress, using rpmtrans.display.event() cb. BZ 737826. - -diff --git a/yum/__init__.py b/yum/__init__.py -index 5fb7c00..2887f36 100644 ---- a/yum/__init__.py -+++ b/yum/__init__.py -@@ -1654,10 +1654,10 @@ class YumBase(depsolve.Depsolve): - self.plugins.run('posttrans') - # sync up what just happened versus what is in the rpmdb - if not self.ts.isTsFlagSet(rpm.RPMTRANS_FLAG_TEST): -- self.verifyTransaction(resultobject) -+ self.verifyTransaction(resultobject, cb.display.event) - return resultobject - -- def verifyTransaction(self, resultobject=None): -+ def verifyTransaction(self, resultobject=None, decb=None): - """Check that the transaction did what was expected, and - propagate external yumdb information. Output error messages - if the transaction did not do what was expected. -@@ -1665,6 +1665,10 @@ class YumBase(depsolve.Depsolve): - :param resultobject: the :class:`yum.misc.GenericHolder` - object returned from the :func:`runTransaction` call that - ran the transaction -+ :param decb: the display event callback for the rpm transaction, we use -+ this to call "events" -+ object returned from the :func:`runTransaction` call that -+ ran the transaction - """ - # check to see that the rpmdb and the tsInfo roughly matches - # push package object metadata outside of rpmdb into yumdb -@@ -1679,7 +1683,12 @@ class YumBase(depsolve.Depsolve): - - vt_st = time.time() - self.plugins.run('preverifytrans') -+ count = 0 - for txmbr in self.tsInfo: -+ if decb is not None: -+ count += 1 -+ decb(txmbr.name, 'verifying', -+ count, len(self.tsInfo), count, len(self.tsInfo)) - if txmbr.output_state in TS_INSTALL_STATES: - if not self.rpmdb.contains(po=txmbr.po): - # maybe a file log here, too -diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py -index 9b265f9..4d468dc 100644 ---- a/yum/rpmtrans.py -+++ b/yum/rpmtrans.py -@@ -77,6 +77,7 @@ class RPMBaseCallback: - TS_OBSOLETED: _('Obsoleted'), - TS_OBSOLETING: _('Installing'), - TS_UPDATED: _('Cleanup'), -+ 'verifying': _('Verifying'), - 'repackaging': _('Repackaging')} - # The fileaction are not translated, most sane IMHO / Tim - self.fileaction = { TS_UPDATE: 'Updated', diff --git a/yum-arm-hfp-support.patch b/yum-arm-hfp-support.patch deleted file mode 100644 index 992ebc7..0000000 --- a/yum-arm-hfp-support.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -uNr yum-3.4.3-orig/rpmUtils/arch.py yum-3.4.3/rpmUtils/arch.py ---- yum-3.4.3-orig/rpmUtils/arch.py 2011-11-30 19:24:32.000000000 -0600 -+++ yum-3.4.3/rpmUtils/arch.py 2011-11-30 19:24:58.000000000 -0600 -@@ -2,6 +2,7 @@ - # - - import os -+import rpm - - _ppc64_native_is_best = True - -@@ -65,6 +66,10 @@ - "armv5tejl": "armv5tel", - "armv5tel": "noarch", - -+ #arm hardware floating point -+ "armv7hnl": "armv7hl", -+ "armv7hl": "noarch", -+ - # super-h - "sh4a": "sh4", - "sh4": "noarch", -@@ -235,6 +240,13 @@ - - return arch - -+def getCanonARMArch(arch): -+ # the %{_target_arch} macro in rpm will let us know the abi we are using -+ target = rpm.expandMacro('%{_target_cpu}') -+ if target.startswith('armv7h'): -+ return target -+ return arch -+ - def getCanonPPCArch(arch): - # FIXME: should I do better handling for mac, etc? - if arch != "ppc64": -@@ -312,6 +324,8 @@ - if (len(arch) == 4 and arch[0] == "i" and arch[2:4] == "86"): - return getCanonX86Arch(arch) - -+ if arch.startswith("arm"): -+ return getCanonARMArch(arch) - if arch.startswith("ppc"): - return getCanonPPCArch(arch) - if arch.startswith("sparc"): -@@ -363,6 +377,8 @@ - return "sparc" - elif myarch.startswith("ppc64") and not _ppc64_native_is_best: - return "ppc" -+ elif myarch.startswith("armv7h"): -+ return "armhfp" - elif myarch.startswith("arm"): - return "arm" - diff --git a/yum-distro-configs.patch b/yum-distro-configs.patch new file mode 100644 index 0000000..28b7856 --- /dev/null +++ b/yum-distro-configs.patch @@ -0,0 +1,17 @@ +diff -ru yum-3.4.3-orig/yum/config.py yum-3.4.3/yum/config.py +--- yum-3.4.3-orig/yum/config.py 2011-12-02 15:45:41.617448597 -0500 ++++ yum-3.4.3/yum/config.py 2011-12-02 15:46:20.576285275 -0500 +@@ -45,9 +45,9 @@ + # Alter/patch these to change the default checking... + __pkgs_gpgcheck_default__ = False + __repo_gpgcheck_default__ = False +-__main_multilib_policy_default__ = 'all' +-__main_failovermethod_default__ = 'roundrobin' +-__main_installonly_limit_default__ = 0 ++__main_multilib_policy_default__ = 'best' ++__main_failovermethod_default__ = 'priority' ++__main_installonly_limit_default__ = 3 + + class Option(object): + """ +Only in yum-3.4.3/yum: config.py~ 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-ppc64-preferred.patch b/yum-ppc64-preferred.patch index 0aa1b4e..6c84924 100644 --- a/yum-ppc64-preferred.patch +++ b/yum-ppc64-preferred.patch @@ -2,8 +2,8 @@ diff -ru yum-3.4.3-orig/rpmUtils/arch.py yum-3.4.3/rpmUtils/arch.py --- yum-3.4.3-orig/rpmUtils/arch.py 2011-06-28 17:01:10.009680846 -0400 +++ yum-3.4.3/rpmUtils/arch.py 2011-06-28 17:01:31.849916539 -0400 @@ -3,7 +3,7 @@ - import os + import rpm -_ppc64_native_is_best = False +_ppc64_native_is_best = True diff --git a/yum.spec b/yum.spec index 900472b..3747211 100644 --- a/yum.spec +++ b/yum.spec @@ -18,20 +18,17 @@ Summary: RPM package installer/updater/manager Name: yum Version: 3.4.3 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz Source1: yum.conf.fedora Source2: yum-updatesd.conf.fedora -Patch0: installonlyn-enable.patch -Patch1: yum-mirror-priority.patch -Patch3: yum-multilib-policy-best.patch +Patch1: yum-distro-configs.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch Patch6: yum-HEAD.patch Patch7: yum-ppc64-preferred.patch -Patch8: yum-arm-hfp-support.patch Patch20: yum-manpage-files.patch URL: http://yum.baseurl.org/ @@ -133,18 +130,14 @@ These are the files needed to run yum updates as a cron job. Install this package if you want auto yum updates nightly via cron. - %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch3 -p0 %patch4 -p0 %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 %patch20 -p1 +%patch1 -p1 %build make @@ -318,6 +311,14 @@ exit 0 %endif %changelog +* Fri Dec 2 2011 James Antill - 3.4.3-14 +- update to latest HEAD +- Init "found" variable for distro-sync full. BZ 752407. +- Fix _conv_pkg_state when calling with history as checksum. BZ 757736. +- When a repo. fails in repolist, manually populate the ones after it.A +- Fix a corner case in exception2msg(). BZ 749239. +- Transifex sync. + * Wed Nov 30 2011 Dennis Gilmore - 3.4.3-13 - add patch from upstream for arm hardware floating point support