diff --git a/Makefile b/Makefile
index c600c1d..366e6b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
SUBDIRS = rpmUtils yum etc docs po
PYFILES = $(wildcard *.py)
+PYLINT_MODULES = *.py yum rpmUtils
+PYLINT_IGNORE = oldUtils.py
PKGNAME = yum
VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec)
@@ -53,6 +55,12 @@ test-skipbroken:
check: test
+pylint:
+ @pylint --rcfile=test/yum-pylintrc --ignore=$(PYLINT_IGNORE) $(PYLINT_MODULES)
+
+pylint-short:
+ @pylint -r n --rcfile=test/yum-pylintrc --ignore=$(PYLINT_IGNORE) $(PYLINT_MODULES)
+
changelog:
git log --since=2007-05-16 --pretty --numstat --summary | git2cl > ChangeLog
diff --git a/cli.py b/cli.py
index 0374667..9a78e9b 100644
--- a/cli.py
+++ b/cli.py
@@ -25,7 +25,7 @@ import sys
import time
import random
import logging
-from optparse import OptionParser
+from optparse import OptionParser,OptionGroup
import rpm
import output
@@ -35,17 +35,15 @@ import yum.Errors
import yum.logginglevels
import yum.misc
import yum.plugins
-from yum.constants import TS_OBSOLETED
import rpmUtils.arch
-from rpmUtils.arch import isMultiLibArch
import rpmUtils.miscutils
-from yum.packages import parsePackages, YumLocalPackage
+from yum.packages import parsePackages
from yum import _
from yum.rpmtrans import RPMTransaction
import signal
import yumcommands
-from yum.misc import to_unicode, to_utf8
+from yum.i18n import to_unicode, to_utf8
def sigquit(signum, frame):
""" SIGQUIT handler for the yum cli. """
@@ -98,6 +96,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
self.registerCommand(yumcommands.RepoListCommand())
self.registerCommand(yumcommands.HelpCommand())
self.registerCommand(yumcommands.ReInstallCommand())
+ self.registerCommand(yumcommands.DowngradeCommand())
def registerCommand(self, command):
for name in command.getNames():
@@ -305,9 +304,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
disk[m.group(2)] = int(m.group(1))
if disk:
- summary += _('Disk Requirements:\n')
- for k in disk:
- summary += _(' At least %dMB needed on the %s filesystem.\n') % (disk[k], k)
+ summary += _('Disk Requirements:\n')
+ for k in disk:
+ summary += _(' At least %dMB needed on the %s filesystem.\n') % (disk[k], k)
# TODO: simplify the dependency errors?
@@ -355,8 +354,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
# 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.'))
- return 1
+ self.verbose_logger.info(_('Trying to run the transaction but nothing to do. Exiting.'))
+ return 1
# NOTE: In theory we can skip this in -q -y mode, for a slight perf.
# gain. But it's probably doom to have a different code path.
@@ -501,14 +500,14 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
continue
elif result == 1:
- if not sys.stdin.isatty() and not self.conf.assumeyes:
- raise yum.Errors.YumBaseError, \
- _('Refusing to automatically import keys when running ' \
- 'unattended.\nUse "-y" to override.')
+ if not sys.stdin.isatty() and not self.conf.assumeyes:
+ raise yum.Errors.YumBaseError, \
+ _('Refusing to automatically import keys when running ' \
+ 'unattended.\nUse "-y" to override.')
- # the callback here expects to be able to take options which
- # userconfirm really doesn't... so fake it
- self.getKeyForPackage(po, lambda x, y, z: self.userconfirm())
+ # the callback here expects to be able to take options which
+ # userconfirm really doesn't... so fake it
+ self.getKeyForPackage(po, lambda x, y, z: self.userconfirm())
else:
# Fatal error
@@ -564,7 +563,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
"""Attempts to take the user specified list of packages/wildcards
and install them, or if they are installed, update them to a newer
version. If a complete version number if specified, attempt to
- downgrade them to the specified version"""
+ upgrade (or downgrade if they have been removed) them to the
+ specified version"""
# get the list of available packages
# iterate over the user's list
# add packages to Transaction holding class if they match.
@@ -574,9 +574,6 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
oldcount = len(self.tsInfo)
- toBeInstalled = {} # keyed on name
- passToUpdate = [] # list of pkgtups to pass along to updatecheck
-
for arg in userlist:
if os.path.exists(arg) and arg.endswith('.rpm'): # this is hurky, deal w/it
val, msglist = self.localInstall(filelist=[arg])
@@ -647,6 +644,33 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
else:
return 0, [_('No Packages marked for removal')]
+ def downgradePkgs(self, userlist):
+ """Attempts to take the user specified list of packages/wildcards
+ and downgrade them. If a complete version number if specified,
+ attempt to downgrade them to the specified version"""
+
+ oldcount = len(self.tsInfo)
+
+ for arg in userlist:
+ # FIXME: We should allow local file downgrades too
+ # even more important for Fedora.
+ if False and os.path.exists(arg) and arg.endswith('.rpm'):
+ val, msglist = self.localDowngrade(filelist=[arg])
+ continue # it was something on disk and it ended in rpm
+ # no matter what we don't go looking at repos
+
+ try:
+ self.downgrade(pattern=arg)
+ except yum.Errors.DowngradeError:
+ self.verbose_logger.log(yum.logginglevels.INFO_2,
+ _('No package %s%s%s available.'),
+ self.term.MODE['bold'], arg,
+ self.term.MODE['normal'])
+ self._maybeYouMeant(arg)
+ if len(self.tsInfo) > oldcount:
+ return 2, [_('Package(s) to downgrade')]
+ return 0, [_('Nothing to do')]
+
def localInstall(self, filelist, updateonly=0):
"""handles installs/updates of rpms provided on the filesystem in a
local dir (ie: not from a repo)"""
@@ -887,17 +911,26 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
self.verbose_logger.log(yum.logginglevels.INFO_2,
_('Installed Groups:'))
for group in installed:
- self.verbose_logger.log(yum.logginglevels.INFO_2, ' %s',
- group.ui_name)
+ if self.verbose_logger.isEnabledFor(yum.logginglevels.DEBUG_3):
+ self.verbose_logger.log(yum.logginglevels.INFO_2,
+ ' %s (%s)', group.ui_name,
+ group.groupid)
+ else:
+ self.verbose_logger.log(yum.logginglevels.INFO_2,
+ ' %s', group.ui_name)
if len(available) > 0:
self.verbose_logger.log(yum.logginglevels.INFO_2,
_('Available Groups:'))
for group in available:
- self.verbose_logger.log(yum.logginglevels.INFO_2, ' %s',
- group.ui_name)
+ if self.verbose_logger.isEnabledFor(yum.logginglevels.DEBUG_3):
+ self.verbose_logger.log(yum.logginglevels.INFO_2,
+ ' %s (%s)', group.ui_name,
+ group.groupid)
+ else:
+ self.verbose_logger.log(yum.logginglevels.INFO_2,
+ ' %s', group.ui_name)
-
return 0, [_('Done')]
def returnGroupInfo(self, userlist):
@@ -1047,9 +1080,18 @@ class YumOptionParser(OptionParser):
'''
def __init__(self,base, **kwargs):
+ # check if this is called with a utils=True/False parameter
+ if 'utils' in kwargs:
+ self._utils = kwargs['utils']
+ del kwargs['utils']
+ else:
+ self._utils = False
OptionParser.__init__(self, **kwargs)
self.logger = logging.getLogger("yum.cli")
self.base = base
+ self.plugin_option_group = OptionGroup(self, _("Plugin Options"))
+ self.add_option_group(self.plugin_option_group)
+
self._addYumBasicOptions()
def error(self, msg):
@@ -1221,71 +1263,76 @@ class YumOptionParser(OptionParser):
dest = eval('parser.values.%s' % optobj.dest)
dest.append((opt, value))
-
+ if self._utils:
+ group = OptionGroup(self, "Yum Base Options")
+ self.add_option_group(group)
+ else:
+ group = self
+
# Note that we can't use the default action="help" because of the
# fact that print_help() unconditionally does .encode() ... which is
# bad on unicode input.
- self.conflict_handler = "resolve"
- self.add_option("-h", "--help", action="callback",
+ group.conflict_handler = "resolve"
+ group.add_option("-h", "--help", action="callback",
callback=self._wrapOptParseUsage,
help=_("show this help message and exit"))
- self.conflict_handler = "error"
+ group.conflict_handler = "error"
- self.add_option("-t", "--tolerant", action="store_true",
+ group.add_option("-t", "--tolerant", action="store_true",
help=_("be tolerant of errors"))
- self.add_option("-C", dest="cacheonly", action="store_true",
+ group.add_option("-C", dest="cacheonly", action="store_true",
help=_("run entirely from cache, don't update cache"))
- self.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
+ group.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
help=_("config file location"), metavar=' [config file]')
- self.add_option("-R", dest="sleeptime", type='int', default=None,
+ group.add_option("-R", dest="sleeptime", type='int', default=None,
help=_("maximum command wait time"), metavar=' [minutes]')
- self.add_option("-d", dest="debuglevel", default=None,
+ group.add_option("-d", dest="debuglevel", default=None,
help=_("debugging output level"), type='int',
metavar=' [debug level]')
- self.add_option("--showduplicates", dest="showdupesfromrepos",
+ group.add_option("--showduplicates", dest="showdupesfromrepos",
action="store_true",
help=_("show duplicates, in repos, in list/search commands"))
- self.add_option("-e", dest="errorlevel", default=None,
+ group.add_option("-e", dest="errorlevel", default=None,
help=_("error output level"), type='int',
metavar=' [error level]')
- self.add_option("-q", "--quiet", dest="quiet", action="store_true",
+ group.add_option("-q", "--quiet", dest="quiet", action="store_true",
help=_("quiet operation"))
- self.add_option("-v", "--verbose", dest="verbose", action="store_true",
+ group.add_option("-v", "--verbose", dest="verbose", action="store_true",
help=_("verbose operation"))
- self.add_option("-y", dest="assumeyes", action="store_true",
+ group.add_option("-y", dest="assumeyes", action="store_true",
help=_("answer yes for all questions"))
- self.add_option("--version", action="store_true",
+ group.add_option("--version", action="store_true",
help=_("show Yum version and exit"))
- self.add_option("--installroot", help=_("set install root"),
+ group.add_option("--installroot", help=_("set install root"),
metavar='[path]')
- self.add_option("--enablerepo", action='callback',
+ group.add_option("--enablerepo", action='callback',
type='string', callback=repo_optcb, dest='repos', default=[],
help=_("enable one or more repositories (wildcards allowed)"),
metavar='[repo]')
- self.add_option("--disablerepo", action='callback',
+ group.add_option("--disablerepo", action='callback',
type='string', callback=repo_optcb, dest='repos', default=[],
help=_("disable one or more repositories (wildcards allowed)"),
metavar='[repo]')
- self.add_option("-x", "--exclude", default=[], action="append",
+ group.add_option("-x", "--exclude", default=[], action="append",
help=_("exclude package(s) by name or glob"), metavar='[package]')
- self.add_option("", "--disableexcludes", default=[], action="append",
+ group.add_option("", "--disableexcludes", default=[], action="append",
help=_("disable exclude from main, for a repo or for everything"),
metavar='[repo]')
- self.add_option("--obsoletes", action="store_true",
+ group.add_option("--obsoletes", action="store_true",
help=_("enable obsoletes processing during updates"))
- self.add_option("--noplugins", action="store_true",
+ group.add_option("--noplugins", action="store_true",
help=_("disable Yum plugins"))
- self.add_option("--nogpgcheck", action="store_true",
+ group.add_option("--nogpgcheck", action="store_true",
help=_("disable gpg signature checking"))
- self.add_option("", "--disableplugin", dest="disableplugins", default=[],
+ group.add_option("", "--disableplugin", dest="disableplugins", default=[],
action="append", help=_("disable plugins by name"),
metavar='[plugin]')
- self.add_option("", "--enableplugin", dest="enableplugins", default=[],
+ group.add_option("", "--enableplugin", dest="enableplugins", default=[],
action="append", help=_("enable plugins by name"),
metavar='[plugin]')
- self.add_option("--skip-broken", action="store_true", dest="skipbroken",
+ group.add_option("--skip-broken", action="store_true", dest="skipbroken",
help=_("skip packages with depsolving problems"))
- self.add_option("", "--color", dest="color", default=None,
+ group.add_option("", "--color", dest="color", default=None,
help=_("control whether color is used"))
diff --git a/docs/Makefile b/docs/Makefile
index 379ba2b..dc31d0e 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -6,7 +6,8 @@ clean:
rm -fr epydoc
install:
- mkdir -p $(DESTDIR)/usr/share/man/man{5,8}
+ mkdir -p $(DESTDIR)/usr/share/man/man5
+ mkdir -p $(DESTDIR)/usr/share/man/man8
install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
diff --git a/docs/yum.8 b/docs/yum.8
index 3818902..0e65dcb 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -59,7 +59,9 @@ gnome\-packagekit application\&.
.br
.I \fR * localupdate rpmfile1 [rpmfile2] [\&.\&.\&.]
.br
-.I \fR * reinstall package1
+.I \fR * reinstall package1 [package2] [\&.\&.\&.]
+.br
+.I \fR * downgrade package1 [package2] [\&.\&.\&.]
.br
.I \fR * deplist package1 [package2] [\&.\&.\&.]
.br
@@ -191,8 +193,14 @@ If required the enabled repositories will be used to resolve dependencies.
.IP
.IP "\fBreinstall\fP"
Will reinstall the identically versioned package as is currently installed.
-It will not necessarily work for all pkgs. Kernels, in particular are not
-going to play nicely with this.
+This does not work for "installonly" packages, like Kernels.
+.IP
+.IP "\fBdowngrade\fP"
+Will try and downgrade a package from the version currently installed to the
+previously highest version (or the specified version).
+The depsolver will not necessarily work, but if you specify all the packages it
+should work (and thus. all the simple cases will work). Also this does not
+work for "installonly" packages, like Kernels.
.IP
.IP "\fBdeplist\fP"
Produces a list of all dependencies and what packages provide those
diff --git a/output.py b/output.py
index 62af285..b88bc27 100755
--- a/output.py
+++ b/output.py
@@ -29,7 +29,8 @@ import re # For YumTerm
from urlgrabber.progress import TextMeter
import urlgrabber.progress
from urlgrabber.grabber import URLGrabError
-from yum.misc import sortPkgObj, prco_tuple_to_string, to_str, to_utf8, to_unicode, get_my_lang_code
+from yum.misc import prco_tuple_to_string
+from yum.i18n import to_str, to_utf8, to_unicode
import yum.misc
from rpmUtils.miscutils import checkSignals
from yum.constants import *
@@ -293,6 +294,8 @@ class YumOutput:
self.i18ndomains = ["redhat-dist"]
self.term = YumTerm()
+ self._last_interrupt = None
+
def printtime(self):
months = [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'),
@@ -865,14 +868,14 @@ class YumOutput:
size = int(pkg.size)
totsize += size
try:
- if pkg.verifyLocalPkg():
- locsize += size
+ if pkg.verifyLocalPkg():
+ locsize += size
except:
- pass
+ pass
except:
- error = True
- self.logger.error(_('There was an error calculating total download size'))
- break
+ error = True
+ self.logger.error(_('There was an error calculating total download size'))
+ break
if (not error):
if locsize:
@@ -1100,9 +1103,13 @@ Remove %5.5s Package(s)
now = time.time()
- if not hasattr(self, '_last_interrupt'):
+ if not self._last_interrupt:
hibeg = self.term.MODE['bold']
hiend = self.term.MODE['normal']
+ # For translators: This is output like:
+# Current download cancelled, interrupt (ctrl-c) again within two seconds
+# to exit.
+ # Where "interupt (ctrl-c) again" and "two" are highlighted.
msg = _("""
Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds to exit.
""") % (hibeg, hiend, hibeg, delta_exit_str, hiend)
diff --git a/po/ca.po b/po/ca.po
index 4519720..3bef4b5 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-12 13:25+0000\n"
-"PO-Revision-Date: 2009-02-01 15:03+0100\n"
-"Last-Translator: Agustí Grau <fletxa@gmail.com>\n"
+"POT-Creation-Date: 2009-03-27 19:24+0000\n"
+"PO-Revision-Date: 2009-03-31 22:25+0100\n"
+"Last-Translator: Agustí Grau <fedora@softcatala.org>\n"
"Language-Team: Catalan <fedora@softcatala.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr ""
"X-Poedit-Language: Catalan\n"
#: ../callback.py:48
-#: ../output.py:911
+#: ../output.py:922
#: ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Actualitzant"
@@ -45,7 +45,7 @@ msgstr "S'està esborrant"
#: ../callback.py:50
#: ../callback.py:51
#: ../callback.py:53
-#: ../output.py:910
+#: ../output.py:921
#: ../yum/rpmtrans.py:73
#: ../yum/rpmtrans.py:74
#: ../yum/rpmtrans.py:76
@@ -59,7 +59,7 @@ msgid "Obsoleted"
msgstr "Obsolet"
#: ../callback.py:54
-#: ../output.py:1016
+#: ../output.py:1029
msgid "Updated"
msgstr "Actualitzat"
@@ -70,7 +70,7 @@ msgstr "Esborrat"
#: ../callback.py:56
#: ../callback.py:57
#: ../callback.py:59
-#: ../output.py:1014
+#: ../output.py:1027
msgid "Installed"
msgstr "Instal·lat"
@@ -93,7 +93,7 @@ msgid "Erased: %s"
msgstr "Esborrat: %s"
#: ../callback.py:217
-#: ../output.py:912
+#: ../output.py:923
msgid "Removing"
msgstr "S'està esborrant"
@@ -102,63 +102,63 @@ msgstr "S'està esborrant"
msgid "Cleanup"
msgstr "Neteja"
-#: ../cli.py:105
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "L'ordre «%s» ja està definida"
-#: ../cli.py:117
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Configurant repositoris"
-#: ../cli.py:128
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "S'estan llegint les metadades de repositoris des de fitxers locals"
-#: ../cli.py:187
+#: ../cli.py:192
#: ../utils.py:79
#, python-format
msgid "Config Error: %s"
msgstr "Error de configuració: %s"
-#: ../cli.py:190
-#: ../cli.py:1174
+#: ../cli.py:195
+#: ../cli.py:1224
#: ../utils.py:82
#, python-format
msgid "Options Error: %s"
msgstr "Error d'opcions: %s"
-#: ../cli.py:218
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Instal·lat: %s-%s a %s"
-#: ../cli.py:220
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Muntat : %s a %s"
-#: ../cli.py:222
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Pujat: %s a %s"
-#: ../cli.py:259
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Cal que doneu alguna ordre"
-#: ../cli.py:301
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Requeriments de disc:\n"
-#: ../cli.py:303
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Es necessiten almenys %dMB al sistema de fitxers %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:308
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -166,66 +166,58 @@ msgstr ""
"Resum d'errors\n"
"-------------\n"
-#: ../cli.py:351
+#: ../cli.py:359
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:381
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "S'està sortint de l'ordre de l'usuari"
-#: ../cli.py:385
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "S'estan descarregant els següents paquets:"
-#: ../cli.py:390
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "S'ha produït un error descarregant els següents paquets:\n"
-#: ../cli.py:402
-msgid "Entering rpm code"
-msgstr "S'està entrant en codi rpm"
-
-#: ../cli.py:406
-#: ../yum/__init__.py:3330
+#: ../cli.py:418
+#: ../yum/__init__.py:3520
msgid "Running rpm_check_debug"
msgstr "S'està executant rpm_check_debug"
-#: ../cli.py:409
-#: ../yum/__init__.py:3333
+#: ../cli.py:421
+#: ../yum/__init__.py:3523
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "S'ha produït un error amb rpm_check_debug contra depsolve:"
-#: ../cli.py:413
+#: ../cli.py:425
#, python-format
msgid "Please report this error in %s"
msgstr "Siusplau, informeu d'aquest error a %s"
-#: ../cli.py:419
+#: ../cli.py:431
msgid "Running Transaction Test"
msgstr "S'està executant la transacció de prova"
-#: ../cli.py:435
+#: ../cli.py:447
msgid "Finished Transaction Test"
msgstr "Ha acabat la transacció de prova"
-#: ../cli.py:437
+#: ../cli.py:449
msgid "Transaction Check Error:\n"
msgstr "S'ha produït un error en la transacció de prova:\n"
-#: ../cli.py:444
+#: ../cli.py:456
msgid "Transaction Test Succeeded"
msgstr "La transacció de prova ha acabat amb èxit"
-#: ../cli.py:465
+#: ../cli.py:477
msgid "Running Transaction"
msgstr "S'està executant la transacció"
-#: ../cli.py:470
-msgid "Leaving rpm code"
-msgstr "Deixant codi rpm"
-
-#: ../cli.py:497
+#: ../cli.py:507
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -233,183 +225,184 @@ msgstr ""
"No s'importaran automàticament les claus en una execució desatesa.\n"
"Feu servir \"-y\" per a importar les claus."
-#: ../cli.py:516
-#: ../cli.py:550
+#: ../cli.py:526
+#: ../cli.py:560
msgid " * Maybe you meant: "
msgstr " * Potser volíeu dir: "
-#: ../cli.py:533
-#: ../cli.py:541
+#: ../cli.py:543
+#: ../cli.py:551
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "Paquets %s%s%s disponibles, però no instal·lats."
-#: ../cli.py:547
-#: ../cli.py:582
+#: ../cli.py:557
+#: ../cli.py:588
+#: ../cli.py:668
#, python-format
msgid "No package %s%s%s available."
msgstr "El paquet %s%s%s no està disponible."
-#: ../cli.py:572
-msgid "Parsing package install arguments"
-msgstr "S'estan analitzant els arguments del paquet a instal·lar"
-
-#: ../cli.py:587
-#: ../cli.py:662
-#: ../yumcommands.py:984
+#: ../cli.py:593
+#: ../cli.py:695
msgid "Package(s) to install"
msgstr "Paquets a instal·lar"
-#: ../cli.py:588
-#: ../cli.py:663
-#: ../yumcommands.py:151
-#: ../yumcommands.py:985
+#: ../cli.py:594
+#: ../cli.py:674
+#: ../cli.py:696
+#: ../yumcommands.py:159
+#: ../yumcommands.py:1013
msgid "Nothing to do"
msgstr "Res a fer"
-#: ../cli.py:621
+#: ../cli.py:627
#, python-format
msgid "%d packages marked for Update"
msgstr "%d paquets marcats per a actualitzar"
-#: ../cli.py:624
+#: ../cli.py:630
msgid "No Packages marked for Update"
msgstr "No hi ha cap paquet marcat per a actualitzar"
-#: ../cli.py:638
+#: ../cli.py:644
#, python-format
msgid "%d packages marked for removal"
msgstr "%d paquets marcats per a esborrar"
-#: ../cli.py:641
+#: ../cli.py:647
msgid "No Packages marked for removal"
msgstr "No hi ha cap paquet marcat per a esborrar"
-#: ../cli.py:653
+#: ../cli.py:673
+msgid "Package(s) to downgrade"
+msgstr "Paquets per a desactualitzar"
+
+#: ../cli.py:686
msgid "No Packages Provided"
msgstr "No s'ha proporcionat cap paquet"
-#: ../cli.py:708
+#: ../cli.py:741
msgid "Matching packages for package list to user args"
msgstr "S'està comparant els paquets per a la llista de paquets amb els arguments de l'usuari"
-#: ../cli.py:757
+#: ../cli.py:790
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Avís: no s'ha trobat cap coincidència per a: %s"
-#: ../cli.py:760
+#: ../cli.py:793
msgid "No Matches found"
msgstr "No s'ha trobat cap coincidència"
-#: ../cli.py:799
+#: ../cli.py:832
#, python-format
msgid ""
-"Warning: 3.0.x versions of yum would erronously match against filenames.\n"
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
"Avís: les versions 3.0.x del yum comproven incorrectament els noms de fitxer.\n"
" Podeu usar \"%s*/%s%s\" i/o \"%s*bin/%s%s\" per obtenir aquest comportament"
-#: ../cli.py:815
+#: ../cli.py:848
#, python-format
msgid "No Package Found for %s"
msgstr "No s'ha trobat cap paquet per a %s"
-#: ../cli.py:827
+#: ../cli.py:860
msgid "Cleaning up Everything"
msgstr "S'està netejant tot"
-#: ../cli.py:841
+#: ../cli.py:874
msgid "Cleaning up Headers"
msgstr "S'estan netejant les capçaleres"
-#: ../cli.py:844
+#: ../cli.py:877
msgid "Cleaning up Packages"
msgstr "S'estan netejant els paquets"
-#: ../cli.py:847
+#: ../cli.py:880
msgid "Cleaning up xml metadata"
msgstr "S'estan netejant les metadades xml"
-#: ../cli.py:850
+#: ../cli.py:883
msgid "Cleaning up database cache"
msgstr "S'està netejant la memòria cau de la base de dades"
-#: ../cli.py:853
+#: ../cli.py:886
msgid "Cleaning up expire-cache metadata"
msgstr "S'està netejant la memòria cau de metadades que han vençut"
-#: ../cli.py:856
+#: ../cli.py:889
msgid "Cleaning up plugins"
msgstr "S'estan netejant els connectors"
-#: ../cli.py:881
+#: ../cli.py:914
msgid "Installed Groups:"
msgstr "Grups instal·lats:"
-#: ../cli.py:888
+#: ../cli.py:926
msgid "Available Groups:"
msgstr "Grups disponibles:"
-#: ../cli.py:894
+#: ../cli.py:936
msgid "Done"
msgstr "Fet"
-#: ../cli.py:905
-#: ../cli.py:923
-#: ../cli.py:929
-#: ../yum/__init__.py:2388
+#: ../cli.py:947
+#: ../cli.py:965
+#: ../cli.py:971
+#: ../yum/__init__.py:2421
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Avís: El grup %s no existeix."
-#: ../cli.py:933
+#: ../cli.py:975
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:935
+#: ../cli.py:977
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d paquets a instal·lar"
-#: ../cli.py:945
-#: ../yum/__init__.py:2400
+#: ../cli.py:987
+#: ../yum/__init__.py:2433
#, python-format
msgid "No group named %s exists"
msgstr "No existeix cap grup anomenat %s"
-#: ../cli.py:951
+#: ../cli.py:993
msgid "No packages to remove from groups"
msgstr "No hi ha cap paquet a esborrar dels grups"
-#: ../cli.py:953
+#: ../cli.py:995
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d paquets a esborrar"
-#: ../cli.py:995
+#: ../cli.py:1037
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "El paquet %s ja està instal·lat, s'ometrà"
-#: ../cli.py:1006
+#: ../cli.py:1048
#, 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:1032
+#: ../cli.py:1074
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr "No hi ha cap altre %s instal·lat, s'afegeix a la llista per a una possible instal·lació"
-#: ../cli.py:1051
+#: ../cli.py:1093
#, python-format
msgid "Command line error: %s"
msgstr "Error en la línia d'ordres: %s"
-#: ../cli.py:1064
+#: ../cli.py:1106
#, python-format
msgid ""
"\n"
@@ -420,253 +413,253 @@ msgstr ""
"\n"
"%s: l'opció %s necessita un argument"
-#: ../cli.py:1114
+#: ../cli.py:1164
msgid "--color takes one of: auto, always, never"
msgstr "--color pren un valor d'entre: auto, always, never"
-#: ../cli.py:1216
+#: ../cli.py:1266
msgid "show this help message and exit"
msgstr "mostra el missatge d'ajuda i surt"
-#: ../cli.py:1220
+#: ../cli.py:1270
msgid "be tolerant of errors"
msgstr "sigues tolerant amb els errors"
-#: ../cli.py:1222
+#: ../cli.py:1272
msgid "run entirely from cache, don't update cache"
msgstr "executa totalment des de la memòria cau, no l'actualitzis"
-#: ../cli.py:1224
+#: ../cli.py:1274
msgid "config file location"
msgstr "ubicació del fitxer de configuració"
-#: ../cli.py:1226
+#: ../cli.py:1276
msgid "maximum command wait time"
msgstr "temps màxim d'espera d'ordres"
-#: ../cli.py:1228
+#: ../cli.py:1278
msgid "debugging output level"
msgstr "nivell de sortida de depuració"
-#: ../cli.py:1232
+#: ../cli.py:1282
msgid "show duplicates, in repos, in list/search commands"
msgstr "mostra duplicats, en repositoris, en les ordres per llistar i cercar"
-#: ../cli.py:1234
+#: ../cli.py:1284
msgid "error output level"
msgstr "nivell de sortida d'error"
-#: ../cli.py:1237
+#: ../cli.py:1287
msgid "quiet operation"
msgstr "operació silenciosa"
-#: ../cli.py:1239
+#: ../cli.py:1289
msgid "verbose operation"
msgstr "operació descriptiva"
-#: ../cli.py:1241
+#: ../cli.py:1291
msgid "answer yes for all questions"
msgstr "respon sí a totes les preguntes"
-#: ../cli.py:1243
+#: ../cli.py:1293
msgid "show Yum version and exit"
msgstr "mostra la versió del Yum i surt"
-#: ../cli.py:1244
+#: ../cli.py:1294
msgid "set install root"
msgstr "estableix l'arrel de la instal·lació"
-#: ../cli.py:1248
+#: ../cli.py:1298
msgid "enable one or more repositories (wildcards allowed)"
msgstr "habilita un o més repositoris (es permeten caràcters de reemplaçament)"
-#: ../cli.py:1252
+#: ../cli.py:1302
msgid "disable one or more repositories (wildcards allowed)"
msgstr "deshabilita un o més repositoris (es permeten caràcters de reemplaçament)"
-#: ../cli.py:1255
+#: ../cli.py:1305
msgid "exclude package(s) by name or glob"
msgstr "exclou els paquets per nom o expressió regular del glob"
-#: ../cli.py:1257
+#: ../cli.py:1307
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:1260
+#: ../cli.py:1310
msgid "enable obsoletes processing during updates"
msgstr "habilita el processament d'obsolets durant les actualitzacions"
-#: ../cli.py:1262
+#: ../cli.py:1312
msgid "disable Yum plugins"
msgstr "inhabilita els connectors de Yum"
-#: ../cli.py:1264
+#: ../cli.py:1314
msgid "disable gpg signature checking"
msgstr "inhabilita la comprobació de signatures gpg"
-#: ../cli.py:1266
+#: ../cli.py:1316
msgid "disable plugins by name"
msgstr "inhabilita els connectors pel seu nom"
-#: ../cli.py:1269
+#: ../cli.py:1319
msgid "enable plugins by name"
msgstr "habilita els connectors pel seu nom"
-#: ../cli.py:1272
+#: ../cli.py:1322
msgid "skip packages with depsolving problems"
msgstr "omet paquets amb problemes de resolució de dependències"
-#: ../cli.py:1274
+#: ../cli.py:1324
msgid "control whether color is used"
msgstr "controla sempre que s'usi color"
-#: ../output.py:301
+#: ../output.py:298
msgid "Jan"
msgstr "Gen"
-#: ../output.py:301
+#: ../output.py:298
msgid "Feb"
msgstr "Feb"
-#: ../output.py:301
+#: ../output.py:298
msgid "Mar"
msgstr "Mar"
-#: ../output.py:301
+#: ../output.py:298
msgid "Apr"
msgstr "Abr"
-#: ../output.py:301
+#: ../output.py:298
msgid "May"
msgstr "Mai"
-#: ../output.py:301
+#: ../output.py:298
msgid "Jun"
msgstr "Jun"
-#: ../output.py:302
+#: ../output.py:299
msgid "Jul"
msgstr "Jul"
-#: ../output.py:302
+#: ../output.py:299
msgid "Aug"
msgstr "Ago"
-#: ../output.py:302
+#: ../output.py:299
msgid "Sep"
msgstr "Set"
-#: ../output.py:302
+#: ../output.py:299
msgid "Oct"
msgstr "Oct"
-#: ../output.py:302
+#: ../output.py:299
msgid "Nov"
msgstr "Nov"
-#: ../output.py:302
+#: ../output.py:299
msgid "Dec"
msgstr "Des"
-#: ../output.py:312
+#: ../output.py:309
msgid "Trying other mirror."
msgstr "S'està intentant un altre servidor rèplica."
-#: ../output.py:527
+#: ../output.py:525
#, python-format
msgid "Name : %s%s%s"
msgstr "Nom : %s%s%s"
-#: ../output.py:528
+#: ../output.py:526
#, python-format
msgid "Arch : %s"
msgstr "Arq : %s"
-#: ../output.py:530
+#: ../output.py:528
#, python-format
msgid "Epoch : %s"
msgstr "Època : %s"
-#: ../output.py:531
+#: ../output.py:529
#, python-format
msgid "Version : %s"
msgstr "Versió : %s"
-#: ../output.py:532
+#: ../output.py:530
#, python-format
msgid "Release : %s"
msgstr "Release : %s"
-#: ../output.py:533
+#: ../output.py:531
#, python-format
msgid "Size : %s"
msgstr "Mida : %s"
-#: ../output.py:534
+#: ../output.py:532
#, python-format
msgid "Repo : %s"
msgstr "Repo : %s"
-#: ../output.py:536
+#: ../output.py:534
#, python-format
msgid "Committer : %s"
msgstr "Desenvolupador : %s"
-#: ../output.py:537
+#: ../output.py:535
#, python-format
msgid "Committime : %s"
msgstr "Pujat : %s"
-#: ../output.py:538
+#: ../output.py:536
#, python-format
msgid "Buildtime : %s"
msgstr "Temps de creació : %s"
-#: ../output.py:540
+#: ../output.py:538
#, python-format
msgid "Installtime: %s"
msgstr "Temps d'instal·lació: %s"
-#: ../output.py:541
+#: ../output.py:539
msgid "Summary : "
msgstr "Resum : "
-#: ../output.py:543
+#: ../output.py:541
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:544
+#: ../output.py:542
#, python-format
msgid "License : %s"
msgstr "Llicència : %s"
-#: ../output.py:545
+#: ../output.py:543
msgid "Description: "
msgstr "Descripció: "
-#: ../output.py:609
+#: ../output.py:611
msgid "y"
msgstr "s"
-#: ../output.py:609
+#: ../output.py:611
msgid "yes"
msgstr "sí"
-#: ../output.py:610
+#: ../output.py:612
msgid "n"
msgstr "n"
-#: ../output.py:610
+#: ../output.py:612
msgid "no"
msgstr "no"
# REMEMBER to Translate [Y/N] to the current locale
-#: ../output.py:614
+#: ../output.py:616
msgid "Is this ok [y/N]: "
msgstr "És correcte [s/N]: "
-#: ../output.py:702
+#: ../output.py:704
#, python-format
msgid ""
"\n"
@@ -675,138 +668,143 @@ msgstr ""
"\n"
"Grup: %s"
-#: ../output.py:709
+#: ../output.py:708
+#, python-format
+msgid " Group-Id: %s"
+msgstr " Id de Grup: %s"
+
+#: ../output.py:713
#, python-format
msgid " Description: %s"
msgstr " Descripció: %s"
-#: ../output.py:711
+#: ../output.py:715
msgid " Mandatory Packages:"
msgstr " Paquets obligatoris:"
-#: ../output.py:712
+#: ../output.py:716
msgid " Default Packages:"
msgstr " Paquets per defecte:"
-#: ../output.py:713
+#: ../output.py:717
msgid " Optional Packages:"
msgstr " Paquets opcionals:"
-#: ../output.py:714
+#: ../output.py:718
msgid " Conditional Packages:"
msgstr " Paquets condicionals:"
-#: ../output.py:734
+#: ../output.py:738
#, python-format
msgid "package: %s"
msgstr "paquet: %s"
-#: ../output.py:736
+#: ../output.py:740
msgid " No dependencies for this package"
msgstr " No hi ha dependències per a aquest paquet"
-#: ../output.py:741
+#: ../output.py:745
#, python-format
msgid " dependency: %s"
msgstr " dependència: %s"
-#: ../output.py:743
+#: ../output.py:747
msgid " Unsatisfied dependency"
msgstr " Dependència insatisfeta"
-#: ../output.py:815
+#: ../output.py:819
#, python-format
msgid "Repo : %s"
msgstr "Repo : %s"
-#: ../output.py:816
+#: ../output.py:820
msgid "Matched from:"
msgstr "Coincidències amb:"
-#: ../output.py:824
+#: ../output.py:828
msgid "Description : "
msgstr "Descripció : "
-#: ../output.py:827
+#: ../output.py:831
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:830
+#: ../output.py:834
#, python-format
msgid "License : %s"
msgstr "Llicència : %s"
-#: ../output.py:833
+#: ../output.py:837
#, python-format
msgid "Filename : %s"
msgstr "Fitxer : %s"
-#: ../output.py:837
+#: ../output.py:841
msgid "Other : "
msgstr "Altre : "
-#: ../output.py:870
+#: ../output.py:874
msgid "There was an error calculating total download size"
msgstr "S'ha produït un error en calcular la mida total de la descàrrega"
-#: ../output.py:875
+#: ../output.py:879
#, python-format
msgid "Total size: %s"
msgstr "Mida total: %s"
-#: ../output.py:878
+#: ../output.py:882
#, python-format
msgid "Total download size: %s"
msgstr "Mida total de la descàrrega: %s"
-#: ../output.py:913
+#: ../output.py:924
msgid "Installing for dependencies"
msgstr "S'està instal·lant per dependències"
-#: ../output.py:914
+#: ../output.py:925
msgid "Updating for dependencies"
msgstr "S'està actualitzant degut a les dependències"
-#: ../output.py:915
+#: ../output.py:926
msgid "Removing for dependencies"
msgstr "S'està esborrant degut a les dependències"
-#: ../output.py:922
-#: ../output.py:1018
+#: ../output.py:933
+#: ../output.py:1031
msgid "Skipped (dependency problems)"
msgstr "Ignorat degut a problemes de dependències:"
-#: ../output.py:943
+#: ../output.py:954
msgid "Package"
msgstr "Paquet"
-#: ../output.py:943
+#: ../output.py:954
msgid "Arch"
msgstr "Arq"
-#: ../output.py:944
+#: ../output.py:955
msgid "Version"
msgstr "Versió"
-#: ../output.py:944
+#: ../output.py:955
msgid "Repository"
msgstr "Repositori"
-#: ../output.py:945
+#: ../output.py:956
msgid "Size"
msgstr "Mida"
-#: ../output.py:956
+#: ../output.py:968
#, python-format
msgid ""
-" replacing %s.%s %s\n"
+" replacing %s%s%s.%s %s\n"
"\n"
msgstr ""
-" s'està reemplaçant %s.%s %s\n"
+" s'està reemplaçant %s%s%s.%s %s\n"
"\n"
-#: ../output.py:964
+#: ../output.py:977
#, python-format
msgid ""
"\n"
@@ -823,27 +821,36 @@ msgstr ""
"Actualitza %5.5s paquets \n"
"Esborra %5.5s paquets \n"
-#: ../output.py:1012
+#: ../output.py:1025
msgid "Removed"
msgstr "Esborrat"
-#: ../output.py:1013
+#: ../output.py:1026
msgid "Dependency Removed"
msgstr "Dependència esborrada"
-#: ../output.py:1015
+#: ../output.py:1028
msgid "Dependency Installed"
msgstr "Dependència instal·lada"
-#: ../output.py:1017
+#: ../output.py:1030
msgid "Dependency Updated"
msgstr "Dependència actualitzada"
-#: ../output.py:1019
+#: ../output.py:1032
msgid "Replaced"
msgstr "Reemplaçat"
-#: ../output.py:1092
+#: ../output.py:1033
+msgid "Failed"
+msgstr "Ha fallat"
+
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1099
+msgid "two"
+msgstr "dos"
+
+#: ../output.py:1106
#, python-format
msgid ""
"\n"
@@ -852,67 +859,67 @@ msgstr ""
"\n"
" S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%s segons per a sortir.\n"
-#: ../output.py:1102
+#: ../output.py:1116
msgid "user interrupt"
msgstr "interrupció de l'usuari"
-#: ../output.py:1118
+#: ../output.py:1132
msgid "Total"
msgstr "Total"
-#: ../output.py:1132
+#: ../output.py:1146
msgid "installed"
msgstr "instal·lat"
-#: ../output.py:1133
+#: ../output.py:1147
msgid "updated"
msgstr "actualitzat"
-#: ../output.py:1134
+#: ../output.py:1148
msgid "obsoleted"
msgstr "obsolet"
-#: ../output.py:1135
+#: ../output.py:1149
msgid "erased"
msgstr "esborrat"
-#: ../output.py:1139
+#: ../output.py:1153
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Paquet %s.%s %s:%s-%s passarà a ser %s"
-#: ../output.py:1146
+#: ../output.py:1160
msgid "--> Running transaction check"
msgstr "--> S'està executant la transacció de prova"
-#: ../output.py:1151
+#: ../output.py:1165
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Tornant a calcular la resolució de dependències amb els nous canvis."
-#: ../output.py:1156
+#: ../output.py:1170
msgid "--> Finished Dependency Resolution"
msgstr "--> Ha finalitzat la resolució de dependències"
-#: ../output.py:1161
+#: ../output.py:1175
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> S'està processant la dependència %s per al paquet: %s"
-#: ../output.py:1166
+#: ../output.py:1180
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Dependència no resolta: %s"
-#: ../output.py:1172
+#: ../output.py:1186
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> S'està processant el conflicte: %s té un conflicte amb %s"
-#: ../output.py:1175
+#: ../output.py:1189
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:1179
+#: ../output.py:1193
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> S'està descarregant la capçalera per a %s per a empaquetar dins de la transacció de prova."
@@ -992,273 +999,274 @@ msgstr "El fitxer %s donat com a argument a l'intèrpret d'ordres no existeix."
msgid "Error: more than one file given as argument to shell."
msgstr "Error: s'ha donat més d'un fitxer com a argument per a l'intèrpret d'ordres."
-#: ../yumcommands.py:161
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr "PAQUET..."
-#: ../yumcommands.py:164
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr "Instal·la un o més paquets al vostre sistema"
-#: ../yumcommands.py:173
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr "S'està preparant el procés d'instal·lació"
-#: ../yumcommands.py:184
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr "[PAQUET...]"
-#: ../yumcommands.py:187
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr "S'ha actualitzat un o més paquets al vostre sistema"
-#: ../yumcommands.py:195
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr "S'està preparant el procés d'actualització"
-#: ../yumcommands.py:237
+#: ../yumcommands.py:243
msgid "Display details about a package or group of packages"
msgstr "Mostra detalls sobre un paquet o un grup de paquets"
-#: ../yumcommands.py:278
+#: ../yumcommands.py:292
msgid "Installed Packages"
msgstr "Paquets instal·lats"
-#: ../yumcommands.py:285
+#: ../yumcommands.py:300
msgid "Available Packages"
msgstr "Paquets disponibles"
-#: ../yumcommands.py:289
+#: ../yumcommands.py:304
msgid "Extra Packages"
msgstr "Paquets extra"
-#: ../yumcommands.py:291
+#: ../yumcommands.py:308
msgid "Updated Packages"
msgstr "Paquets actualitzats"
-#: ../yumcommands.py:298
-#: ../yumcommands.py:305
-#: ../yumcommands.py:574
+#. This only happens in verbose mode
+#: ../yumcommands.py:316
+#: ../yumcommands.py:323
+#: ../yumcommands.py:600
msgid "Obsoleting Packages"
msgstr "Paquets obsolets"
-#: ../yumcommands.py:307
+#: ../yumcommands.py:325
msgid "Recently Added Packages"
msgstr "Paquets recentment afegits"
-#: ../yumcommands.py:314
+#: ../yumcommands.py:332
msgid "No matching Packages to list"
msgstr "No hi ha paquets coincidents per llistar"
-#: ../yumcommands.py:328
+#: ../yumcommands.py:346
msgid "List a package or groups of packages"
msgstr "Llista un paquet o un grup de paquets"
-#: ../yumcommands.py:340
+#: ../yumcommands.py:358
msgid "Remove a package or packages from your system"
msgstr "Esborra un o més paquets del vostre sistema"
-#: ../yumcommands.py:348
+#: ../yumcommands.py:365
msgid "Setting up Remove Process"
msgstr "S'està preparant el procés d'esborrat"
-#: ../yumcommands.py:363
+#: ../yumcommands.py:379
msgid "Setting up Group Process"
msgstr "S'està preparant el procés de grup"
-#: ../yumcommands.py:369
+#: ../yumcommands.py:385
msgid "No Groups on which to run command"
msgstr "No hi ha cap grup on executar l'ordre"
-#: ../yumcommands.py:382
+#: ../yumcommands.py:398
msgid "List available package groups"
msgstr "Llista els grups de paquets disponibles"
-#: ../yumcommands.py:399
+#: ../yumcommands.py:415
msgid "Install the packages in a group on your system"
msgstr "Instal·la els paquets en un grup en el vostre sistema"
-#: ../yumcommands.py:421
+#: ../yumcommands.py:437
msgid "Remove the packages in a group from your system"
msgstr "Esborra els paquets en un grup en el vostre sistema"
-#: ../yumcommands.py:448
+#: ../yumcommands.py:464
msgid "Display details about a package group"
msgstr "Mostra detalls sobre un grup de paquets"
-#: ../yumcommands.py:472
+#: ../yumcommands.py:488
msgid "Generate the metadata cache"
msgstr "Genera les metadades de la memòria cau"
-#: ../yumcommands.py:478
+#: ../yumcommands.py:494
msgid "Making cache files for all metadata files."
msgstr "S'estan fent els fitxers de memòria cau per a tots els fitxers de metadades."
-#: ../yumcommands.py:479
+#: ../yumcommands.py:495
msgid "This may take a while depending on the speed of this computer"
msgstr "Això pot trigar una estona depenent de la velocitat d'aquest ordinador"
-#: ../yumcommands.py:500
+#: ../yumcommands.py:516
msgid "Metadata Cache Created"
msgstr "S'han creat les metadades per a la memòria cau"
-#: ../yumcommands.py:514
+#: ../yumcommands.py:530
msgid "Remove cached data"
msgstr "S'han esborrat les dades de la memòria cau"
-#: ../yumcommands.py:535
+#: ../yumcommands.py:551
msgid "Find what package provides the given value"
msgstr "Troba quin paquet proporciona el valor donat"
-#: ../yumcommands.py:555
+#: ../yumcommands.py:571
msgid "Check for available package updates"
msgstr "Comprova si hi ha actualitzacions de paquets disponibles"
-#: ../yumcommands.py:594
+#: ../yumcommands.py:620
msgid "Search package details for the given string"
msgstr "Busca detalls del paquet per la cadena donada"
-#: ../yumcommands.py:600
+#: ../yumcommands.py:626
msgid "Searching Packages: "
msgstr "S'estan buscant paquets: "
-#: ../yumcommands.py:617
+#: ../yumcommands.py:643
msgid "Update packages taking obsoletes into account"
msgstr "Actualitza paquets tenint en compte els obsolets"
-#: ../yumcommands.py:626
+#: ../yumcommands.py:651
msgid "Setting up Upgrade Process"
msgstr "S'està preparant el procés d'actualització"
-#: ../yumcommands.py:640
+#: ../yumcommands.py:665
msgid "Install a local RPM"
msgstr "Instal·la un RPM local"
-#: ../yumcommands.py:649
+#: ../yumcommands.py:673
msgid "Setting up Local Package Process"
msgstr "S'està configurant el procés local de paquets"
-#: ../yumcommands.py:668
+#: ../yumcommands.py:692
msgid "Determine which package provides the given dependency"
msgstr "Determina quin paquet satisfà la dependència donada"
-#: ../yumcommands.py:671
+#: ../yumcommands.py:695
msgid "Searching Packages for Dependency:"
msgstr "S'estan buscant paquets per a la dependència:"
-#: ../yumcommands.py:685
+#: ../yumcommands.py:709
msgid "Run an interactive yum shell"
msgstr "Executa un intèrpret d'ordres interactiu de yum"
-#: ../yumcommands.py:691
+#: ../yumcommands.py:715
msgid "Setting up Yum Shell"
msgstr "S'està preparant l'intèrpret d'ordres de yum"
-#: ../yumcommands.py:709
+#: ../yumcommands.py:733
msgid "List a package's dependencies"
msgstr "Llista les dependències d'un paquet"
-#: ../yumcommands.py:715
+#: ../yumcommands.py:739
msgid "Finding dependencies: "
msgstr "S'estan trobant dependències: "
-#: ../yumcommands.py:731
+#: ../yumcommands.py:755
msgid "Display the configured software repositories"
msgstr "Mostra els repositoris de programari configurats"
-#: ../yumcommands.py:779
-#: ../yumcommands.py:780
+#: ../yumcommands.py:803
+#: ../yumcommands.py:804
msgid "enabled"
msgstr "habilitat"
-#: ../yumcommands.py:788
-#: ../yumcommands.py:789
+#: ../yumcommands.py:812
+#: ../yumcommands.py:813
msgid "disabled"
msgstr "deshabilitat"
-#: ../yumcommands.py:800
+#: ../yumcommands.py:827
msgid "Repo-id : "
msgstr "Id-repo : "
-#: ../yumcommands.py:801
+#: ../yumcommands.py:828
msgid "Repo-name : "
msgstr "Nom-repo : "
-#: ../yumcommands.py:802
+#: ../yumcommands.py:829
msgid "Repo-status : "
msgstr "Estat-repo : "
-#: ../yumcommands.py:804
+#: ../yumcommands.py:831
msgid "Repo-revision: "
msgstr "Repo-revisió : "
-#: ../yumcommands.py:808
+#: ../yumcommands.py:835
msgid "Repo-tags : "
msgstr "Repo-etiquetes : "
-#: ../yumcommands.py:814
+#: ../yumcommands.py:841
msgid "Repo-distro-tags: "
msgstr "Repo-etiq-dist : "
-#: ../yumcommands.py:819
+#: ../yumcommands.py:846
msgid "Repo-updated: "
msgstr "Repo-actualitzat: "
-#: ../yumcommands.py:821
+#: ../yumcommands.py:848
msgid "Repo-pkgs : "
msgstr "Paquets-repo : "
-#: ../yumcommands.py:822
+#: ../yumcommands.py:849
msgid "Repo-size : "
msgstr "Mida-repo : "
-#: ../yumcommands.py:829
+#: ../yumcommands.py:856
msgid "Repo-baseurl: "
msgstr "URL-base-repo : "
-#: ../yumcommands.py:833
+#: ../yumcommands.py:860
msgid "Repo-metalink: "
msgstr "Repo-metaenllaç : "
-#: ../yumcommands.py:836
+#: ../yumcommands.py:863
msgid "Repo-mirrors: "
msgstr "Miralls-repo : "
-#: ../yumcommands.py:840
+#: ../yumcommands.py:867
msgid "Repo-exclude: "
msgstr "Repo-exclou : "
-#: ../yumcommands.py:844
+#: ../yumcommands.py:871
msgid "Repo-include: "
msgstr "Repo-inclou : "
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:854
-#: ../yumcommands.py:880
+#: ../yumcommands.py:881
+#: ../yumcommands.py:907
msgid "repo id"
msgstr "id repo"
-#: ../yumcommands.py:868
-#: ../yumcommands.py:869
-#: ../yumcommands.py:883
+#: ../yumcommands.py:895
+#: ../yumcommands.py:896
+#: ../yumcommands.py:910
msgid "status"
msgstr "estat"
-#: ../yumcommands.py:881
+#: ../yumcommands.py:908
msgid "repo name"
msgstr "nom repo"
-#: ../yumcommands.py:907
+#: ../yumcommands.py:934
msgid "Display a helpful usage message"
msgstr "Mostra un missatge d'ajuda d'ús"
-#: ../yumcommands.py:941
+#: ../yumcommands.py:968
#, python-format
msgid "No help available for %s"
msgstr "No hi ha ajuda disponible per a %s"
-#: ../yumcommands.py:946
+#: ../yumcommands.py:973
msgid ""
"\n"
"\n"
@@ -1268,7 +1276,7 @@ msgstr ""
"\n"
"àlies: "
-#: ../yumcommands.py:948
+#: ../yumcommands.py:975
msgid ""
"\n"
"\n"
@@ -1278,15 +1286,27 @@ msgstr ""
"\n"
"àlies: "
-#: ../yumcommands.py:977
+#: ../yumcommands.py:1003
msgid "Setting up Reinstall Process"
msgstr "S'està preparant el procés de reinstal·lació"
-#: ../yumcommands.py:991
+#: ../yumcommands.py:1012
+msgid "Package(s) to reinstall"
+msgstr "Paquets a reinstal·lar"
+
+#: ../yumcommands.py:1019
msgid "reinstall a package"
msgstr "reinstal·la un paquet"
-#: ../yummain.py:41
+#: ../yumcommands.py:1037
+msgid "Setting up Downgrade Process"
+msgstr "S'està preparant el procés de desactualització"
+
+#: ../yumcommands.py:1044
+msgid "downgrade a package"
+msgstr "desactualitza un paquet"
+
+#: ../yummain.py:42
msgid ""
"\n"
"\n"
@@ -1296,7 +1316,7 @@ msgstr ""
"\n"
"S'està sortint per la cancel·lació de l'usuari"
-#: ../yummain.py:47
+#: ../yummain.py:48
msgid ""
"\n"
"\n"
@@ -1306,28 +1326,90 @@ msgstr ""
"\n"
"S'està sortint en trobar la canonada trencada"
-#: ../yummain.py:98
+#: ../yummain.py:126
+msgid "Running"
+msgstr "S'està executant"
+
+#: ../yummain.py:127
+msgid "Sleeping"
+msgstr "Està dormint"
+
+#: ../yummain.py:128
+msgid "Uninteruptable"
+msgstr "Ininterrumpible"
+
+#: ../yummain.py:129
+msgid "Zombie"
+msgstr "Zombi"
+
+#: ../yummain.py:130
+msgid "Traced/Stopped"
+msgstr "Traçat/aturat"
+
+#: ../yummain.py:131
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: ../yummain.py:135
+msgid " The other application is: PackageKit"
+msgstr " L'altre aplicatiu és: PackageKit"
+
+#: ../yummain.py:137
+#, python-format
+msgid " The other application is: %s"
+msgstr " L'altre aplicatiu és: %s"
+
+#: ../yummain.py:140
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr " Memòria : %5s RSS (%5sB VSZ)"
+
+#: ../yummain.py:144
+#, python-format
+msgid " Started: %s - %s ago"
+msgstr " Iniciat: fa %s-%s"
+
+#: ../yummain.py:146
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr " Estat : %s, pid: %d"
+
+#: ../yummain.py:171
msgid "Another app is currently holding the yum lock; waiting for it to exit..."
msgstr "Alguna altra aplicació té el bloqueig del yum; s'està esperant a que surti..."
-#: ../yummain.py:125
-#: ../yummain.py:164
+#: ../yummain.py:199
+#: ../yummain.py:238
#, python-format
msgid "Error: %s"
msgstr "Error: %s"
-#: ../yummain.py:135
-#: ../yummain.py:171
+#: ../yummain.py:209
+#: ../yummain.py:250
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Errors desconeguts: Codi de sortida: %d:"
#. Depsolve stage
-#: ../yummain.py:142
+#: ../yummain.py:216
msgid "Resolving Dependencies"
msgstr "S'estan resolent dependències"
-#: ../yummain.py:177
+#: ../yummain.py:240
+msgid " You could try using --skip-broken to work around the problem"
+msgstr " Hauríeu de provar utilitzant --skip-broken per evitar el problema"
+
+#: ../yummain.py:241
+msgid ""
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+msgstr ""
+" Haríeu de provar d'executar: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+
+#: ../yummain.py:256
msgid ""
"\n"
"Dependencies Resolved"
@@ -1335,11 +1417,11 @@ msgstr ""
"\n"
"Dependències resoltes"
-#: ../yummain.py:191
+#: ../yummain.py:270
msgid "Complete!"
msgstr "Completat!"
-#: ../yummain.py:238
+#: ../yummain.py:317
msgid ""
"\n"
"\n"
@@ -1383,7 +1465,7 @@ msgid "Member: %s"
msgstr "Membre: %s"
#: ../yum/depsolve.py:247
-#: ../yum/depsolve.py:734
+#: ../yum/depsolve.py:739
#, python-format
msgid "%s converted to install"
msgstr "%s convertits per a instal·lar"
@@ -1432,118 +1514,118 @@ msgstr "Mode per al paquet que proporciona %s: %s"
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: el paquet %s requereix %s marcat per a esborrar"
-#: ../yum/depsolve.py:393
+#: ../yum/depsolve.py:394
#, 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:396
+#: ../yum/depsolve.py:397
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: S'està actualitzant %s per a resoldre dependències."
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:405
#, 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:414
+#: ../yum/depsolve.py:415
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "No es pot resoldre el requeriment %s per a %s"
-#: ../yum/depsolve.py:437
+#: ../yum/depsolve.py:438
#, 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:479
+#: ../yum/depsolve.py:480
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr "%s es troba en els paquets proporcionats però ja es troba instal·lat, s'està esborrant."
-#: ../yum/depsolve.py:494
+#: ../yum/depsolve.py:496
#, 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:505
+#: ../yum/depsolve.py:507
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "El paquet potencial que resol dependències %s té una nova instància insta·lada."
-#: ../yum/depsolve.py:513
-#: ../yum/depsolve.py:562
+#: ../yum/depsolve.py:515
+#: ../yum/depsolve.py:564
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Manca una dependència: %s es necessita per al paquet %s"
-#: ../yum/depsolve.py:526
+#: ../yum/depsolve.py:528
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s ja es troba en ts, s'està ometent"
-#: ../yum/depsolve.py:572
+#: ../yum/depsolve.py:574
#, 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:580
+#: ../yum/depsolve.py:582
#, 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:672
-#: ../yum/depsolve.py:752
+#: ../yum/depsolve.py:675
+#: ../yum/depsolve.py:757
msgid "Success - empty transaction"
msgstr "Èxit - transacció buida"
-#: ../yum/depsolve.py:711
-#: ../yum/depsolve.py:724
+#: ../yum/depsolve.py:714
+#: ../yum/depsolve.py:729
msgid "Restarting Loop"
msgstr "S'està recomençant el bucle"
-#: ../yum/depsolve.py:740
+#: ../yum/depsolve.py:745
msgid "Dependency Process ending"
msgstr "Està acabant el procés de dependències"
-#: ../yum/depsolve.py:746
+#: ../yum/depsolve.py:751
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s de %s té problemes resolent dependències"
-#: ../yum/depsolve.py:753
+#: ../yum/depsolve.py:758
msgid "Success - deps resolved"
msgstr "Èxit - dependències resoltes"
-#: ../yum/depsolve.py:767
+#: ../yum/depsolve.py:772
#, python-format
msgid "Checking deps for %s"
msgstr "S'estan comprobant les dependències per a %s"
-#: ../yum/depsolve.py:850
+#: ../yum/depsolve.py:855
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "s'està buscant %s com a requeriment de %s"
-#: ../yum/depsolve.py:990
+#: ../yum/depsolve.py:997
#, python-format
msgid "Running compare_providers() for %s"
msgstr "S'està executant compare_providers() per a %s"
-#: ../yum/depsolve.py:1018
-#: ../yum/depsolve.py:1024
+#: ../yum/depsolve.py:1025
+#: ../yum/depsolve.py:1031
#, python-format
msgid "better arch in po %s"
msgstr "millor arq en el po %s"
-#: ../yum/depsolve.py:1063
+#: ../yum/depsolve.py:1092
#, python-format
msgid "%s obsoletes %s"
msgstr "%s fa obsolet %s"
-#: ../yum/depsolve.py:1079
+#: ../yum/depsolve.py:1108
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1552,112 +1634,112 @@ msgstr ""
"archdist ha comparat %s amb %s a %s\n"
" Ha guanyat: %s"
-#: ../yum/depsolve.py:1086
+#: ../yum/depsolve.py:1115
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "rpm font comú %s i %s"
-#: ../yum/depsolve.py:1092
+#: ../yum/depsolve.py:1121
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "prefix comú de %s entre %s i %s"
-#: ../yum/depsolve.py:1100
+#: ../yum/depsolve.py:1129
#, python-format
msgid "Best Order: %s"
msgstr "Millor ordre: %s"
-#: ../yum/__init__.py:135
+#: ../yum/__init__.py:158
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigsetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/__init__.py:315
+#: ../yum/__init__.py:367
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Falta el nom del repositori %r en la configuració, s'utilitzarà l'id"
-#: ../yum/__init__.py:353
+#: ../yum/__init__.py:405
msgid "plugins already initialised"
msgstr "els connectors ja estan inicialitzats"
-#: ../yum/__init__.py:360
+#: ../yum/__init__.py:412
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/__init__.py:370
+#: ../yum/__init__.py:423
msgid "Reading Local RPMDB"
msgstr "S'està llegint un RPMDB local"
-#: ../yum/__init__.py:388
+#: ../yum/__init__.py:441
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/__init__.py:408
+#: ../yum/__init__.py:461
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() desapareixerà en una versió futura de Yum.\n"
-#: ../yum/__init__.py:425
+#: ../yum/__init__.py:478
msgid "Setting up Package Sacks"
msgstr "S'estan configurant els sacs de paquets"
-#: ../yum/__init__.py:468
+#: ../yum/__init__.py:521
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "l'objecte repositori per al repositori %s no té un mètode _resetSack\n"
-#: ../yum/__init__.py:469
+#: ../yum/__init__.py:522
msgid "therefore this repo cannot be reset.\n"
msgstr "Aquest repositori no es pot reiniciar.\n"
-#: ../yum/__init__.py:474
+#: ../yum/__init__.py:527
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/__init__.py:486
+#: ../yum/__init__.py:539
msgid "Building updates object"
msgstr "S'està construint l'objecte d'actualitzacions"
-#: ../yum/__init__.py:517
+#: ../yum/__init__.py:570
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/__init__.py:541
+#: ../yum/__init__.py:595
msgid "Getting group metadata"
msgstr "S'estan obtenint les metadades del grup"
-#: ../yum/__init__.py:567
+#: ../yum/__init__.py:621
#, python-format
msgid "Adding group file from repository: %s"
msgstr "S'està afegint el fitxer del grup des del repositori: %s"
-#: ../yum/__init__.py:576
+#: ../yum/__init__.py:630
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "No s'ha pogut afegir el fitxer dels grups des del repositori: %s - %s"
-#: ../yum/__init__.py:582
+#: ../yum/__init__.py:636
msgid "No Groups Available in any repository"
msgstr "No hi ha cap grup disponible en cap repositori"
-#: ../yum/__init__.py:632
+#: ../yum/__init__.py:686
msgid "Importing additional filelist information"
msgstr "S'està important informació adicional de la llista de fitxers"
-#: ../yum/__init__.py:641
+#: ../yum/__init__.py:695
msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them."
msgstr "Encara hi ha transaccions sense acabar. Hauríeu de considerar executar yum-complete-transaction abans per acabar-les."
-#: ../yum/__init__.py:707
+#: ../yum/__init__.py:761
#, python-format
msgid "Skip-broken round %i"
msgstr "Intent %i d'omissió dels paquets trencats"
-#: ../yum/__init__.py:759
+#: ../yum/__init__.py:813
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "L'omissió dels paquets trencats ha necessitat %i intents"
-#: ../yum/__init__.py:760
+#: ../yum/__init__.py:814
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1665,89 +1747,89 @@ msgstr ""
"\n"
"Paquets omesos degut a problemes de dependències:"
-#: ../yum/__init__.py:764
+#: ../yum/__init__.py:818
#, python-format
msgid " %s from %s"
msgstr " %s des de %s"
-#: ../yum/__init__.py:908
+#: ../yum/__init__.py:958
msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr "Avís: ha fallat l'scriptlet o s'han produït altre tipus d'errors no fatals durant la transacció."
-#: ../yum/__init__.py:924
+#: ../yum/__init__.py:973
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "No s'ha pogut esborrar el fitxer de transaccions %s"
-#: ../yum/__init__.py:965
+#: ../yum/__init__.py:1015
#, python-format
msgid "excluding for cost: %s from %s"
msgstr "s'està excloent per cost: %s de %s"
-#: ../yum/__init__.py:996
+#: ../yum/__init__.py:1046
msgid "Excluding Packages in global exclude list"
msgstr "S'estan excloent paquets en la llista global d'exclusió"
-#: ../yum/__init__.py:998
+#: ../yum/__init__.py:1048
#, python-format
msgid "Excluding Packages from %s"
msgstr "S'estan excloent paquets de %s"
-#: ../yum/__init__.py:1025
+#: ../yum/__init__.py:1077
#, python-format
msgid "Reducing %s to included packages only"
msgstr "S'està reduint %s únicament a paquets inclosos."
-#: ../yum/__init__.py:1031
+#: ../yum/__init__.py:1083
#, python-format
msgid "Keeping included package %s"
msgstr "S'està mantenint el paquet inclòs %s"
-#: ../yum/__init__.py:1037
+#: ../yum/__init__.py:1089
#, python-format
msgid "Removing unmatched package %s"
msgstr "S'està esborrant el paquet sense coincidències %s"
-#: ../yum/__init__.py:1040
+#: ../yum/__init__.py:1092
msgid "Finished"
msgstr "Finalitzat"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1070
+#: ../yum/__init__.py:1122
#, 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:1074
+#: ../yum/__init__.py:1126
#, 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."
-#: ../yum/__init__.py:1145
+#: ../yum/__init__.py:1196
msgid "Package does not match intended download"
msgstr "El paquet no coincideix amb la descàrrega intentada"
-#: ../yum/__init__.py:1160
+#: ../yum/__init__.py:1211
msgid "Could not perform checksum"
msgstr "No s'ha pogut realitzar la suma de verificació"
-#: ../yum/__init__.py:1163
+#: ../yum/__init__.py:1214
msgid "Package does not match checksum"
msgstr "No coincideix la suma de verificació del paquet"
-#: ../yum/__init__.py:1206
+#: ../yum/__init__.py:1257
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr "la suma de verificació del paquet falla però l'ús de memòria cau està habilitat per a %s"
-#: ../yum/__init__.py:1209
-#: ../yum/__init__.py:1237
+#: ../yum/__init__.py:1260
+#: ../yum/__init__.py:1289
#, python-format
msgid "using local copy of %s"
msgstr "s'està utilitzant la còpia local de %s"
-#: ../yum/__init__.py:1251
+#: ../yum/__init__.py:1301
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1758,331 +1840,343 @@ msgstr ""
" * lliure %s\n"
" * necessari %s"
-#: ../yum/__init__.py:1298
+#: ../yum/__init__.py:1348
msgid "Header is not complete."
msgstr "La capçalera no està completa."
-#: ../yum/__init__.py:1338
+#: ../yum/__init__.py:1385
#, python-format
msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr "La capçalera no es troba en la memòria cau local i està habilitat el mode de només memòria cau. No es pot descarregar %s"
-#: ../yum/__init__.py:1393
+#: ../yum/__init__.py:1440
#, 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:1397
+#: ../yum/__init__.py:1444
#, python-format
msgid "Problem opening package %s"
msgstr "Hi ha hagut un problema obrint el paquet %s"
-#: ../yum/__init__.py:1405
+#: ../yum/__init__.py:1452
#, 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:1409
+#: ../yum/__init__.py:1456
#, python-format
msgid "Package %s is not signed"
msgstr "El paquet %s no està signat"
-#: ../yum/__init__.py:1447
+#: ../yum/__init__.py:1494
#, python-format
msgid "Cannot remove %s"
msgstr "No es pot esborrar %s"
-#: ../yum/__init__.py:1451
+#: ../yum/__init__.py:1498
#, python-format
msgid "%s removed"
msgstr "S'ha esborrat %s"
-#: ../yum/__init__.py:1488
+#: ../yum/__init__.py:1534
#, python-format
msgid "Cannot remove %s file %s"
msgstr "No es pot esborrar %s fitxer %s"
-#: ../yum/__init__.py:1492
+#: ../yum/__init__.py:1538
#, python-format
msgid "%s file %s removed"
msgstr "%s fitxer %s esborrat"
-#: ../yum/__init__.py:1494
+#: ../yum/__init__.py:1540
#, python-format
msgid "%d %s files removed"
msgstr "%d %s fitxers esborrats"
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1609
#, 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:1569
+#: ../yum/__init__.py:1615
#, 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:1787
+#: ../yum/__init__.py:1833
msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
msgstr "searchPackages() desapareixerà en una futura versió de Yum. Useu searchGenerator(). \n"
-#: ../yum/__init__.py:1825
+#: ../yum/__init__.py:1875
#, python-format
msgid "Searching %d packages"
msgstr "S'estan buscant %d paquets"
-#: ../yum/__init__.py:1829
+#: ../yum/__init__.py:1879
#, python-format
msgid "searching package %s"
msgstr "s'està buscant el paquet %s"
-#: ../yum/__init__.py:1841
+#: ../yum/__init__.py:1891
msgid "searching in file entries"
msgstr "s'està buscant en les entrades de fitxers"
-#: ../yum/__init__.py:1848
+#: ../yum/__init__.py:1898
msgid "searching in provides entries"
msgstr "s'està buscant en les entrades proporcionades"
-#: ../yum/__init__.py:1881
+#: ../yum/__init__.py:1931
#, python-format
msgid "Provides-match: %s"
msgstr "Proporciona-coincideix: %s"
-#: ../yum/__init__.py:1930
+#: ../yum/__init__.py:1980
msgid "No group data available for configured repositories"
msgstr "No hi ha dades de grup disponibles en cap dels repositoris configurats"
-#: ../yum/__init__.py:1961
-#: ../yum/__init__.py:1980
#: ../yum/__init__.py:2011
-#: ../yum/__init__.py:2017
-#: ../yum/__init__.py:2090
-#: ../yum/__init__.py:2094
+#: ../yum/__init__.py:2030
+#: ../yum/__init__.py:2061
+#: ../yum/__init__.py:2067
+#: ../yum/__init__.py:2146
+#: ../yum/__init__.py:2150
+#: ../yum/__init__.py:2447
#, python-format
msgid "No Group named %s exists"
msgstr "No existeix cap grup anomenat %s"
-#: ../yum/__init__.py:1992
-#: ../yum/__init__.py:2107
+#: ../yum/__init__.py:2042
+#: ../yum/__init__.py:2163
#, 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:2039
+#: ../yum/__init__.py:2089
#, python-format
msgid "Adding package %s from group %s"
msgstr "S'està afegint el paquet %s del grup %s"
-#: ../yum/__init__.py:2043
+#: ../yum/__init__.py:2093
#, 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:2132
+#: ../yum/__init__.py:2190
#, 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:2147
+#: ../yum/__init__.py:2205
msgid "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
msgstr "getInstalledPackageObject() desapareixarà, useu self.rpmdb.searchPkgTuple().\n"
-#: ../yum/__init__.py:2199
-#: ../yum/__init__.py:2242
-msgid "Invalid versioned dependency string, try quoting it."
-msgstr "La cadena de versió de dependència és invàlida, proveu-ho entre cometes."
-
-#: ../yum/__init__.py:2201
-#: ../yum/__init__.py:2244
+#: ../yum/__init__.py:2261
+#: ../yum/__init__.py:2305
msgid "Invalid version flag"
msgstr "Marcador de versió invàlid"
-#: ../yum/__init__.py:2216
-#: ../yum/__init__.py:2220
+#: ../yum/__init__.py:2276
+#: ../yum/__init__.py:2280
#, python-format
msgid "No Package found for %s"
msgstr "No s'ha trobat cap paquet per a %s"
-#: ../yum/__init__.py:2428
+#: ../yum/__init__.py:2480
msgid "Package Object was not a package object instance"
msgstr "L'objecte paquet no era una instància d'objecte paquet"
-#: ../yum/__init__.py:2432
+#: ../yum/__init__.py:2484
msgid "Nothing specified to install"
msgstr "No hi ha res especificat per a instal·lar"
-#. only one in there
-#: ../yum/__init__.py:2450
+#: ../yum/__init__.py:2500
+#: ../yum/__init__.py:3127
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "S'està verificant si hi ha un proveïdor virtual o un fitxer proveïdor per a %s"
-#: ../yum/__init__.py:2456
-#: ../yum/__init__.py:2696
-#: ../yum/__init__.py:2863
+#: ../yum/__init__.py:2506
+#: ../yum/__init__.py:2783
+#: ../yum/__init__.py:2943
+#: ../yum/__init__.py:3133
#, python-format
msgid "No Match for argument: %s"
msgstr "No hi ha cap coincidència per a l'argument: %s"
-#: ../yum/__init__.py:2522
+#: ../yum/__init__.py:2580
#, python-format
msgid "Package %s installed and not available"
msgstr "El paquet %s es troba instal·lat però no és disponible"
-#: ../yum/__init__.py:2525
+#: ../yum/__init__.py:2583
msgid "No package(s) available to install"
msgstr "No hi ha cap paquet disponible per a instal·lar"
-#: ../yum/__init__.py:2537
+#: ../yum/__init__.py:2595
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "El paquet: %s - ja està en la transacció"
-#: ../yum/__init__.py:2552
+#: ../yum/__init__.py:2610
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr "El paquet %s és obsolet degut a %s, es provarà d'instal·lar %s"
-#: ../yum/__init__.py:2560
+#: ../yum/__init__.py:2618
#, 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:2567
+#: ../yum/__init__.py:2632
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr "El paquet coincident %s ja es troba instal·lat. S'està buscant una actualització."
#. update everything (the easy case)
-#: ../yum/__init__.py:2640
+#: ../yum/__init__.py:2718
msgid "Updating Everything"
msgstr "S'està actualitzant tot"
-#: ../yum/__init__.py:2658
-#: ../yum/__init__.py:2768
-#: ../yum/__init__.py:2790
-#: ../yum/__init__.py:2812
+#: ../yum/__init__.py:2736
+#: ../yum/__init__.py:2845
+#: ../yum/__init__.py:2866
+#: ../yum/__init__.py:2892
#, 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:2693
-#: ../yum/__init__.py:2860
+#: ../yum/__init__.py:2771
+#: ../yum/__init__.py:2940
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:2759
+#: ../yum/__init__.py:2836
#, 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:2793
-#: ../yum/__init__.py:2815
+#: ../yum/__init__.py:2869
+#: ../yum/__init__.py:2895
#, 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"
-#: ../yum/__init__.py:2876
+#: ../yum/__init__.py:2956
msgid "No package matched to remove"
msgstr "No hi ha cap paquet coincident per a esborrar"
-#: ../yum/__init__.py:2910
+#: ../yum/__init__.py:2990
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "No es pot obrir el fitxer %s. S'ometrà."
-#: ../yum/__init__.py:2913
+#: ../yum/__init__.py:2993
#, python-format
msgid "Examining %s: %s"
msgstr "S'està examinant %s: %s"
-#: ../yum/__init__.py:2921
+#: ../yum/__init__.py:3001
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr "No s'ha pogut afegir el paquet %s a la transacció. No és una arquitectura compatible: %s"
-#: ../yum/__init__.py:2929
+#: ../yum/__init__.py:3009
#, python-format
msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
-msgstr "El paquet %s no està instal·lat; no es pot actualitzar. Executa yum install per a instal·lar-lo."
+msgstr "El paquet %s no està instal·lat; no es pot actualitzar. Executeu «yum install» per a instal·lar-lo."
-#: ../yum/__init__.py:2962
+#: ../yum/__init__.py:3044
#, python-format
msgid "Excluding %s"
msgstr "S'està excloent %s"
-#: ../yum/__init__.py:2967
+#: ../yum/__init__.py:3049
#, python-format
msgid "Marking %s to be installed"
msgstr "S'està marcant %s per a ser instal·lat"
-#: ../yum/__init__.py:2973
+#: ../yum/__init__.py:3055
#, python-format
msgid "Marking %s as an update to %s"
msgstr "S'està marcant %s com a actualització de %s"
-#: ../yum/__init__.py:2980
+#: ../yum/__init__.py:3062
#, python-format
msgid "%s: does not update installed package."
msgstr "%s no actualitza el paquet instal·lat."
-#: ../yum/__init__.py:2998
+#: ../yum/__init__.py:3077
msgid "Problem in reinstall: no package matched to remove"
msgstr "Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a esborrar"
-#: ../yum/__init__.py:3009
+#: ../yum/__init__.py:3089
+#: ../yum/__init__.py:3160
#, 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:3016
+#: ../yum/__init__.py:3098
msgid "Problem in reinstall: no package matched to install"
msgstr "Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a instal·lar"
-#: ../yum/__init__.py:3051
+#: ../yum/__init__.py:3152
+msgid "No package(s) available to downgrade"
+msgstr "No hi ha cap paquet disponible per a desactualitzar"
+
+#: ../yum/__init__.py:3183
+#, python-format
+msgid "No Match for available package: %s"
+msgstr "No hi ha cap paquet disponible que coincideixi: %s"
+
+#: ../yum/__init__.py:3189
+#, python-format
+msgid "Only Upgrade available on package: %s"
+msgstr "Només hi ha una actualització disponible per al paquet: %s"
+
+#: ../yum/__init__.py:3241
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "S'està recuperant la clau GPG des de %s"
-#: ../yum/__init__.py:3071
+#: ../yum/__init__.py:3261
msgid "GPG key retrieval failed: "
msgstr "La recuperació de la clau GPG ha fallat: "
-#: ../yum/__init__.py:3082
+#: ../yum/__init__.py:3272
#, 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:3114
+#: ../yum/__init__.py:3304
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "La clau GPG de %s (0x%s) ja està instal·lada"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3119
-#: ../yum/__init__.py:3181
+#: ../yum/__init__.py:3309
+#: ../yum/__init__.py:3371
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "S'està important la clau GPG 0x%s \"%s\" des de %s"
-#: ../yum/__init__.py:3136
+#: ../yum/__init__.py:3326
msgid "Not installing key"
msgstr "No s'està instal·lant la clau"
-#: ../yum/__init__.py:3142
+#: ../yum/__init__.py:3332
#, python-format
msgid "Key import failed (code %d)"
msgstr "La importació de la clau ha fallat (codi %d)"
-#: ../yum/__init__.py:3143
-#: ../yum/__init__.py:3202
+#: ../yum/__init__.py:3333
+#: ../yum/__init__.py:3392
msgid "Key imported successfully"
msgstr "La clau s'ha importat amb èxit"
-#: ../yum/__init__.py:3148
-#: ../yum/__init__.py:3207
+#: ../yum/__init__.py:3338
+#: ../yum/__init__.py:3397
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
@@ -2091,96 +2185,96 @@ 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:3157
+#: ../yum/__init__.py:3347
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:3176
+#: ../yum/__init__.py:3366
#, 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:3196
+#: ../yum/__init__.py:3386
#, python-format
msgid "Not installing key for repo %s"
msgstr "No s'està instal·lant la clau per al repositori %s"
-#: ../yum/__init__.py:3201
+#: ../yum/__init__.py:3391
msgid "Key import failed"
msgstr "Ha fallat la importació de la clau"
-#: ../yum/__init__.py:3292
+#: ../yum/__init__.py:3482
msgid "Unable to find a suitable mirror."
msgstr "No s'ha pogut trobar un servidor rèplica vàlid."
-#: ../yum/__init__.py:3294
+#: ../yum/__init__.py:3484
msgid "Errors were encountered while downloading packages."
msgstr "S'han trobat errors descarregant paquets."
-#: ../yum/__init__.py:3335
+#: ../yum/__init__.py:3525
#, python-format
msgid "Please report this error at %s"
msgstr "Siusplau, informeu d'aquest error al %s"
-#: ../yum/__init__.py:3359
+#: ../yum/__init__.py:3549
msgid "Test Transaction Errors: "
msgstr "Errors en la transacció de prova: "
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:201
+#: ../yum/plugins.py:204
msgid "Loaded plugins: "
msgstr "Connectors carregats: "
-#: ../yum/plugins.py:215
-#: ../yum/plugins.py:221
+#: ../yum/plugins.py:218
+#: ../yum/plugins.py:224
#, python-format
msgid "No plugin match for: %s"
msgstr "No hi ha cap connector que coincideixi amb: %s"
-#: ../yum/plugins.py:251
+#: ../yum/plugins.py:254
#, python-format
-msgid "\"%s\" plugin is disabled"
-msgstr "El connector \"%s\" està deshabilitat"
+msgid "Not loading \"%s\" plugin, as it is disabled"
+msgstr "No s'està carregant el connector \"%s\", ja que està deshabilitat"
#. Give full backtrace:
-#: ../yum/plugins.py:263
+#: ../yum/plugins.py:266
#, python-format
msgid "Plugin \"%s\" can't be imported"
msgstr "No s'ha pogut importar el connector \"%s\""
-#: ../yum/plugins.py:270
+#: ../yum/plugins.py:273
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr "El connector \"%s\" no especifica la versió de l'API requerida."
-#: ../yum/plugins.py:275
+#: ../yum/plugins.py:278
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr "El connector \"%s\" requereix l'API %s. L'API disponible és %s"
-#: ../yum/plugins.py:308
+#: ../yum/plugins.py:311
#, python-format
msgid "Loading \"%s\" plugin"
msgstr "S'està carregant el connector \"%s\""
-#: ../yum/plugins.py:315
+#: ../yum/plugins.py:318
#, python-format
msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
msgstr "Existeixen dos o més connectors amb el mateix nom \"%s\" en el camí de cerca de connectors"
-#: ../yum/plugins.py:335
+#: ../yum/plugins.py:338
#, python-format
msgid "Configuration file %s not found"
msgstr "No s'ha trobat el fitxer de configuració %s"
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:338
+#: ../yum/plugins.py:341
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr "No s'ha pogut trobar un fitxer de configuració per al connector %s"
-#: ../yum/plugins.py:492
+#: ../yum/plugins.py:495
msgid "registration of commands not supported"
msgstr "l'enregistrament d'ordres no està suportat"
@@ -2188,34 +2282,44 @@ msgstr "l'enregistrament d'ordres no està suportat"
msgid "Repackaging"
msgstr "Reempaquetant"
-#: ../rpmUtils/oldUtils.py:26
+#: ../rpmUtils/oldUtils.py:31
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
msgstr "La capçalera no es pot obrir o no coincideix amb %s, %s"
-#: ../rpmUtils/oldUtils.py:46
+#: ../rpmUtils/oldUtils.py:51
#, python-format
msgid "RPM %s fails md5 check"
msgstr "Falla la comprobació md5 per al RPM %s"
-#: ../rpmUtils/oldUtils.py:144
+#: ../rpmUtils/oldUtils.py:149
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
msgstr "No s'ha pogut obrir la base de dades RPM per a llegir-la. Potser ja està en ús?"
-#: ../rpmUtils/oldUtils.py:174
+#: ../rpmUtils/oldUtils.py:181
msgid "Got an empty Header, something has gone wrong"
msgstr "S'ha obtingut una capçalera buida, alguna cosa ha anat malament"
-#: ../rpmUtils/oldUtils.py:244
#: ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254
-#: ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:258
+#: ../rpmUtils/oldUtils.py:261
+#: ../rpmUtils/oldUtils.py:264
#, python-format
msgid "Damaged Header %s"
msgstr "Capçalera malmesa %s"
-#: ../rpmUtils/oldUtils.py:272
+#: ../rpmUtils/oldUtils.py:279
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "S'ha produïut un error en obrir rpm %s - error %s"
+#~ msgid "Entering rpm code"
+#~ msgstr "S'està entrant en codi rpm"
+#~ msgid "Leaving rpm code"
+#~ msgstr "Deixant codi rpm"
+#~ msgid "Parsing package install arguments"
+#~ msgstr "S'estan analitzant els arguments del paquet a instal·lar"
+#~ msgid "Invalid versioned dependency string, try quoting it."
+#~ msgstr ""
+#~ "La cadena de versió de dependència és invàlida, proveu-ho entre cometes."
+
diff --git a/po/da.po b/po/da.po
index 2e81805..a9e9f77 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,39 +2,39 @@
# Copyright (C) 2008 THE yum'S COPYRIGHT HOLDER
# This file is distributed under the same license as the yum package.
# tim <timlau@fedoraproject.org>, 2008.
-# , fuzzy
-# tim <timlau@fedoraproject.org>, 2008.
+# Kris Thomsen <lakristho@gmail.com>, 2009.
#
#
msgid ""
msgstr ""
"Project-Id-Version: yum 3.2.10\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-25 11:29+0100\n"
-"PO-Revision-Date: 2008-03-25 11:45+0100\n"
-"Last-Translator: Tim Lauridsen <timlau@fedoraproject.org>\n"
-"Language-Team: Danish <dansk@klid.dk>\n"
+"POT-Creation-Date: 2009-04-03 14:46+0000\n"
+"PO-Revision-Date: 2009-04-05 23:23+0200\n"
+"Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../callback.py:48 ../output.py:512
+#: ../callback.py:48 ../output.py:933 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Opdaterer"
-#: ../callback.py:49
+#: ../callback.py:49 ../yum/rpmtrans.py:72
msgid "Erasing"
msgstr "Sletter"
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:932
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Installerer"
-#: ../callback.py:52 ../callback.py:58
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
msgid "Obsoleted"
msgstr "Overflødiggjort"
-#: ../callback.py:54 ../output.py:558
+#: ../callback.py:54 ../output.py:1040
msgid "Updated"
msgstr "Opdateret"
@@ -42,7 +42,7 @@ msgstr "Opdateret"
msgid "Erased"
msgstr "Slettet"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1038
msgid "Installed"
msgstr "Installeret"
@@ -57,60 +57,75 @@ msgstr "Genpakning"
#: ../callback.py:189
#, python-format
msgid "Error: invalid output state: %s for %s"
-msgstr "Error: Invalid output-status: %s for %s"
+msgstr "Error: ugyldig uddatastatus: %s for %s"
#: ../callback.py:212
#, python-format
msgid "Erased: %s"
-msgstr "Slettet : %s"
+msgstr "Slettet: %s"
-#: ../callback.py:217 ../output.py:513
+#: ../callback.py:217 ../output.py:934
msgid "Removing"
msgstr "Sletter"
-#: ../callback.py:219
+#: ../callback.py:219 ../yum/rpmtrans.py:77
msgid "Cleanup"
msgstr "Oprydning af"
-#: ../cli.py:103
+#: ../cli.py:104
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Kommandoen \"%s\" er allerede defineret"
-#: ../cli.py:115
+#: ../cli.py:116
msgid "Setting up repositories"
-msgstr "Opsætning af filkilder"
+msgstr "Indstiller pakkearkiver"
-#: ../cli.py:126
+#: ../cli.py:127
msgid "Reading repository metadata in from local files"
-msgstr "Læser filkilde-metadata fra lokale filer"
+msgstr "Læser pakkearkiv for metadata fra lokale filer"
-#: ../cli.py:183 ../utils.py:72
+#: ../cli.py:190 ../utils.py:87
#, python-format
msgid "Config Error: %s"
msgstr "Konfigurationsfejl: %s"
-#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
+#: ../cli.py:193 ../cli.py:1231 ../utils.py:90
#, python-format
msgid "Options Error: %s"
-msgstr "Fejl i valgmulighed: %s"
+msgstr "Fejl i indstilling: %s"
+
+#: ../cli.py:221
+#, python-format
+msgid " Installed: %s-%s at %s"
+msgstr " Installeret: %s-%s på %s"
+
+#: ../cli.py:223
+#, python-format
+msgid " Built : %s at %s"
+msgstr " Bygget : %s på %s"
+
+#: ../cli.py:225
+#, python-format
+msgid " Committed: %s at %s"
+msgstr " Indsendt: %s på %s"
-#: ../cli.py:229
+#: ../cli.py:264
msgid "You need to give some command"
msgstr "Du skal angive en kommando"
-#: ../cli.py:271
+#: ../cli.py:307
msgid "Disk Requirements:\n"
msgstr "Behov for diskplads:\n"
-#: ../cli.py:273
+#: ../cli.py:309
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
-msgstr " Der er behov for mindst: %dMB på følgende %s filsystem.\n"
+msgstr " Der er brug for mindst %dmb på %s-filsystemet.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:278
+#: ../cli.py:314
msgid ""
"Error Summary\n"
"-------------\n"
@@ -118,434 +133,494 @@ msgstr ""
"Fejlopsummering\n"
"---------------\n"
-#: ../cli.py:317
+#: ../cli.py:357
msgid "Trying to run the transaction but nothing to do. Exiting."
-msgstr "Forsøger at udføre transaktionen, men der intet at udføre. Afslutter."
+msgstr "Forsøger at udføre overførslen, men der intet at udføre. Afslutter."
-#: ../cli.py:347
+#: ../cli.py:393
msgid "Exiting on user Command"
msgstr "Afslutter efter brugerens ønske"
-#: ../cli.py:351
+#: ../cli.py:397
msgid "Downloading Packages:"
msgstr "Henter pakker:"
-#: ../cli.py:356
+#: ../cli.py:402
msgid "Error Downloading Packages:\n"
msgstr "Fejl ved hentning af pakker:\n"
-#: ../cli.py:370 ../yum/__init__.py:2746
+#: ../cli.py:416 ../yum/__init__.py:3528
msgid "Running rpm_check_debug"
msgstr "Kører rpm_check_debug"
-#: ../cli.py:373 ../yum/__init__.py:2749
+#: ../cli.py:419 ../yum/__init__.py:3531
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "FEJL i rpm_check_dedug vs afhængighedsløsning:"
-#: ../cli.py:377 ../yum/__init__.py:2751
-msgid "Please report this error in bugzilla"
-msgstr "Opret venligst en fejlrapport i bugzilla"
+#: ../cli.py:423
+#, python-format
+msgid "Please report this error in %s"
+msgstr "Rapportér venligst denne fejl i %s"
-#: ../cli.py:383
+#: ../cli.py:429
msgid "Running Transaction Test"
-msgstr "Kører transaktionstest"
+msgstr "Kører overførselstest"
-#: ../cli.py:399
+#: ../cli.py:445
msgid "Finished Transaction Test"
-msgstr "Afsluttede transaktionstest"
+msgstr "Afsluttede overførselstest"
-#: ../cli.py:401
+#: ../cli.py:447
msgid "Transaction Check Error:\n"
-msgstr "Fejl i transaktionscheck:\n"
+msgstr "Fejl i overførselskontrol:\n"
-#: ../cli.py:408
+#: ../cli.py:454
msgid "Transaction Test Succeeded"
-msgstr "Transaktionstest afsluttet uden fejl"
+msgstr "Overførselstest afsluttet uden fejl"
-#: ../cli.py:429
+#: ../cli.py:475
msgid "Running Transaction"
-msgstr "Kører transaktion"
+msgstr "Kører overførsel"
-#: ../cli.py:459
+#: ../cli.py:505
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
msgstr ""
-"Afviser automatisk import af nøgler ved baggrundskørsel.\n"
-"Brug \"-y\" til at forcere."
+"Afviser automatisk importering af nøgler ved baggrundskørsel.\n"
+"Brug \"-y\" til at overskrive."
-#: ../cli.py:491
-msgid "Parsing package install arguments"
-msgstr "Behandler pakkeinstallationsargumenter"
+#: ../cli.py:524 ../cli.py:558
+msgid " * Maybe you meant: "
+msgstr " * Du mente måske: "
+
+#: ../cli.py:541 ../cli.py:549
+#, 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:501
+#: ../cli.py:555 ../cli.py:586 ../cli.py:666
#, python-format
-msgid "No package %s available."
-msgstr "Pakken %s er ikke tilgængelig"
+msgid "No package %s%s%s available."
+msgstr "Pakken %s%s%s er ikke tilgængelig"
-#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
+#: ../cli.py:591 ../cli.py:693
msgid "Package(s) to install"
msgstr "Pakke(r) til installation"
-#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:592 ../cli.py:672 ../cli.py:694 ../yumcommands.py:157
+#: ../yumcommands.py:1015
msgid "Nothing to do"
msgstr "Intet at udføre"
-#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
-#: ../yum/__init__.py:2340
-#, 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"
-
-#: ../cli.py:568
-#, python-format
-msgid "Could not find update match for %s"
-msgstr "Kunne ikke finde et match for %s"
-
-#: ../cli.py:580
+#: ../cli.py:625
#, python-format
msgid "%d packages marked for Update"
msgstr "%d pakker markeret til opdatering"
-#: ../cli.py:583
+#: ../cli.py:628
msgid "No Packages marked for Update"
msgstr "Ingen pakker markeret til opdatering"
-#: ../cli.py:599
+#: ../cli.py:642
#, python-format
msgid "%d packages marked for removal"
msgstr "%d pakker markeret til sletning"
-#: ../cli.py:602
+#: ../cli.py:645
msgid "No Packages marked for removal"
msgstr "Ingen pakker markeret til sletning"
-#: ../cli.py:614
+#: ../cli.py:671
+msgid "Package(s) to downgrade"
+msgstr "Pakke(r) til nedgradering"
+
+#: ../cli.py:684
msgid "No Packages Provided"
msgstr "Ingen pakker angivet"
-#: ../cli.py:654
+#: ../cli.py:739
msgid "Matching packages for package list to user args"
msgstr "Matcher pakker til pakkeliste baseret på brugerens argumenter"
-#: ../cli.py:701
+#: ../cli.py:788
#, python-format
msgid "Warning: No matches found for: %s"
-msgstr "Advarsel :%s blev ikke fundet"
+msgstr "Advarsel: Ingen match blev fundet for: %s"
-#: ../cli.py:704
+#: ../cli.py:791
msgid "No Matches found"
msgstr "Ingen match fundet"
-#: ../cli.py:745
+#: ../cli.py:830
+#, python-format
+msgid ""
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
+msgstr ""
+"Advarsel: 3.0.x-versioner af yum vil matche fejlagtigt mod filnavne.\n"
+" Du kan bruge \"%s*/%s%s\" og/eller \"%s*bin/%s%s\" for at få den opførsel"
+
+#: ../cli.py:846
#, python-format
msgid "No Package Found for %s"
msgstr "Ingen pakke fundet for %s"
-#: ../cli.py:757
+#: ../cli.py:858
msgid "Cleaning up Everything"
msgstr "Oprydning af alt"
-#: ../cli.py:771
+#: ../cli.py:872
msgid "Cleaning up Headers"
-msgstr "Oprydning af header-filer"
+msgstr "Oprydning af headerfiler"
-#: ../cli.py:774
+#: ../cli.py:875
msgid "Cleaning up Packages"
msgstr "Oprydning af pakker"
-#: ../cli.py:777
+#: ../cli.py:878
msgid "Cleaning up xml metadata"
msgstr "Oprydning af xml-metadata"
-#: ../cli.py:780
+#: ../cli.py:881
msgid "Cleaning up database cache"
-msgstr "Oprydning af database-cache"
+msgstr "Oprydning af mellemlager til database"
-#: ../cli.py:783
+#: ../cli.py:884
msgid "Cleaning up expire-cache metadata"
-msgstr "Oprydning af udløbet cache metadata"
+msgstr "Oprydning af udløbet mellemlager til metadata"
-#: ../cli.py:786
+#: ../cli.py:887
msgid "Cleaning up plugins"
msgstr "Oprydning af udvidelsesmoduler"
-#: ../cli.py:807
+#: ../cli.py:912
msgid "Installed Groups:"
msgstr "Installerede grupper:"
-#: ../cli.py:814
+#: ../cli.py:924
msgid "Available Groups:"
msgstr "Tilgængelige grupper:"
-#: ../cli.py:820
+#: ../cli.py:934
msgid "Done"
msgstr "Afsluttet"
-#: ../cli.py:829 ../cli.py:841 ../cli.py:847
+#: ../cli.py:945 ../cli.py:963 ../cli.py:969 ../yum/__init__.py:2420
#, python-format
msgid "Warning: Group %s does not exist."
-msgstr "Advarsel: Gruppen %s ikke fundet."
+msgstr "Advarsel: Gruppen %s findes ikke."
-#: ../cli.py:853
+#: ../cli.py:973
msgid "No packages in any requested group available to install or update"
-msgstr ""
-"Ingen efterspurgte pakker er tilgængelige til installation eller opdatering"
+msgstr "Ingen pakke i nogen de efterspurgte grupper, er tilgængelige til installation eller opdatering"
-#: ../cli.py:855
+#: ../cli.py:975
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d pakke(r) til installation"
-#: ../cli.py:865
+#: ../cli.py:985 ../yum/__init__.py:2432
#, python-format
msgid "No group named %s exists"
msgstr "Gruppen %s findes ikke"
-#: ../cli.py:871
+#: ../cli.py:991
msgid "No packages to remove from groups"
msgstr "Ingen pakker at slette fra grupper"
-#: ../cli.py:873
+#: ../cli.py:993
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d pakke(r) til sletning"
-#: ../cli.py:915
+#: ../cli.py:1035
#, python-format
msgid "Package %s is already installed, skipping"
-msgstr "Pakken %s er allerede installeret"
+msgstr "Pakken %s er allerede installeret, springer over"
-#: ../cli.py:926
+#: ../cli.py:1046
#, 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:952
+#: ../cli.py:1072
#, python-format
msgid "No other %s installed, adding to list for potential install"
-msgstr ""
-"Ingen andre %s er installeret, tilføjer til liste af mulig installation"
+msgstr "Ingen andre %s er installeret, tilføjer til liste til mulig installation"
+
+#: ../cli.py:1092
+msgid "Plugin Options"
+msgstr "Indstillinger til udvidelsesmodul"
-#: ../cli.py:971
+#: ../cli.py:1100
#, python-format
msgid "Command line error: %s"
-msgstr "Kommandolinie-fejl: %s"
+msgstr "Kommandoliniefejl: %s"
+
+#: ../cli.py:1113
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s: %s option requires an argument"
+msgstr ""
+"\n"
+"\n"
+"%s: %s indstilling kræver et argument"
-#: ../cli.py:1101
+#: ../cli.py:1171
+msgid "--color takes one of: auto, always, never"
+msgstr "--color tager en af: auto, altid, aldrig"
+
+#: ../cli.py:1278
+msgid "show this help message and exit"
+msgstr "vis denne hjælpemeddelse og afslut"
+
+#: ../cli.py:1282
msgid "be tolerant of errors"
msgstr "vær fejltolerant"
-#: ../cli.py:1103
+#: ../cli.py:1284
msgid "run entirely from cache, don't update cache"
-msgstr "Kør kun med lokal cache, ingen opdatering af cachen"
+msgstr "kør kun fra mellemlager, ingen opdatering af mellemlageret"
-#: ../cli.py:1105
+#: ../cli.py:1286
msgid "config file location"
msgstr "placering af konfigurationsfil"
-#: ../cli.py:1107
+#: ../cli.py:1288
msgid "maximum command wait time"
-msgstr "maksimal kommando-ventetid"
+msgstr "maksimal ventetid på kommando"
-#: ../cli.py:1109
+#: ../cli.py:1290
msgid "debugging output level"
msgstr "debug-visningsniveau"
-#: ../cli.py:1113
+#: ../cli.py:1294
msgid "show duplicates, in repos, in list/search commands"
-msgstr "Vis gengangere, i filkilder, i list/search kommandoer"
+msgstr "vis gengangere, i pakkearkiver, i list/search-kommandoer"
-#: ../cli.py:1115
+#: ../cli.py:1296
msgid "error output level"
-msgstr "fejl-visningsniveau"
+msgstr "fejlvisningsniveau"
-#: ../cli.py:1118
+#: ../cli.py:1299
msgid "quiet operation"
msgstr "stille operation"
-#: ../cli.py:1122
+#: ../cli.py:1301
+msgid "verbose operation"
+msgstr "uddybende operation"
+
+#: ../cli.py:1303
msgid "answer yes for all questions"
-msgstr "svar 'ja' på alle spørgsmål"
+msgstr "svar ja til alle spørgsmål"
-#: ../cli.py:1124
+#: ../cli.py:1305
msgid "show Yum version and exit"
-msgstr "vis Yum version og afslut"
+msgstr "vis Yum-version og afslut"
-#: ../cli.py:1125
+#: ../cli.py:1306
msgid "set install root"
-msgstr "Sæt installationsroden"
+msgstr "sæt installationsroden"
-#: ../cli.py:1129
+#: ../cli.py:1310
msgid "enable one or more repositories (wildcards allowed)"
-msgstr "aktiver en eller flere filkilder (wildcards er tilladt)"
+msgstr "aktivér en eller flere pakkearkiver (wildcards er tilladt)"
-#: ../cli.py:1133
+#: ../cli.py:1314
msgid "disable one or more repositories (wildcards allowed)"
-msgstr "deaktiver en eller flere filkilder (wildcards tilladt)"
+msgstr "deaktivér en eller flere pakkearkiver (wildcards er tilladt)"
-#: ../cli.py:1136
+#: ../cli.py:1317
msgid "exclude package(s) by name or glob"
-msgstr "ekskluder pakke(r) med navn eller wildcards"
+msgstr "ekskludér pakke(r) med navn eller klump"
-#: ../cli.py:1138
+#: ../cli.py:1319
msgid "disable exclude from main, for a repo or for everything"
-msgstr ""
-"deaktiver ekskludering af pakker, for filkilde eller for alle filkilder"
+msgstr "deaktivér ekskludering fra main, for et pakkearkiv eller for alt"
-#: ../cli.py:1141
+#: ../cli.py:1322
msgid "enable obsoletes processing during updates"
-msgstr "aktiver overflødiggørelse under behandling af opdateringer"
+msgstr "aktivér overflødiggørelse under behandling af opdateringer"
-#: ../cli.py:1143
+#: ../cli.py:1324
msgid "disable Yum plugins"
-msgstr "deaktiver yum-udvidelser (plugins)"
+msgstr "deaktivér Yum-udvidelsesmoduler"
-#: ../cli.py:1145
+#: ../cli.py:1326
msgid "disable gpg signature checking"
-msgstr "deaktiver check af gpg signaturer"
+msgstr "deaktivér kontrol af gpg-signaturer"
-#: ../cli.py:1147
+#: ../cli.py:1328
msgid "disable plugins by name"
-msgstr "deaktiver navngivne udvidelser (plugins)"
+msgstr "deaktivér udvidelsesmoduler ved navn"
+
+#: ../cli.py:1331
+msgid "enable plugins by name"
+msgstr "aktivér udvidelsesmoduler ved navn"
-#: ../cli.py:1150
+#: ../cli.py:1334
msgid "skip packages with depsolving problems"
-msgstr "drop pakker med afhængighedsproblemer"
+msgstr "spring pakker med afhængighedsproblemer over"
-#: ../output.py:229
+#: ../cli.py:1336
+msgid "control whether color is used"
+msgstr "kontrollér om farve er brugt"
+
+#: ../output.py:301
msgid "Jan"
msgstr "Jan"
-#: ../output.py:229
+#: ../output.py:301
msgid "Feb"
msgstr "Feb"
-#: ../output.py:229
+#: ../output.py:301
msgid "Mar"
msgstr "Mar"
-#: ../output.py:229
+#: ../output.py:301
msgid "Apr"
msgstr "Apr"
-#: ../output.py:229
+#: ../output.py:301
msgid "May"
msgstr "Maj"
-#: ../output.py:229
+#: ../output.py:301
msgid "Jun"
msgstr "Jun"
-#: ../output.py:230
+#: ../output.py:302
msgid "Jul"
msgstr "Jul"
-#: ../output.py:230
+#: ../output.py:302
msgid "Aug"
msgstr "Aug"
-#: ../output.py:230
+#: ../output.py:302
msgid "Sep"
msgstr "Sep"
-#: ../output.py:230
+#: ../output.py:302
msgid "Oct"
msgstr "Okt"
-#: ../output.py:230
+#: ../output.py:302
msgid "Nov"
msgstr "Nov"
-#: ../output.py:230
+#: ../output.py:302
msgid "Dec"
msgstr "Dec"
-#: ../output.py:240
+#: ../output.py:312
msgid "Trying other mirror."
-msgstr "Prøver et andet filspejl (mirror)"
+msgstr "Prøver et andet filspejl."
-#: ../output.py:293
+#: ../output.py:534
#, python-format
-msgid "Name : %s"
-msgstr "Navn : %s"
+msgid "Name : %s%s%s"
+msgstr "Navn : %s%s%s"
-#: ../output.py:294
+#: ../output.py:535
#, python-format
msgid "Arch : %s"
-msgstr "Arkt : %s"
+msgstr "Arkitektur : %s"
-#: ../output.py:296
+#: ../output.py:537
#, python-format
msgid "Epoch : %s"
msgstr "Epoch : %s"
-#: ../output.py:297
+#: ../output.py:538
#, python-format
msgid "Version : %s"
msgstr "Version : %s"
-#: ../output.py:298
+#: ../output.py:539
#, python-format
msgid "Release : %s"
-msgstr "Release : %s"
+msgstr "Udgivelse : %s"
-#: ../output.py:299
+#: ../output.py:540
#, python-format
msgid "Size : %s"
-msgstr "Strl : %s"
+msgstr "Størrelse : %s"
-#: ../output.py:300
+#: ../output.py:541
#, python-format
msgid "Repo : %s"
msgstr "Kilde : %s"
-#: ../output.py:302
+#: ../output.py:543
+#, python-format
+msgid "From repo : %s"
+msgstr "Fra kilde : %s"
+
+#: ../output.py:545
#, python-format
msgid "Committer : %s"
-msgstr "Committer : %s"
+msgstr "Indsender : %s"
+
+#: ../output.py:546
+#, python-format
+msgid "Committime : %s"
+msgstr "Indsendingstid : %s"
+
+#: ../output.py:547
+#, python-format
+msgid "Buildtime : %s"
+msgstr "Byggetid : %s"
-#: ../output.py:303
+#: ../output.py:549
+#, python-format
+msgid "Installtime: %s"
+msgstr "Installationstid: %s"
+
+#: ../output.py:550
msgid "Summary : "
-msgstr "Sammendrag : "
+msgstr "Resumé : "
-#: ../output.py:305
+#: ../output.py:552
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:306
+#: ../output.py:553
#, python-format
msgid "License : %s"
-msgstr "Lisense : %s"
+msgstr "Licens : %s"
-#: ../output.py:307
+#: ../output.py:554
msgid "Description: "
-msgstr "Beskrivelse:"
+msgstr "Beskrivelse: "
-#: ../output.py:351
-msgid "Is this ok [y/N]: "
-msgstr "Er dette o.k. [j/N]: "
-
-#: ../output.py:357 ../output.py:360
+#: ../output.py:622
msgid "y"
msgstr "j"
-#: ../output.py:357
-msgid "n"
-msgstr "n"
-
-#: ../output.py:357 ../output.py:360
+#: ../output.py:622
msgid "yes"
msgstr "ja"
-#: ../output.py:357
+#: ../output.py:623
+msgid "n"
+msgstr "n"
+
+#: ../output.py:623
msgid "no"
msgstr "nej"
-#: ../output.py:367
+#: ../output.py:627
+msgid "Is this ok [y/N]: "
+msgstr "Er dette o.k. [j/N]: "
+
+#: ../output.py:715
#, python-format
msgid ""
"\n"
@@ -554,142 +629,192 @@ msgstr ""
"\n"
"Gruppe: %s"
-#: ../output.py:369
+#: ../output.py:719
+#, python-format
+msgid " Group-Id: %s"
+msgstr " Gruppeid: %s"
+
+#: ../output.py:724
#, python-format
msgid " Description: %s"
msgstr " Beskrivelse: %s"
-#: ../output.py:371
+#: ../output.py:726
msgid " Mandatory Packages:"
msgstr " Tvungne pakker:"
-#: ../output.py:376
+#: ../output.py:727
msgid " Default Packages:"
-msgstr "-Standard-pakker:"
+msgstr " Standardpakker:"
-#: ../output.py:381
+#: ../output.py:728
msgid " Optional Packages:"
-msgstr "-Valgfrie pakker:"
+msgstr " Valgfrie pakker:"
-#: ../output.py:386
+#: ../output.py:729
msgid " Conditional Packages:"
-msgstr "-Afhængige pakker:"
+msgstr " Afhængige pakker:"
-#: ../output.py:394
+#: ../output.py:749
#, python-format
msgid "package: %s"
msgstr "pakke: %s"
-#: ../output.py:396
+#: ../output.py:751
msgid " No dependencies for this package"
msgstr " Ingen afhængigheder for denne pakke"
-#: ../output.py:401
+#: ../output.py:756
#, python-format
msgid " dependency: %s"
-msgstr " Afhængighed: %s"
+msgstr " afhængighed: %s"
-#: ../output.py:403
+#: ../output.py:758
msgid " Unsatisfied dependency"
msgstr " Ufuldendt afhængighed"
-#: ../output.py:461
+#: ../output.py:830
+#, python-format
+msgid "Repo : %s"
+msgstr "Kilde : %s"
+
+#: ../output.py:831
msgid "Matched from:"
msgstr "Matchet af:"
-#: ../output.py:487
+#: ../output.py:839
+msgid "Description : "
+msgstr "Beskrivelse : "
+
+#: ../output.py:842
+#, python-format
+msgid "URL : %s"
+msgstr "URL : %s"
+
+#: ../output.py:845
+#, python-format
+msgid "License : %s"
+msgstr "Licens : %s"
+
+#: ../output.py:848
+#, python-format
+msgid "Filename : %s"
+msgstr "Filnavn : %s"
+
+#: ../output.py:852
+msgid "Other : "
+msgstr "Andre : "
+
+#: ../output.py:885
msgid "There was an error calculating total download size"
-msgstr "Der var en fejl i beregning af den totale download-størrelse"
+msgstr "Der opstod en fejl i beregning af den totale hentningsstørrelse"
-#: ../output.py:492
+#: ../output.py:890
#, python-format
msgid "Total size: %s"
msgstr "Total størrelse: %s"
-#: ../output.py:495
+#: ../output.py:893
#, python-format
msgid "Total download size: %s"
-msgstr "Total download-størrelse: %s"
+msgstr "Total hentningsstørrelse: %s"
+
+#: ../output.py:935
+msgid "Installing for dependencies"
+msgstr "Installerer til afhængigheder"
+
+#: ../output.py:936
+msgid "Updating for dependencies"
+msgstr "Opdaterer til afhængigheder"
-#: ../output.py:507
+#: ../output.py:937
+msgid "Removing for dependencies"
+msgstr "Sletter til afhængigheder"
+
+#: ../output.py:944 ../output.py:1042
+msgid "Skipped (dependency problems)"
+msgstr "Sprunget over (afhængighedsproblemer)"
+
+#: ../output.py:965
msgid "Package"
msgstr "Pakke"
-#: ../output.py:507
+#: ../output.py:965
msgid "Arch"
-msgstr "Arkt"
+msgstr "Arkitektur"
-#: ../output.py:507
+#: ../output.py:966
msgid "Version"
msgstr "Version"
-#: ../output.py:507
+#: ../output.py:966
msgid "Repository"
-msgstr "Filkilde"
+msgstr "Pakkearkiv"
-#: ../output.py:507
+#: ../output.py:967
msgid "Size"
msgstr "Størrelse"
-#: ../output.py:514
-msgid "Installing for dependencies"
-msgstr "Installer som afhængighed"
-
-#: ../output.py:515
-msgid "Updating for dependencies"
-msgstr "Opdaterer som afhængighed"
-
-#: ../output.py:516
-msgid "Removing for dependencies"
-msgstr "Sletter som afhængighed"
-
-#: ../output.py:528
+#: ../output.py:979
#, python-format
msgid ""
-" replacing %s.%s %s\n"
+" replacing %s%s%s.%s %s\n"
"\n"
msgstr ""
-" erstatter %s.%s %s\n"
+" erstatter %s%s%s.%s %s\n"
"\n"
-#: ../output.py:536
+#: ../output.py:988
#, python-format
msgid ""
"\n"
"Transaction Summary\n"
-"=============================================================================\n"
+"%s\n"
"Install %5.5s Package(s) \n"
"Update %5.5s Package(s) \n"
"Remove %5.5s Package(s) \n"
msgstr ""
"\n"
-"Transaktionssammendrag\n"
-"=============================================================================\n"
+"Overførselssammendrag\n"
+"%s\n"
"Installerer %5.5s pakke(r) \n"
"Opdaterer %5.5s pakke(r) \n"
"Sletter %5.5s pakke(r) \n"
-#: ../output.py:554
+#: ../output.py:1036
msgid "Removed"
msgstr "Slettet"
-#: ../output.py:555
+#: ../output.py:1037
msgid "Dependency Removed"
msgstr "Afhængighed slettet"
-#: ../output.py:557
+#: ../output.py:1039
msgid "Dependency Installed"
msgstr "Afhængighed installeret"
-#: ../output.py:559
+#: ../output.py:1041
msgid "Dependency Updated"
msgstr "Afhængighed opdateret"
-#: ../output.py:560
+#: ../output.py:1043
msgid "Replaced"
msgstr "Erstattet"
-#: ../output.py:618
+#: ../output.py:1044
+msgid "Failed"
+msgstr "Fejlede"
+
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1110
+msgid "two"
+msgstr "to"
+
+#. For translators: This is output like:
+#. Current download cancelled, interrupt (ctrl-c) again within two seconds
+#. to exit.
+#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#: ../output.py:1121
#, python-format
msgid ""
"\n"
@@ -697,75 +822,79 @@ msgid ""
"seconds to exit.\n"
msgstr ""
"\n"
-" Nuværende download afbrudt, %safbryd (ctrl-c) igen %s indenfor %s%s%s "
+" Nuværende hentning afbrudt, %safbryd (ctrl-c) igen %s indenfor %s%s%s "
"sekunder for at afslutte.\n"
-#: ../output.py:628
+#: ../output.py:1131
msgid "user interrupt"
msgstr "afsluttet af bruger"
-#: ../output.py:639
+#: ../output.py:1147
+msgid "Total"
+msgstr "Ialt"
+
+#: ../output.py:1161
msgid "installed"
msgstr "installeret"
-#: ../output.py:640
+#: ../output.py:1162
msgid "updated"
msgstr "opdateret"
-#: ../output.py:641
+#: ../output.py:1163
msgid "obsoleted"
msgstr "overflødiggjort"
-#: ../output.py:642
+#: ../output.py:1164
msgid "erased"
msgstr "slettet"
-#: ../output.py:646
+#: ../output.py:1168
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Pakke %s.%s %s:%s-%s sat til at blive %s"
-#: ../output.py:653
+#: ../output.py:1175
msgid "--> Running transaction check"
-msgstr "--> Kører transaktionscheck"
+msgstr "--> Kører overførselskontrol"
-#: ../output.py:658
+#: ../output.py:1180
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Genstarter afhængighedssøgning med nye ændringer."
-#: ../output.py:663
+#: ../output.py:1185
msgid "--> Finished Dependency Resolution"
msgstr "--> Afsluttede afhængighedssøgningen"
-#: ../output.py:668
+#: ../output.py:1190
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Behandler afhængighed: %s for pakken: %s"
-#: ../output.py:673
+#: ../output.py:1195
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Ikke fundet afhængighed: %s"
-#: ../output.py:679
+#: ../output.py:1201
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Behandler konflikt: %s konflikter med %s"
-#: ../output.py:682
+#: ../output.py:1204
msgid "--> Populating transaction set with selected packages. Please wait."
-msgstr "--> Udfylder transaktionssættet med valgte pakker, vent venligst."
+msgstr "--> Udfylder overførselssættet med valgte pakker. Vent venligst."
-#: ../output.py:686
+#: ../output.py:1208
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
-msgstr "---> Downloader header for %s til at indsætte i transaktionssættet."
+msgstr "---> Henter headerfil for %s til at indsætte i overførselssættet."
-#: ../yumcommands.py:36
+#: ../yumcommands.py:40
msgid "You need to be root to perform this command."
msgstr "Du skal være root for at udføre denne kommando"
-#: ../yumcommands.py:43
+#: ../yumcommands.py:47
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -783,263 +912,326 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
"\n"
-"You have enabled checking of packages via GPG keys. This is a good thing. \n"
-"However, you do not have any GPG public keys installed. You need to "
-"download\n"
-"the keys for packages you wish to install and install them.\n"
-"You can do that by running the command:\n"
+"Du har aktiveret kontrol af pakker via GPG-nøgler. Dette er en god ting. \n"
+"Selvom du ikke har nogen GPG-nøgler installeret. Du bliver nødt til at "
+"hente\n"
+"nøglerne til pakkerne, som du vil installere og installere dem.\n"
+"Du kan gøre det ved at køre kommandoen:\n"
" rpm --import public.gpg.key\n"
"\n"
"\n"
-"Alternatively you can specify the url to the key you would like to use\n"
-"for a repository in the 'gpgkey' option in a repository section and yum \n"
-"will install it for you.\n"
+"Alternativt kan du angive URL'en til nøglen, som du vil bruge til et\n"
+"pakkearkiv i \"gpgkey\"-indstillingen i en pakkearkivssektion og Yum \n"
+"vil installere den for dig.\n"
"\n"
-"For more information contact your distribution or package provider.\n"
+"For mere information, kan du kontakte din distribution eller pakkeudbyder.\n"
-#: ../yumcommands.py:63
+#: ../yumcommands.py:67
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
-msgstr "Fejl: en liste med pakker behøves af %s"
+msgstr "Fejl: En liste med pakker behøves af %s"
-#: ../yumcommands.py:69
+#: ../yumcommands.py:73
msgid "Error: Need an item to match"
msgstr "Fejl: Behøver noget at matche med"
-#: ../yumcommands.py:75
+#: ../yumcommands.py:79
msgid "Error: Need a group or list of groups"
msgstr "Fejl: Behøver en gruppe eller liste af grupper"
-#: ../yumcommands.py:84
+#: ../yumcommands.py:88
#, python-format
msgid "Error: clean requires an option: %s"
-msgstr "Fejl: clean behøver en option: %s"
+msgstr "Fejl: clean behøver en indstilling: %s"
-#: ../yumcommands.py:89
+#: ../yumcommands.py:93
#, python-format
msgid "Error: invalid clean argument: %r"
-msgstr "Fejl: invalid clean argument: %r"
+msgstr "Fejl: ugyldigt clean-argument: %r"
-#: ../yumcommands.py:102
+#: ../yumcommands.py:106
msgid "No argument to shell"
-msgstr "Ingen argumenter til shell"
+msgstr "Ingen argumenter til skal"
-#: ../yumcommands.py:105
+#: ../yumcommands.py:108
#, python-format
msgid "Filename passed to shell: %s"
-msgstr "Filnavn brugt som parameter til shell: %s"
+msgstr "Filnavn tilpasset skal: %s"
-#: ../yumcommands.py:109
+#: ../yumcommands.py:112
#, python-format
msgid "File %s given as argument to shell does not exist."
-msgstr "Filen %s givet som argument til shell findes ikke."
+msgstr "Filen %s givet som argument til skal findes ikke."
-#: ../yumcommands.py:115
+#: ../yumcommands.py:118
msgid "Error: more than one file given as argument to shell."
-msgstr "Fejl: mere end en fil angivet som argument til shell"
+msgstr "Fejl: mere end en fil angivet som argument til skal."
-#: ../yumcommands.py:156
+#: ../yumcommands.py:167
msgid "PACKAGE..."
msgstr "PAKKE..."
-#: ../yumcommands.py:159
+#: ../yumcommands.py:170
msgid "Install a package or packages on your system"
-msgstr "Installerer en/flere pakker på systemet"
+msgstr "Installerer en eller flere pakker på systemet"
-#: ../yumcommands.py:168
+#: ../yumcommands.py:178
msgid "Setting up Install Process"
msgstr "Opsætning af installationsprocessen"
-#: ../yumcommands.py:179
+#: ../yumcommands.py:189
msgid "[PACKAGE...]"
msgstr "[PAKKE...]"
-#: ../yumcommands.py:182
+#: ../yumcommands.py:192
msgid "Update a package or packages on your system"
msgstr "Opdaterer en eller flere pakker på systemet"
-#: ../yumcommands.py:190
+#: ../yumcommands.py:199
msgid "Setting up Update Process"
msgstr "Opsætning af opdateringsprocessen"
-#: ../yumcommands.py:204
+#: ../yumcommands.py:241
msgid "Display details about a package or group of packages"
-msgstr "Vis detaljer om en eller flere pakker"
+msgstr "Vis detaljer om en pakke eller en gruppe af pakker"
-#: ../yumcommands.py:212
+#: ../yumcommands.py:290
msgid "Installed Packages"
msgstr "Installerede pakker"
-#: ../yumcommands.py:213
+#: ../yumcommands.py:298
msgid "Available Packages"
msgstr "Tilgængelige pakker"
-#: ../yumcommands.py:214
+#: ../yumcommands.py:302
msgid "Extra Packages"
msgstr "Ekstra pakker"
-#: ../yumcommands.py:215
+#: ../yumcommands.py:306
msgid "Updated Packages"
msgstr "Opdaterede pakker"
-#: ../yumcommands.py:221 ../yumcommands.py:225
+#. This only happens in verbose mode
+#: ../yumcommands.py:314 ../yumcommands.py:321 ../yumcommands.py:598
msgid "Obsoleting Packages"
msgstr "Overflødiggør pakker"
-#: ../yumcommands.py:226
+#: ../yumcommands.py:323
msgid "Recently Added Packages"
msgstr "Pakker som er tilføjet for nyligt"
-#: ../yumcommands.py:232
+#: ../yumcommands.py:330
msgid "No matching Packages to list"
-msgstr "Der blev ikke fundet nogle pakker som matchede"
+msgstr "Ingen matchende pakker til liste"
-#: ../yumcommands.py:246
+#: ../yumcommands.py:344
msgid "List a package or groups of packages"
-msgstr "Viser en eller flere pakker"
+msgstr "Viser en pakke eller en gruppe af pakker"
-#: ../yumcommands.py:258
+#: ../yumcommands.py:356
msgid "Remove a package or packages from your system"
-msgstr "Sletter en/flere pakker fra systemet"
+msgstr "Sletter en eller flere pakker fra dit system"
-#: ../yumcommands.py:266
+#: ../yumcommands.py:363
msgid "Setting up Remove Process"
msgstr "Opsætning af sletningsprocessen"
-#: ../yumcommands.py:278
+#: ../yumcommands.py:377
msgid "Setting up Group Process"
msgstr "Opsætning af gruppeprocessen"
-#: ../yumcommands.py:284
+#: ../yumcommands.py:383
msgid "No Groups on which to run command"
-msgstr "Ingen grupper angivet"
+msgstr "Ingen grupper, på hvilke der køres en kommando"
-#: ../yumcommands.py:297
+#: ../yumcommands.py:396
msgid "List available package groups"
-msgstr "Vis tilgængelige grupper"
+msgstr "Vis tilgængelige pakkegrupper"
-#: ../yumcommands.py:314
+#: ../yumcommands.py:413
msgid "Install the packages in a group on your system"
-msgstr "Installer alle pakkerne i en gruppe"
+msgstr "Installér alle pakkerne i en gruppe på dit system"
-#: ../yumcommands.py:336
+#: ../yumcommands.py:435
msgid "Remove the packages in a group from your system"
-msgstr "Sletter alle pakkerne i en gruppe"
+msgstr "Sletter alle pakkerne i en gruppe fra dit system"
-#: ../yumcommands.py:360
+#: ../yumcommands.py:462
msgid "Display details about a package group"
-msgstr "Vis informationer om en gruppe"
+msgstr "Vis informationer om en pakkegruppe"
-#: ../yumcommands.py:384
+#: ../yumcommands.py:486
msgid "Generate the metadata cache"
-msgstr "Opretter metadata-cachen"
+msgstr "Opretter mellemlager for metadata"
-#: ../yumcommands.py:390
+#: ../yumcommands.py:492
msgid "Making cache files for all metadata files."
-msgstr "Opdater cachen med alle metadata-filer"
+msgstr "Opretter mellemlagerfiler til alle metadatafiler"
-#: ../yumcommands.py:391
+#: ../yumcommands.py:493
msgid "This may take a while depending on the speed of this computer"
-msgstr "Dette kan tage et godt stykke tid"
+msgstr "Dette kan tage et stykke tid, afhængigt af hastigheden op denne computer"
-#: ../yumcommands.py:412
+#: ../yumcommands.py:514
msgid "Metadata Cache Created"
-msgstr "Metadata-cache oprettet"
+msgstr "Mellemlager for metadata oprettet"
-#: ../yumcommands.py:426
+#: ../yumcommands.py:528
msgid "Remove cached data"
msgstr "Sletter data fra cachen"
-#: ../yumcommands.py:447
+#: ../yumcommands.py:549
msgid "Find what package provides the given value"
-msgstr "Finder pakker som leverer en given afhængighed"
+msgstr "Finder pakker som leverer en given værdi"
-#: ../yumcommands.py:467
+#: ../yumcommands.py:569
msgid "Check for available package updates"
-msgstr "Check for tilgængelige opdateringer"
+msgstr "Kontrol af tilgængelige pakkeopdateringer"
-#: ../yumcommands.py:490
+#: ../yumcommands.py:618
msgid "Search package details for the given string"
msgstr "Søger efter en given streng i pakkeinformationerne"
-#: ../yumcommands.py:496
+#: ../yumcommands.py:624
msgid "Searching Packages: "
msgstr "Søger i pakkerne: "
-#: ../yumcommands.py:513
+#: ../yumcommands.py:641
msgid "Update packages taking obsoletes into account"
-msgstr "Opdaterer pakker (tager hensyn til overflødiggjorte pakker)"
+msgstr "Opdaterer pakker, tager hensyn til overflødiggjorte pakker"
-#: ../yumcommands.py:522
+#: ../yumcommands.py:649
msgid "Setting up Upgrade Process"
msgstr "Opsætning af opgraderingsprocessen"
-#: ../yumcommands.py:536
+#: ../yumcommands.py:663
msgid "Install a local RPM"
msgstr "Installer en lokal RPM-fil"
-#: ../yumcommands.py:545
+#: ../yumcommands.py:671
msgid "Setting up Local Package Process"
msgstr "Opsætning af lokalpakkeprocessen"
-#: ../yumcommands.py:564
+#: ../yumcommands.py:690
msgid "Determine which package provides the given dependency"
-msgstr "Bestemmer hvilken pakke som leverer en bestemt afhængighed"
+msgstr "Bestem hvilken pakke som leverer en bestemt afhængighed"
-#: ../yumcommands.py:567
+#: ../yumcommands.py:693
msgid "Searching Packages for Dependency:"
msgstr "Søger efter afhængighed i pakkerne:"
-#: ../yumcommands.py:581
+#: ../yumcommands.py:707
msgid "Run an interactive yum shell"
-msgstr "Kør en interaktiv yum shell"
+msgstr "Kør en interaktiv Yum-skal"
-#: ../yumcommands.py:587
+#: ../yumcommands.py:713
msgid "Setting up Yum Shell"
-msgstr "Opsætning af Yum Shell"
+msgstr "Opsætning af Yum-skal"
-#: ../yumcommands.py:605
+#: ../yumcommands.py:731
msgid "List a package's dependencies"
msgstr "Viser en pakkes afhængigheder"
-#: ../yumcommands.py:611
+#: ../yumcommands.py:737
msgid "Finding dependencies: "
msgstr "Finder afhængigheder: "
-#: ../yumcommands.py:627
+#: ../yumcommands.py:753
msgid "Display the configured software repositories"
-msgstr "Viser software-filkilder"
-
-#: ../yumcommands.py:645
-msgid "repo id"
-msgstr "kilde-id"
-
-#: ../yumcommands.py:645
-msgid "repo name"
-msgstr "kilde-navn"
-
-#: ../yumcommands.py:645
-msgid "status"
-msgstr "status"
+msgstr "Viser de konfigurerede pakkearkiver"
-#: ../yumcommands.py:651
+#: ../yumcommands.py:801 ../yumcommands.py:802
msgid "enabled"
msgstr "aktiveret"
-#: ../yumcommands.py:654
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "disabled"
msgstr "deaktiveret"
-#: ../yumcommands.py:671
+#: ../yumcommands.py:825
+msgid "Repo-id : "
+msgstr "Kildeid : "
+
+#: ../yumcommands.py:826
+msgid "Repo-name : "
+msgstr "Kildenavn : "
+
+#: ../yumcommands.py:827
+msgid "Repo-status : "
+msgstr "Kildestatus : "
+
+#: ../yumcommands.py:829
+msgid "Repo-revision: "
+msgstr "Kilderevision: "
+
+#: ../yumcommands.py:833
+msgid "Repo-tags : "
+msgstr "Kildeflag : "
+
+#: ../yumcommands.py:839
+msgid "Repo-distro-tags: "
+msgstr "Kildedistroflag: "
+
+#: ../yumcommands.py:844
+msgid "Repo-updated: "
+msgstr "Kildeopdateret: "
+
+#: ../yumcommands.py:846
+msgid "Repo-pkgs : "
+msgstr "Kildepakker : "
+
+#: ../yumcommands.py:847
+msgid "Repo-size : "
+msgstr "Kildestørrelse : "
+
+#: ../yumcommands.py:854
+msgid "Repo-baseurl: "
+msgstr "Kildegrundurl: "
+
+#: ../yumcommands.py:858
+msgid "Repo-metalink: "
+msgstr "Kildemetahenvisning: "
+
+#: ../yumcommands.py:862
+msgid " Updated : "
+msgstr " Opdateret : "
+
+#: ../yumcommands.py:865
+msgid "Repo-mirrors: "
+msgstr "Kildespejle: "
+
+#: ../yumcommands.py:869
+msgid "Repo-exclude: "
+msgstr "Kildeekskluder: "
+
+#: ../yumcommands.py:873
+msgid "Repo-include: "
+msgstr "Kildeinkluder: "
+
+#. Work out the first (id) and last (enabled/disalbed/count),
+#. then chop the middle (name)...
+#: ../yumcommands.py:883 ../yumcommands.py:909
+msgid "repo id"
+msgstr "kildeid"
+
+#: ../yumcommands.py:897 ../yumcommands.py:898 ../yumcommands.py:912
+msgid "status"
+msgstr "status"
+
+#: ../yumcommands.py:910
+msgid "repo name"
+msgstr "kildenavn"
+
+#: ../yumcommands.py:936
msgid "Display a helpful usage message"
msgstr "Viser hjælp om brugen af en kommando"
-#: ../yumcommands.py:705
+#: ../yumcommands.py:970
#, python-format
msgid "No help available for %s"
-msgstr "Ingen tilgængelig hjælp for %s"
+msgstr "Ingen tilgængelig hjælp til %s"
-#: ../yumcommands.py:710
+#: ../yumcommands.py:975
msgid ""
"\n"
"\n"
@@ -1049,7 +1241,7 @@ msgstr ""
"\n"
"aliaser: "
-#: ../yumcommands.py:712
+#: ../yumcommands.py:977
msgid ""
"\n"
"\n"
@@ -1059,15 +1251,27 @@ msgstr ""
"\n"
"alias: "
-#: ../yumcommands.py:741
+#: ../yumcommands.py:1005
msgid "Setting up Reinstall Process"
msgstr "Opsætning af geninstallationsprocessen"
-#: ../yumcommands.py:755
+#: ../yumcommands.py:1014
+msgid "Package(s) to reinstall"
+msgstr "Pakke(r) til geninstallation"
+
+#: ../yumcommands.py:1021
msgid "reinstall a package"
-msgstr "geninstallering af en pakke"
+msgstr "geninstallér en pakke"
+
+#: ../yumcommands.py:1039
+msgid "Setting up Downgrade Process"
+msgstr "Opsætning af nedgraderingsprocessen"
-#: ../yummain.py:41
+#: ../yumcommands.py:1046
+msgid "downgrade a package"
+msgstr "nedgradér en pakke"
+
+#: ../yummain.py:42
msgid ""
"\n"
"\n"
@@ -1077,7 +1281,7 @@ msgstr ""
"\n"
"Afslutter efter brugerens ønske"
-#: ../yummain.py:47
+#: ../yummain.py:48
msgid ""
"\n"
"\n"
@@ -1085,41 +1289,104 @@ msgid ""
msgstr ""
"\n"
"\n"
-"Afslutter på grund af en Broken Pipe"
+"Afslutter på ødelagt tunnel"
+
+#: ../yummain.py:126
+msgid "Running"
+msgstr "Kører"
+
+#: ../yummain.py:127
+msgid "Sleeping"
+msgstr "Sover"
+
+#: ../yummain.py:128
+msgid "Uninteruptable"
+msgstr "Kan ikke forstyres"
+
+#: ../yummain.py:129
+msgid "Zombie"
+msgstr "Zombie"
+
+#: ../yummain.py:130
+msgid "Traced/Stopped"
+msgstr "Fundet/stoppet"
-#: ../yummain.py:105
+#: ../yummain.py:131
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: ../yummain.py:135
+msgid " The other application is: PackageKit"
+msgstr " Det andet program er: PackageKit"
+
+#: ../yummain.py:137
+#, python-format
+msgid " The other application is: %s"
+msgstr " Det andet program er: %s"
+
+#: ../yummain.py:140
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr " Hukommelse : %5a RSS (%5sB VSZ)"
+
+#: ../yummain.py:144
+#, python-format
+msgid " Started: %s - %s ago"
+msgstr " Startede: %s - %s siden"
+
+#: ../yummain.py:146
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr " Status : %s, pid: %d"
+
+#: ../yummain.py:171
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
-msgstr "Yum er låst af en anden applikation, venter på at den afslutter.."
+msgstr ""
+"Yum er låst af en anden applikation, venter på at den afslutter.."
-#: ../yummain.py:132 ../yummain.py:171
+#: ../yummain.py:199 ../yummain.py:238
#, python-format
msgid "Error: %s"
msgstr "Fejl: %s"
-#: ../yummain.py:142 ../yummain.py:178
+#: ../yummain.py:209 ../yummain.py:250
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
-msgstr "Ukendt fejl: Returkode: %d:"
+msgstr "Ukendt(e) fejl: Returkode: %d:"
#. Depsolve stage
-#: ../yummain.py:149
+#: ../yummain.py:216
msgid "Resolving Dependencies"
-msgstr "Finder afhængigheder"
+msgstr "Løser afhængigheder"
+
+#: ../yummain.py:240
+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"
+
+#: ../yummain.py:241
+msgid ""
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+msgstr ""
+" Du kunne prøve at køre: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
-#: ../yummain.py:184
+#: ../yummain.py:256
msgid ""
"\n"
"Dependencies Resolved"
msgstr ""
"\n"
-"Afhængigheder fundet"
+"Afhængigheder løst"
-#: ../yummain.py:198
+#: ../yummain.py:270
msgid "Complete!"
msgstr "Afsluttet!"
-#: ../yummain.py:245
+#: ../yummain.py:317
msgid ""
"\n"
"\n"
@@ -1129,829 +1396,944 @@ msgstr ""
"\n"
"Afslutter efter brugerens ønske"
-#: ../yum/depsolve.py:82
+#: ../yum/depsolve.py:84
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:95
+#: ../yum/depsolve.py:99
msgid "Setting up TransactionSets before config class is up"
msgstr "Opsætning af TransactionSets før config-klassen er sat op"
-#: ../yum/depsolve.py:136
+#: ../yum/depsolve.py:150
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Invalid tsflag i konfigurationsfilen: %s"
-#: ../yum/depsolve.py:147
+#: ../yum/depsolve.py:161
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Søger i pkgSack for afhængigheden: %s"
-#: ../yum/depsolve.py:170
+#: ../yum/depsolve.py:184
#, python-format
msgid "Potential match for %s from %s"
msgstr "Mulig match for %s fra %s"
-#: ../yum/depsolve.py:178
+#: ../yum/depsolve.py:192
#, python-format
msgid "Matched %s to require for %s"
msgstr "Matchede %s som afhængighed for %s"
-#: ../yum/depsolve.py:219
+#: ../yum/depsolve.py:233
#, python-format
msgid "Member: %s"
msgstr "Medlem: %s"
-#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
+#: ../yum/depsolve.py:247 ../yum/depsolve.py:739
#, python-format
msgid "%s converted to install"
msgstr "%s konverteret til installation"
-#: ../yum/depsolve.py:240
+#: ../yum/depsolve.py:254
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Tilføjer pakke %s i mode %s"
-#: ../yum/depsolve.py:250
+#: ../yum/depsolve.py:264
#, python-format
msgid "Removing Package %s"
msgstr "Sletter Pakke %s"
-#: ../yum/depsolve.py:261
+#: ../yum/depsolve.py:275
#, python-format
msgid "%s requires: %s"
msgstr "%s behøver: %s"
-#: ../yum/depsolve.py:312
+#: ../yum/depsolve.py:333
msgid "Needed Require has already been looked up, cheating"
msgstr "Afhængighed fundet tidligere, snyder"
-#: ../yum/depsolve.py:322
+#: ../yum/depsolve.py:343
#, 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:329
+#: ../yum/depsolve.py:350
#, python-format
msgid "Potential Provider: %s"
-msgstr "Mulig leverandør af afhængighed: %s"
+msgstr "Mulig udbyder: %s"
-#: ../yum/depsolve.py:352
+#: ../yum/depsolve.py:373
#, python-format
msgid "Mode is %s for provider of %s: %s"
-msgstr "Mode er %s for leverandør af %s: %s"
+msgstr "Tilstand er %s for udbyder af %s: %s"
-#: ../yum/depsolve.py:356
+#: ../yum/depsolve.py:377
#, python-format
msgid "Mode for pkg providing %s: %s"
-msgstr "Mode for pakke som leverer %s: %s"
+msgstr "Tilstand for pakke som leverer %s: %s"
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:381
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
-msgstr "TSINFO: %s pakker som behøver %s markeret for sletning"
+msgstr "TSINFO: %s pakker som behøver %s markeret til sletning"
-#: ../yum/depsolve.py:372
+#: ../yum/depsolve.py:394
#, 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:375
+#: ../yum/depsolve.py:397
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: Opdaterer %s for at opfylde afhængighed."
-#: ../yum/depsolve.py:378
+#: ../yum/depsolve.py:405
#, python-format
msgid "Cannot find an update path for dep for: %s"
-msgstr "Kan ikke finde en opdateringsvej for afhængigheden for : %s"
+msgstr "Kan ikke finde en opdateringsvej for afhængigheden for: %s"
-#: ../yum/depsolve.py:388
+#: ../yum/depsolve.py:415
#, python-format
msgid "Unresolvable requirement %s for %s"
-msgstr "Ikke fundet afhængighed %s for %s"
+msgstr "Uløst afhængighed %s for %s"
+
+#: ../yum/depsolve.py:438
+#, 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:434
+#: ../yum/depsolve.py:480
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
-msgstr ""
-"%s som leverer afhængigheder er allerede installeret, fjerner fra transaktion"
+msgstr "%s er i udbydet pakker, men er allerede installeret, fjerner."
-#: ../yum/depsolve.py:449
+#: ../yum/depsolve.py:496
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
-msgstr "Pakken %s findes i en nyere udgave i transaktionen"
+msgstr "Mulig løsningspakke %s har en nyere udgave i ts."
-#: ../yum/depsolve.py:460
+#: ../yum/depsolve.py:507
#, python-format
msgid "Potential resolving package %s has newer instance installed."
-msgstr "Pakken %s er allerede installeret i en nyere udgave"
+msgstr "Mulig løsningspakke %s har en nyere udgave installeret."
-#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
+#: ../yum/depsolve.py:515 ../yum/depsolve.py:564
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Manglende afhængighed: %s behøves af følgende pakke %s"
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:528
#, python-format
msgid "%s already in ts, skipping this one"
-msgstr "%s er allerede fundet i transaktion, springer den over"
-
-#: ../yum/depsolve.py:510
-#, python-format
-msgid ""
-"Failure finding best provider of %s for %s, exceeded maximum loop length"
-msgstr ""
-"Failure finding best provider of %s for %s, exceeded maximum loop length"
+msgstr "%s er allerede i ts, springer den over"
-#: ../yum/depsolve.py:537
+#: ../yum/depsolve.py:574
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: Markerer %s som en opdatering for %s"
-#: ../yum/depsolve.py:544
+#: ../yum/depsolve.py:582
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: Markerer %s til installerer for %s"
-#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
+#: ../yum/depsolve.py:675 ../yum/depsolve.py:757
msgid "Success - empty transaction"
-msgstr "Succes -- tom transaktion"
+msgstr "Succes -- tom overførsel"
-#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
+#: ../yum/depsolve.py:714 ../yum/depsolve.py:729
msgid "Restarting Loop"
-msgstr "Genstarter loop"
+msgstr "Genstarter løkke"
-#: ../yum/depsolve.py:702
+#: ../yum/depsolve.py:745
msgid "Dependency Process ending"
-msgstr "Afhængighedssøgning afsluttet"
+msgstr "Afhængighedsproces afslutter"
-#: ../yum/depsolve.py:708
+#: ../yum/depsolve.py:751
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s fra %s har afhængighedsproblemer"
-#: ../yum/depsolve.py:715
+#: ../yum/depsolve.py:758
msgid "Success - deps resolved"
-msgstr "Succes - afhængigheder fundet"
+msgstr "Succes - afhængigheder løst"
-#: ../yum/depsolve.py:729
+#: ../yum/depsolve.py:772
#, python-format
msgid "Checking deps for %s"
-msgstr "Checker afhængigheder for %s"
+msgstr "Kontrollerer afhængigheder for %s"
-#: ../yum/depsolve.py:782
+#: ../yum/depsolve.py:855
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "søger efter %s som afhængighed for %s"
-#: ../yum/depsolve.py:933
+#: ../yum/depsolve.py:997
#, python-format
-msgid "Comparing best: %s to po: %s"
-msgstr "Comparing best: %s to po: %s"
+msgid "Running compare_providers() for %s"
+msgstr "Kører compare_providers() for %s"
-#: ../yum/depsolve.py:937
-#, python-format
-msgid "Same: best %s == po: %s"
-msgstr "Same: best %s == po: %s"
-
-#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
-#, python-format
-msgid "best %s obsoletes po: %s"
-msgstr "best %s obsoletes po: %s"
-
-#: ../yum/depsolve.py:955
-#, python-format
-msgid "po %s obsoletes best: %s"
-msgstr "po %s obsoletes best: %s"
-
-#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#: ../yum/depsolve.py:1025 ../yum/depsolve.py:1031
#, python-format
msgid "better arch in po %s"
-msgstr "better arch in po %s"
+msgstr "bedre arkitektur i po %s"
-#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#: ../yum/depsolve.py:1092
#, python-format
-msgid "po %s shares a sourcerpm with %s"
-msgstr "po %s shares a sourcerpm with %s"
+msgid "%s obsoletes %s"
+msgstr "%s overflødigør %s"
-#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#: ../yum/depsolve.py:1108
#, python-format
-msgid "best %s shares a sourcerpm with %s"
-msgstr "best %s shares a sourcerpm with %s"
+msgid ""
+"archdist compared %s to %s on %s\n"
+" Winner: %s"
+msgstr ""
+"arkitekturdistribution sammenligner %s med %s på %s\n"
+" Vinder: %s"
-#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#: ../yum/depsolve.py:1115
#, python-format
-msgid "po %s shares more of the name prefix with %s"
-msgstr "po %s shares more of the name prefix with %s"
+msgid "common sourcerpm %s and %s"
+msgstr "normal kilde-RPM %s og %s"
-#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#: ../yum/depsolve.py:1121
#, python-format
-msgid "po %s has a shorter name than best %s"
-msgstr "po %s has a shorter name than best %s"
+msgid "common prefix of %s between %s and %s"
+msgstr "normal præfiks af %s mellem %s og %s"
-#: ../yum/depsolve.py:1025
+#: ../yum/depsolve.py:1129
#, python-format
-msgid "bestpkg %s shares more of the name prefix with %s"
-msgstr "bestpkg %s shares more of the name prefix with %s"
+msgid "Best Order: %s"
+msgstr "Bedste orden: %s"
-#: ../yum/__init__.py:119
+#: ../yum/__init__.py:158
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:296
+#: ../yum/__init__.py:367
#, python-format
msgid "Repository %r is missing name in configuration, using id"
-msgstr "Kilden %r mangler 'name' i konfigurationen, bruger 'id' i stedet"
+msgstr "Pakkearkiv %r mangler navn i konfigurationen, bruger id"
-#: ../yum/__init__.py:332
+#: ../yum/__init__.py:405
msgid "plugins already initialised"
-msgstr "Udvidelser (plugins) er allerede indlæst"
+msgstr "udvidelsesmoduler er allerede initieret"
-#: ../yum/__init__.py:339
+#: ../yum/__init__.py:412
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:349
+#: ../yum/__init__.py:423
msgid "Reading Local RPMDB"
msgstr "Læser lokal RPMDB"
-#: ../yum/__init__.py:367
+#: ../yum/__init__.py:441
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:387
+#: ../yum/__init__.py:461
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:404
+#: ../yum/__init__.py:478
msgid "Setting up Package Sacks"
msgstr "Opsætning af pakkelister"
-#: ../yum/__init__.py:447
+#: ../yum/__init__.py:521
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
-msgstr "repo object for repo %s lacks a _resetSack method\n"
+msgstr "kildeobjekt for kilde %s mangler en _resetSack-metode\n"
-#: ../yum/__init__.py:448
+#: ../yum/__init__.py:522
msgid "therefore this repo cannot be reset.\n"
-msgstr "derfor kan denne filkilde ikke blive nulstillet\n"
+msgstr "derfor kan dette pakkearkiv ikke blive nulstillet.\n"
-#: ../yum/__init__.py:453
+#: ../yum/__init__.py:527
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:465
+#: ../yum/__init__.py:539
msgid "Building updates object"
msgstr "Bygger opdateringsobjekt"
-#: ../yum/__init__.py:496
+#: ../yum/__init__.py:570
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:520
+#: ../yum/__init__.py:595
msgid "Getting group metadata"
-msgstr "Henter gruppe-metadata"
+msgstr "Henter gruppemetadata"
-#: ../yum/__init__.py:546
+#: ../yum/__init__.py:621
#, python-format
msgid "Adding group file from repository: %s"
-msgstr "Tilfører gruppefil fra kilden %s"
+msgstr "Tilfører gruppefil fra pakkearkiv: %s"
-#: ../yum/__init__.py:555
+#: ../yum/__init__.py:630
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
-msgstr "Tilføjelse af gruppefil fejlede for følgende filkilde: %s - %s"
+msgstr "Tilføjelse af gruppefil fejlede for følgende pakkearkiv: %s - %s"
-#: ../yum/__init__.py:561
+#: ../yum/__init__.py:636
msgid "No Groups Available in any repository"
-msgstr "Ingen tilgængelige grupper i nogen filkilder"
+msgstr "Ingen tilgængelige grupper i noget pakkearkiv"
-#: ../yum/__init__.py:611
+#: ../yum/__init__.py:686
msgid "Importing additional filelist information"
-msgstr "Importerer ekstra informationer om filer"
+msgstr "Importerer yderligere information om filliste"
-#: ../yum/__init__.py:657
+#: ../yum/__init__.py:695
+msgid ""
+"There are unfinished transactions remaining. You might consider running yum-"
+"complete-transaction first to finish them."
+msgstr ""
+"Der er uafsluttede overførsler tilbage. Du bør overveje at køre yum-"
+"complete-transaction først for at afslutte dem."
+
+#: ../yum/__init__.py:761
#, python-format
msgid "Skip-broken round %i"
msgstr "Skip-broken runde %i"
-#: ../yum/__init__.py:680
+#: ../yum/__init__.py:813
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Skip-broken tog %i runder "
-#: ../yum/__init__.py:681
+#: ../yum/__init__.py:814
msgid ""
"\n"
"Packages skipped because of dependency problems:"
msgstr ""
"\n"
-"Pakker droppet pågrund af problemer med afhængigheder:"
+"Pakker sprunget over på grund af problemer med afhængigheder:"
-#: ../yum/__init__.py:685
+#: ../yum/__init__.py:818
#, python-format
msgid " %s from %s"
msgstr " %s fra %s"
-#: ../yum/__init__.py:774
+#: ../yum/__init__.py:958
+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:973
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Kunne ikke slette transaktionsfilen %s"
-#: ../yum/__init__.py:814
+#: ../yum/__init__.py:1015
#, python-format
msgid "excluding for cost: %s from %s"
-msgstr "ekskluderer på grund af cost: %s fra %s"
+msgstr "ekskluderer for cost: %s fra %s"
-#: ../yum/__init__.py:845
+#: ../yum/__init__.py:1046
msgid "Excluding Packages in global exclude list"
msgstr "Ekskluderer pakker i den globale ekskluderingsliste"
-#: ../yum/__init__.py:847
+#: ../yum/__init__.py:1048
#, python-format
msgid "Excluding Packages from %s"
msgstr "Ekskluderer pakker fra %s"
-#: ../yum/__init__.py:875
+#: ../yum/__init__.py:1077
#, python-format
msgid "Reducing %s to included packages only"
msgstr "Reducerer %s til kun at indholde inkluderede pakker"
-#: ../yum/__init__.py:880
+#: ../yum/__init__.py:1083
#, python-format
msgid "Keeping included package %s"
msgstr "Beholder inkluderet pakke %s"
-#: ../yum/__init__.py:886
+#: ../yum/__init__.py:1089
#, python-format
msgid "Removing unmatched package %s"
-msgstr "Sletter ikke-fundet pakke %s"
+msgstr "Sletter umatchende pakke %s"
-#: ../yum/__init__.py:889
+#: ../yum/__init__.py:1092
msgid "Finished"
msgstr "Afsluttet"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:919
+#: ../yum/__init__.py:1122
#, python-format
msgid "Unable to check if PID %s is active"
-msgstr "Kunne ikke teste om PID %s er aktiv"
+msgstr "Kunne ikke kontrollere om PID %s er aktiv"
#. Another copy seems to be running.
-#: ../yum/__init__.py:923
+#: ../yum/__init__.py:1126
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
-msgstr "Lås fundet %s: Anden kopi kører som pid %s."
+msgstr "Lås fundet %s: en anden kopi kører som PID %s."
-#: ../yum/__init__.py:970 ../yum/__init__.py:977
+#: ../yum/__init__.py:1196
msgid "Package does not match intended download"
-msgstr "Pakken matcher ikke"
+msgstr "Pakken matcher ikke den planlagte nedhentning"
-#: ../yum/__init__.py:991
+#: ../yum/__init__.py:1211
msgid "Could not perform checksum"
msgstr "Kunne ikke udføre checksum"
-#: ../yum/__init__.py:994
+#: ../yum/__init__.py:1214
msgid "Package does not match checksum"
msgstr "Pakken matcher ikke checksum"
-#: ../yum/__init__.py:1036
+#: ../yum/__init__.py:1257
#, python-format
msgid "package fails checksum but caching is enabled for %s"
-msgstr "Pakken fejlede checksum. men caching er aktiveret for %s"
+msgstr "Pakken fejlede checksum, men mellemlagring er aktiveret for %s"
-#: ../yum/__init__.py:1042
+#: ../yum/__init__.py:1260 ../yum/__init__.py:1289
#, python-format
msgid "using local copy of %s"
msgstr "bruger lokal kopi af %s"
-#: ../yum/__init__.py:1061
+#: ../yum/__init__.py:1301
#, python-format
-msgid "Insufficient space in download directory %s to download"
-msgstr "Ikke plads nok i download-biblioteket %s"
-
-#: ../yum/__init__.py:1094
+msgid ""
+"Insufficient space in download directory %s\n"
+" * free %s\n"
+" * needed %s"
+msgstr "Ikke plads nok i nedhentningskataloget %s\n"
+" * fri %s\n"
+" * behøvet %s"
+
+#: ../yum/__init__.py:1348
msgid "Header is not complete."
-msgstr "Header er ikke komplet"
+msgstr "Headerfil er ikke komplet."
-#: ../yum/__init__.py:1134
+#: ../yum/__init__.py:1385
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr ""
-"Header not in local cache and caching-only mode enabled. Cannot download %s"
+"Headerfil er ikke i lokal cache og kun-caching-tilstand er aktiveret. Kan ikke hente %s"
-#: ../yum/__init__.py:1189
+#: ../yum/__init__.py:1440
#, python-format
msgid "Public key for %s is not installed"
-msgstr "Offentlig nøgle for %s er ikke installeret i RPM-databasen"
+msgstr "Offentlig nøgle for %s er ikke installeret"
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1444
#, python-format
msgid "Problem opening package %s"
-msgstr "Kunne ikke åbne følgende pakke %s"
+msgstr "Kunne ikke åbne pakke %s"
-#: ../yum/__init__.py:1201
+#: ../yum/__init__.py:1452
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Offentlig nøgle for %s er ikke sikker"
-#: ../yum/__init__.py:1205
+#: ../yum/__init__.py:1456
#, python-format
msgid "Package %s is not signed"
msgstr "Pakken %s er ikke signeret"
-#: ../yum/__init__.py:1243
+#: ../yum/__init__.py:1494
#, python-format
msgid "Cannot remove %s"
msgstr "Kan ikke slette %s"
-#: ../yum/__init__.py:1247
+#: ../yum/__init__.py:1498
#, python-format
msgid "%s removed"
msgstr "%s slettet"
-#: ../yum/__init__.py:1283
+#: ../yum/__init__.py:1534
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Kan ikke slette %s filen %s"
-#: ../yum/__init__.py:1287
+#: ../yum/__init__.py:1538
#, python-format
msgid "%s file %s removed"
msgstr "%s filen %s er slettet"
-#: ../yum/__init__.py:1289
+#: ../yum/__init__.py:1540
#, python-format
msgid "%d %s files removed"
msgstr "%d %s filer slettet"
-#: ../yum/__init__.py:1329
+#: ../yum/__init__.py:1609
#, python-format
msgid "More than one identical match in sack for %s"
-msgstr "Mere end et match for %s"
+msgstr "Mere end et identisk match i liste for %s"
-#: ../yum/__init__.py:1335
+#: ../yum/__init__.py:1615
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Ingen opdateringer matcher %s.%s %s:%s-%s"
-#: ../yum/__init__.py:1543
+#: ../yum/__init__.py:1833
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
msgstr ""
-"searchPackages() will go away in a future version of "
-"Yum. Use searchGenerator() instead. \n"
+"searchPackages() vil forsvinde i en fremtidig version af "
+"Yum. Brug searchGenerator() istedet. \n"
-#: ../yum/__init__.py:1580
+#: ../yum/__init__.py:1875
#, python-format
msgid "Searching %d packages"
msgstr "Genemsøger %d pakker"
-#: ../yum/__init__.py:1584
+#: ../yum/__init__.py:1879
#, python-format
msgid "searching package %s"
-msgstr "gennemsøger følgende pakke %s"
+msgstr "gennemsøger pakke %s"
-#: ../yum/__init__.py:1596
+#: ../yum/__init__.py:1891
msgid "searching in file entries"
-msgstr "gennemsøger filer indeholdt i pakkerne"
+msgstr "gennemsøger filopslag"
-#: ../yum/__init__.py:1603
+#: ../yum/__init__.py:1898
msgid "searching in provides entries"
msgstr "søger efter afhængigheder"
-#: ../yum/__init__.py:1633
+#: ../yum/__init__.py:1931
#, python-format
msgid "Provides-match: %s"
-msgstr "Levere match: %s"
+msgstr "Leverer match: %s"
-#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
-#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
+#: ../yum/__init__.py:1980
+msgid "No group data available for configured repositories"
+msgstr "Ingen tilgængelige gruppedata i konfigurerede pakkearkiver"
+
+#: ../yum/__init__.py:2011 ../yum/__init__.py:2030 ../yum/__init__.py:2061
+#: ../yum/__init__.py:2067 ../yum/__init__.py:2146 ../yum/__init__.py:2150
+#: ../yum/__init__.py:2446
#, python-format
msgid "No Group named %s exists"
msgstr "Gruppen %s findes ikke"
-#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
+#: ../yum/__init__.py:2042 ../yum/__init__.py:2163
#, python-format
msgid "package %s was not marked in group %s"
msgstr "pakken %s var ikke markeret i gruppen %s"
-#: ../yum/__init__.py:1770
+#: ../yum/__init__.py:2089
#, python-format
msgid "Adding package %s from group %s"
msgstr "Tilføjer pakken %s fra gruppen %s"
-#: ../yum/__init__.py:1774
+#: ../yum/__init__.py:2093
#, python-format
msgid "No package named %s available to be installed"
-msgstr "Pakken %s er ikke tilgængelig for installation"
+msgstr "Pakken %s er ikke tilgængelig til installation"
-#: ../yum/__init__.py:1849
+#: ../yum/__init__.py:2190
#, python-format
msgid "Package tuple %s could not be found in packagesack"
-msgstr "Pakken %s blev ikke fundet i de tilgængelige pakker"
+msgstr "Pakken %s kunne ikke findes i pakkeliste"
-#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
-msgid "Invalid versioned dependency string, try quoting it."
-msgstr "Invalidt versioneret afhængighedsstreng."
+#: ../yum/__init__.py:2204
+msgid ""
+"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
+msgstr ""
+"getInstalledPackageObject() vil forsvinde, brug self.rpmdb.searchPkgTuple().\n"
-#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
+#: ../yum/__init__.py:2260 ../yum/__init__.py:2304
msgid "Invalid version flag"
-msgstr "Forkert versions-flag"
+msgstr "Ugyldig versionsflag"
-#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
+#: ../yum/__init__.py:2275 ../yum/__init__.py:2279
#, python-format
msgid "No Package found for %s"
-msgstr "%s pakken blev ikke fundet"
+msgstr "Ingen pakke fundet for %s"
-#: ../yum/__init__.py:2066
+#: ../yum/__init__.py:2479
msgid "Package Object was not a package object instance"
-msgstr "Pakkeobjektet er ikke af en korrekt type"
+msgstr "Pakkeobjektet er ikke en pakkeobjektinstans"
-#: ../yum/__init__.py:2070
+#: ../yum/__init__.py:2483
msgid "Nothing specified to install"
-msgstr "Ingenting angivet til installering"
+msgstr "Der er intet angivet til installation"
-#. only one in there
-#: ../yum/__init__.py:2085
+#: ../yum/__init__.py:2499 ../yum/__init__.py:3126
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
-msgstr "Checker for virtual leverandør eller fil-leverandør for %s"
+msgstr "Kontrollerer for virtueludbyder eller filudbyder for %s"
-#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
+#: ../yum/__init__.py:2505 ../yum/__init__.py:2782 ../yum/__init__.py:2942
+#: ../yum/__init__.py:3132
#, python-format
msgid "No Match for argument: %s"
-msgstr "Ingen match for argumenter: %s"
+msgstr "Ingen match for argument: %s"
+
+#: ../yum/__init__.py:2579
+#, python-format
+msgid "Package %s installed and not available"
+msgstr "Pakken %s installeret og ikke tilgængelig"
-#. FIXME - this is where we could check to see if it already installed
-#. for returning better errors
-#: ../yum/__init__.py:2146
+#: ../yum/__init__.py:2582
msgid "No package(s) available to install"
-msgstr "Ingen pakker er tilgængelige til installation"
+msgstr "Ingen pakke(r) er tilgængelig(e) til installation"
-#: ../yum/__init__.py:2158
+#: ../yum/__init__.py:2594
#, python-format
msgid "Package: %s - already in transaction set"
-msgstr "Pakken: %s findes allerede i transaktionen"
+msgstr "Pakken: %s - allerede i overførselssættet"
-#: ../yum/__init__.py:2171
+#: ../yum/__init__.py:2609
+#, 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:2617
#, python-format
msgid "Package %s already installed and latest version"
-msgstr "%s er allerede installeret i den nyeste version"
+msgstr "Pakke %s er allerede installeret i den nyeste version"
-#: ../yum/__init__.py:2178
+#: ../yum/__init__.py:2631
#, python-format
msgid "Package matching %s already installed. Checking for update."
-msgstr "Pakken som levere %s er allerede installeret. Søger efter opdatering"
+msgstr "Pakken som matcher %s er allerede installeret. Søger efter opdatering."
#. update everything (the easy case)
-#: ../yum/__init__.py:2220
+#: ../yum/__init__.py:2717
msgid "Updating Everything"
-msgstr "Opdaterer alting"
+msgstr "Opdaterer alt"
-#: ../yum/__init__.py:2304
+#: ../yum/__init__.py:2735 ../yum/__init__.py:2844 ../yum/__init__.py:2865
+#: ../yum/__init__.py:2891
#, python-format
-msgid "Package is already obsoleted: %s.%s %s:%s-%s"
-msgstr "Pakken: %s.%s %s:%s-%s er allerede overflødiggjort"
+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:2377
+#: ../yum/__init__.py:2770 ../yum/__init__.py:2939
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:2392
+#: ../yum/__init__.py:2835
+#, 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:2868 ../yum/__init__.py:2894
+#, python-format
+msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+msgstr "Ingen opdatering af pakke som allerede er overflødiggjort: %s.%s %s:%s-%s"
+
+#: ../yum/__init__.py:2955
msgid "No package matched to remove"
msgstr "Ingen pakker fundet til sletning"
-#: ../yum/__init__.py:2426
+#: ../yum/__init__.py:2989
#, python-format
msgid "Cannot open file: %s. Skipping."
-msgstr "Kan ikke åbne filen: %s. Springer den over."
+msgstr "Kan ikke åbne fil: %s. Springer over."
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:2992
#, python-format
msgid "Examining %s: %s"
msgstr "Undersøger %s: %s"
-#: ../yum/__init__.py:2436
+#: ../yum/__init__.py:3000
+#, python-format
+msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+msgstr "Kan ikke tilføje pakke %s til overførsel. Ikke en kompatibel arkitektur: %s"
+
+#: ../yum/__init__.py:3008
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
"instead."
msgstr ""
-"Pakken %s er ikke installeret, så den kan ikke opdateres. Kør 'yum install' "
-"for at installere den"
+"Pakken %s er ikke installeret, så den kan ikke opdateres. Kør yum install "
+"for at installere den istedet."
-#: ../yum/__init__.py:2468
+#: ../yum/__init__.py:3043
#, python-format
msgid "Excluding %s"
msgstr "Ekskluderer %s"
-#: ../yum/__init__.py:2473
+#: ../yum/__init__.py:3048
#, python-format
msgid "Marking %s to be installed"
msgstr "Markerer %s til installation"
-#: ../yum/__init__.py:2479
+#: ../yum/__init__.py:3054
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Markerer %s som en opdatering til %s"
-#: ../yum/__init__.py:2486
+#: ../yum/__init__.py:3061
#, python-format
msgid "%s: does not update installed package."
-msgstr "%s kan ikke opdatere nogen installeret pakke"
+msgstr "%s kan ikke opdatere installeret pakke."
-#: ../yum/__init__.py:2504
+#: ../yum/__init__.py:3076
msgid "Problem in reinstall: no package matched to remove"
msgstr "Problem med geninstallation, ingen pakke fundet til at blive slettet"
-#: ../yum/__init__.py:2515
+#: ../yum/__init__.py:3088 ../yum/__init__.py:3159
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
-msgstr ""
-"Springer pakken %s over, da den er tilladt til installering i flere verisoner"
+msgstr "Pakke %s er tilladt at have flere installationer, springer over"
-#: ../yum/__init__.py:2522
+#: ../yum/__init__.py:3097
msgid "Problem in reinstall: no package matched to install"
msgstr "Problem med geninstallation: ingen pakke fundet til at installere"
-#: ../yum/__init__.py:2570
+#: ../yum/__init__.py:3151
+msgid "No package(s) available to downgrade"
+msgstr "Ingen pakke(r) er tilgængelig(e) til nedgradering"
+
+#: ../yum/__init__.py:3182
+#, python-format
+msgid "No Match for available package: %s"
+msgstr "Ingen match for tilgængelig pakke: %s"
+
+#: ../yum/__init__.py:3188
+#, python-format
+msgid "Only Upgrade available on package: %s"
+msgstr "Opgradér kun tilgængelig på pakke: %s"
+
+#: ../yum/__init__.py:3249
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Henter GPG-nøgle fra %s"
-#: ../yum/__init__.py:2576
+#: ../yum/__init__.py:3269
msgid "GPG key retrieval failed: "
-msgstr "Hentning af GPG-nøglen fejlede:"
+msgstr "Hentning af GPG-nøglen mislykkedes: "
-#: ../yum/__init__.py:2589
-msgid "GPG key parsing failed: "
-msgstr "Check af GPG-nøglen fejlede"
+#: ../yum/__init__.py:3280
+#, 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:2593
+#: ../yum/__init__.py:3312
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
-msgstr "Følgende GPG-nøgle %s (0x%s) er allerede installeret"
+msgstr "GPG-nøgle på %s (0x%s) er allerede installeret"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:2598
+#: ../yum/__init__.py:3317 ../yum/__init__.py:3379
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
-msgstr "Importerer GPG-nøglen 0x%s \"%s\" fra %s"
+msgstr "Importerer GPG-nøgle 0x%s \"%s\" fra %s"
-#: ../yum/__init__.py:2610
+#: ../yum/__init__.py:3334
msgid "Not installing key"
-msgstr "Nøglen blev ikke installeret"
+msgstr "Installerer ikke nøgle"
-#: ../yum/__init__.py:2616
+#: ../yum/__init__.py:3340
#, python-format
msgid "Key import failed (code %d)"
-msgstr "Import af nøglen fejlede (returkode %d)"
+msgstr "Importering af nøgle mislykkedes (kode %d)"
-#: ../yum/__init__.py:2619
+#: ../yum/__init__.py:3341 ../yum/__init__.py:3400
msgid "Key imported successfully"
msgstr "Nøglen blev importet med succes"
-#: ../yum/__init__.py:2624
+#: ../yum/__init__.py:3346 ../yum/__init__.py:3405
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
"are not correct for this package.\n"
"Check that the correct key URLs are configured for this repository."
msgstr ""
-"GPG-nøglen angivet for \"%s\" kilden er allerede installet, men den er ikke "
+"GPG-nøglen er vist for \"%s\" pakkearkivet er allerede installeret, men den er ikke "
"korrekt for denne pakke.\n"
-"Check at konfigurationen af nøgle-URL'er er korrekt for denne kilde."
+"Kontrollér at konfigurationen af nøgle-URL'er er korrekt for denne kilde."
-#: ../yum/__init__.py:2633
+#: ../yum/__init__.py:3355
msgid "Import of key(s) didn't help, wrong key(s)?"
-msgstr "Import af nøgle(r) hjalp ikke, måske er nøglerne forkerte?"
+msgstr "Importering af nøgle(r) hjalp ikke, forkerte nøgle(r)?"
+
+#: ../yum/__init__.py:3374
+#, 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:3394
+#, python-format
+msgid "Not installing key for repo %s"
+msgstr "Installerer ikke nøgle for kilde %s"
+
+#: ../yum/__init__.py:3399
+msgid "Key import failed"
+msgstr "Importering af nøgle mislykkedes"
-#: ../yum/__init__.py:2707
+#: ../yum/__init__.py:3490
msgid "Unable to find a suitable mirror."
-msgstr "Kunne ikke finde et passende mirror."
+msgstr "Kunne ikke finde et passende filspejl."
-#: ../yum/__init__.py:2709
+#: ../yum/__init__.py:3492
msgid "Errors were encountered while downloading packages."
-msgstr "Følgende fejl blev fundet under download af pakker."
+msgstr "Fejl blev fundet under hentning af pakker."
-#: ../yum/__init__.py:2774
+#: ../yum/__init__.py:3533
+#, python-format
+msgid "Please report this error at %s"
+msgstr "Rapportér venligst denne fejl på %s"
+
+#: ../yum/__init__.py:3557
msgid "Test Transaction Errors: "
-msgstr "Fejl i testtransaktionen:"
+msgstr "Fejl i testoverførslen: "
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:195
+#: ../yum/plugins.py:204
msgid "Loaded plugins: "
-msgstr "Indlæser plugins: "
+msgstr "Indlæste udvidelsesmoduler: "
-#: ../yum/plugins.py:206
+#: ../yum/plugins.py:218 ../yum/plugins.py:224
#, python-format
msgid "No plugin match for: %s"
-msgstr "Ingen plugin som matcher: %s"
+msgstr "Intet udvidelsesmodul til: %s"
+
+#: ../yum/plugins.py:254
+#, python-format
+msgid "Not loading \"%s\" plugin, as it is disabled"
+msgstr "Indlæser ikke \"%s\" udvidelsesmodul, fordi det er deaktiveret"
-#: ../yum/plugins.py:219
+#. Give full backtrace:
+#: ../yum/plugins.py:266
#, python-format
-msgid "\"%s\" plugin is disabled"
-msgstr "\"%s\" plugin er deaktiveret"
+msgid "Plugin \"%s\" can't be imported"
+msgstr "Udvidelsesmodul \"%s\" kan ikke importeres"
-#: ../yum/plugins.py:231
+#: ../yum/plugins.py:273
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
-msgstr "Plugin \"%s\" angiver ikke hvilken API-version som det behøver"
+msgstr "Udvidelsesmodul \"%s\" angiver ikke hvilken API-version der er påkrævet"
-#: ../yum/plugins.py:235
+#: ../yum/plugins.py:278
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
-msgstr "Plugin \"%s\" behøver API %s. Understøttet API er %s."
+msgstr "Udvidelsesmodul \"%s\" krævet API %s. Understøttet API er %s."
-#: ../yum/plugins.py:264
+#: ../yum/plugins.py:311
#, python-format
msgid "Loading \"%s\" plugin"
-msgstr "Indlæser \"%s\" plugin"
+msgstr "Indlæser \"%s\" udvidelsesmodul"
-#: ../yum/plugins.py:271
+#: ../yum/plugins.py:318
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
-msgstr "En eller flere plugins med navnet \"%s\" er fundet i plugin-søgestien"
+msgstr ""
+"To eller flere udvidelsesmoduler med navnet \"%s\" er fundet i søgestien for udvidelsesmoduler"
-#: ../yum/plugins.py:291
+#: ../yum/plugins.py:338
#, python-format
msgid "Configuration file %s not found"
msgstr "Konfigurationsfilen %s er ikke fundet"
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:294
+#: ../yum/plugins.py:341
#, python-format
msgid "Unable to find configuration file for plugin %s"
-msgstr "Kunne ikke finde konfigurationsfilen for følgende plugin: %s"
+msgstr "Kunne ikke finde konfigurationsfilen til udvidelsesmodul: %s"
-#: ../yum/plugins.py:448
+#: ../yum/plugins.py:499
msgid "registration of commands not supported"
-msgstr "Registring af kommandolinie-komandoer er ikke supporteret"
+msgstr "registrering af komandoer er ikke understøttet"
-#: ../rpmUtils/oldUtils.py:26
+#: ../yum/rpmtrans.py:78
+msgid "Repackaging"
+msgstr "Genpakning"
+
+#: ../rpmUtils/oldUtils.py:33
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
-msgstr "Header kunne ikke åbnes, eller passede ikke %s, %s."
+msgstr "Headerfil kunne ikke åbnes, eller matchede ikke %s, %s."
-#: ../rpmUtils/oldUtils.py:46
+#: ../rpmUtils/oldUtils.py:53
#, python-format
msgid "RPM %s fails md5 check"
-msgstr "RPM %s fejlede md5 checksum"
+msgstr "RPM %s fejlede md5-kontrol"
-#: ../rpmUtils/oldUtils.py:144
+#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
-msgstr ""
-"Kan ikke åbne RPM-databasen, Måske er den i brug af en anden applikation"
+msgstr "Kunne ikke åbne RPM-database til læsning. Måske er den allerede i brug?"
-#: ../rpmUtils/oldUtils.py:174
+#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
-msgstr "Fandt en tom header, noget er gået helt galt."
+msgstr "Fandt en tom headerfil, noget er gået galt"
-#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
-msgstr "Ødelagt header %s"
+msgstr "Ødelagt headerfil %s"
-#: ../rpmUtils/oldUtils.py:272
+#: ../rpmUtils/oldUtils.py:281
#, python-format
msgid "Error opening rpm %s - error %s"
-msgstr "Fejl ved åbning af rpm %s - fejl %s"
+msgstr "Fejl ved åbning af RPM %s - fejl %s"
+
+#~ msgid "Parsing package install arguments"
+#~ msgstr "Behandler argumenter for pakkeinstallation"
+
+#~ msgid "Could not find update match for %s"
+#~ msgstr "Kunne ikke finde opdateringsmatch for %s"
+
+#~ msgid ""
+#~ "Failure finding best provider of %s for %s, exceeded maximum loop length"
+#~ msgstr ""
+#~ "Fejl ved at finde den bedste udbyder af %s for %s, overskrider maksimum loop-længde"
+
+#~ msgid "Comparing best: %s to po: %s"
+#~ msgstr "Sammenligner bedste: %s til po: %s"
+
+#~ msgid "Same: best %s == po: %s"
+#~ msgstr "Samme: bedste %s == po: %s"
+
+#~ msgid "po %s obsoletes best: %s"
+#~ msgstr "po %s overflødigør bedste: %s"
+
+#~ msgid "po %s shares a sourcerpm with %s"
+#~ msgstr "po %s deler en kilde-RPM med %s"
+
+#~ msgid "best %s shares a sourcerpm with %s"
+#~ msgstr "bedste %s deler en kilde-RPM med %s"
+
+#~ msgid "po %s shares more of the name prefix with %s"
+#~ msgstr "po %s deler flere af navnepræfiksene med %s"
+
+#~ msgid "po %s has a shorter name than best %s"
+#~ msgstr "po %s har et kortere navn end bedste %s"
+
+#~ msgid "bestpkg %s shares more of the name prefix with %s"
+#~ msgstr "bestpkg %s deler flere af navnepræfiksene med %s"
+
+#~ msgid "Invalid versioned dependency string, try quoting it."
+#~ msgstr "Ugyldig versioneret afhængighedsstreng, prøv at citere det."
#~ msgid "Looking for Obsoletes for %s"
-#~ msgstr "Søger efter overflødiggørelse for %s"
+#~ msgstr "Søger efter overflødiggørelse til %s"
#~ msgid "unable to find newer package for %s"
-#~ msgstr "Kunne ikke fine en nyere pakke for %s"
+#~ msgstr "kunne ikke finde en nyere pakke til %s"
#~ msgid "TSINFO: Updating %s to resolve conflict."
#~ msgstr "TSINFO: Opdaterer %s for at løse en konflikt."
#~ msgid "%s conflicts: %s"
-#~ msgstr "%s konflikter med: %s"
+#~ msgstr "%s konflikter: %s"
#~ msgid "%s conflicts with %s"
#~ msgstr "%s konflikter med %s"
-#~ msgid "Package %s needs %s, this is not available."
-#~ msgstr "Pakken %s behøver %s, som ikke er tilgængelig."
-
#~ msgid "Package %s conflicts with %s."
#~ msgstr "Pakken %s konflikter med %s."
#~ msgid "Running \"%s\" handler for \"%s\" plugin"
-#~ msgstr "Kører \"%s\" handler for \"%s\" plugin"
+#~ msgstr "Kører \"%s\" håndterer for \"%s\" udvidelsesmodul"
-#, fuzzy
#~ msgid ""
#~ "Description:\n"
#~ "%s"
-#~ msgstr "Beskrivelse: %s"
+#~ msgstr ""
+#~ "Beskrivelse:\n"
+#~ "%s"
diff --git a/po/de.po b/po/de.po
index 839bbe3..a7e2101 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,7 +2,7 @@
# Copyright (C) 2006 Duke
# This file is distributed under the same license as the yum package.
#
-# Fabian Affolter <fab@fedoraproject.org>, 2007,2008,2009.
+# Fabian Affolter <fab@fedoraproject.org>, 2007-2009.
# Dominik Sandjaja <dominiksandjaja@fedoraproject.org>, 2008,2009.
# Thomas Spura <tomspur@fedoraproject.org>, 2008.
#
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-04 01:24+0000\n"
-"PO-Revision-Date: 2009-02-20 23:38+0100\n"
-"Last-Translator: Dominik Sandjaja <dominiksandjaja@fedoraproject.org>\n"
+"POT-Creation-Date: 2009-03-28 19:19+0000\n"
+"PO-Revision-Date: 2009-03-29 22:00+0100\n"
+"Last-Translator: Fabian Affolter <fab@fedoraproject.org>\n"
"Language-Team: German <fedora-trans-de@redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
"X-Poedit-Language: German\n"
#: ../callback.py:48
-#: ../output.py:909
+#: ../output.py:922
#: ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Aktualisieren"
@@ -34,7 +34,7 @@ msgstr "Löschen"
#: ../callback.py:50
#: ../callback.py:51
#: ../callback.py:53
-#: ../output.py:908
+#: ../output.py:921
#: ../yum/rpmtrans.py:73
#: ../yum/rpmtrans.py:74
#: ../yum/rpmtrans.py:76
@@ -48,7 +48,7 @@ msgid "Obsoleted"
msgstr "Veraltet"
#: ../callback.py:54
-#: ../output.py:1014
+#: ../output.py:1029
msgid "Updated"
msgstr "Aktualisiert"
@@ -59,7 +59,7 @@ msgstr "Gelöscht"
#: ../callback.py:56
#: ../callback.py:57
#: ../callback.py:59
-#: ../output.py:1012
+#: ../output.py:1027
msgid "Installed"
msgstr "Installiert"
@@ -70,7 +70,7 @@ msgstr "Kein Header - huh?"
# Geht sicher auch besser..., Ideen? Fabian
#: ../callback.py:168
msgid "Repackage"
-msgstr "Neu verpackt"
+msgstr "Neu verpacken"
#: ../callback.py:189
#, python-format
@@ -83,7 +83,7 @@ msgid "Erased: %s"
msgstr "Gelöscht: %s"
#: ../callback.py:217
-#: ../output.py:910
+#: ../output.py:923
msgid "Removing"
msgstr "Entfernen"
@@ -105,109 +105,109 @@ msgstr "Repositories werden eingerichtet"
msgid "Reading repository metadata in from local files"
msgstr "Lese Repository-Metadaten aus lokalen Dateien ein"
-#: ../cli.py:191
+#: ../cli.py:192
#: ../utils.py:79
#, python-format
msgid "Config Error: %s"
msgstr "Konfigurationsfehler: %s"
-#: ../cli.py:194
-#: ../cli.py:1178
+#: ../cli.py:195
+#: ../cli.py:1190
#: ../utils.py:82
#, python-format
msgid "Options Error: %s"
msgstr "Optionenfehler: %s"
-#: ../cli.py:222
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Installiert: %s-%s am %s"
-#: ../cli.py:224
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Gebaut : %s am %s"
-#: ../cli.py:226
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Übermittelt: %s am %s"
-#: ../cli.py:263
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Sie müssen irgendeinen Befehl eingeben"
-#: ../cli.py:305
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Festplattenplatz-Anforderungen:\n"
-#: ../cli.py:307
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Mindestens %d MB werden auf dem Dateisystem %s benötigt.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:312
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
msgstr ""
"Fehler-Zusammenfassung\n"
-"-------------\n"
+"----------------------\n"
-#: ../cli.py:355
+#: ../cli.py:359
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:391
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Beende nach Befehl des Benutzers"
-#: ../cli.py:395
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Lade Pakete herunter:"
-#: ../cli.py:400
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Fehler beim Herunterladen der Pakete:\n"
-#: ../cli.py:414
-#: ../yum/__init__.py:3342
+#: ../cli.py:418
+#: ../yum/__init__.py:3362
msgid "Running rpm_check_debug"
msgstr "Führe rpm_check_debug durch"
-#: ../cli.py:417
-#: ../yum/__init__.py:3345
+#: ../cli.py:421
+#: ../yum/__init__.py:3365
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "FEHLER mit rpm_check_debug gegen depsolve:"
-#: ../cli.py:421
+#: ../cli.py:425
#, python-format
msgid "Please report this error in %s"
msgstr "Bitte melden Sie diesen Fehler unter %s"
-#: ../cli.py:427
+#: ../cli.py:431
msgid "Running Transaction Test"
msgstr "Führe Verarbeitungstest durch"
-#: ../cli.py:443
+#: ../cli.py:447
msgid "Finished Transaction Test"
msgstr "Verarbeitungstest beendet"
-#: ../cli.py:445
+#: ../cli.py:449
msgid "Transaction Check Error:\n"
msgstr "Prüffehler bei Verarbeitung:\n"
-#: ../cli.py:452
+#: ../cli.py:456
msgid "Transaction Test Succeeded"
msgstr "Verarbeitungstest erfolgreich"
-#: ../cli.py:473
+#: ../cli.py:477
msgid "Running Transaction"
msgstr "Führe Verarbeitung durch"
-#: ../cli.py:503
+#: ../cli.py:507
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -215,181 +215,181 @@ msgstr ""
"Verweigere automatischen Import der Schlüssel, wenn unbeaufsichtigt ausgeführt.\n"
"Benutze \"-y\" zum Überschreiben."
-#: ../cli.py:522
-#: ../cli.py:556
+#: ../cli.py:526
+#: ../cli.py:560
msgid " * Maybe you meant: "
-msgstr " * Meinten Sie vielleicht:"
+msgstr " * Meinten Sie vielleicht:"
-#: ../cli.py:539
-#: ../cli.py:547
+#: ../cli.py:543
+#: ../cli.py:551
#, 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:553
-#: ../cli.py:586
+#: ../cli.py:557
+#: ../cli.py:590
#, python-format
msgid "No package %s%s%s available."
-msgstr "Kein Paket %s%s%s verfügbar."
+msgstr "Kein Paket %s%s%s verfügbar."
-#: ../cli.py:591
-#: ../cli.py:666
-#: ../yumcommands.py:988
+#: ../cli.py:595
+#: ../cli.py:670
+#: ../yumcommands.py:1010
msgid "Package(s) to install"
msgstr "Paket(e) zum Installieren"
-#: ../cli.py:592
-#: ../cli.py:667
+#: ../cli.py:596
+#: ../cli.py:671
#: ../yumcommands.py:159
-#: ../yumcommands.py:989
+#: ../yumcommands.py:1011
msgid "Nothing to do"
msgstr "Nichts zu tun"
-#: ../cli.py:625
+#: ../cli.py:629
#, python-format
msgid "%d packages marked for Update"
msgstr "%d Pakete zur Aktualisierung markiert"
-#: ../cli.py:628
+#: ../cli.py:632
msgid "No Packages marked for Update"
msgstr "Keine Pakete für die Aktualisierung markiert"
-#: ../cli.py:642
+#: ../cli.py:646
#, python-format
msgid "%d packages marked for removal"
msgstr "%d Pakete für die Entfernung markiert"
-#: ../cli.py:645
+#: ../cli.py:649
msgid "No Packages marked for removal"
msgstr "Keine Pakete für die Entfernung markiert"
-#: ../cli.py:657
+#: ../cli.py:661
msgid "No Packages Provided"
msgstr "Keine Pakete bereitgestellt"
-#: ../cli.py:712
+#: ../cli.py:716
msgid "Matching packages for package list to user args"
msgstr "Übereinstimmende Pakete für Paket-Liste nach Benutzer-Argument"
-#: ../cli.py:761
+#: ../cli.py:765
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Warnung: Keine Übereinstimmung gefunden für: %s"
-#: ../cli.py:764
+#: ../cli.py:768
msgid "No Matches found"
msgstr "Keine Übereinstimmungen gefunden"
-# dies geht sicher auch noch verständlicher. Fabian
-#: ../cli.py:803
+#: ../cli.py:807
#, python-format
msgid ""
-"Warning: 3.0.x versions of yum would erronously match against filenames.\n"
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
-"Warnung: 3.0.x Versionen von yum stimmen irrtümlicherweise gegen Dateinamen überein.\n"
+"Warnung: 3.0.x Versionen von yum stimmen irrtümlicherweise mit Dateinamen ab.\n"
" Sie können \"%s*/%s%s\" und/oder \"%s*bin/%s%s\" benutzen, um dieses Verhalten zu bekommen"
-#: ../cli.py:819
+#: ../cli.py:823
#, python-format
msgid "No Package Found for %s"
msgstr "Kein Paket gefunden für %s"
# Räume auf, säubere...weiss jemand eine Übersetzung, welche nicht an den Staubsauger erinnert. Fabian
-#: ../cli.py:831
+#: ../cli.py:835
msgid "Cleaning up Everything"
msgstr "Räume alles auf"
-#: ../cli.py:845
+#: ../cli.py:849
msgid "Cleaning up Headers"
msgstr "Räume Header auf"
-#: ../cli.py:848
+#: ../cli.py:852
msgid "Cleaning up Packages"
msgstr "Räume Pakete auf"
-#: ../cli.py:851
+#: ../cli.py:855
msgid "Cleaning up xml metadata"
msgstr "Räume XML-Metadaten auf"
-#: ../cli.py:854
+#: ../cli.py:858
msgid "Cleaning up database cache"
msgstr "Räume Datenbank-Speicher auf"
-#: ../cli.py:857
+#: ../cli.py:861
msgid "Cleaning up expire-cache metadata"
msgstr "Räume Metadaten für abgelaufene Caches auf"
-#: ../cli.py:860
+#: ../cli.py:864
msgid "Cleaning up plugins"
msgstr "Räume Plugins auf"
-#: ../cli.py:885
+#: ../cli.py:889
msgid "Installed Groups:"
msgstr "Installierte Gruppen:"
-#: ../cli.py:892
+#: ../cli.py:896
msgid "Available Groups:"
msgstr "Verfügbare Gruppen:"
-#: ../cli.py:898
+#: ../cli.py:902
msgid "Done"
msgstr "Fertig"
-#: ../cli.py:909
-#: ../cli.py:927
-#: ../cli.py:933
-#: ../yum/__init__.py:2387
+#: ../cli.py:913
+#: ../cli.py:931
+#: ../cli.py:937
+#: ../yum/__init__.py:2410
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Warnung: Gruppe %s existiert nicht."
-#: ../cli.py:937
+#: ../cli.py:941
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:939
+#: ../cli.py:943
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d Paket(e) zum Installieren"
-#: ../cli.py:949
-#: ../yum/__init__.py:2399
+#: ../cli.py:953
+#: ../yum/__init__.py:2422
#, python-format
msgid "No group named %s exists"
msgstr "Es existiert keine Gruppe mit dem Namen %s"
-#: ../cli.py:955
+#: ../cli.py:959
msgid "No packages to remove from groups"
msgstr "Keine Pakete zum Entfernen aus dem Gruppen gefunden"
-#: ../cli.py:957
+#: ../cli.py:961
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d Paket(e) zum Entfernen"
-#: ../cli.py:999
+#: ../cli.py:1003
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Paket %s ist bereits installiert, überspringe"
-#: ../cli.py:1010
+# Meint das nicht eher übergehe? -tl
+#: ../cli.py:1014
#, 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:1036
+#: ../cli.py:1040
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr "Kein anderes %s installiert, füge es zur Liste für eine potentielle Installation hinzu"
-#: ../cli.py:1055
+#: ../cli.py:1059
#, python-format
msgid "Command line error: %s"
msgstr "Kommandozeilen-Fehler: %s"
-#: ../cli.py:1068
+#: ../cli.py:1072
#, python-format
msgid ""
"\n"
@@ -400,103 +400,103 @@ msgstr ""
"\n"
"%s: %s Option benötigt ein Argument"
-#: ../cli.py:1118
+#: ../cli.py:1130
msgid "--color takes one of: auto, always, never"
msgstr "--color kann einen der folgenden Werte haben: auto, always, never"
-#: ../cli.py:1220
+#: ../cli.py:1232
msgid "show this help message and exit"
msgstr "Hilfeinformation anzeigen und beenden"
-#: ../cli.py:1224
+#: ../cli.py:1236
msgid "be tolerant of errors"
msgstr "fehlertolerant sein"
-#: ../cli.py:1226
+#: ../cli.py:1238
msgid "run entirely from cache, don't update cache"
msgstr "laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischenspeicher nicht"
-#: ../cli.py:1228
+#: ../cli.py:1240
msgid "config file location"
msgstr "Ort der Konfigurationsdatei"
-#: ../cli.py:1230
+#: ../cli.py:1242
msgid "maximum command wait time"
msgstr "maximale Befehlswartezeit"
-#: ../cli.py:1232
+#: ../cli.py:1244
msgid "debugging output level"
msgstr "Debugging-Ausgabe-Stufe"
-#: ../cli.py:1236
+#: ../cli.py:1248
msgid "show duplicates, in repos, in list/search commands"
msgstr "Zeige Duplikate, in Repos, in Listen/Suchen-Befehlen"
-#: ../cli.py:1238
+#: ../cli.py:1250
msgid "error output level"
msgstr "Fehler-Ausgabe-Stufe"
-#: ../cli.py:1241
+#: ../cli.py:1253
msgid "quiet operation"
msgstr "Stiller Betrieb"
-#: ../cli.py:1243
+#: ../cli.py:1255
msgid "verbose operation"
msgstr "Wortreicher Betrieb"
-#: ../cli.py:1245
+#: ../cli.py:1257
msgid "answer yes for all questions"
msgstr "Beantworte alle Fragen mit 'ja'"
-#: ../cli.py:1247
+#: ../cli.py:1259
msgid "show Yum version and exit"
msgstr "Yum-Version anzeigen und Programm beenden"
-#: ../cli.py:1248
+#: ../cli.py:1260
msgid "set install root"
msgstr "Wurzel-Installationsverzeichnis setzen"
-#: ../cli.py:1252
+#: ../cli.py:1264
msgid "enable one or more repositories (wildcards allowed)"
-msgstr "aktiviere eines oder mehrere Repositories (Wildcards erlaubt)"
+msgstr "aktiviere ein oder mehrere Repositories (Wildcards erlaubt)"
-#: ../cli.py:1256
+#: ../cli.py:1268
msgid "disable one or more repositories (wildcards allowed)"
-msgstr "deaktiviere eines oder mehrere Repositories (Wildcards erlaubt)"
+msgstr "deaktiviere ein oder mehrere Repositories (Wildcards erlaubt)"
-#: ../cli.py:1259
+#: ../cli.py:1271
msgid "exclude package(s) by name or glob"
-msgstr "schließe Paket(e) nach Namen oder global aus"
+msgstr "schliesse Paket(e) nach Namen oder global aus"
-#: ../cli.py:1261
+#: ../cli.py:1273
msgid "disable exclude from main, for a repo or for everything"
msgstr "deaktiviere Ausschluss von 'main', einem Repository oder allem"
-#: ../cli.py:1264
+#: ../cli.py:1276
msgid "enable obsoletes processing during updates"
msgstr "aktiviere veraltetes Verarbeiten während Aktualisierung"
-#: ../cli.py:1266
+#: ../cli.py:1278
msgid "disable Yum plugins"
msgstr "deaktiviere Yum-Plugins"
-#: ../cli.py:1268
+#: ../cli.py:1280
msgid "disable gpg signature checking"
msgstr "deaktiviere GPG-Signatur-Prüfung"
-#: ../cli.py:1270
+#: ../cli.py:1282
msgid "disable plugins by name"
msgstr "deaktiviere Plugins nach Namen"
-#: ../cli.py:1273
+#: ../cli.py:1285
msgid "enable plugins by name"
msgstr "aktiviere Plugins nach Namen"
-#: ../cli.py:1276
+#: ../cli.py:1288
msgid "skip packages with depsolving problems"
msgstr "überspringe Pakete mit Abhängigkeitsauflösungsproblemen"
-#: ../cli.py:1278
+#: ../cli.py:1290
msgid "control whether color is used"
msgstr "kontrolliert, ob Farbe benutzt wird"
@@ -580,7 +580,7 @@ msgstr "Ausgabe : %s"
#: ../output.py:531
#, python-format
msgid "Size : %s"
-msgstr "Größe : %s"
+msgstr "Grösse : %s"
#: ../output.py:532
#, python-format
@@ -625,27 +625,27 @@ msgstr "Lizenz : %s"
msgid "Description: "
msgstr "Beschreibung:"
-#: ../output.py:607
+#: ../output.py:611
msgid "y"
msgstr "j"
-#: ../output.py:607
+#: ../output.py:611
msgid "yes"
msgstr "ja"
-#: ../output.py:608
+#: ../output.py:612
msgid "n"
msgstr "n"
-#: ../output.py:608
+#: ../output.py:612
msgid "no"
msgstr "nein"
-#: ../output.py:612
+#: ../output.py:616
msgid "Is this ok [y/N]: "
msgstr "Ist dies in Ordnung? [j/N] :"
-#: ../output.py:700
+#: ../output.py:704
#, python-format
msgid ""
"\n"
@@ -654,138 +654,143 @@ msgstr ""
"\n"
"Gruppe: %s"
-#: ../output.py:707
+#: ../output.py:708
+#, python-format
+msgid " Group-Id: %s"
+msgstr " Gruppen-ID: %s"
+
+#: ../output.py:713
#, python-format
msgid " Description: %s"
msgstr " Beschreibung: %s"
-#: ../output.py:709
+#: ../output.py:715
msgid " Mandatory Packages:"
msgstr " Obligatorische Pakete:"
-#: ../output.py:710
+#: ../output.py:716
msgid " Default Packages:"
msgstr " Standard-Pakete:"
-#: ../output.py:711
+#: ../output.py:717
msgid " Optional Packages:"
msgstr " Optionale Pakete:"
-#: ../output.py:712
+#: ../output.py:718
msgid " Conditional Packages:"
msgstr " Zwangsbedingte Pakete:"
-#: ../output.py:732
+#: ../output.py:738
#, python-format
msgid "package: %s"
msgstr "Paket: %s"
-#: ../output.py:734
+#: ../output.py:740
msgid " No dependencies for this package"
msgstr " Keine Abhängigkeiten für dieses Paket"
-#: ../output.py:739
+#: ../output.py:745
#, python-format
msgid " dependency: %s"
msgstr " Abhängigkeit: %s"
-#: ../output.py:741
+#: ../output.py:747
msgid " Unsatisfied dependency"
msgstr " Nicht erfüllte Abhängigkeit"
-#: ../output.py:813
+#: ../output.py:819
#, python-format
msgid "Repo : %s"
msgstr "Repo : %s"
-#: ../output.py:814
+#: ../output.py:820
msgid "Matched from:"
msgstr "Übereinstimmung von:"
-#: ../output.py:822
+#: ../output.py:828
msgid "Description : "
msgstr "Beschreibung : "
-#: ../output.py:825
+#: ../output.py:831
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:828
+#: ../output.py:834
#, python-format
msgid "License : %s"
msgstr "Lizenz : %s"
-#: ../output.py:831
+#: ../output.py:837
#, python-format
msgid "Filename : %s"
msgstr "Dateiname : %s"
-#: ../output.py:835
+#: ../output.py:841
msgid "Other : "
msgstr "Andere : "
-#: ../output.py:868
+#: ../output.py:874
msgid "There was an error calculating total download size"
-msgstr "Fehler beim Berechnen der Gesamtgröße der Downloads"
+msgstr "Fehler beim Berechnen der Gesamtgrösse der Downloads"
-#: ../output.py:873
+#: ../output.py:879
#, python-format
msgid "Total size: %s"
-msgstr "Gesamtgröße: %s"
+msgstr "Gesamtgrösse: %s"
-#: ../output.py:876
+#: ../output.py:882
#, python-format
msgid "Total download size: %s"
-msgstr "Gesamte Downloadgröße: %s"
+msgstr "Gesamte Downloadgrösse: %s"
-#: ../output.py:911
+#: ../output.py:924
msgid "Installing for dependencies"
msgstr "Installiert für Abhängigkeiten"
-#: ../output.py:912
+#: ../output.py:925
msgid "Updating for dependencies"
msgstr "Aktualisiert für Abhängigkeiten"
-#: ../output.py:913
+#: ../output.py:926
msgid "Removing for dependencies"
msgstr "Entfernt für Abhängigkeiten"
-#: ../output.py:920
-#: ../output.py:1016
+#: ../output.py:933
+#: ../output.py:1031
msgid "Skipped (dependency problems)"
msgstr "Übersprungen (Abhängigkeitsprobleme)"
-#: ../output.py:941
+#: ../output.py:954
msgid "Package"
msgstr "Paket"
-#: ../output.py:941
+#: ../output.py:954
msgid "Arch"
msgstr "Arch"
-#: ../output.py:942
+#: ../output.py:955
msgid "Version"
msgstr "Version"
-#: ../output.py:942
+#: ../output.py:955
msgid "Repository"
msgstr "Repository"
-#: ../output.py:943
+#: ../output.py:956
msgid "Size"
-msgstr "Größe"
+msgstr "Grösse"
-#: ../output.py:954
+#: ../output.py:968
#, python-format
msgid ""
-" replacing %s.%s %s\n"
+" replacing %s%s%s.%s %s\n"
"\n"
msgstr ""
-" ersetze %s.%s %s\n"
+" ersetze %s%s%s.%s %s\n"
"\n"
-#: ../output.py:962
+#: ../output.py:977
#, python-format
msgid ""
"\n"
@@ -802,31 +807,36 @@ msgstr ""
"Aktualisieren %5.5s Paket(e) \n"
"Entfernen %5.5s Paket(e) \n"
-#: ../output.py:1010
+#: ../output.py:1025
msgid "Removed"
msgstr "Entfernt"
-#: ../output.py:1011
+#: ../output.py:1026
msgid "Dependency Removed"
msgstr "Abhängigkeiten entfernt"
-#: ../output.py:1013
+#: ../output.py:1028
msgid "Dependency Installed"
msgstr "Abhängigkeit installiert"
-#: ../output.py:1015
+#: ../output.py:1030
msgid "Dependency Updated"
msgstr "Abhängigkeit aktualisiert"
-#: ../output.py:1017
+#: ../output.py:1032
msgid "Replaced"
msgstr "Ersetzt "
-#: ../output.py:1018
+#: ../output.py:1033
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: ../output.py:1091
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1099
+msgid "two"
+msgstr "zwei"
+
+#: ../output.py:1106
#, python-format
msgid ""
"\n"
@@ -835,68 +845,68 @@ msgstr ""
"\n"
" Aktueller Download abgebrochen, %s unterbrechen Sie (Ctrl-c) erneut %s innerhalb %s%s%s Sekunden zum Beenden.\n"
-#: ../output.py:1101
+#: ../output.py:1116
msgid "user interrupt"
msgstr "Benutzer-Unterbrechung"
-#: ../output.py:1117
+#: ../output.py:1132
msgid "Total"
-msgstr "Total"
+msgstr "Gesamt"
-#: ../output.py:1131
+#: ../output.py:1146
msgid "installed"
msgstr "installiert"
-#: ../output.py:1132
+#: ../output.py:1147
msgid "updated"
msgstr "aktualisiert"
-#: ../output.py:1133
+#: ../output.py:1148
msgid "obsoleted"
msgstr "veraltet"
-#: ../output.py:1134
+#: ../output.py:1149
msgid "erased"
msgstr "gelöscht"
# Dies ist das Sorgenkind. So weit ich weiss, werden die Verben von oben bezogen. Eventuell könnte auch eine radikale Änderung eine Lösung sein. Fabian
-#: ../output.py:1138
+#: ../output.py:1153
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Paket %s.%s %s:%s-%s markiert, um %s zu werden"
-#: ../output.py:1145
+#: ../output.py:1160
msgid "--> Running transaction check"
msgstr "--> Führe Transaktionsprüfung aus"
-#: ../output.py:1150
+#: ../output.py:1165
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Starte Abhängigkeitsauflösung mit den neuen Änderungen neu."
-#: ../output.py:1155
+#: ../output.py:1170
msgid "--> Finished Dependency Resolution"
msgstr "--> Abhängigkeitsauflösung beendet"
-#: ../output.py:1160
+#: ../output.py:1175
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Verarbeite Abhängigkeiten: %s für Paket: %s"
-#: ../output.py:1165
+#: ../output.py:1180
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Nicht aufgelöste Abhängigkeit: %s"
-#: ../output.py:1171
+#: ../output.py:1186
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Verarbeite Konflikt: %s kollidiert mit %s"
-#: ../output.py:1174
+#: ../output.py:1189
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr "--> Fülle Verarbeitungsset mit ausgewählten Paketen. Bitte warten."
-#: ../output.py:1178
+#: ../output.py:1193
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Lade Header für %s herunter, um ins Verarbeitungsset zu packen."
@@ -929,11 +939,11 @@ msgstr ""
" rpm --import public.gpg.key\n"
"\n"
"\n"
-"Alternativ könnten Sie den URL zum Schlüssel, welcher Sie benutzen wollen\n"
+"Alternativ könnten Sie den URL zum Schlüssel, welchen Sie benutzen wollen\n"
"für ein Repository, durch die 'gpgkey'-Option in einem Repository-Bereich\n"
-"angeben und yum wird ihn für Sie installieren.\n"
+"angeben, und yum wird ihn für Sie installieren.\n"
"\n"
-"Für weitere Informationen kontaktieren Sie Ihre Distribution oder Ihren Paket-Anbieter.\n"
+"Für weitere Informationen kontaktieren Sie Ihren Distributions- oder Paket-Anbieter.\n"
#: ../yumcommands.py:68
#, python-format
@@ -1004,245 +1014,247 @@ msgstr "Einrichten des Aktualisierungsprozess"
msgid "Display details about a package or group of packages"
msgstr "Zeige Details über ein Paket oder einer Gruppe von Pakete an"
-#: ../yumcommands.py:284
+#: ../yumcommands.py:292
msgid "Installed Packages"
msgstr "Installierte Pakete"
-#: ../yumcommands.py:291
+#: ../yumcommands.py:300
msgid "Available Packages"
msgstr "Verfügbare Pakete"
-#: ../yumcommands.py:295
+#: ../yumcommands.py:304
msgid "Extra Packages"
msgstr "Extra-Pakete"
-#: ../yumcommands.py:297
+#: ../yumcommands.py:308
msgid "Updated Packages"
msgstr "Aktualisierte Pakete"
-#: ../yumcommands.py:304
-#: ../yumcommands.py:311
-#: ../yumcommands.py:578
+#. This only happens in verbose mode
+#: ../yumcommands.py:316
+#: ../yumcommands.py:323
+#: ../yumcommands.py:600
msgid "Obsoleting Packages"
msgstr "Veraltete Pakete"
-#: ../yumcommands.py:313
+#: ../yumcommands.py:325
msgid "Recently Added Packages"
msgstr "Kürzlich hinzugefügte Pakete"
-#: ../yumcommands.py:320
+#: ../yumcommands.py:332
msgid "No matching Packages to list"
msgstr "Keine übereinstimmenden Pakete zum Auflisten"
-#: ../yumcommands.py:334
+#: ../yumcommands.py:346
msgid "List a package or groups of packages"
-msgstr "Liste von Pakete oder Gruppen von Paketen"
+msgstr "Liste von Paketen oder Gruppen von Paketen"
-#: ../yumcommands.py:346
+#: ../yumcommands.py:358
msgid "Remove a package or packages from your system"
msgstr "Entferne ein Paket oder Pakete auf Ihrem System"
-#: ../yumcommands.py:353
+#: ../yumcommands.py:365
msgid "Setting up Remove Process"
msgstr "Einrichten des Entfernungsprozess"
-#: ../yumcommands.py:367
+#: ../yumcommands.py:379
msgid "Setting up Group Process"
msgstr "Einrichten des Gruppenprozess"
-#: ../yumcommands.py:373
+#: ../yumcommands.py:385
msgid "No Groups on which to run command"
msgstr "Keine Gruppe, auf welcher der Befehl ausgeführt werden kann"
-#: ../yumcommands.py:386
+#: ../yumcommands.py:398
msgid "List available package groups"
msgstr "Verfügbare Gruppen anzeigen"
-#: ../yumcommands.py:403
+#: ../yumcommands.py:415
msgid "Install the packages in a group on your system"
msgstr "Installiere die Pakete in einer Gruppe auf Ihrem System"
-#: ../yumcommands.py:425
+#: ../yumcommands.py:437
msgid "Remove the packages in a group from your system"
msgstr "Entferne die Pakete in einer Gruppe von Ihrem System"
-#: ../yumcommands.py:452
+#: ../yumcommands.py:464
msgid "Display details about a package group"
msgstr "Zeigt Details über eine Paket-Gruppe an"
-#: ../yumcommands.py:476
+#: ../yumcommands.py:488
msgid "Generate the metadata cache"
msgstr "Generiere den Metadaten-Zwischenspeicher"
-#: ../yumcommands.py:482
+#: ../yumcommands.py:494
msgid "Making cache files for all metadata files."
msgstr "Erstelle Zwischenspeicherungsdatei für alle Metadaten-Dateien."
-#: ../yumcommands.py:483
+#: ../yumcommands.py:495
msgid "This may take a while depending on the speed of this computer"
-msgstr "Dies kann eine Weile dauert, abhängig von der Geschwindigkeit dieses Computers"
+msgstr "Dies kann eine Weile dauern, abhängig von der Geschwindigkeit dieses Computers"
-#: ../yumcommands.py:504
+#: ../yumcommands.py:516
msgid "Metadata Cache Created"
msgstr "Metadaten-Zwischenspeicher erstellt"
-#: ../yumcommands.py:518
+#: ../yumcommands.py:530
msgid "Remove cached data"
msgstr "Entferne gespeicherte Daten"
-#: ../yumcommands.py:539
+#: ../yumcommands.py:551
msgid "Find what package provides the given value"
-msgstr "Suche ein Paket, welches den gegebenen Wert bereitstellen"
+msgstr "Suche ein Paket, das den gegebenen Wert bereitstellt"
-#: ../yumcommands.py:559
+#: ../yumcommands.py:571
msgid "Check for available package updates"
msgstr "Überprüfe auf verfügbare Paket-Aktualisierungen"
-#: ../yumcommands.py:598
+#: ../yumcommands.py:620
msgid "Search package details for the given string"
msgstr "Suche nach Paket-Details für die gegebene Zeichenkette"
-#: ../yumcommands.py:604
+#: ../yumcommands.py:626
msgid "Searching Packages: "
msgstr "Suche Pakete:"
-#: ../yumcommands.py:621
+#: ../yumcommands.py:643
msgid "Update packages taking obsoletes into account"
msgstr "Aktualisiere Pakete, berücksichtige veraltete"
-#: ../yumcommands.py:629
+# Gibt es einen Unterschied zwischen Update und Upgrade Process? -tl
+#: ../yumcommands.py:651
msgid "Setting up Upgrade Process"
-msgstr "Einrichten des Upgradeprozess"
+msgstr "Einrichten des Upgradeprozesses"
-#: ../yumcommands.py:643
+#: ../yumcommands.py:665
msgid "Install a local RPM"
msgstr "Installiere ein lokales RPM"
-#: ../yumcommands.py:651
+#: ../yumcommands.py:673
msgid "Setting up Local Package Process"
msgstr "Einrichten der lokalen Paketverarbeitung"
-#: ../yumcommands.py:670
+#: ../yumcommands.py:692
msgid "Determine which package provides the given dependency"
msgstr "Bestimme, welche Pakete die gegebenen Abhängigkeiten bereitstellen"
-#: ../yumcommands.py:673
+#: ../yumcommands.py:695
msgid "Searching Packages for Dependency:"
msgstr "Suche Pakete für Abhängigkeit:"
-#: ../yumcommands.py:687
+#: ../yumcommands.py:709
msgid "Run an interactive yum shell"
msgstr "Führe eine interaktive Yum-Shell aus"
-#: ../yumcommands.py:693
+#: ../yumcommands.py:715
msgid "Setting up Yum Shell"
msgstr "Einrichten der Yum-Shell"
-#: ../yumcommands.py:711
+#: ../yumcommands.py:733
msgid "List a package's dependencies"
msgstr "Liste von Paket-Abhängigkeiten"
-#: ../yumcommands.py:717
+#: ../yumcommands.py:739
msgid "Finding dependencies: "
msgstr "Suche Abhängigkeiten:"
-#: ../yumcommands.py:733
+#: ../yumcommands.py:755
msgid "Display the configured software repositories"
msgstr "Zeige die konfigurierten Software-Repositories an"
-#: ../yumcommands.py:781
-#: ../yumcommands.py:782
+#: ../yumcommands.py:803
+#: ../yumcommands.py:804
msgid "enabled"
msgstr "aktiviert"
-#: ../yumcommands.py:790
-#: ../yumcommands.py:791
+#: ../yumcommands.py:812
+#: ../yumcommands.py:813
msgid "disabled"
msgstr "deaktiviert"
-#: ../yumcommands.py:805
+#: ../yumcommands.py:827
msgid "Repo-id : "
msgstr "Repo-ID : "
-#: ../yumcommands.py:806
+#: ../yumcommands.py:828
msgid "Repo-name : "
msgstr "Repo-Name : "
-#: ../yumcommands.py:807
+#: ../yumcommands.py:829
msgid "Repo-status : "
msgstr "Repo-Status : "
-#: ../yumcommands.py:809
+#: ../yumcommands.py:831
msgid "Repo-revision: "
msgstr "Repo-Revision: "
-#: ../yumcommands.py:813
+#: ../yumcommands.py:835
msgid "Repo-tags : "
msgstr "Repo-Tags : "
-#: ../yumcommands.py:819
+#: ../yumcommands.py:841
msgid "Repo-distro-tags: "
msgstr "Repo-Distro-Tags: "
-#: ../yumcommands.py:824
+#: ../yumcommands.py:846
msgid "Repo-updated: "
msgstr "Repo aktualisiert:"
-#: ../yumcommands.py:826
+#: ../yumcommands.py:848
msgid "Repo-pkgs : "
msgstr "Repo-PKGS : "
-#: ../yumcommands.py:827
+#: ../yumcommands.py:849
msgid "Repo-size : "
-msgstr "Repo-Größe : "
+msgstr "Repo-Grösse : "
-#: ../yumcommands.py:834
+#: ../yumcommands.py:856
msgid "Repo-baseurl: "
msgstr "Repo BaseURL:"
-#: ../yumcommands.py:838
+#: ../yumcommands.py:860
msgid "Repo-metalink: "
msgstr "Repo-Metalink: "
-#: ../yumcommands.py:841
+#: ../yumcommands.py:863
msgid "Repo-mirrors: "
msgstr "Repo-Spiegel: "
-#: ../yumcommands.py:845
+#: ../yumcommands.py:867
msgid "Repo-exclude: "
msgstr "Repo ausgeschlossen:"
-#: ../yumcommands.py:849
+#: ../yumcommands.py:871
msgid "Repo-include: "
msgstr "Repo eingeschlossen:"
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:859
-#: ../yumcommands.py:885
+#: ../yumcommands.py:881
+#: ../yumcommands.py:907
msgid "repo id"
msgstr "Repo-ID"
-#: ../yumcommands.py:873
-#: ../yumcommands.py:874
-#: ../yumcommands.py:888
+#: ../yumcommands.py:895
+#: ../yumcommands.py:896
+#: ../yumcommands.py:910
msgid "status"
msgstr "Status"
-#: ../yumcommands.py:886
+#: ../yumcommands.py:908
msgid "repo name"
msgstr "Repo-Name:"
-#: ../yumcommands.py:912
+#: ../yumcommands.py:934
msgid "Display a helpful usage message"
msgstr "Zeigt eine kurze Verwendungsinformation"
-#: ../yumcommands.py:946
+#: ../yumcommands.py:968
#, python-format
msgid "No help available for %s"
msgstr "Keine Hilfe für %s vorhanden"
-#: ../yumcommands.py:951
+#: ../yumcommands.py:973
msgid ""
"\n"
"\n"
@@ -1252,7 +1264,7 @@ msgstr ""
"\n"
"Aliase: "
-#: ../yumcommands.py:953
+#: ../yumcommands.py:975
msgid ""
"\n"
"\n"
@@ -1262,11 +1274,11 @@ msgstr ""
"\n"
"Alias: "
-#: ../yumcommands.py:981
+#: ../yumcommands.py:1003
msgid "Setting up Reinstall Process"
msgstr "Einrichten des Neuinstallationsprozess"
-#: ../yumcommands.py:995
+#: ../yumcommands.py:1017
msgid "reinstall a package"
msgstr "Installiere Paket neu"
@@ -1290,76 +1302,90 @@ msgstr ""
"\n"
"Beende wegen defekter Pipe"
-#: ../yummain.py:124
+#: ../yummain.py:126
msgid "Running"
msgstr "Läuft"
-#: ../yummain.py:125
+#: ../yummain.py:127
msgid "Sleeping"
msgstr "Schläft"
-#: ../yummain.py:126
+#: ../yummain.py:128
msgid "Uninteruptable"
msgstr "Nicht unterbrechbar"
-#: ../yummain.py:127
+#: ../yummain.py:129
msgid "Zombie"
msgstr "Zombie"
-#: ../yummain.py:128
+#: ../yummain.py:130
msgid "Traced/Stopped"
msgstr "Verfolgt/Gestoppt"
-#: ../yummain.py:129
+#: ../yummain.py:131
msgid "Unknown"
msgstr "Unbekannt"
-#: ../yummain.py:133
+#: ../yummain.py:135
msgid " The other application is: PackageKit"
msgstr " Die andere Anwendung ist: PackageKit"
-#: ../yummain.py:135
+#: ../yummain.py:137
#, python-format
msgid " The other application is: %s"
msgstr " Die andere Anwendung ist: %s"
-#: ../yummain.py:138
+#: ../yummain.py:140
#, python-format
msgid " Memory : %5s RSS (%5sB VSZ)"
msgstr " Speicher : %5s RSS (%5sB VSZ)"
-#: ../yummain.py:142
+#: ../yummain.py:144
#, python-format
msgid " Started: %s - %s ago"
msgstr " Gestartet: %s - vor %s"
-#: ../yummain.py:144
+#: ../yummain.py:146
#, python-format
msgid " State : %s, pid: %d"
msgstr " Status : %s, pid: %d"
-#: ../yummain.py:169
+#: ../yummain.py:171
msgid "Another app is currently holding the yum lock; waiting for it to exit..."
-msgstr "Eine andere Anwendung blockiert momentan yum. Warte, dass sie beendet wird..."
+msgstr "Eine andere Anwendung blockiert momentan yum. Warte, dass sie beendet wird ..."
-#: ../yummain.py:197
-#: ../yummain.py:236
+#: ../yummain.py:199
+#: ../yummain.py:238
#, python-format
msgid "Error: %s"
msgstr "Fehler: %s"
-#: ../yummain.py:207
-#: ../yummain.py:243
+#: ../yummain.py:209
+#: ../yummain.py:250
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
-msgstr "Unbekannte(r) Fehlercode: Exit Code: %d:"
+msgstr "Unbekannte(r) Fehler: Exit Code: %d:"
#. Depsolve stage
-#: ../yummain.py:214
+#: ../yummain.py:216
msgid "Resolving Dependencies"
msgstr "Löse Abhängigkeiten auf"
-#: ../yummain.py:249
+#: ../yummain.py:240
+msgid " You could try using --skip-broken to work around the problem"
+msgstr " Sie können versuchen --skip-broken zu benutzen, um das Problem zu umgehen."
+
+#: ../yummain.py:241
+msgid ""
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+msgstr ""
+" Sie können versuchen das folgenden auszuführen: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+
+#: ../yummain.py:256
msgid ""
"\n"
"Dependencies Resolved"
@@ -1367,12 +1393,12 @@ msgstr ""
"\n"
"Abhängigkeiten aufgelöst"
-#: ../yummain.py:263
+#: ../yummain.py:270
msgid "Complete!"
msgstr "Komplett!"
# Ist eine ziemlich unschöne Übersetzung...Vorschläge? Fabian
-#: ../yummain.py:310
+#: ../yummain.py:325
msgid ""
"\n"
"\n"
@@ -1384,11 +1410,11 @@ msgstr ""
#: ../yum/depsolve.py:84
msgid "doTsSetup() will go away in a future version of Yum.\n"
-msgstr "doTsSetup() wird in zukünftigen Version von Yum verschwinden.\n"
+msgstr "doTsSetup() wird in zukünftigen Versionen von Yum verschwinden.\n"
#: ../yum/depsolve.py:99
msgid "Setting up TransactionSets before config class is up"
-msgstr "Konfiguriere TransactionSets bevor die Konfigurationsklasse gestartet ist"
+msgstr "Konfiguriere TransactionSets, bevor die Konfigurationsklasse gestartet ist"
#: ../yum/depsolve.py:150
#, python-format
@@ -1443,7 +1469,7 @@ msgstr "Benötigte Anforderung wurde bereits nachgeschlagen, betrüge"
#: ../yum/depsolve.py:343
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
-msgstr "Benötigte Anforderung ist kein Paket-Name. Schlagen nach: %s"
+msgstr "Benötigte Anforderung ist kein Paket-Name. Schlage nach: %s"
#: ../yum/depsolve.py:350
#, python-format
@@ -1463,12 +1489,12 @@ msgstr "Modus für pkg-Bereitstellung %s: %s"
#: ../yum/depsolve.py:381
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
-msgstr "TSINFO: %s Paket benötigt %s markiert als gelöscht"
+msgstr "TSINFO: %s Paket benötigt %s, welches als gelöscht markiert ist"
#: ../yum/depsolve.py:394
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
-msgstr "TSINFO: Veraltetes %s mit %s zum Auflösen der Abhängigkeit."
+msgstr "TSINFO: Ersetze %s durch %s zum Auflösen der Abhängigkeit."
#: ../yum/depsolve.py:397
#, python-format
@@ -1478,7 +1504,7 @@ msgstr "TSINFO: Aktualisiere %s zum Auflösen der Abhängigkeit."
#: ../yum/depsolve.py:405
#, python-format
msgid "Cannot find an update path for dep for: %s"
-msgstr "Kann keine Aktualisierungspfad für Abhängigkeit finden für: %s"
+msgstr "Kann keinen Aktualisierungspfad finden für Abhängigkeit für: %s"
#: ../yum/depsolve.py:415
#, python-format
@@ -1496,38 +1522,38 @@ msgstr "Übereinstimmung von %s, welche gebraucht wird für %s"
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:495
+#: ../yum/depsolve.py:496
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
-msgstr "Potentielles aufgelöste Paket %s hat eine neuere Instanz in ts."
+msgstr "Potentielles aufgelöstes Paket %s hat eine neuere Instanz in ts."
-#: ../yum/depsolve.py:506
+#: ../yum/depsolve.py:507
#, 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:514
-#: ../yum/depsolve.py:563
+#: ../yum/depsolve.py:515
+#: ../yum/depsolve.py:564
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Fehlende Abhängigkeit: %s wird benötigt von Paket %s"
-#: ../yum/depsolve.py:527
+#: ../yum/depsolve.py:528
#, python-format
msgid "%s already in ts, skipping this one"
-msgstr "%s bereits in ts, überspringe dies"
+msgstr "%s bereits in ts, überspringe dieses"
-#: ../yum/depsolve.py:573
+#: ../yum/depsolve.py:574
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: Markiere %s als Aktualisierung für %s"
-#: ../yum/depsolve.py:581
+#: ../yum/depsolve.py:582
#, python-format
msgid "TSINFO: Marking %s as install for %s"
-msgstr "TSINFO: Markiert %s als Installation für %s"
+msgstr "TSINFO: Markiere %s als Installation für %s"
-#: ../yum/depsolve.py:674
+#: ../yum/depsolve.py:675
#: ../yum/depsolve.py:756
msgid "Success - empty transaction"
msgstr "Erfolg - Leere Transaktion"
@@ -1558,7 +1584,7 @@ msgstr "Prüfe Abhängigkeiten für %s"
#: ../yum/depsolve.py:854
#, python-format
msgid "looking for %s as a requirement of %s"
-msgstr "schauen nach %s als eine Anforderung von %s"
+msgstr "Suche nach %s als eine Anforderung von %s"
#: ../yum/depsolve.py:996
#, python-format
@@ -1571,129 +1597,130 @@ msgstr "Führe compare_providers() aus für %s"
msgid "better arch in po %s"
msgstr "bessere Architektur in po %s"
-#: ../yum/depsolve.py:1084
+#: ../yum/depsolve.py:1091
#, python-format
msgid "%s obsoletes %s"
-msgstr " %s veraltete %s"
+msgstr "%s ersetzt %s"
-#: ../yum/depsolve.py:1100
+#: ../yum/depsolve.py:1107
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
" Winner: %s"
msgstr ""
-"Archdist verglichen %s zu %s auf %s\n"
+"archdist verglichen %s zu %s auf %s\n"
" Gewinner: %s"
-#: ../yum/depsolve.py:1107
+#: ../yum/depsolve.py:1114
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "Gemeinsames Quellen-RPM %s und %s"
-#: ../yum/depsolve.py:1113
+#: ../yum/depsolve.py:1120
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "Gemeinsamer Prefix von %s zwischen %s und %s"
# Hat jemand eine Idee für eine bessere Übersetzung? Fabian
-#: ../yum/depsolve.py:1121
+#: ../yum/depsolve.py:1128
#, python-format
msgid "Best Order: %s"
msgstr "Beste Bestellung: %s"
-#: ../yum/__init__.py:154
+#: ../yum/__init__.py:176
msgid "doConfigSetup() will go away in a future version of Yum.\n"
-msgstr "doConfigSetup() wird in zukünftigen Version von Yum verschwinden.\n"
+msgstr "doConfigSetup() wird in zukünftigen Versionen von Yum verschwinden.\n"
-#: ../yum/__init__.py:350
+#. FIXME: Use critical? or exception?
+#: ../yum/__init__.py:386
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Bei Repository %r fehlt der Name in der Konfiguration, benutze id"
-#: ../yum/__init__.py:388
+#: ../yum/__init__.py:424
msgid "plugins already initialised"
msgstr "Plugins bereits initialisiert"
-#: ../yum/__init__.py:395
+#: ../yum/__init__.py:431
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
-msgstr "doRpmDBSetup() wird in zukünftigen Version von Yum verschwinden.\n"
+msgstr "doRpmDBSetup() wird in zukünftigen Versionen von Yum verschwinden.\n"
-#: ../yum/__init__.py:405
+#: ../yum/__init__.py:441
msgid "Reading Local RPMDB"
msgstr "Lese lokale RPMDB"
-#: ../yum/__init__.py:423
+#: ../yum/__init__.py:459
msgid "doRepoSetup() will go away in a future version of Yum.\n"
-msgstr "doRepoSetup() wird in zukünftigen Version von Yum verschwinden.\n"
+msgstr "doRepoSetup() wird in zukünftigen Versionen von Yum verschwinden.\n"
-#: ../yum/__init__.py:443
+#: ../yum/__init__.py:479
msgid "doSackSetup() will go away in a future version of Yum.\n"
-msgstr "doSackSetup() wird in zukünftigen Version von Yum verschwinden \n"
+msgstr "doSackSetup() wird in zukünftigen Versionen von Yum verschwinden \n"
-#: ../yum/__init__.py:460
+#: ../yum/__init__.py:496
msgid "Setting up Package Sacks"
msgstr "Einrichten des Paket-Behälters"
-#: ../yum/__init__.py:503
+#: ../yum/__init__.py:539
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
-msgstr "Repository-Objekt für Repository %s fehlt a _resetSack method\n"
+msgstr "Repository-Objekt für Repository %s fehlt eine _resetSack-Methode\n"
-#: ../yum/__init__.py:504
+#: ../yum/__init__.py:540
msgid "therefore this repo cannot be reset.\n"
-msgstr "deshalb dieses Repository kann nicht zurückgesetzt werden.\n"
+msgstr "deshalb kann dieses Repository nicht zurückgesetzt werden.\n"
-#: ../yum/__init__.py:509
+#: ../yum/__init__.py:545
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
-msgstr "doUpdateSetup() wird in zukünftigen Version von Yum verschwinden.\n"
+msgstr "doUpdateSetup() wird in zukünftigen Versionen von Yum verschwinden.\n"
-#: ../yum/__init__.py:521
+#: ../yum/__init__.py:557
msgid "Building updates object"
msgstr "Baue Aktualisierungsobjekt"
-#: ../yum/__init__.py:552
+#: ../yum/__init__.py:588
msgid "doGroupSetup() will go away in a future version of Yum.\n"
-msgstr "doGroupSetup() wird in zukünftigen Version von Yum verschwinden .\n"
+msgstr "doGroupSetup() wird in zukünftigen Versionen von Yum verschwinden .\n"
-#: ../yum/__init__.py:576
+#: ../yum/__init__.py:612
msgid "Getting group metadata"
msgstr "Beziehe Gruppen-Metadaten"
-#: ../yum/__init__.py:602
+#: ../yum/__init__.py:637
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Füge Gruppen-Datei von Repository hinzu: %s"
-#: ../yum/__init__.py:611
+#: ../yum/__init__.py:642
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Hinzufügen von Gruppen-Datei für Repository fehlgeschlagen: %s - %s"
-#: ../yum/__init__.py:617
+#: ../yum/__init__.py:648
msgid "No Groups Available in any repository"
msgstr "Keine Gruppen in irgendeinem Repository verfügbar"
-#: ../yum/__init__.py:667
+#: ../yum/__init__.py:698
msgid "Importing additional filelist information"
msgstr "Importiere zusätzlichen Dateilisten-Informationen"
-#: ../yum/__init__.py:676
+#: ../yum/__init__.py:706
msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them."
-msgstr "Es gibt noch nicht abgeschlossene Transaktionen. Sie sollten in Betracht ziehen, zuerst yum-complete-transaction auszuführen, um diese abzuschließen."
+msgstr "Es gibt noch nicht abgeschlossene Transaktionen. Sie sollten in Betracht ziehen, zuerst yum-complete-transaction auszuführen, um diese abzuschliessen."
# Ob da die Übersetzung den Punkt trifft...Fabian
-#: ../yum/__init__.py:742
+#: ../yum/__init__.py:772
#, python-format
msgid "Skip-broken round %i"
msgstr "Überspringe defekte Runde %i"
# Ob da die Übersetzung den Punkt trifft...Fabian
-#: ../yum/__init__.py:794
+#: ../yum/__init__.py:824
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Überspringen der defekte brachte %i Runden"
-#: ../yum/__init__.py:795
+#: ../yum/__init__.py:825
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1701,91 +1728,90 @@ msgstr ""
"\n"
"Pakete übersprungen wegen Abhängigkeitsproblemen:"
-#: ../yum/__init__.py:799
+#: ../yum/__init__.py:829
#, python-format
msgid " %s from %s"
msgstr " %s von %s"
-#: ../yum/__init__.py:943
+#: ../yum/__init__.py:968
msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr "Warnung: Es sind Scriptlet- oder andere nicht-fatale Fehler bei der Verarbeitung aufgetreten."
-#: ../yum/__init__.py:958
+#: ../yum/__init__.py:983
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Entfernen der Verarbeitungsdatei %s fehlgeschlagen"
# verstehe ich nicht ganz, was gemeint ist. Fabian
-#: ../yum/__init__.py:999
+#: ../yum/__init__.py:1025
#, python-format
msgid "excluding for cost: %s from %s"
msgstr "Ausschluss für Aufwand: %s von %s"
-# Dies gefällt auch nicht allen. Fabian
-#: ../yum/__init__.py:1030
+#: ../yum/__init__.py:1056
msgid "Excluding Packages in global exclude list"
-msgstr "Schließe Pakete, welche in der globalen Ausschlussliste sind, aus"
+msgstr "Schliesse Pakete, die in der globalen Ausschlussliste sind, aus"
-#: ../yum/__init__.py:1032
+#: ../yum/__init__.py:1058
#, python-format
msgid "Excluding Packages from %s"
-msgstr "Schließe Pakete von %s aus"
+msgstr "Schliesse Pakete von %s aus"
-#: ../yum/__init__.py:1061
+#: ../yum/__init__.py:1085
#, python-format
msgid "Reducing %s to included packages only"
-msgstr "Reduziere %s nur zum Einbeziehen der Pakete"
+msgstr "Reduziere %s auf einbezogene Pakete"
-#: ../yum/__init__.py:1067
+#: ../yum/__init__.py:1091
#, python-format
msgid "Keeping included package %s"
msgstr "Behalte integriertes Paket %s"
-#: ../yum/__init__.py:1073
+#: ../yum/__init__.py:1097
#, python-format
msgid "Removing unmatched package %s"
msgstr "Entferne nicht übereinstimmendes Paket %s"
-#: ../yum/__init__.py:1076
+#: ../yum/__init__.py:1100
msgid "Finished"
msgstr "Abgeschlossen"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1106
+#: ../yum/__init__.py:1130
#, python-format
msgid "Unable to check if PID %s is active"
-msgstr "Unfähig zum Prüfen, ob PID %s ist aktiv"
+msgstr "Unfähig zu prüfen, ob PID %s ist aktiv"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1110
+#: ../yum/__init__.py:1134
#, 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."
-#: ../yum/__init__.py:1177
+#: ../yum/__init__.py:1204
msgid "Package does not match intended download"
msgstr "Paket stimmt nicht mit dem vorgesehenen Herunterladen überein."
-#: ../yum/__init__.py:1192
+#: ../yum/__init__.py:1219
msgid "Could not perform checksum"
msgstr "Konnte Prüfsumme nicht bilden"
-#: ../yum/__init__.py:1195
+#: ../yum/__init__.py:1222
msgid "Package does not match checksum"
msgstr "Paket stimmt nicht mit der Prüfsumme überein"
-#: ../yum/__init__.py:1238
+#: ../yum/__init__.py:1265
#, python-format
msgid "package fails checksum but caching is enabled for %s"
-msgstr "Paket bei Checksumme-Prüfung durchgefallen, aber Zwischenspeicherung ist aktiviert für %s"
+msgstr "Paket bei Prüfsummen-Prüfung durchgefallen, aber Zwischenspeicherung ist aktiviert für %s"
-#: ../yum/__init__.py:1241
-#: ../yum/__init__.py:1270
+#: ../yum/__init__.py:1268
+#: ../yum/__init__.py:1297
#, python-format
msgid "using local copy of %s"
msgstr "benutze lokale Kopie von %s"
-#: ../yum/__init__.py:1282
+#: ../yum/__init__.py:1309
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1793,334 +1819,329 @@ msgid ""
" * needed %s"
msgstr ""
"Nicht genügend Platz im Download-Verzeichnis %s vorhanden\n"
-" * frei %s\n"
+" * frei %s\n"
" * benötigt %s"
-#: ../yum/__init__.py:1329
+#: ../yum/__init__.py:1356
msgid "Header is not complete."
msgstr "Header ist nicht vollständig."
-#: ../yum/__init__.py:1366
+#: ../yum/__init__.py:1393
#, python-format
msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr "Header ist nicht im lokalen Zwischenspeicher und Nur-Zwischenspeicher-Modus aktiviert. Kann %s nicht herunterladen"
-#: ../yum/__init__.py:1421
+#: ../yum/__init__.py:1448
#, python-format
msgid "Public key for %s is not installed"
msgstr "Öffentlicher Schlüssel für %s ist nicht installiert"
-#: ../yum/__init__.py:1425
+#: ../yum/__init__.py:1452
#, python-format
msgid "Problem opening package %s"
msgstr "Problem beim Öffnen des Paketes %s"
-#: ../yum/__init__.py:1433
+#: ../yum/__init__.py:1460
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Öffentlicher Schlüssel für %s ist nicht vertrauenswürdig"
-#: ../yum/__init__.py:1437
+#: ../yum/__init__.py:1464
#, python-format
msgid "Package %s is not signed"
msgstr "Paket %s ist nicht unterschrieben"
-#: ../yum/__init__.py:1475
+#: ../yum/__init__.py:1502
#, python-format
msgid "Cannot remove %s"
msgstr "Kann %s nicht entfernen"
-#: ../yum/__init__.py:1479
+#: ../yum/__init__.py:1505
#, python-format
msgid "%s removed"
msgstr "%s entfernt"
-#: ../yum/__init__.py:1515
+#: ../yum/__init__.py:1541
#, python-format
msgid "Cannot remove %s file %s"
-msgstr "Kann %s Datei nicht entfernt %s"
+msgstr "Kann %s Datei nicht entfernen %s"
-#: ../yum/__init__.py:1519
+#: ../yum/__init__.py:1544
#, python-format
msgid "%s file %s removed"
msgstr "%s Datei %s entfernt"
-#: ../yum/__init__.py:1521
+#: ../yum/__init__.py:1546
#, python-format
msgid "%d %s files removed"
msgstr "%d %s Dateien entfernt"
-#: ../yum/__init__.py:1590
+#: ../yum/__init__.py:1614
#, 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:1596
+#: ../yum/__init__.py:1619
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
-msgstr "Keine Übereinstimmungen %s.%s %s:%s-%s mit der Aktualisierung"
+msgstr "Keine Übereinstimmungen mit %s.%s %s:%s-%s bei der Aktualisierung"
-#: ../yum/__init__.py:1814
+#: ../yum/__init__.py:1838
msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
-msgstr "searchPackages() wird in zukünftigen Version von Yum verschwinden. Benutze stattdessen searchGenerator(). \n"
+msgstr "searchPackages() wird in zukünftigen Versionen von Yum verschwinden. Benutze stattdessen searchGenerator(). \n"
-#: ../yum/__init__.py:1852
+#: ../yum/__init__.py:1876
#, python-format
msgid "Searching %d packages"
msgstr "Suche %d Pakete"
-#: ../yum/__init__.py:1856
+#: ../yum/__init__.py:1879
#, python-format
msgid "searching package %s"
msgstr "Suche Paket %s"
-#: ../yum/__init__.py:1868
+#: ../yum/__init__.py:1890
msgid "searching in file entries"
msgstr "Suche in Datei-Einträgen"
-#: ../yum/__init__.py:1875
+#: ../yum/__init__.py:1896
msgid "searching in provides entries"
msgstr "suche in bereitgestellten Einträgen"
-#: ../yum/__init__.py:1908
+#: ../yum/__init__.py:1929
#, python-format
msgid "Provides-match: %s"
msgstr "Stelle Übereinstimmung bereit: %s"
-#: ../yum/__init__.py:1957
+#: ../yum/__init__.py:1978
msgid "No group data available for configured repositories"
-msgstr "Keine Gruppe für konfigurierte Repositories verfügbar"
+msgstr "Keine Gruppendaten für konfigurierte Repositories verfügbar"
-#: ../yum/__init__.py:1988
-#: ../yum/__init__.py:2007
-#: ../yum/__init__.py:2038
-#: ../yum/__init__.py:2044
-#: ../yum/__init__.py:2117
-#: ../yum/__init__.py:2121
+#: ../yum/__init__.py:2009
+#: ../yum/__init__.py:2028
+#: ../yum/__init__.py:2058
+#: ../yum/__init__.py:2064
+#: ../yum/__init__.py:2143
+#: ../yum/__init__.py:2147
#, python-format
msgid "No Group named %s exists"
msgstr "Kein Gruppe mit dem Namen %s vorhanden"
-#: ../yum/__init__.py:2019
-#: ../yum/__init__.py:2134
+#: ../yum/__init__.py:2039
+#: ../yum/__init__.py:2159
#, python-format
msgid "package %s was not marked in group %s"
msgstr "Paket %s war nicht markiert in Gruppe %s"
-#: ../yum/__init__.py:2066
+#: ../yum/__init__.py:2085
#, python-format
msgid "Adding package %s from group %s"
msgstr "Füge Paket %s aus Gruppe %s hinzu"
-#: ../yum/__init__.py:2070
+#: ../yum/__init__.py:2090
#, python-format
msgid "No package named %s available to be installed"
msgstr "Kein Paket mit Namen %s verfügbar zum Installieren"
# Paket-Behälter wird sicher nicht allen gefallen. Fabian
-#: ../yum/__init__.py:2159
+#: ../yum/__init__.py:2186
#, 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:2174
+#: ../yum/__init__.py:2201
msgid "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
msgstr "getInstalledPackageObject() wird verschwinden, benutze self.rpmdb.searchPkgTuple().\n"
-#: ../yum/__init__.py:2226
-#: ../yum/__init__.py:2269
-msgid "Invalid versioned dependency string, try quoting it."
-msgstr "Ungültig versionierte Abhängigkeitszeichenkette, versuche es zu notieren."
-
-#: ../yum/__init__.py:2228
-#: ../yum/__init__.py:2271
+#: ../yum/__init__.py:2253
+#: ../yum/__init__.py:2294
msgid "Invalid version flag"
msgstr "Ungültiges Versionsflag"
-#: ../yum/__init__.py:2243
-#: ../yum/__init__.py:2247
+#: ../yum/__init__.py:2268
+#: ../yum/__init__.py:2272
#, python-format
msgid "No Package found for %s"
msgstr "Kein Paket gefunden für %s"
-#: ../yum/__init__.py:2426
+#: ../yum/__init__.py:2449
msgid "Package Object was not a package object instance"
msgstr "Paketobjekt war keine Paketobjektinstanz"
-#: ../yum/__init__.py:2430
+#: ../yum/__init__.py:2453
msgid "Nothing specified to install"
msgstr "Nichts angegeben zum Installieren"
-#: ../yum/__init__.py:2446
+#: ../yum/__init__.py:2469
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Überprüfe nach virtueller Bereitstellung oder Datei-Bereitstellung für %s"
-#: ../yum/__init__.py:2452
-#: ../yum/__init__.py:2705
-#: ../yum/__init__.py:2875
+#: ../yum/__init__.py:2475
+#: ../yum/__init__.py:2740
+#: ../yum/__init__.py:2900
#, python-format
msgid "No Match for argument: %s"
msgstr "Kein Übereinstimmung für Argument: %s"
-#: ../yum/__init__.py:2523
+#: ../yum/__init__.py:2548
#, python-format
msgid "Package %s installed and not available"
msgstr "Paket %s installiert und nicht verfügbar"
-#: ../yum/__init__.py:2526
+#: ../yum/__init__.py:2551
msgid "No package(s) available to install"
msgstr "Kein(e) Paket(e) zum Installieren verfügbar."
-#: ../yum/__init__.py:2538
+#: ../yum/__init__.py:2564
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Paket: %s - bereits im Transaktionsset"
-#: ../yum/__init__.py:2553
+#: ../yum/__init__.py:2580
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
-msgstr "Paket %s von %s ist veraltet, versuche stattdessen %s zu installieren."
+msgstr "Paket %s wurde ersetzt durch %s, versuche stattdessen %s zu installieren."
-#: ../yum/__init__.py:2561
+#: ../yum/__init__.py:2588
#, python-format
msgid "Package %s already installed and latest version"
-msgstr "Paket %s ist bereits installiert und ist in der neusten Version vorhanden."
+msgstr "Paket %s ist bereits in der neusten Version installiert."
-#: ../yum/__init__.py:2568
+#: ../yum/__init__.py:2595
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr "Paket, das auf %s passt, ist bereits installiert. Überprüfe auf Aktualisierung."
#. update everything (the easy case)
-#: ../yum/__init__.py:2649
+#: ../yum/__init__.py:2675
msgid "Updating Everything"
msgstr "Aktualisiere alles"
-#: ../yum/__init__.py:2667
-#: ../yum/__init__.py:2777
-#: ../yum/__init__.py:2798
-#: ../yum/__init__.py:2824
+#: ../yum/__init__.py:2693
+#: ../yum/__init__.py:2802
+#: ../yum/__init__.py:2823
+#: ../yum/__init__.py:2849
#, 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:2702
-#: ../yum/__init__.py:2872
+#: ../yum/__init__.py:2728
+#: ../yum/__init__.py:2897
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:2768
+#: ../yum/__init__.py:2793
#, 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:2801
-#: ../yum/__init__.py:2827
+#: ../yum/__init__.py:2826
+#: ../yum/__init__.py:2852
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
-msgstr "Aktualisiere Paket nicht, da es bereits veraltet ist: %s.%s %s:%s-%s"
+msgstr "Aktualisiere Paket nicht, da es bereits aktualisiert ist: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2888
+#: ../yum/__init__.py:2913
msgid "No package matched to remove"
msgstr "Kein Paket stimmt zum Entfernen überein"
-#: ../yum/__init__.py:2922
+#: ../yum/__init__.py:2947
#, python-format
msgid "Cannot open file: %s. Skipping."
-msgstr "Kann Datei nicht öffnen: %s. Überspringen."
+msgstr "Kann Datei nicht öffnen: %s. Überspringe."
-#: ../yum/__init__.py:2925
+#: ../yum/__init__.py:2949
#, python-format
msgid "Examining %s: %s"
msgstr "Untersuche %s: %s"
-#: ../yum/__init__.py:2933
+#: ../yum/__init__.py:2957
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr "Kann Paket %s nicht zur Transaktion hinzufügen. Keine kompatible Architektur: %s"
-#: ../yum/__init__.py:2941
+#: ../yum/__init__.py:2965
#, python-format
msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
msgstr "Paket %s nicht installiert, kann es nicht aktualisieren. Führen Sie stattdessen yum install aus, um es zu installieren."
-#: ../yum/__init__.py:2974
+#: ../yum/__init__.py:2998
#, python-format
msgid "Excluding %s"
-msgstr "Exklusive %s"
+msgstr "Schliesse %s aus"
-#: ../yum/__init__.py:2979
+#: ../yum/__init__.py:3002
#, python-format
msgid "Marking %s to be installed"
msgstr "Markiere %s zum Installieren"
-#: ../yum/__init__.py:2985
+#: ../yum/__init__.py:3007
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Markiere %s als eine Aktualisierung für %s"
-#: ../yum/__init__.py:2992
+#: ../yum/__init__.py:3012
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: aktualisiert installierte Pakete nicht."
-#: ../yum/__init__.py:3010
+#: ../yum/__init__.py:3029
msgid "Problem in reinstall: no package matched to remove"
msgstr "Probleme beim Neuinstallieren: kein Paket stimmt zum Entfernen überein"
-#: ../yum/__init__.py:3021
+#: ../yum/__init__.py:3040
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Paket %s darf mehrfach installiert sein, überspringe"
-#: ../yum/__init__.py:3028
+#: ../yum/__init__.py:3050
msgid "Problem in reinstall: no package matched to install"
msgstr "Probleme beim Neuinstallieren: kein Paket stimmt zum Installieren überein"
-#: ../yum/__init__.py:3063
+#: ../yum/__init__.py:3085
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "GPG-Schlüssel abrufen von %s"
-#: ../yum/__init__.py:3083
+#: ../yum/__init__.py:3105
msgid "GPG key retrieval failed: "
msgstr "GPG-Schlüssel-Abruf fehlgeschlagen:"
-#: ../yum/__init__.py:3094
+#: ../yum/__init__.py:3116
#, 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:3126
+#: ../yum/__init__.py:3148
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG-Schlüssel unter %s (0x%s) ist bereits installiert"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3131
-#: ../yum/__init__.py:3193
+#: ../yum/__init__.py:3153
+#: ../yum/__init__.py:3214
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Importiere GPG-Schlüssel 0x%s \"%s\" von %s"
-#: ../yum/__init__.py:3148
+#: ../yum/__init__.py:3169
msgid "Not installing key"
msgstr "Nicht installierter Schlüssel"
-#: ../yum/__init__.py:3154
+#: ../yum/__init__.py:3175
#, python-format
msgid "Key import failed (code %d)"
msgstr "Schlüssel-Import fehlgeschlagen (Code %d)"
-#: ../yum/__init__.py:3155
-#: ../yum/__init__.py:3214
+#: ../yum/__init__.py:3176
+#: ../yum/__init__.py:3236
msgid "Key imported successfully"
msgstr "Schlüssel erfolgreich importiert"
-#: ../yum/__init__.py:3160
-#: ../yum/__init__.py:3219
+#: ../yum/__init__.py:3181
+#: ../yum/__init__.py:3241
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
@@ -2129,113 +2150,112 @@ 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:3169
+#: ../yum/__init__.py:3190
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:3188
+#: ../yum/__init__.py:3209
#, 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:3208
+#: ../yum/__init__.py:3228
#, python-format
msgid "Not installing key for repo %s"
-msgstr "Nicht installierter Schlüssel für Repo %s"
+msgstr "Installierte Schlüssel für Repo %s nicht"
-#: ../yum/__init__.py:3213
+#: ../yum/__init__.py:3235
msgid "Key import failed"
msgstr "Schlüssel-Import fehlgeschlagen"
-#: ../yum/__init__.py:3304
+#: ../yum/__init__.py:3325
msgid "Unable to find a suitable mirror."
msgstr "Es kann kein geeigneten Spiegelserver gefunden werden."
-#: ../yum/__init__.py:3306
+#: ../yum/__init__.py:3327
msgid "Errors were encountered while downloading packages."
msgstr "Beim Herunterladen der Pakete sind Fehler aufgetreten."
-#: ../yum/__init__.py:3347
+#: ../yum/__init__.py:3367
#, python-format
msgid "Please report this error at %s"
msgstr "Bitte melden Sie diesen Fehler unter %s"
-#: ../yum/__init__.py:3371
+#: ../yum/__init__.py:3391
msgid "Test Transaction Errors: "
-msgstr "Test-Transaktionsfehler"
+msgstr "Test-Transaktionsfehler: "
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:201
+#: ../yum/plugins.py:204
msgid "Loaded plugins: "
msgstr "Geladene Plugins: "
-#: ../yum/plugins.py:215
-#: ../yum/plugins.py:221
+#: ../yum/plugins.py:218
+#: ../yum/plugins.py:224
#, python-format
msgid "No plugin match for: %s"
msgstr "Kein Plugin für Argument: %s"
-#: ../yum/plugins.py:251
+#: ../yum/plugins.py:254
#, python-format
-msgid "\"%s\" plugin is disabled"
-msgstr "\"%s\" Plugin ist deaktiviert"
+msgid "Not loading \"%s\" plugin, as it is disabled"
+msgstr "\"%s\"-Plugin ist deaktiviert"
#. Give full backtrace:
-#: ../yum/plugins.py:263
+#: ../yum/plugins.py:266
#, python-format
msgid "Plugin \"%s\" can't be imported"
msgstr "Plugin \"%s\" kann nicht importiert werden"
-#: ../yum/plugins.py:270
+#: ../yum/plugins.py:273
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr "Plugin \"%s\" gibt keine benötigte API-Version an"
-#: ../yum/plugins.py:275
+#: ../yum/plugins.py:278
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr "Plugin \"%s\" benötigt API %s. Unterstützte API ist %s."
-#: ../yum/plugins.py:308
+#: ../yum/plugins.py:311
#, python-format
msgid "Loading \"%s\" plugin"
-msgstr "Lade \"%s\" Plugin"
+msgstr "Lade \"%s\"-Plugin"
-#: ../yum/plugins.py:315
+#: ../yum/plugins.py:318
#, python-format
msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
msgstr "Zwei oder mehr Plugins mit dem Namen \"%s\" existieren im Plugin-Suchpfad"
-#: ../yum/plugins.py:335
+#: ../yum/plugins.py:338
#, python-format
msgid "Configuration file %s not found"
msgstr "Konfigurationsdatei %s nicht gefunden"
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:338
+#: ../yum/plugins.py:341
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr "Kann Konfigurationsdatei für Plugin %s nicht finden"
-#: ../yum/plugins.py:492
+#: ../yum/plugins.py:495
msgid "registration of commands not supported"
msgstr "Registrierung von Befehlen nicht unterstützt"
-# Geht sicher auch besser..., Ideen? Fabian
#: ../yum/rpmtrans.py:78
msgid "Repackaging"
-msgstr "Neu verpacken"
+msgstr "Packe neu"
#: ../rpmUtils/oldUtils.py:26
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
-msgstr "Header kann nicht geöffnet werden oder stimmt nicht überein %s, %s."
+msgstr "Header kann nicht geöffnet werden oder stimmt nicht überein mit %s, %s."
#: ../rpmUtils/oldUtils.py:46
#, python-format
msgid "RPM %s fails md5 check"
-msgstr "RPM %s kann md5 nicht überprüfen"
+msgstr "RPM %s besteht md5-Prüfung nicht"
#: ../rpmUtils/oldUtils.py:144
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
@@ -2258,6 +2278,9 @@ msgstr "Defekter Header %s"
msgid "Error opening rpm %s - error %s"
msgstr "Fehler bei Öffnen des RPM %s - Fehler %s"
+#~ msgid "Invalid versioned dependency string, try quoting it."
+#~ msgstr ""
+#~ "Ungültig versionierte Abhängigkeitszeichenkette, versuche es zu notieren."
#~ msgid "Parsing package install arguments"
#~ msgstr "Analysiere Installationsargumente des Pakets"
#~ msgid "Could not find update match for %s"
diff --git a/po/pl.po b/po/pl.po
index e1e4000..01bd931 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,15 +5,15 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-22 03:51+0100\n"
-"PO-Revision-Date: 2008-11-22 03:55+0100\n"
+"POT-Creation-Date: 2009-03-05 15:36+0100\n"
+"PO-Revision-Date: 2009-03-05 19:06+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../callback.py:48 ../output.py:914 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:922 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Aktualizowanie"
@@ -21,7 +21,7 @@ msgstr "Aktualizowanie"
msgid "Erasing"
msgstr "Usuwanie"
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:913
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:921
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Instalowanie"
@@ -30,7 +30,7 @@ msgstr "Instalowanie"
msgid "Obsoleted"
msgstr "Przestarzałe"
-#: ../callback.py:54 ../output.py:1019
+#: ../callback.py:54 ../output.py:1029
msgid "Updated"
msgstr "Zaktualizowano"
@@ -38,7 +38,7 @@ msgstr "Zaktualizowano"
msgid "Erased"
msgstr "Usunięto"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1017
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1027
msgid "Installed"
msgstr "Zainstalowano"
@@ -60,7 +60,7 @@ msgstr "Błąd: nieprawidłowy stan wyjścia: %s dla %s"
msgid "Erased: %s"
msgstr "Usunięto: %s"
-#: ../callback.py:217 ../output.py:915
+#: ../callback.py:217 ../output.py:923
msgid "Removing"
msgstr "Usuwanie"
@@ -81,47 +81,47 @@ msgstr "Ustawianie repozytoriów"
msgid "Reading repository metadata in from local files"
msgstr "Odczytywanie metadanych repozytoriów z lokalnych plików"
-#: ../cli.py:188 ../utils.py:79
+#: ../cli.py:191 ../utils.py:79
#, python-format
msgid "Config Error: %s"
msgstr "Błąd konfiguracji: %s"
-#: ../cli.py:191 ../cli.py:1172 ../utils.py:82
+#: ../cli.py:194 ../cli.py:1189 ../utils.py:82
#, python-format
msgid "Options Error: %s"
msgstr "Błąd opcji: %s"
-#: ../cli.py:219
+#: ../cli.py:222
#, python-format
msgid " Installed: %s-%s at %s"
-msgstr " Zainstalowane: %s-%s at %s"
+msgstr " Zainstalowane: %s-%s o %s"
-#: ../cli.py:221
+#: ../cli.py:224
#, python-format
msgid " Built : %s at %s"
msgstr " Zbudowane : %s o %s"
-#: ../cli.py:223
+#: ../cli.py:226
#, python-format
msgid " Committed: %s at %s"
msgstr " Wysłane: %s o %s"
-#: ../cli.py:260
+#: ../cli.py:265
msgid "You need to give some command"
msgstr "Musisz podać jakieś polecenie"
-#: ../cli.py:302
+#: ../cli.py:308
msgid "Disk Requirements:\n"
msgstr "Wymagana przestrzeń na dysku:\n"
-#: ../cli.py:304
+#: ../cli.py:310
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Potrzeba co najmniej %d MB w systemie plików %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:309
+#: ../cli.py:315
msgid ""
"Error Summary\n"
"-------------\n"
@@ -129,64 +129,56 @@ msgstr ""
"Podsumowanie błędów\n"
"-------------------\n"
-#: ../cli.py:352
+#: ../cli.py:358
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Zamykanie."
-#: ../cli.py:382
+#: ../cli.py:394
msgid "Exiting on user Command"
msgstr "Zamykanie na polecenie użytkownika"
-#: ../cli.py:386
+#: ../cli.py:398
msgid "Downloading Packages:"
msgstr "Pobieranie pakietów:"
-#: ../cli.py:391
+#: ../cli.py:403
msgid "Error Downloading Packages:\n"
msgstr "Błąd podczas pobierania pakietów:\n"
-#: ../cli.py:403
-msgid "Entering rpm code"
-msgstr "Przechodzenie do kodu RPM"
-
-#: ../cli.py:407 ../yum/__init__.py:3312
+#: ../cli.py:417 ../yum/__init__.py:3344
msgid "Running rpm_check_debug"
msgstr "Wykonywanie rpm_check_debug"
-#: ../cli.py:410 ../yum/__init__.py:3315
+#: ../cli.py:420 ../yum/__init__.py:3347
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "BŁĄD rpm_check_debug i rozwiązywania zależności:"
-#: ../cli.py:414
+#: ../cli.py:424
#, python-format
msgid "Please report this error in %s"
msgstr "Zgłoś ten błąd na %s"
-#: ../cli.py:420
+#: ../cli.py:430
msgid "Running Transaction Test"
msgstr "Wykonywanie testu transakcji"
-#: ../cli.py:436
+#: ../cli.py:446
msgid "Finished Transaction Test"
msgstr "Zakończono test transakcji"
-#: ../cli.py:438
+#: ../cli.py:448
msgid "Transaction Check Error:\n"
msgstr "Błąd podczas sprawdzania transakcji:\n"
-#: ../cli.py:445
+#: ../cli.py:455
msgid "Transaction Test Succeeded"
msgstr "Test transakcji został zakończony powodzeniem"
-#: ../cli.py:466
+#: ../cli.py:476
msgid "Running Transaction"
msgstr "Wykonywanie transakcji"
-#: ../cli.py:471
-msgid "Leaving rpm code"
-msgstr "Opuszczanie kodu RPM"
-
-#: ../cli.py:498
+#: ../cli.py:506
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -195,174 +187,170 @@ msgstr ""
"uruchomienia.\n"
"Użyj \"-y\", aby wymusić."
-#: ../cli.py:517 ../cli.py:550
+#: ../cli.py:525 ../cli.py:559
msgid " * Maybe you meant: "
msgstr " * Czy chodziło o: "
-#: ../cli.py:533 ../cli.py:541
+#: ../cli.py:542 ../cli.py:550
#, 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:547 ../cli.py:582
+#: ../cli.py:556 ../cli.py:589
#, python-format
msgid "No package %s%s%s available."
msgstr "Nie ma pakietu %s%s%s."
-#: ../cli.py:572
-msgid "Parsing package install arguments"
-msgstr "Analizowanie parametrów instalacji pakietów"
-
-#: ../cli.py:587 ../cli.py:662 ../yumcommands.py:984
+#: ../cli.py:594 ../cli.py:669 ../yumcommands.py:1010
msgid "Package(s) to install"
msgstr "Pakiety do zainstalowania"
-#: ../cli.py:588 ../cli.py:663 ../yumcommands.py:151 ../yumcommands.py:985
+#: ../cli.py:595 ../cli.py:670 ../yumcommands.py:159 ../yumcommands.py:1011
msgid "Nothing to do"
msgstr "Nie ma niczego do zrobienia"
-#: ../cli.py:621
+#: ../cli.py:628
#, python-format
msgid "%d packages marked for Update"
msgstr "%d pakietów oznaczonych do aktualizacji"
-#: ../cli.py:624
+#: ../cli.py:631
msgid "No Packages marked for Update"
msgstr "Brak pakietów oznaczonych do aktualizacji"
-#: ../cli.py:638
+#: ../cli.py:645
#, python-format
msgid "%d packages marked for removal"
msgstr "%d pakietów oznaczonych do usunięcia"
-#: ../cli.py:641
+#: ../cli.py:648
msgid "No Packages marked for removal"
msgstr "Brak pakietów oznaczonych do usunięcia"
-#: ../cli.py:653
+#: ../cli.py:660
msgid "No Packages Provided"
msgstr "Nie podano pakietów"
-#: ../cli.py:706
+#: ../cli.py:715
msgid "Matching packages for package list to user args"
msgstr "Dopasowywanie listy pakietów do parametrów użytkownika"
-#: ../cli.py:755
+#: ../cli.py:764
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Ostrzeżenie: nie znaleziono wyników dla: %s"
-#: ../cli.py:758
+#: ../cli.py:767
msgid "No Matches found"
msgstr "Brak wyników"
-#: ../cli.py:797
+#: ../cli.py:806
#, python-format
msgid ""
-"Warning: 3.0.x versions of yum would erronously match against filenames.\n"
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
-"Ostrzeżenie: wersje yuma 3.0.x błędnie dopasowują nazwy plików.\n"
+"Ostrzeżenie: wersje 3.0.x yuma błędnie dopasowują nazwy plików.\n"
" Można użyć \"%s*/%s%s\" i/lub \"%s*bin/%s%s\", aby uzyskać to zachowanie"
-#: ../cli.py:813
+#: ../cli.py:822
#, python-format
msgid "No Package Found for %s"
msgstr "Nie znaleziono pakietów dla %s"
-#: ../cli.py:825
+#: ../cli.py:834
msgid "Cleaning up Everything"
msgstr "Czyszczenie wszystkiego"
-#: ../cli.py:839
+#: ../cli.py:848
msgid "Cleaning up Headers"
msgstr "Czyszczenie nagłówków"
-#: ../cli.py:842
+#: ../cli.py:851
msgid "Cleaning up Packages"
msgstr "Czyszczenie pakietów"
-#: ../cli.py:845
+#: ../cli.py:854
msgid "Cleaning up xml metadata"
msgstr "Czytanie metadanych XML"
-#: ../cli.py:848
+#: ../cli.py:857
msgid "Cleaning up database cache"
msgstr "Czyszczenie pamięci podręcznej bazy danych"
-#: ../cli.py:851
+#: ../cli.py:860
msgid "Cleaning up expire-cache metadata"
msgstr "Czytanie metadanych wygasłej pamięci podręcznej"
-#: ../cli.py:854
+#: ../cli.py:863
msgid "Cleaning up plugins"
msgstr "Czyszczenie wtyczek"
-#: ../cli.py:879
+#: ../cli.py:888
msgid "Installed Groups:"
msgstr "Zainstalowane grupy:"
-#: ../cli.py:886
+#: ../cli.py:895
msgid "Available Groups:"
msgstr "Dostępne grupy:"
-#: ../cli.py:892
+#: ../cli.py:901
msgid "Done"
msgstr "Zakończono"
-#: ../cli.py:903 ../cli.py:921 ../cli.py:927 ../yum/__init__.py:2387
+#: ../cli.py:912 ../cli.py:930 ../cli.py:936 ../yum/__init__.py:2386
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Ostrzeżenie: grupa %s nie istnieje."
-#: ../cli.py:931
+#: ../cli.py:940
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:933
+#: ../cli.py:942
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d pakietów do instalacji"
-#: ../cli.py:943 ../yum/__init__.py:2399
+#: ../cli.py:952 ../yum/__init__.py:2398
#, python-format
msgid "No group named %s exists"
msgstr "Grupa o nazwie %s nie istnieje"
-#: ../cli.py:949
+#: ../cli.py:958
msgid "No packages to remove from groups"
msgstr "Brak pakietów do usunięcia z grup"
-#: ../cli.py:951
+#: ../cli.py:960
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d pakietów do usunięcia"
-#: ../cli.py:993
+#: ../cli.py:1002
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Pakiet %s jest już zainstalowany, pomijanie"
-#: ../cli.py:1004
+#: ../cli.py:1013
#, 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:1030
+#: ../cli.py:1039
#, 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:1049
+#: ../cli.py:1058
#, python-format
msgid "Command line error: %s"
msgstr "Błąd wiersza poleceń: %s"
-#: ../cli.py:1062
+#: ../cli.py:1071
#, python-format
msgid ""
"\n"
@@ -373,252 +361,252 @@ msgstr ""
"\n"
"%s: opcja %s wymaga parametru"
-#: ../cli.py:1112
+#: ../cli.py:1129
msgid "--color takes one of: auto, always, never"
msgstr "--color przyjmuje jedną z: auto, always, never"
-#: ../cli.py:1214
+#: ../cli.py:1231
msgid "show this help message and exit"
msgstr "wyświetla ten komunikat pomocy i wyłącza"
-#: ../cli.py:1218
+#: ../cli.py:1235
msgid "be tolerant of errors"
msgstr "toleruje błędy"
-#: ../cli.py:1220
+#: ../cli.py:1237
msgid "run entirely from cache, don't update cache"
msgstr "uruchamia wyłącznie z pamięci podręcznej i nie aktualizuje jej"
-#: ../cli.py:1222
+#: ../cli.py:1239
msgid "config file location"
msgstr "położenie pliku konfiguracji"
-#: ../cli.py:1224
+#: ../cli.py:1241
msgid "maximum command wait time"
msgstr "maksymalny czas oczekiwania na polecenie"
-#: ../cli.py:1226
+#: ../cli.py:1243
msgid "debugging output level"
msgstr "poziom wyjścia debugowania"
-#: ../cli.py:1230
+#: ../cli.py:1247
msgid "show duplicates, in repos, in list/search commands"
msgstr "wyświetla duplikaty w repozytoriach w poleceniach list/search"
-#: ../cli.py:1232
+#: ../cli.py:1249
msgid "error output level"
msgstr "poziom wyjścia błędów"
-#: ../cli.py:1235
+#: ../cli.py:1252
msgid "quiet operation"
msgstr "mało komunikatów"
-#: ../cli.py:1237
+#: ../cli.py:1254
msgid "verbose operation"
msgstr "dużo komunikatów"
-#: ../cli.py:1239
+#: ../cli.py:1256
msgid "answer yes for all questions"
msgstr "odpowiada tak na wszystkie pytania"
-#: ../cli.py:1241
+#: ../cli.py:1258
msgid "show Yum version and exit"
msgstr "wyświetla wersję yuma i wyłącza"
-#: ../cli.py:1242
+#: ../cli.py:1259
msgid "set install root"
msgstr "ustawia roota instalacji"
-#: ../cli.py:1246
+#: ../cli.py:1263
msgid "enable one or more repositories (wildcards allowed)"
msgstr "włącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)"
-#: ../cli.py:1250
+#: ../cli.py:1267
msgid "disable one or more repositories (wildcards allowed)"
msgstr "wyłącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)"
-#: ../cli.py:1253
+#: ../cli.py:1270
msgid "exclude package(s) by name or glob"
msgstr "wyklucza pakiety po nazwie lub wyrażeniu regularnym"
-#: ../cli.py:1255
+#: ../cli.py:1272
msgid "disable exclude from main, for a repo or for everything"
msgstr "wyłącza wykluczanie z głównego, dla repozytorium lub wszystkiego"
-#: ../cli.py:1258
+#: ../cli.py:1275
msgid "enable obsoletes processing during updates"
msgstr "włącza przetwarzanie przestarzałych pakietów podczas aktualizacji"
-#: ../cli.py:1260
+#: ../cli.py:1277
msgid "disable Yum plugins"
msgstr "wyłącza wtyczki yuma"
-#: ../cli.py:1262
+#: ../cli.py:1279
msgid "disable gpg signature checking"
msgstr "wyłącza sprawdzanie podpisu GPG"
-#: ../cli.py:1264
+#: ../cli.py:1281
msgid "disable plugins by name"
msgstr "wyłącza wtyczki po nazwie"
-#: ../cli.py:1267
+#: ../cli.py:1284
msgid "enable plugins by name"
msgstr "włącza wtyczki po nazwie"
-#: ../cli.py:1270
+#: ../cli.py:1287
msgid "skip packages with depsolving problems"
msgstr "pomija pakiety mające problemy z rozwiązaniem zależności"
-#: ../cli.py:1272
+#: ../cli.py:1289
msgid "control whether color is used"
msgstr "kontroluje użycie kolorów"
-#: ../output.py:301
+#: ../output.py:298
msgid "Jan"
msgstr "sty"
-#: ../output.py:301
+#: ../output.py:298
msgid "Feb"
msgstr "lut"
-#: ../output.py:301
+#: ../output.py:298
msgid "Mar"
msgstr "mar"
-#: ../output.py:301
+#: ../output.py:298
msgid "Apr"
msgstr "kwi"
-#: ../output.py:301
+#: ../output.py:298
msgid "May"
msgstr "maj"
-#: ../output.py:301
+#: ../output.py:298
msgid "Jun"
msgstr "cze"
-#: ../output.py:302
+#: ../output.py:299
msgid "Jul"
msgstr "lip"
-#: ../output.py:302
+#: ../output.py:299
msgid "Aug"
msgstr "sie"
-#: ../output.py:302
+#: ../output.py:299
msgid "Sep"
msgstr "wrz"
-#: ../output.py:302
+#: ../output.py:299
msgid "Oct"
msgstr "paź"
-#: ../output.py:302
+#: ../output.py:299
msgid "Nov"
msgstr "lis"
-#: ../output.py:302
+#: ../output.py:299
msgid "Dec"
msgstr "gru"
-#: ../output.py:312
+#: ../output.py:309
msgid "Trying other mirror."
msgstr "Próbowanie innego serwera lustrzanego."
-#: ../output.py:527
+#: ../output.py:525
#, python-format
msgid "Name : %s%s%s"
msgstr "Nazwa : %s%s%s"
-#: ../output.py:528
+#: ../output.py:526
#, python-format
msgid "Arch : %s"
msgstr "Architektura : %s"
-#: ../output.py:530
+#: ../output.py:528
#, python-format
msgid "Epoch : %s"
msgstr "Epoka : %s"
-#: ../output.py:531
+#: ../output.py:529
#, python-format
msgid "Version : %s"
msgstr "Wersja : %s"
-#: ../output.py:532
+#: ../output.py:530
#, python-format
msgid "Release : %s"
msgstr "Wydanie : %s"
-#: ../output.py:533
+#: ../output.py:531
#, python-format
msgid "Size : %s"
msgstr "Rozmiar : %s"
-#: ../output.py:534
+#: ../output.py:532
#, python-format
msgid "Repo : %s"
msgstr "Repozytorium : %s"
-#: ../output.py:536
+#: ../output.py:534
#, python-format
msgid "Committer : %s"
msgstr "Twórca : %s"
-#: ../output.py:537
+#: ../output.py:535
#, python-format
msgid "Committime : %s"
msgstr "Czas wysłania : %s"
-#: ../output.py:538
+#: ../output.py:536
#, python-format
msgid "Buildtime : %s"
msgstr "Czas zbudowania : %s"
-#: ../output.py:540
+#: ../output.py:538
#, python-format
msgid "Installtime: %s"
msgstr "Czas zainstalowania: %s"
-#: ../output.py:541
+#: ../output.py:539
msgid "Summary : "
msgstr "Podsumowanie : "
-#: ../output.py:543
+#: ../output.py:541
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:544
+#: ../output.py:542
#, python-format
msgid "License : %s"
msgstr "Licencja : %s"
-#: ../output.py:545
+#: ../output.py:543
msgid "Description: "
msgstr "Opis : "
-#: ../output.py:609
+#: ../output.py:611
msgid "y"
msgstr "t"
-#: ../output.py:609
+#: ../output.py:611
msgid "yes"
msgstr "tak"
-#: ../output.py:610
+#: ../output.py:612
msgid "n"
msgstr "n"
-#: ../output.py:610
+#: ../output.py:612
msgid "no"
msgstr "nie"
-#: ../output.py:614
+#: ../output.py:616
msgid "Is this ok [y/N]: "
msgstr "W porządku? [t/N]: "
-#: ../output.py:702
+#: ../output.py:704
#, python-format
msgid ""
"\n"
@@ -627,137 +615,142 @@ msgstr ""
"\n"
"Grupa: %s"
-#: ../output.py:709
+#: ../output.py:708
+#, python-format
+msgid " Group-Id: %s"
+msgstr " Identyfikator grupy: %s"
+
+#: ../output.py:713
#, python-format
msgid " Description: %s"
msgstr " Opis: %s"
-#: ../output.py:711
+#: ../output.py:715
msgid " Mandatory Packages:"
msgstr " Pakiety obowiązkowe:"
-#: ../output.py:712
+#: ../output.py:716
msgid " Default Packages:"
msgstr " Domyślne pakiety:"
-#: ../output.py:713
+#: ../output.py:717
msgid " Optional Packages:"
msgstr " Pakiety opcjonalne:"
-#: ../output.py:714
+#: ../output.py:718
msgid " Conditional Packages:"
msgstr " Pakiety warunkowe:"
-#: ../output.py:734
+#: ../output.py:738
#, python-format
msgid "package: %s"
msgstr "pakiet: %s"
-#: ../output.py:736
+#: ../output.py:740
msgid " No dependencies for this package"
msgstr " Brak zależności dla tego pakietu"
-#: ../output.py:741
+#: ../output.py:745
#, python-format
msgid " dependency: %s"
msgstr " zależność: %s"
-#: ../output.py:743
+#: ../output.py:747
msgid " Unsatisfied dependency"
msgstr " Nierozwiązana zależność"
-#: ../output.py:818
+#: ../output.py:819
#, python-format
msgid "Repo : %s"
msgstr "Repozytorium: %s"
-#: ../output.py:819
+#: ../output.py:820
msgid "Matched from:"
msgstr "Dopasowano z:"
-#: ../output.py:827
+#: ../output.py:828
msgid "Description : "
msgstr "Opis : "
-#: ../output.py:830
+#: ../output.py:831
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:833
+#: ../output.py:834
#, python-format
msgid "License : %s"
msgstr "Licencja : %s"
-#: ../output.py:836
+#: ../output.py:837
#, python-format
msgid "Filename : %s"
msgstr "Nazwa pliku : %s"
-#: ../output.py:840
+#: ../output.py:841
msgid "Other : "
msgstr "Inne : "
-#: ../output.py:873
+#: ../output.py:874
msgid "There was an error calculating total download size"
msgstr "Wystąpił błąd podczas obliczania całkowitego rozmiaru pobierania"
-#: ../output.py:878
+#: ../output.py:879
#, python-format
msgid "Total size: %s"
msgstr "Całkowity rozmiar: %s"
-#: ../output.py:881
+#: ../output.py:882
#, python-format
msgid "Total download size: %s"
msgstr "Całkowity rozmiar pobierania: %s"
-#: ../output.py:916
+#: ../output.py:924
msgid "Installing for dependencies"
msgstr "Instalowanie, aby rozwiązać zależności"
-#: ../output.py:917
+#: ../output.py:925
msgid "Updating for dependencies"
msgstr "Aktualizowanie, aby rozwiązać zależności"
-#: ../output.py:918
+#: ../output.py:926
msgid "Removing for dependencies"
msgstr "Usuwanie, aby rozwiązać zależności"
-#: ../output.py:925 ../output.py:1021
+#: ../output.py:933 ../output.py:1031
msgid "Skipped (dependency problems)"
msgstr "Pominięto (problemy z zależnościami)"
-#: ../output.py:946
+#: ../output.py:954
msgid "Package"
msgstr "Pakiet"
-#: ../output.py:946
+#: ../output.py:954
msgid "Arch"
msgstr "Architektura"
-#: ../output.py:947
+#: ../output.py:955
msgid "Version"
msgstr "Wersja"
-#: ../output.py:947
+#: ../output.py:955
msgid "Repository"
msgstr "Repozytorium"
-#: ../output.py:948
+#: ../output.py:956
msgid "Size"
msgstr "Rozmiar"
-#: ../output.py:959
+#: ../output.py:968
#, python-format
msgid ""
-" replacing %s.%s %s\n"
+" replacing %s%s%s.%s %s\n"
"\n"
msgstr ""
-" zastępuje %s.%s %s\n"
+" zastępuje %s%s%s.%s %s\n"
"\n"
-#: ../output.py:967
+#: ../output.py:977
#, python-format
msgid ""
"\n"
@@ -774,27 +767,36 @@ msgstr ""
"Aktualizowanie %5.5s pakietów \n"
"Usuwanie %5.5s pakietów \n"
-#: ../output.py:1015
+#: ../output.py:1025
msgid "Removed"
msgstr "Usunięto"
-#: ../output.py:1016
+#: ../output.py:1026
msgid "Dependency Removed"
msgstr "Usunięto zależność"
-#: ../output.py:1018
+#: ../output.py:1028
msgid "Dependency Installed"
msgstr "Zainstalowano zależność"
-#: ../output.py:1020
+#: ../output.py:1030
msgid "Dependency Updated"
msgstr "Zaktualizowano zależność"
-#: ../output.py:1022
+#: ../output.py:1032
msgid "Replaced"
msgstr "Zastąpiono"
-#: ../output.py:1095
+#: ../output.py:1033
+msgid "Failed"
+msgstr "Nie powiodło się"
+
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1099
+msgid "two"
+msgstr "dwóch"
+
+#: ../output.py:1106
#, python-format
msgid ""
"\n"
@@ -805,67 +807,67 @@ msgstr ""
" Obecne pobieranie zostało anulowane, %sprzerwij (Ctrl-C) ponownie%s w ciągu "
"%s%s%s sekund, aby zakończyć.\n"
-#: ../output.py:1105
+#: ../output.py:1116
msgid "user interrupt"
msgstr "przerwane przez użytkownika"
-#: ../output.py:1121
+#: ../output.py:1132
msgid "Total"
msgstr "Razem"
-#: ../output.py:1135
+#: ../output.py:1146
msgid "installed"
msgstr "zainstalowany"
-#: ../output.py:1136
+#: ../output.py:1147
msgid "updated"
msgstr "zaktualizowany"
-#: ../output.py:1137
+#: ../output.py:1148
msgid "obsoleted"
msgstr "zastąpiony"
-#: ../output.py:1138
+#: ../output.py:1149
msgid "erased"
msgstr "usunięty"
-#: ../output.py:1142
+#: ../output.py:1153
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Pakiet %s.%s %s:%s-%s zostanie %s"
-#: ../output.py:1149
+#: ../output.py:1160
msgid "--> Running transaction check"
msgstr "--> Wykonywanie sprawdzania transakcji"
-#: ../output.py:1154
+#: ../output.py:1165
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Ponowne uruchamianie rozwiązywania zależności z nowymi zmianami."
-#: ../output.py:1159
+#: ../output.py:1170
msgid "--> Finished Dependency Resolution"
msgstr "--> Zakończono rozwiązywanie zależności"
-#: ../output.py:1164
+#: ../output.py:1175
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Przetwarzanie zależności: %s dla pakietu: %s"
-#: ../output.py:1169
+#: ../output.py:1180
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Nierozwiązana zależność: %s"
-#: ../output.py:1175
+#: ../output.py:1186
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Przetwarzanie konfliktów: %s jest w konflikcie z %s"
-#: ../output.py:1178
+#: ../output.py:1189
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr "--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać."
-#: ../output.py:1182
+#: ../output.py:1193
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Pobieranie nagłówka dla %s do umieszczenia w zestawie transakcji."
@@ -946,266 +948,267 @@ msgstr "Plik %s podany powłoce jako parametr nie istnieje."
msgid "Error: more than one file given as argument to shell."
msgstr "Błąd: podano powłoce więcej niż jeden plik jako parametr."
-#: ../yumcommands.py:161
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr "PAKIET..."
-#: ../yumcommands.py:164
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr "Zainstaluj pakiet lub pakiety w systemie"
-#: ../yumcommands.py:173
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr "Ustawianie procesu instalacji"
-#: ../yumcommands.py:184
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr "[PAKIET...]"
-#: ../yumcommands.py:187
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr "Zaktualizuj pakiet lub pakiety w systemie"
-#: ../yumcommands.py:195
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr "Ustawianie procesu aktualizacji"
-#: ../yumcommands.py:237
+#: ../yumcommands.py:243
msgid "Display details about a package or group of packages"
msgstr "Wyświetl szczegóły o pakiecie lub grupie pakietów"
-#: ../yumcommands.py:278
+#: ../yumcommands.py:292
msgid "Installed Packages"
msgstr "Zainstalowane pakiety"
-#: ../yumcommands.py:285
+#: ../yumcommands.py:300
msgid "Available Packages"
msgstr "Dostępne pakiety"
-#: ../yumcommands.py:289
+#: ../yumcommands.py:304
msgid "Extra Packages"
msgstr "Dodatkowe pakiety"
-#: ../yumcommands.py:291
+#: ../yumcommands.py:308
msgid "Updated Packages"
msgstr "Zaktualizowane pakiety"
-#: ../yumcommands.py:298 ../yumcommands.py:305 ../yumcommands.py:574
+#. This only happens in verbose mode
+#: ../yumcommands.py:316 ../yumcommands.py:323 ../yumcommands.py:600
msgid "Obsoleting Packages"
msgstr "Zastępowanie przestarzałych pakietów"
-#: ../yumcommands.py:307
+#: ../yumcommands.py:325
msgid "Recently Added Packages"
msgstr "Ostatnio dodane pakiety"
-#: ../yumcommands.py:314
+#: ../yumcommands.py:332
msgid "No matching Packages to list"
msgstr "Brak pakietów pasujących do listy"
-#: ../yumcommands.py:328
+#: ../yumcommands.py:346
msgid "List a package or groups of packages"
msgstr "Wyświetl listę pakietów lub grup pakietów"
-#: ../yumcommands.py:340
+#: ../yumcommands.py:358
msgid "Remove a package or packages from your system"
msgstr "Usuń pakiet lub pakiety z systemu"
-#: ../yumcommands.py:348
+#: ../yumcommands.py:365
msgid "Setting up Remove Process"
msgstr "Ustawianie procesu usuwania"
-#: ../yumcommands.py:363
+#: ../yumcommands.py:379
msgid "Setting up Group Process"
msgstr "Ustawianie procesu grup"
-#: ../yumcommands.py:369
+#: ../yumcommands.py:385
msgid "No Groups on which to run command"
msgstr "Brak grup, na których można wykonać polecenie"
-#: ../yumcommands.py:382
+#: ../yumcommands.py:398
msgid "List available package groups"
msgstr "Wyświetl listę dostępnych grup pakietów"
-#: ../yumcommands.py:399
+#: ../yumcommands.py:415
msgid "Install the packages in a group on your system"
msgstr "Zainstaluj pakiety z grupy w systemie"
-#: ../yumcommands.py:421
+#: ../yumcommands.py:437
msgid "Remove the packages in a group from your system"
msgstr "Usuń pakiety z grupy z systemu"
-#: ../yumcommands.py:448
+#: ../yumcommands.py:464
msgid "Display details about a package group"
msgstr "Wyświetl szczegóły o grupie pakietów"
-#: ../yumcommands.py:472
+#: ../yumcommands.py:488
msgid "Generate the metadata cache"
msgstr "Utwórz pamięć podręczną metadanych"
-#: ../yumcommands.py:478
+#: ../yumcommands.py:494
msgid "Making cache files for all metadata files."
msgstr "Tworzenie plików pamięci podręcznej ze wszystkich plików metadanych."
-#: ../yumcommands.py:479
+#: ../yumcommands.py:495
msgid "This may take a while depending on the speed of this computer"
msgstr "Może to chwilę zająć, z zależności od szybkości komputera"
-#: ../yumcommands.py:500
+#: ../yumcommands.py:516
msgid "Metadata Cache Created"
msgstr "Utworzono pamięć podręczną metadanych"
-#: ../yumcommands.py:514
+#: ../yumcommands.py:530
msgid "Remove cached data"
msgstr "Usunięto dane z pamięci podręcznej"
-#: ../yumcommands.py:535
+#: ../yumcommands.py:551
msgid "Find what package provides the given value"
msgstr "Znajdź pakiet dostarczający podaną wartość"
-#: ../yumcommands.py:555
+#: ../yumcommands.py:571
msgid "Check for available package updates"
msgstr "Sprawdź dostępne aktualizacje pakietów"
-#: ../yumcommands.py:594
+#: ../yumcommands.py:620
msgid "Search package details for the given string"
msgstr "Znajdź szczegóły pakietów dla podanego łańcucha tekstowego"
-#: ../yumcommands.py:600
+#: ../yumcommands.py:626
msgid "Searching Packages: "
msgstr "Wyszukiwanie pakietów: "
-#: ../yumcommands.py:617
+#: ../yumcommands.py:643
msgid "Update packages taking obsoletes into account"
msgstr "Zaktualizuj pakiety, w tym przestarzałe"
-#: ../yumcommands.py:626
+#: ../yumcommands.py:651
msgid "Setting up Upgrade Process"
msgstr "Ustawianie procesu aktualizacji"
-#: ../yumcommands.py:640
+#: ../yumcommands.py:665
msgid "Install a local RPM"
msgstr "Zainstaluj lokalny pakiet RPM"
-#: ../yumcommands.py:649
+#: ../yumcommands.py:673
msgid "Setting up Local Package Process"
msgstr "Ustawianie procesu lokalnego pakietu"
-#: ../yumcommands.py:668
+#: ../yumcommands.py:692
msgid "Determine which package provides the given dependency"
msgstr "Określ, który pakiet dostarcza podaną zależność"
-#: ../yumcommands.py:671
+#: ../yumcommands.py:695
msgid "Searching Packages for Dependency:"
msgstr "Wyszukiwanie pakietów dla zależności:"
-#: ../yumcommands.py:685
+#: ../yumcommands.py:709
msgid "Run an interactive yum shell"
msgstr "Uruchom interaktywną powłokę yuma"
-#: ../yumcommands.py:691
+#: ../yumcommands.py:715
msgid "Setting up Yum Shell"
msgstr "Ustawianie powłoki yuma"
-#: ../yumcommands.py:709
+#: ../yumcommands.py:733
msgid "List a package's dependencies"
msgstr "Wyświetl listę zależności pakietu"
-#: ../yumcommands.py:715
+#: ../yumcommands.py:739
msgid "Finding dependencies: "
msgstr "Wyszukiwanie zależności: "
-#: ../yumcommands.py:731
+#: ../yumcommands.py:755
msgid "Display the configured software repositories"
msgstr "Wyświetl skonfigurowane repozytoria oprogramowania"
-#: ../yumcommands.py:779 ../yumcommands.py:780
+#: ../yumcommands.py:803 ../yumcommands.py:804
msgid "enabled"
msgstr "włączone"
-#: ../yumcommands.py:788 ../yumcommands.py:789
+#: ../yumcommands.py:812 ../yumcommands.py:813
msgid "disabled"
msgstr "wyłączone"
-#: ../yumcommands.py:800
+#: ../yumcommands.py:827
msgid "Repo-id : "
msgstr "Identyfikator repozytorium : "
-#: ../yumcommands.py:801
+#: ../yumcommands.py:828
msgid "Repo-name : "
msgstr "Nazwa repozytorium : "
-#: ../yumcommands.py:802
+#: ../yumcommands.py:829
msgid "Repo-status : "
msgstr "Stan repozytorium : "
-#: ../yumcommands.py:804
+#: ../yumcommands.py:831
msgid "Repo-revision: "
msgstr "Wersja repozytorium : "
-#: ../yumcommands.py:808
+#: ../yumcommands.py:835
msgid "Repo-tags : "
msgstr "Znaczniki repozytorium : "
-#: ../yumcommands.py:814
+#: ../yumcommands.py:841
msgid "Repo-distro-tags: "
msgstr "Znaczniki dystrybucji repozytorium: "
-#: ../yumcommands.py:819
+#: ../yumcommands.py:846
msgid "Repo-updated: "
msgstr "Aktualizacje repozytorium : "
-#: ../yumcommands.py:821
+#: ../yumcommands.py:848
msgid "Repo-pkgs : "
msgstr "Pakiety repozytorium : "
-#: ../yumcommands.py:822
+#: ../yumcommands.py:849
msgid "Repo-size : "
msgstr "Rozmiar repozytorium : "
-#: ../yumcommands.py:829
+#: ../yumcommands.py:856
msgid "Repo-baseurl: "
msgstr "Podstawowy URL repozytorium : "
-#: ../yumcommands.py:833
+#: ../yumcommands.py:860
msgid "Repo-metalink: "
msgstr "Metaodnośnik repozytorium : "
-#: ../yumcommands.py:836
+#: ../yumcommands.py:863
msgid "Repo-mirrors: "
msgstr "Serwery lustrzane repozytorium : "
-#: ../yumcommands.py:840
+#: ../yumcommands.py:867
msgid "Repo-exclude: "
msgstr "Wykluczenia z repozytorium : "
-#: ../yumcommands.py:844
+#: ../yumcommands.py:871
msgid "Repo-include: "
msgstr "Dołączone z repozytorium : "
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:854 ../yumcommands.py:880
+#: ../yumcommands.py:881 ../yumcommands.py:907
msgid "repo id"
msgstr "ID repozytorium"
-#: ../yumcommands.py:868 ../yumcommands.py:869 ../yumcommands.py:883
+#: ../yumcommands.py:895 ../yumcommands.py:896 ../yumcommands.py:910
msgid "status"
msgstr "stan"
-#: ../yumcommands.py:881
+#: ../yumcommands.py:908
msgid "repo name"
msgstr "nazwa repozytorium"
-#: ../yumcommands.py:907
+#: ../yumcommands.py:934
msgid "Display a helpful usage message"
msgstr "Wyświetl pomocny komunikat o używaniu"
-#: ../yumcommands.py:941
+#: ../yumcommands.py:968
#, python-format
msgid "No help available for %s"
msgstr "Brak pomocy dla %s"
-#: ../yumcommands.py:946
+#: ../yumcommands.py:973
msgid ""
"\n"
"\n"
@@ -1215,7 +1218,7 @@ msgstr ""
"\n"
"aliasy: "
-#: ../yumcommands.py:948
+#: ../yumcommands.py:975
msgid ""
"\n"
"\n"
@@ -1225,15 +1228,15 @@ msgstr ""
"\n"
"alias: "
-#: ../yumcommands.py:977
+#: ../yumcommands.py:1003
msgid "Setting up Reinstall Process"
msgstr "Ustawianie procesu ponownej instalacji"
-#: ../yumcommands.py:991
+#: ../yumcommands.py:1017
msgid "reinstall a package"
msgstr "ponownie zainstaluj pakiet"
-#: ../yummain.py:41
+#: ../yummain.py:42
msgid ""
"\n"
"\n"
@@ -1243,7 +1246,7 @@ msgstr ""
"\n"
"Zamykanie na polecenie użytkownika"
-#: ../yummain.py:47
+#: ../yummain.py:48
msgid ""
"\n"
"\n"
@@ -1253,27 +1256,87 @@ msgstr ""
"\n"
"Zamykanie na przerwanym potoku"
-#: ../yummain.py:98
+#: ../yummain.py:124
+msgid "Running"
+msgstr "Wykonywanie"
+
+#: ../yummain.py:125
+msgid "Sleeping"
+msgstr "Zasypianie"
+
+#: ../yummain.py:126
+msgid "Uninteruptable"
+msgstr "Nie można przerywać"
+
+#: ../yummain.py:127
+msgid "Zombie"
+msgstr "Zombie"
+
+#: ../yummain.py:128
+msgid "Traced/Stopped"
+msgstr "Śledzone/zatrzymane"
+
+#: ../yummain.py:129
+msgid "Unknown"
+msgstr "Nienznane"
+
+#: ../yummain.py:133
+msgid " The other application is: PackageKit"
+msgstr " Inna aplikacja to PackageKit"
+
+#: ../yummain.py:135
+#, python-format
+msgid " The other application is: %s"
+msgstr " Inna aplikacja to: %s"
+
+#: ../yummain.py:138
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr " Pamięć: %5s RSS (%5sB VSZ)"
+
+#: ../yummain.py:142
+#, =python-format
+msgid " Started: %s - %s ago"
+msgstr " Uruchomiono: %s - %s temu"
+
+#: ../yummain.py:144
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr " Stan: %s, PID: %d"
+
+#: ../yummain.py:169
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr "Inna aplikacja obecnie blokuje yuma. Oczekiwanie na jej zakończenie..."
-#: ../yummain.py:125 ../yummain.py:164
+#: ../yummain.py:197 ../yummain.py:236
#, python-format
msgid "Error: %s"
msgstr "Błąd: %s"
-#: ../yummain.py:135 ../yummain.py:171
+#: ../yummain.py:207 ../yummain.py:247
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Nieznane błędy: kod wyjścia: %d:"
#. Depsolve stage
-#: ../yummain.py:142
+#: ../yummain.py:214
msgid "Resolving Dependencies"
msgstr "Rozwiązywanie zależności"
-#: ../yummain.py:177
+#: ../yummain.py:238
+msgid " You could try using --skip-broken to work around the problem"
+msgstr " Powinieneś spróbować użyć --skip-broken, aby obejść problem"
+
+#: ../yummain.py:239
+msgid ""
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes"
+msgstr ""
+" Można spróbować wykonać: package-cleanup --problems\n"
+" package-cleanup --dupes"
+
+#: ../yummain.py:253
msgid ""
"\n"
"Dependencies Resolved"
@@ -1281,11 +1344,11 @@ msgstr ""
"\n"
"Rozwiązano zależności"
-#: ../yummain.py:191
+#: ../yummain.py:267
msgid "Complete!"
msgstr "Zakończono!"
-#: ../yummain.py:238
+#: ../yummain.py:314
msgid ""
"\n"
"\n"
@@ -1328,7 +1391,7 @@ msgstr "%s pasuje jako wymaganie dla %s"
msgid "Member: %s"
msgstr "Członek: %s"
-#: ../yum/depsolve.py:247 ../yum/depsolve.py:733
+#: ../yum/depsolve.py:247 ../yum/depsolve.py:738
#, python-format
msgid "%s converted to install"
msgstr "%s przekonwertowano do zainstalowania"
@@ -1377,118 +1440,118 @@ msgstr "Tryb dla pakietu dostarczającego %s: %s"
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:393
+#: ../yum/depsolve.py:394
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr ""
"TSINFO: zastępowanie przestarzałego pakietu %s pakietem %s, aby rozwiązać "
"zależność."
-#: ../yum/depsolve.py:396
+#: ../yum/depsolve.py:397
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: aktualizowanie %s, aby rozwiązać zależność."
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:405
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Nie można znaleźć ścieżki aktualizacji dla zależności dla: %s"
-#: ../yum/depsolve.py:414
+#: ../yum/depsolve.py:415
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Nie można rozwiązać wymagania %s dla %s"
-#: ../yum/depsolve.py:437
+#: ../yum/depsolve.py:438
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Szybko dopasowano %s jako wymaganie %s"
#. is it already installed?
-#: ../yum/depsolve.py:479
+#: ../yum/depsolve.py:480
#, 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:494
+#: ../yum/depsolve.py:495
#, 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:505
+#: ../yum/depsolve.py:506
#, 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:513 ../yum/depsolve.py:562
+#: ../yum/depsolve.py:514 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Brakująca zależność: %s jest wymagane przez pakiet %s"
-#: ../yum/depsolve.py:526
+#: ../yum/depsolve.py:527
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s jest już w zestawie transakcji, pomijanie"
-#: ../yum/depsolve.py:572
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: oznaczanie %s jako aktualizacji dla %s"
-#: ../yum/depsolve.py:580
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: oznaczanie %s jako do zainstalowania dla %s"
-#: ../yum/depsolve.py:672 ../yum/depsolve.py:751
+#: ../yum/depsolve.py:674 ../yum/depsolve.py:756
msgid "Success - empty transaction"
msgstr "Powodzenie - pusta transakcja"
-#: ../yum/depsolve.py:710 ../yum/depsolve.py:723
+#: ../yum/depsolve.py:713 ../yum/depsolve.py:728
msgid "Restarting Loop"
msgstr "Ponowne uruchamianie pętli"
-#: ../yum/depsolve.py:739
+#: ../yum/depsolve.py:744
msgid "Dependency Process ending"
msgstr "Kończenie procesu zależności"
-#: ../yum/depsolve.py:745
+#: ../yum/depsolve.py:750
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s z %s ma problemy z rozwiązywaniem zależności"
-#: ../yum/depsolve.py:752
+#: ../yum/depsolve.py:757
msgid "Success - deps resolved"
msgstr "Powodzenie - rozwiązano zależności"
-#: ../yum/depsolve.py:766
+#: ../yum/depsolve.py:771
#, python-format
msgid "Checking deps for %s"
msgstr "Sprawdzanie zależności dla %s"
-#: ../yum/depsolve.py:849
+#: ../yum/depsolve.py:854
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "wyszukiwanie %s jako wymagania %s"
-#: ../yum/depsolve.py:989
+#: ../yum/depsolve.py:996
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Wykonywanie compare_providers() dla %s"
-#: ../yum/depsolve.py:1017 ../yum/depsolve.py:1023
+#: ../yum/depsolve.py:1024 ../yum/depsolve.py:1030
#, python-format
msgid "better arch in po %s"
msgstr "lepsze arch w po %s"
-#: ../yum/depsolve.py:1062
+#: ../yum/depsolve.py:1091
#, python-format
msgid "%s obsoletes %s"
msgstr "%s zastępuje %s"
-#: ../yum/depsolve.py:1078
+#: ../yum/depsolve.py:1107
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1497,17 +1560,17 @@ msgstr ""
"archdist porównało %s do %s na %s\n"
" Zwycięzca: %s"
-#: ../yum/depsolve.py:1085
+#: ../yum/depsolve.py:1114
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "wspólny źródłowy pakiet RPM %s i %s"
-#: ../yum/depsolve.py:1091
+#: ../yum/depsolve.py:1120
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "wspólny przedrostek %s dla %s i %s"
-#: ../yum/depsolve.py:1099
+#: ../yum/depsolve.py:1128
#, python-format
msgid "Best Order: %s"
msgstr "Najlepszy porządek: %s"
@@ -1516,80 +1579,79 @@ msgstr "Najlepszy porządek: %s"
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() zostanie usunięte w przyszłych wersjach yuma.\n"
-#. FIXME: Use critical? or exception?
-#: ../yum/__init__.py:335
+#: ../yum/__init__.py:350
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Repozytorium %r nie posiada nazwy w konfiguracji, używanie ID"
-#: ../yum/__init__.py:373
+#: ../yum/__init__.py:388
msgid "plugins already initialised"
msgstr "wtyczki zostały już zainicjowane"
-#: ../yum/__init__.py:380
+#: ../yum/__init__.py:395
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() zostanie usunięte w przyszłych wersjach yuma.\n"
-#: ../yum/__init__.py:390
+#: ../yum/__init__.py:406
msgid "Reading Local RPMDB"
msgstr "Odczytywanie lokalnej bazy danych RPM"
-#: ../yum/__init__.py:408
+#: ../yum/__init__.py:424
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() zostanie usunięte w przyszłych wersjach yuma.\n"
-#: ../yum/__init__.py:428
+#: ../yum/__init__.py:444
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() zostanie usunięte w przyszłych wersjach yuma.\n"
-#: ../yum/__init__.py:445
+#: ../yum/__init__.py:461
msgid "Setting up Package Sacks"
msgstr "Ustawianie zestawów pakietów"
-#: ../yum/__init__.py:488
+#: ../yum/__init__.py:504
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "obiekt repozytorium %s nie posiada metody _resetSack\n"
-#: ../yum/__init__.py:489
+#: ../yum/__init__.py:505
msgid "therefore this repo cannot be reset.\n"
msgstr "więc to repozytorium nie może zostać przywrócone.\n"
-#: ../yum/__init__.py:494
+#: ../yum/__init__.py:510
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() zostanie usunięte w przyszłych wersjach yuma.\n"
-#: ../yum/__init__.py:506
+#: ../yum/__init__.py:522
msgid "Building updates object"
msgstr "Budowanie obiektu aktualizacji"
-#: ../yum/__init__.py:537
+#: ../yum/__init__.py:553
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() zostanie usunięte w przyszłych wersjach yuma.\n"
-#: ../yum/__init__.py:561
+#: ../yum/__init__.py:578
msgid "Getting group metadata"
msgstr "Pobieranie metadanych grup"
-#: ../yum/__init__.py:586
+#: ../yum/__init__.py:604
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Dodawanie pliku grup z repozytorium: %s"
-#: ../yum/__init__.py:591
+#: ../yum/__init__.py:613
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Dodanie pliku grup dla repozytorium nie powiodło się: %s - %s"
-#: ../yum/__init__.py:597
+#: ../yum/__init__.py:619
msgid "No Groups Available in any repository"
msgstr "Brak dostępnych grup we wszystkich repozytoriach"
-#: ../yum/__init__.py:647
+#: ../yum/__init__.py:669
msgid "Importing additional filelist information"
msgstr "Importowanie dodatkowych informacji o liście plików"
-#: ../yum/__init__.py:655
+#: ../yum/__init__.py:678
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
@@ -1597,17 +1659,17 @@ msgstr ""
"Pozostały niezakończone transakcje. Rozważ wykonanie yum-complete-"
"transaction, aby najpierw je zakończyć."
-#: ../yum/__init__.py:721
+#: ../yum/__init__.py:744
#, python-format
msgid "Skip-broken round %i"
msgstr "Pierwsza runda pomijania uszkodzonych %i"
-#: ../yum/__init__.py:770
+#: ../yum/__init__.py:796
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Pomijanie uszkodzonych zajęło %i rund "
-#: ../yum/__init__.py:771
+#: ../yum/__init__.py:797
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1615,92 +1677,92 @@ msgstr ""
"\n"
"Pakiety pominięto z powodu problemów z zależnościami:"
-#: ../yum/__init__.py:775
+#: ../yum/__init__.py:801
#, python-format
msgid " %s from %s"
msgstr " %s z %s"
-#: ../yum/__init__.py:918
+#: ../yum/__init__.py:945
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie fatalne błędy."
-#: ../yum/__init__.py:934
+#: ../yum/__init__.py:960
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Usunięcie pliku transakcji %s nie powiodło się"
-#: ../yum/__init__.py:975
+#: ../yum/__init__.py:1002
#, python-format
msgid "excluding for cost: %s from %s"
msgstr "wykluczanie z kosztów: %s z %s"
-#: ../yum/__init__.py:1006
+#: ../yum/__init__.py:1033
msgid "Excluding Packages in global exclude list"
msgstr "Wykluczanie pakietów na globalnej liście wykluczonych pakietów"
-#: ../yum/__init__.py:1008
+#: ../yum/__init__.py:1035
#, python-format
msgid "Excluding Packages from %s"
msgstr "Wykluczanie pakietów z %s"
-#: ../yum/__init__.py:1033
+#: ../yum/__init__.py:1064
#, python-format
msgid "Reducing %s to included packages only"
msgstr "Zmniejszanie %s tylko do dołączonych pakietów"
-#: ../yum/__init__.py:1039
+#: ../yum/__init__.py:1070
#, python-format
msgid "Keeping included package %s"
msgstr "Utrzymywanie dołączonego pakietu %s"
-#: ../yum/__init__.py:1045
+#: ../yum/__init__.py:1076
#, python-format
msgid "Removing unmatched package %s"
msgstr "Usuwanie niepasującego pakietu %s"
-#: ../yum/__init__.py:1048
+#: ../yum/__init__.py:1079
msgid "Finished"
msgstr "Zakończono"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1078
+#: ../yum/__init__.py:1109
#, 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:1082
+#: ../yum/__init__.py:1113
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Istnieje blokada %s: inna kopia jest uruchomiona jako PID %s."
-#: ../yum/__init__.py:1153
+#: ../yum/__init__.py:1180
msgid "Package does not match intended download"
msgstr "Pakiet nie zgadza się z zamierzonym pobieraniem"
-#: ../yum/__init__.py:1168
+#: ../yum/__init__.py:1195
msgid "Could not perform checksum"
msgstr "Nie można wykonać sprawdzenia sum kontrolnych"
-#: ../yum/__init__.py:1171
+#: ../yum/__init__.py:1198
msgid "Package does not match checksum"
msgstr "Sumy kontrolne pakietu nie zgadzają się"
-#: ../yum/__init__.py:1214
+#: ../yum/__init__.py:1241
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
"sprawdzenie sum kontrolnych pakietu nie powiodło się, ale zapisywanie w "
"pamięci podręcznej dla %s jest włączone"
-#: ../yum/__init__.py:1217 ../yum/__init__.py:1245
+#: ../yum/__init__.py:1244 ../yum/__init__.py:1273
#, python-format
msgid "using local copy of %s"
msgstr "używanie lokalnej kopii %s"
-#: ../yum/__init__.py:1259
+#: ../yum/__init__.py:1285
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1711,11 +1773,11 @@ msgstr ""
" * wolne %s\n"
" * wymagane %s"
-#: ../yum/__init__.py:1306
+#: ../yum/__init__.py:1332
msgid "Header is not complete."
msgstr "Nagłówek nie jest kompletny."
-#: ../yum/__init__.py:1346
+#: ../yum/__init__.py:1369
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1723,62 +1785,62 @@ msgstr ""
"Nagłówek nie jest w lokalnej pamięci podręcznej, a tryb używania tylko "
"pamięci podręcznej jest włączony. Nie można pobrać %s"
-#: ../yum/__init__.py:1401
+#: ../yum/__init__.py:1424
#, python-format
msgid "Public key for %s is not installed"
msgstr "Klucz publiczny dla %s nie jest zainstalowany"
-#: ../yum/__init__.py:1405
+#: ../yum/__init__.py:1428
#, python-format
msgid "Problem opening package %s"
msgstr "Podczas otwierania pakietu %s wystąpił problem"
-#: ../yum/__init__.py:1413
+#: ../yum/__init__.py:1436
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Klucz publiczny dla %s nie jest zaufany"
-#: ../yum/__init__.py:1417
+#: ../yum/__init__.py:1440
#, python-format
msgid "Package %s is not signed"
msgstr "Pakiet %s nie jest podpisany"
-#: ../yum/__init__.py:1455
+#: ../yum/__init__.py:1478
#, python-format
msgid "Cannot remove %s"
msgstr "Nie można usunąć %s"
-#: ../yum/__init__.py:1458
+#: ../yum/__init__.py:1482
#, python-format
msgid "%s removed"
msgstr "Usunięto %s"
-#: ../yum/__init__.py:1495
+#: ../yum/__init__.py:1518
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Nie można usunąć %s pliku %s"
-#: ../yum/__init__.py:1498
+#: ../yum/__init__.py:1522
#, python-format
msgid "%s file %s removed"
msgstr "Usunięto %s plik %s"
-#: ../yum/__init__.py:1500
+#: ../yum/__init__.py:1524
#, python-format
msgid "%d %s files removed"
msgstr "Usunięto %d %s plików"
-#: ../yum/__init__.py:1568
+#: ../yum/__init__.py:1593
#, 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:1573
+#: ../yum/__init__.py:1599
#, 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:1792
+#: ../yum/__init__.py:1817
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1786,104 +1848,99 @@ msgstr ""
"searchPackages() zostanie usunięte w przyszłych wersjach "
"yuma. Zamiast tego użyj searchGenerator(). \n"
-#: ../yum/__init__.py:1829
+#: ../yum/__init__.py:1855
#, python-format
msgid "Searching %d packages"
msgstr "Wyszukiwanie %d pakietów"
-#: ../yum/__init__.py:1832
+#: ../yum/__init__.py:1859
#, python-format
msgid "searching package %s"
msgstr "wyszukiwanie pakietu %s"
-#: ../yum/__init__.py:1843
+#: ../yum/__init__.py:1871
msgid "searching in file entries"
msgstr "wyszukiwanie we wpisach plików"
-#: ../yum/__init__.py:1849
+#: ../yum/__init__.py:1878
msgid "searching in provides entries"
msgstr "wyszukiwanie we wpisach dostarczania"
-#: ../yum/__init__.py:1882
+#: ../yum/__init__.py:1911
#, python-format
msgid "Provides-match: %s"
msgstr "Wyniki dostarczania: %s"
-#: ../yum/__init__.py:1931
+#: ../yum/__init__.py:1960
msgid "No group data available for configured repositories"
msgstr "Brak dostępnych danych grup dla skonfigurowanych repozytoriów"
-#: ../yum/__init__.py:1962 ../yum/__init__.py:1981 ../yum/__init__.py:2011
-#: ../yum/__init__.py:2017 ../yum/__init__.py:2090 ../yum/__init__.py:2094
+#: ../yum/__init__.py:1991 ../yum/__init__.py:2010 ../yum/__init__.py:2041
+#: ../yum/__init__.py:2047 ../yum/__init__.py:2120 ../yum/__init__.py:2124
#, python-format
msgid "No Group named %s exists"
msgstr "Grupa o nazwie %s nie istnieje"
-#: ../yum/__init__.py:1992 ../yum/__init__.py:2106
+#: ../yum/__init__.py:2022 ../yum/__init__.py:2137
#, python-format
msgid "package %s was not marked in group %s"
msgstr "pakiet %s nie został oznaczony w grupie %s"
-#: ../yum/__init__.py:2038
+#: ../yum/__init__.py:2069
#, python-format
msgid "Adding package %s from group %s"
msgstr "Dodawanie pakietu %s z grupy %s"
-#: ../yum/__init__.py:2043
+#: ../yum/__init__.py:2073
#, python-format
msgid "No package named %s available to be installed"
msgstr "Brak dostępnego pakietu o nazwie %s do zainstalowania"
-#: ../yum/__init__.py:2131
+#: ../yum/__init__.py:2162
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "Nie można znaleźć krotki pakietu %s w zestawie pakietów"
-#: ../yum/__init__.py:2146
+#: ../yum/__init__.py:2177
msgid ""
"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
msgstr ""
"getInstalledPackageObject() zostanie usunięte, użyj self.rpmdb.searchPkgTuple"
"().\n"
-#: ../yum/__init__.py:2198 ../yum/__init__.py:2241
-msgid "Invalid versioned dependency string, try quoting it."
-msgstr "Nieprawidłowy łańcuch tekstowy wersji, spróbuj go zacytować."
-
-#: ../yum/__init__.py:2200 ../yum/__init__.py:2243
+#: ../yum/__init__.py:2229 ../yum/__init__.py:2270
msgid "Invalid version flag"
msgstr "Nieprawidłowa flaga wersji"
-#: ../yum/__init__.py:2215 ../yum/__init__.py:2219
+#: ../yum/__init__.py:2244 ../yum/__init__.py:2248
#, python-format
msgid "No Package found for %s"
msgstr "Nie znaleziono pakietu %s"
-#: ../yum/__init__.py:2427
+#: ../yum/__init__.py:2425
msgid "Package Object was not a package object instance"
msgstr "Obiekt pakietu nie był instancją obiektu pakietu"
-#: ../yum/__init__.py:2431
+#: ../yum/__init__.py:2429
msgid "Nothing specified to install"
msgstr "Nie podano nic do zainstalowania"
-#. only one in there
-#: ../yum/__init__.py:2449
+#: ../yum/__init__.py:2445
#, 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:2455 ../yum/__init__.py:2853
+#: ../yum/__init__.py:2451 ../yum/__init__.py:2704 ../yum/__init__.py:2874
#, python-format
msgid "No Match for argument: %s"
msgstr "Brak wyników dla parametru: %s"
-#: ../yum/__init__.py:2521
+#: ../yum/__init__.py:2522
#, python-format
msgid "Package %s installed and not available"
msgstr "Pakiet %s jest zainstalowany, ale nie jest dostępny"
-#: ../yum/__init__.py:2524
+#: ../yum/__init__.py:2525
msgid "No package(s) available to install"
msgstr "Brak pakietów dostępnych do instalacji"
@@ -1892,69 +1949,69 @@ msgstr "Brak pakietów dostępnych do instalacji"
msgid "Package: %s - already in transaction set"
msgstr "Pakiet: %s - jest już w zestawie transakcji"
-#: ../yum/__init__.py:2551
+#: ../yum/__init__.py:2552
+#, 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:2560
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Pakiet %s jest już zainstalowany w najnowszej wersji"
-#: ../yum/__init__.py:2558
+#: ../yum/__init__.py:2567
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
"Pakiet pasujący do %s jest już zainstalowany. Sprawdzanie aktualizacji."
-#: ../yum/__init__.py:2568
-#, 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"
-
#. update everything (the easy case)
-#: ../yum/__init__.py:2646
+#: ../yum/__init__.py:2648
msgid "Updating Everything"
msgstr "Aktualizowanie wszystkiego"
-#: ../yum/__init__.py:2658 ../yum/__init__.py:2758 ../yum/__init__.py:2780
-#: ../yum/__init__.py:2802
+#: ../yum/__init__.py:2666 ../yum/__init__.py:2776 ../yum/__init__.py:2797
+#: ../yum/__init__.py:2823
#, 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:2749
+#: ../yum/__init__.py:2701 ../yum/__init__.py:2871
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: ../yum/__init__.py:2767
#, 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:2783 ../yum/__init__.py:2805
+#: ../yum/__init__.py:2800 ../yum/__init__.py:2826
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "Już zaktualizowany pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2850
-#, python-format
-msgid "%s"
-msgstr "%s"
-
-#: ../yum/__init__.py:2866
+#: ../yum/__init__.py:2887
msgid "No package matched to remove"
msgstr "Brak pasujących pakietów do usunięcia"
-#: ../yum/__init__.py:2900
+#: ../yum/__init__.py:2921
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Nie można otworzyć pliku: %s. Pomijanie."
-#: ../yum/__init__.py:2902
+#: ../yum/__init__.py:2924
#, python-format
msgid "Examining %s: %s"
msgstr "Sprawdzanie %s: %s"
-#: ../yum/__init__.py:2910
+#: ../yum/__init__.py:2932
#, 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:2918
+#: ../yum/__init__.py:2940
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -1963,83 +2020,83 @@ msgstr ""
"Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Uruchom yum "
"install, aby go zainstalować."
-#: ../yum/__init__.py:2951
+#: ../yum/__init__.py:2973
#, python-format
msgid "Excluding %s"
msgstr "Wykluczanie %s"
-#: ../yum/__init__.py:2955
+#: ../yum/__init__.py:2978
#, python-format
msgid "Marking %s to be installed"
msgstr "Oznaczanie %s do zainstalowania"
-#: ../yum/__init__.py:2960
+#: ../yum/__init__.py:2984
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Oznaczanie %s jako aktualizacji %s"
-#: ../yum/__init__.py:2965
+#: ../yum/__init__.py:2991
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: nie aktualizuj zainstalowanego pakietu."
-#: ../yum/__init__.py:2982
+#: ../yum/__init__.py:3009
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:2993
+#: ../yum/__init__.py:3021
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Pakiet %s może być wielokrotnie instalowany, pomijanie"
-#: ../yum/__init__.py:3000
+#: ../yum/__init__.py:3030
msgid "Problem in reinstall: no package matched to install"
msgstr ""
"Podczas ponownego instalowania wystąpił problem: brak pasujących pakietów do "
"zainstalowania"
-#: ../yum/__init__.py:3035
+#: ../yum/__init__.py:3065
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Pobieranie klucza GPG z %s"
-#: ../yum/__init__.py:3055
+#: ../yum/__init__.py:3085
msgid "GPG key retrieval failed: "
msgstr "Pobranie klucza GPG nie powiodło się: "
-#: ../yum/__init__.py:3066
+#: ../yum/__init__.py:3096
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr ""
"Przeanalizowanie klucza GPG nie powiodło się: klucz nie posiada wartości %s"
-#: ../yum/__init__.py:3098
+#: ../yum/__init__.py:3128
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "Klucz GPG %s (0x%s) jest już zainstalowany"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3103 ../yum/__init__.py:3164
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3195
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Importowanie klucza GPG 0x%s \"%s\" z %s"
-#: ../yum/__init__.py:3119
+#: ../yum/__init__.py:3150
msgid "Not installing key"
msgstr "Klucz nie zostanie zainstalowany"
-#: ../yum/__init__.py:3125
+#: ../yum/__init__.py:3156
#, python-format
msgid "Key import failed (code %d)"
msgstr "Zaimportowanie klucza nie powiodło się (kod %d)"
-#: ../yum/__init__.py:3126 ../yum/__init__.py:3186
+#: ../yum/__init__.py:3157 ../yum/__init__.py:3216
msgid "Key imported successfully"
msgstr "Klucz został pomyślnie zaimportowany"
-#: ../yum/__init__.py:3131 ../yum/__init__.py:3191
+#: ../yum/__init__.py:3162 ../yum/__init__.py:3221
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2051,78 +2108,78 @@ msgstr ""
"Sprawdź, czy dla tego repozytorium skonfigurowane są poprawne adresy do "
"kluczy."
-#: ../yum/__init__.py:3140
+#: ../yum/__init__.py:3171
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Zaimportowanie kluczy nie pomogło, błędne klucze?"
-#: ../yum/__init__.py:3159
+#: ../yum/__init__.py:3190
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "Klucz GPG %s (0x%s) został już zaimportowany"
-#: ../yum/__init__.py:3178
+#: ../yum/__init__.py:3210
#, python-format
msgid "Not installing key for repo %s"
msgstr "Klucz dla repozytorium %s nie zostanie zainstalowany"
-#: ../yum/__init__.py:3185
+#: ../yum/__init__.py:3215
msgid "Key import failed"
msgstr "Zaimportowanie klucza nie powiodło się"
-#: ../yum/__init__.py:3275
+#: ../yum/__init__.py:3306
msgid "Unable to find a suitable mirror."
msgstr "Nie można znaleźć odpowiedniego serwera lustrzanego."
-#: ../yum/__init__.py:3277
+#: ../yum/__init__.py:3308
msgid "Errors were encountered while downloading packages."
msgstr "Podczas pobierania pakietów wystąpiły błędy."
-#: ../yum/__init__.py:3317
+#: ../yum/__init__.py:3349
#, python-format
msgid "Please report this error at %s"
msgstr "Zgłoś ten błąd na %s"
-#: ../yum/__init__.py:3341
+#: ../yum/__init__.py:3373
msgid "Test Transaction Errors: "
msgstr "Błędy testu transakcji: "
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:201
+#: ../yum/plugins.py:204
msgid "Loaded plugins: "
msgstr "Wczytane wtyczki: "
-#: ../yum/plugins.py:215 ../yum/plugins.py:221
+#: ../yum/plugins.py:218 ../yum/plugins.py:224
#, python-format
msgid "No plugin match for: %s"
msgstr "Brak wyników dla wtyczki: %s"
-#: ../yum/plugins.py:251
+#: ../yum/plugins.py:254
#, python-format
-msgid "\"%s\" plugin is disabled"
-msgstr "Wtyczka \"%s\" jest wyłączona"
+msgid "Not loading \"%s\" plugin, as it is disabled"
+msgstr "Wtyczka \"%s\" nie została wczytana, ponieważ jest wyłączona"
#. Give full backtrace:
-#: ../yum/plugins.py:263
+#: ../yum/plugins.py:266
#, python-format
msgid "Plugin \"%s\" can't be imported"
msgstr "Nie można zaimportować wtyczki \"%s\""
-#: ../yum/plugins.py:270
+#: ../yum/plugins.py:273
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr "Wtyczka \"%s\" nie określa wymaganej wersji API"
-#: ../yum/plugins.py:275
+#: ../yum/plugins.py:278
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr "Wtyczka \"%s\" wymaga API %s. Obsługiwane API to %s."
-#: ../yum/plugins.py:308
+#: ../yum/plugins.py:311
#, python-format
msgid "Loading \"%s\" plugin"
msgstr "Wczytywanie wtyczki \"%s\""
-#: ../yum/plugins.py:315
+#: ../yum/plugins.py:318
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
@@ -2130,19 +2187,19 @@ msgstr ""
"Istnieją dwie lub więcej wtyczek o nazwie \"%s\" w ścieżce wyszukiwania "
"wtyczek"
-#: ../yum/plugins.py:335
+#: ../yum/plugins.py:338
#, python-format
msgid "Configuration file %s not found"
msgstr "Nie znaleziono pliku konfiguracji %s"
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:338
+#: ../yum/plugins.py:341
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr "Nie można naleźć pliku konfiguracji dla wtyczki %s"
-#: ../yum/plugins.py:492
+#: ../yum/plugins.py:495
msgid "registration of commands not supported"
msgstr "rejestracja poleceń nie jest obsługiwana"
diff --git a/po/sr.po b/po/sr.po
old mode 100755
new mode 100644
index a8de8e7..962ebcb
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-27 13:29+0000\n"
-"PO-Revision-Date: 2008-10-27 22:52+0000\n"
+"POT-Creation-Date: 2009-04-01 19:44+0000\n"
+"PO-Revision-Date: 2009-04-01 21:06+0100\n"
"Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
"Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../callback.py:48 ../output.py:777 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:933 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Ажурирам"
@@ -27,8 +27,7 @@ msgstr "Ажурирам"
msgid "Erasing"
msgstr "Бришем"
-#. Arch can't get "that big" ... so always use the max.
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:776
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:932
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Инсталирам"
@@ -37,7 +36,7 @@ msgstr "Инсталирам"
msgid "Obsoleted"
msgstr "Превазиђени"
-#: ../callback.py:54 ../output.py:891
+#: ../callback.py:54 ../output.py:1040
msgid "Updated"
msgstr "Ажурирани"
@@ -45,7 +44,7 @@ msgstr "Ажурирани"
msgid "Erased"
msgstr "Обрисани"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:889
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1038
msgid "Installed"
msgstr "Инсталирани"
@@ -67,7 +66,7 @@ msgstr "Грешка: погрешно излазно стање: %s за %s"
msgid "Erased: %s"
msgstr "Обрисано: %s"
-#: ../callback.py:217 ../output.py:778
+#: ../callback.py:217 ../output.py:934
msgid "Removing"
msgstr "Уклањам"
@@ -75,60 +74,60 @@ msgstr "Уклањам"
msgid "Cleanup"
msgstr "Чишћење"
-#: ../cli.py:105
+#: ../cli.py:104
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Наредба „%s“ је већ дефинисана"
-#: ../cli.py:117
+#: ../cli.py:116
msgid "Setting up repositories"
msgstr "Постављам ризнице"
-#: ../cli.py:128
+#: ../cli.py:127
msgid "Reading repository metadata in from local files"
msgstr "Читам метаподатке ризница из локалних датотека"
-#: ../cli.py:187 ../utils.py:71
+#: ../cli.py:190 ../utils.py:87
#, python-format
msgid "Config Error: %s"
msgstr "Грешка при подешавању: %s"
-#: ../cli.py:190 ../cli.py:1128 ../utils.py:74
+#: ../cli.py:193 ../cli.py:1231 ../utils.py:90
#, python-format
msgid "Options Error: %s"
msgstr "Грешка у опцијама: %s"
-#: ../cli.py:218
+#: ../cli.py:221
#, python-format
msgid " Installed: %s-%s at %s"
-msgstr " Инсталирано: %s-%s на %s"
+msgstr " Инсталиран : %s-%s %s"
-#: ../cli.py:220
-#, fuzzy, python-format
+#: ../cli.py:223
+#, python-format
msgid " Built : %s at %s"
-msgstr "УРЛ : %s"
+msgstr " Направио/ла: %s %s"
-#: ../cli.py:222
-#, fuzzy, python-format
+#: ../cli.py:225
+#, python-format
msgid " Committed: %s at %s"
-msgstr "Објављивач : %s"
+msgstr " Објавио/ла : %s %s"
-#: ../cli.py:259
+#: ../cli.py:264
msgid "You need to give some command"
msgstr "Морате да унесете неку команду"
-#: ../cli.py:301
+#: ../cli.py:307
msgid "Disk Requirements:\n"
msgstr "Захтеви диска:\n"
-#: ../cli.py:303
+#: ../cli.py:309
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Потребно је најмање %dМБ на %s систему датотека.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:308
+#: ../cli.py:314
msgid ""
"Error Summary\n"
"-------------\n"
@@ -136,55 +135,56 @@ msgstr ""
"Сажетак грешака\n"
"-------------\n"
-#: ../cli.py:351
+#: ../cli.py:357
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "Покушавам да извршим трансакцију али нема шта да се ради. Излазим."
-#: ../cli.py:381
+#: ../cli.py:393
msgid "Exiting on user Command"
msgstr "Излазим на команду корисника"
-#: ../cli.py:385
+#: ../cli.py:397
msgid "Downloading Packages:"
msgstr "Преузимам пакете:"
-#: ../cli.py:390
+#: ../cli.py:402
msgid "Error Downloading Packages:\n"
msgstr "Грешка при преузимању пакета:\n"
-#: ../cli.py:404 ../yum/__init__.py:3182
+#: ../cli.py:416 ../yum/__init__.py:3528
msgid "Running rpm_check_debug"
msgstr "Извршавам rpm_check_debug"
-#: ../cli.py:407 ../yum/__init__.py:3185
+#: ../cli.py:419 ../yum/__init__.py:3531
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "ГРЕШКА са rpm_check_debug у односу на depsolve:"
-#: ../cli.py:411 ../yum/__init__.py:3187
-msgid "Please report this error in bugzilla"
-msgstr "Молим вас, пријавите ову грешку у bugzilla-и"
+#: ../cli.py:423
+#, python-format
+msgid "Please report this error in %s"
+msgstr "Пријавите ову грешку у %s"
-#: ../cli.py:417
+#: ../cli.py:429
msgid "Running Transaction Test"
msgstr "Извршавам проверу трансакције"
-#: ../cli.py:433
+#: ../cli.py:445
msgid "Finished Transaction Test"
msgstr "Завршена је провера трансакције"
-#: ../cli.py:435
+#: ../cli.py:447
msgid "Transaction Check Error:\n"
msgstr "Грешка при провери трансакције:\n"
-#: ../cli.py:442
+#: ../cli.py:454
msgid "Transaction Test Succeeded"
msgstr "Провера трансакције је успела"
-#: ../cli.py:463
+#: ../cli.py:475
msgid "Running Transaction"
msgstr "Извршавам трансакцију"
-#: ../cli.py:493
+#: ../cli.py:505
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -192,72 +192,72 @@ msgstr ""
"Одбијам да аутоматски увезем кључеве када се извршавање не надгледа.\n"
"За превазилажење овога користите „-y“."
-#: ../cli.py:512 ../cli.py:545
+#: ../cli.py:524 ../cli.py:558
msgid " * Maybe you meant: "
msgstr " * Можда сте мислили: "
-#: ../cli.py:528 ../cli.py:536
+#: ../cli.py:541 ../cli.py:549
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "%s%s%s пакет је доступан, али није инсталиран."
-#: ../cli.py:542 ../cli.py:577
+#: ../cli.py:555 ../cli.py:586 ../cli.py:666
#, python-format
msgid "No package %s%s%s available."
-msgstr "Не постоји доступан %s%s%s пакет."
+msgstr "Не постоји доступан пакет %s%s%s."
-#: ../cli.py:567
-msgid "Parsing package install arguments"
-msgstr "Рашчлањујем аргументе инсталације пакета"
-
-#: ../cli.py:582 ../cli.py:657 ../yumcommands.py:912
+#: ../cli.py:591 ../cli.py:693
msgid "Package(s) to install"
msgstr "Пакет(и) који ће се инсталирати"
-#: ../cli.py:583 ../cli.py:658 ../yumcommands.py:150 ../yumcommands.py:913
+#: ../cli.py:592 ../cli.py:672 ../cli.py:694 ../yumcommands.py:157
+#: ../yumcommands.py:1015
msgid "Nothing to do"
msgstr "Нема шта да се ради"
-#: ../cli.py:616
+#: ../cli.py:625
#, python-format
msgid "%d packages marked for Update"
msgstr "%d пакети означени за ажурирање"
-#: ../cli.py:619
+#: ../cli.py:628
msgid "No Packages marked for Update"
msgstr "Нема пакета означених за ажурирање"
-#: ../cli.py:633
+#: ../cli.py:642
#, python-format
msgid "%d packages marked for removal"
msgstr "%d пакети означени за уклањање"
-#: ../cli.py:636
+#: ../cli.py:645
msgid "No Packages marked for removal"
msgstr "Нема пакета означених за уклањање"
-#: ../cli.py:648
+#: ../cli.py:671
+msgid "Package(s) to downgrade"
+msgstr "Пакет(и) који ће се уназадити"
+
+#: ../cli.py:684
msgid "No Packages Provided"
msgstr "Ниједан пакет није добављен"
-#: ../cli.py:689
-#, fuzzy
+#: ../cli.py:739
msgid "Matching packages for package list to user args"
-msgstr "Повезивање пакета за списак пакета по аргументима корисника"
+msgstr "Повезивање пакета за списак пакета према аргументима корисника"
-#: ../cli.py:731
+#: ../cli.py:788
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Упозорење: није нађено подударање за %s"
-#: ../cli.py:734
+#: ../cli.py:791
msgid "No Matches found"
msgstr "Нису пронађена подударања"
-#: ../cli.py:773
+#: ../cli.py:830
#, python-format
msgid ""
-"Warning: 3.0.x versions of yum would erronously match against filenames.\n"
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
"Упозорење: 3.0.x yum верзије би грешком вршиле подударање са називима "
@@ -265,104 +265,108 @@ msgstr ""
" Можете употребити „%s*/%s%s“ и/или „%s*bin/%s%s“ да бисте добили такво "
"понашање"
-#: ../cli.py:789
+#: ../cli.py:846
#, python-format
msgid "No Package Found for %s"
msgstr "Нису пронађени пакети за %s"
-#: ../cli.py:801
+#: ../cli.py:858
msgid "Cleaning up Everything"
msgstr "Чистим све"
-#: ../cli.py:815
+#: ../cli.py:872
msgid "Cleaning up Headers"
msgstr "Чистим заглавља"
-#: ../cli.py:818
+#: ../cli.py:875
msgid "Cleaning up Packages"
msgstr "Чистим пакете"
-#: ../cli.py:821
+#: ../cli.py:878
msgid "Cleaning up xml metadata"
msgstr "Чистим xml метаподатке"
-#: ../cli.py:824
+#: ../cli.py:881
msgid "Cleaning up database cache"
msgstr "Чистим кеш базе података"
-#: ../cli.py:827
+#: ../cli.py:884
msgid "Cleaning up expire-cache metadata"
msgstr "Чистим expire-cache метаподатке"
-#: ../cli.py:830
+#: ../cli.py:887
msgid "Cleaning up plugins"
msgstr "Чистим додатке"
-#: ../cli.py:851
+#: ../cli.py:912
msgid "Installed Groups:"
msgstr "Инсталиране групе:"
-#: ../cli.py:858
+#: ../cli.py:924
msgid "Available Groups:"
msgstr "Доступне групе:"
-#: ../cli.py:864
+#: ../cli.py:934
msgid "Done"
msgstr "Урађено"
-#: ../cli.py:875 ../cli.py:893 ../cli.py:899 ../yum/__init__.py:2274
+#: ../cli.py:945 ../cli.py:963 ../cli.py:969 ../yum/__init__.py:2420
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Упозорење: група %s не постоји."
-#: ../cli.py:903
+#: ../cli.py:973
msgid "No packages in any requested group available to install or update"
msgstr ""
"Нема доступних пакета за инсталацију или ажурирање у свим захтеваним групама"
-#: ../cli.py:905
+#: ../cli.py:975
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d пакет(и) за инсталацију"
-#: ../cli.py:915 ../yum/__init__.py:2286
+#: ../cli.py:985 ../yum/__init__.py:2432
#, python-format
msgid "No group named %s exists"
msgstr "Не постоји група под именом %s"
-#: ../cli.py:921
+#: ../cli.py:991
msgid "No packages to remove from groups"
msgstr "Нема пакета за уклањање из група"
-#: ../cli.py:923
+#: ../cli.py:993
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d пакет(и) за уклањање"
-#: ../cli.py:965
+#: ../cli.py:1035
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Пакет %s је већ инсталиран, прескачем га"
-#: ../cli.py:976
+#: ../cli.py:1046
#, 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:1002
+#: ../cli.py:1072
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
"Не постоји инсталиран други %s, додајем га у списак за потенцијалну "
"инсталацију"
-#: ../cli.py:1021
+#: ../cli.py:1092
+msgid "Plugin Options"
+msgstr "Опције додатка"
+
+#: ../cli.py:1100
#, python-format
msgid "Command line error: %s"
msgstr "Грешка командне линије: %s"
-#: ../cli.py:1034
+#: ../cli.py:1113
#, python-format
msgid ""
"\n"
@@ -373,245 +377,258 @@ msgstr ""
"\n"
"%s: %s опција захтева аргумент"
-#: ../cli.py:1170
+#: ../cli.py:1171
+msgid "--color takes one of: auto, always, never"
+msgstr "--color прима један од следећих: auto, always, never"
+
+#: ../cli.py:1278
msgid "show this help message and exit"
msgstr "прикажи ову помоћну поруку и изађи"
-#: ../cli.py:1174
+#: ../cli.py:1282
msgid "be tolerant of errors"
msgstr "буди толерантан на грешке"
-#: ../cli.py:1176
+#: ../cli.py:1284
msgid "run entirely from cache, don't update cache"
msgstr "извршавај се у потпуности из кеша, не ажурирај кеш"
-#: ../cli.py:1178
+#: ../cli.py:1286
msgid "config file location"
msgstr "место датотеке подешавања"
-#: ../cli.py:1180
+#: ../cli.py:1288
msgid "maximum command wait time"
msgstr "најдуже време чекања на команду"
-#: ../cli.py:1182
+#: ../cli.py:1290
msgid "debugging output level"
msgstr "ниво излазног приказа за проналажење грешака"
-#: ../cli.py:1186
+#: ../cli.py:1294
msgid "show duplicates, in repos, in list/search commands"
msgstr ""
"приказуј дупликате, у ризницама, у командама за излиставање/претраживање"
-#: ../cli.py:1188
+#: ../cli.py:1296
msgid "error output level"
msgstr "ниво излазног приказа грешака"
-#: ../cli.py:1191
+#: ../cli.py:1299
msgid "quiet operation"
msgstr "тиха радња"
-#: ../cli.py:1193
+#: ../cli.py:1301
msgid "verbose operation"
msgstr "опширна радња"
-#: ../cli.py:1195
+#: ../cli.py:1303
msgid "answer yes for all questions"
msgstr "одговори са да на сва питања"
-#: ../cli.py:1197
+#: ../cli.py:1305
msgid "show Yum version and exit"
msgstr "прикажи Yum верзију и изађи"
-#: ../cli.py:1198
+#: ../cli.py:1306
msgid "set install root"
msgstr "постави корени директоријум инсталације"
-#: ../cli.py:1202
+#: ../cli.py:1310
msgid "enable one or more repositories (wildcards allowed)"
msgstr "укључи једну или више ризница (скраћенице су дозвољене)"
-#: ../cli.py:1206
+#: ../cli.py:1314
msgid "disable one or more repositories (wildcards allowed)"
msgstr "искључи једну или више ризница (скраћенице су дозвољене)"
-#: ../cli.py:1209
+#: ../cli.py:1317
msgid "exclude package(s) by name or glob"
msgstr "изузми пакет(е) по имену или глобу"
-#: ../cli.py:1211
+#: ../cli.py:1319
msgid "disable exclude from main, for a repo or for everything"
msgstr "искључи изузимање из главног скупа, за ризницу или за све"
-#: ../cli.py:1214
+#: ../cli.py:1322
msgid "enable obsoletes processing during updates"
msgstr "укључи обраду застарелих пакета у току ажурирања"
-#: ../cli.py:1216
+#: ../cli.py:1324
msgid "disable Yum plugins"
msgstr "искључи додатке за Yum"
-#: ../cli.py:1218
+#: ../cli.py:1326
msgid "disable gpg signature checking"
msgstr "искључи проверу gpg потписа"
-#: ../cli.py:1220
+#: ../cli.py:1328
msgid "disable plugins by name"
msgstr "искључи додатке по имену"
-#: ../cli.py:1223
+#: ../cli.py:1331
msgid "enable plugins by name"
msgstr "укључи додатке по имену"
-#: ../cli.py:1226
+#: ../cli.py:1334
msgid "skip packages with depsolving problems"
msgstr "прескочи пакете који имају проблема са решавањем зависности"
-#: ../output.py:236
+#: ../cli.py:1336
+msgid "control whether color is used"
+msgstr "контролише да ли се користи боја"
+
+#: ../output.py:301
msgid "Jan"
msgstr "јан"
-#: ../output.py:236
+#: ../output.py:301
msgid "Feb"
msgstr "феб"
-#: ../output.py:236
+#: ../output.py:301
msgid "Mar"
msgstr "мар"
-#: ../output.py:236
+#: ../output.py:301
msgid "Apr"
msgstr "апр"
-#: ../output.py:236
+#: ../output.py:301
msgid "May"
msgstr "мај"
-#: ../output.py:236
+#: ../output.py:301
msgid "Jun"
msgstr "јун"
-#: ../output.py:237
+#: ../output.py:302
msgid "Jul"
msgstr "јул"
-#: ../output.py:237
+#: ../output.py:302
msgid "Aug"
msgstr "авг"
-#: ../output.py:237
+#: ../output.py:302
msgid "Sep"
msgstr "сеп"
-#: ../output.py:237
+#: ../output.py:302
msgid "Oct"
msgstr "окт"
-#: ../output.py:237
+#: ../output.py:302
msgid "Nov"
msgstr "нов"
-#: ../output.py:237
+#: ../output.py:302
msgid "Dec"
msgstr "дец"
-#: ../output.py:247
+#: ../output.py:312
msgid "Trying other mirror."
msgstr "Покушавам други одраз."
-#: ../output.py:425
+#: ../output.py:534
#, python-format
msgid "Name : %s%s%s"
msgstr "Име : %s%s%s"
-#: ../output.py:426
+#: ../output.py:535
#, python-format
msgid "Arch : %s"
msgstr "Архитектура: %s"
-#: ../output.py:428
+#: ../output.py:537
#, python-format
msgid "Epoch : %s"
msgstr "Период : %s"
-#: ../output.py:429
+#: ../output.py:538
#, python-format
msgid "Version : %s"
msgstr "Верзија : %s"
-#: ../output.py:430
+#: ../output.py:539
#, python-format
msgid "Release : %s"
msgstr "Издање : %s"
-#: ../output.py:431
+#: ../output.py:540
#, python-format
msgid "Size : %s"
msgstr "Величина : %s"
-#: ../output.py:432
+#: ../output.py:541
#, python-format
msgid "Repo : %s"
msgstr "Ризница : %s"
-#: ../output.py:434
+#: ../output.py:543
+#, python-format
+msgid "From repo : %s"
+msgstr "Из ризнице : %s"
+
+#: ../output.py:545
#, python-format
msgid "Committer : %s"
msgstr "Објављивач : %s"
-#: ../output.py:435
-#, fuzzy, python-format
+#: ../output.py:546
+#, python-format
msgid "Committime : %s"
-msgstr "Објављивач : %s"
+msgstr "Објављен : %s"
-#: ../output.py:436
-#, fuzzy, python-format
+#: ../output.py:547
+#, python-format
msgid "Buildtime : %s"
-msgstr "Објављивач : %s"
+msgstr "Направљен : %s"
-#: ../output.py:438
-#, fuzzy, python-format
+#: ../output.py:549
+#, python-format
msgid "Installtime: %s"
-msgstr "Инсталирани"
+msgstr "Инсталиран : %s"
-#: ../output.py:439
+#: ../output.py:550
msgid "Summary : "
msgstr "Сажетак :"
-#: ../output.py:441
+#: ../output.py:552
#, python-format
msgid "URL : %s"
msgstr "УРЛ : %s"
-#: ../output.py:442
+#: ../output.py:553
#, python-format
msgid "License : %s"
msgstr "Лиценца : %s"
-#: ../output.py:443
+#: ../output.py:554
msgid "Description: "
msgstr "Опис : "
-#: ../output.py:500
+#: ../output.py:622
msgid "y"
msgstr "d"
-#: ../output.py:500
+#: ../output.py:622
msgid "yes"
msgstr "da"
-#: ../output.py:501
+#: ../output.py:623
msgid "n"
msgstr "n"
-#: ../output.py:501
+#: ../output.py:623
msgid "no"
msgstr "ne"
-#: ../output.py:505
+#: ../output.py:627
msgid "Is this ok [y/N]: "
msgstr "Да ли је ово у реду [d/N]: "
-#: ../output.py:587
+#: ../output.py:715
#, python-format
msgid ""
"\n"
@@ -620,132 +637,142 @@ msgstr ""
"\n"
"Група: %s"
-#: ../output.py:594
+#: ../output.py:719
+#, python-format
+msgid " Group-Id: %s"
+msgstr " ИБ групе: %s"
+
+#: ../output.py:724
#, python-format
msgid " Description: %s"
msgstr " Опис: %s"
-#: ../output.py:596
+#: ../output.py:726
msgid " Mandatory Packages:"
msgstr " Обавезни пакети:"
-#: ../output.py:597
+#: ../output.py:727
msgid " Default Packages:"
msgstr " Подразумевани пакети:"
-#: ../output.py:598
+#: ../output.py:728
msgid " Optional Packages:"
msgstr " Изборни пакети:"
-#: ../output.py:599
+#: ../output.py:729
msgid " Conditional Packages:"
msgstr " Условљени пакети:"
-#: ../output.py:619
+#: ../output.py:749
#, python-format
msgid "package: %s"
msgstr "пакет: %s"
-#: ../output.py:621
+#: ../output.py:751
msgid " No dependencies for this package"
msgstr " Не постоје зависности овог пакета"
-#: ../output.py:626
+#: ../output.py:756
#, python-format
msgid " dependency: %s"
msgstr " зависност: %s"
-#: ../output.py:628
+#: ../output.py:758
msgid " Unsatisfied dependency"
msgstr " Незадовољена зависност"
-#: ../output.py:700
+#: ../output.py:830
+#, python-format
+msgid "Repo : %s"
+msgstr "Ризница : %s"
+
+#: ../output.py:831
msgid "Matched from:"
-msgstr "Повезан из:"
+msgstr "Повезан из :"
-#: ../output.py:708
+#: ../output.py:839
msgid "Description : "
msgstr "Опис : "
-#: ../output.py:711
+#: ../output.py:842
#, python-format
msgid "URL : %s"
msgstr "УРЛ : %s"
-#: ../output.py:714
+#: ../output.py:845
#, python-format
msgid "License : %s"
msgstr "Лиценца : %s"
-#: ../output.py:717
+#: ../output.py:848
#, python-format
msgid "Filename : %s"
msgstr "Име датотеке: %s"
-#: ../output.py:721
+#: ../output.py:852
msgid "Other : "
msgstr "Остало : "
-#: ../output.py:753
+#: ../output.py:885
msgid "There was an error calculating total download size"
msgstr "Догодила се грешка при рачунању укупне величине за преузимање"
-#: ../output.py:758
+#: ../output.py:890
#, python-format
msgid "Total size: %s"
msgstr "Укупна величина: %s"
-#: ../output.py:761
+#: ../output.py:893
#, python-format
msgid "Total download size: %s"
msgstr "Укупна величина за преузимање: %s"
-#: ../output.py:779
+#: ../output.py:935
msgid "Installing for dependencies"
msgstr "Инсталирам због зависности"
-#: ../output.py:780
+#: ../output.py:936
msgid "Updating for dependencies"
msgstr "Ажурирам због зависности"
-#: ../output.py:781
+#: ../output.py:937
msgid "Removing for dependencies"
msgstr "Уклањам због зависности"
-#: ../output.py:782 ../output.py:893
+#: ../output.py:944 ../output.py:1042
msgid "Skipped (dependency problems)"
msgstr "Прескочено (проблеми са зависностима)"
-#: ../output.py:818
+#: ../output.py:965
msgid "Package"
msgstr "Пакет"
-#: ../output.py:818
+#: ../output.py:965
msgid "Arch"
msgstr "Архитектура"
-#: ../output.py:819
+#: ../output.py:966
msgid "Version"
msgstr "Верзија"
-#: ../output.py:819
+#: ../output.py:966
msgid "Repository"
msgstr "Ризница"
-#: ../output.py:820
+#: ../output.py:967
msgid "Size"
msgstr "Величина"
-#: ../output.py:831
+#: ../output.py:979
#, python-format
msgid ""
-" replacing %s.%s %s\n"
+" replacing %s%s%s.%s %s\n"
"\n"
msgstr ""
-" уклањам %s.%s %s\n"
+" замењујем %s%s%s.%s %s\n"
"\n"
-#: ../output.py:839
+#: ../output.py:988
#, python-format
msgid ""
"\n"
@@ -762,27 +789,40 @@ msgstr ""
"Ажурирање %5.5s пакет(а) \n"
"Уклањање %5.5s пакет(а) \n"
-#: ../output.py:887
+#: ../output.py:1036
msgid "Removed"
msgstr "Уклоњено"
-#: ../output.py:888
+#: ../output.py:1037
msgid "Dependency Removed"
msgstr "Зависност уклоњена"
-#: ../output.py:890
+#: ../output.py:1039
msgid "Dependency Installed"
msgstr "Зависност инсталирана"
-#: ../output.py:892
+#: ../output.py:1041
msgid "Dependency Updated"
msgstr "Зависност ажурирана"
-#: ../output.py:894
+#: ../output.py:1043
msgid "Replaced"
msgstr "Замењено"
-#: ../output.py:967
+#: ../output.py:1044
+msgid "Failed"
+msgstr "Неуспех"
+
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1110
+msgid "two"
+msgstr "два"
+
+#. For translators: This is output like:
+#. Current download cancelled, interrupt (ctrl-c) again within two seconds
+#. to exit.
+#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#: ../output.py:1121
#, python-format
msgid ""
"\n"
@@ -793,68 +833,68 @@ msgstr ""
" Тренутно преузимање је обустављено, %sinterrupt (ctrl-c) још једном%s у "
"току %s%s%s секунди да бисте изашли.\n"
-#: ../output.py:977
+#: ../output.py:1131
msgid "user interrupt"
msgstr "прекид од стране корисника"
-#: ../output.py:993
+#: ../output.py:1147
msgid "Total"
msgstr "Укупно"
-#: ../output.py:1007
+#: ../output.py:1161
msgid "installed"
msgstr "инсталиран"
-#: ../output.py:1008
+#: ../output.py:1162
msgid "updated"
msgstr "ажуриран"
-#: ../output.py:1009
+#: ../output.py:1163
msgid "obsoleted"
msgstr "превазиђен"
-#: ../output.py:1010
+#: ../output.py:1164
msgid "erased"
msgstr "обрисан"
-#: ../output.py:1014
+#: ../output.py:1168
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Пакет %s.%s %s:%s-%s постављен да буде %s"
-#: ../output.py:1021
+#: ../output.py:1175
msgid "--> Running transaction check"
msgstr "--> Извршава се провера трансакције"
-#: ../output.py:1026
+#: ../output.py:1180
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Поновно покретање разрешавања зависности са новим променама."
-#: ../output.py:1031
+#: ../output.py:1185
msgid "--> Finished Dependency Resolution"
msgstr "--> Завршено је разрешавање зависности"
-#: ../output.py:1036
+#: ../output.py:1190
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Обрађујем зависност: %s за пакет: %s"
-#: ../output.py:1041
+#: ../output.py:1195
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Неразрешена зависност: %s"
-#: ../output.py:1047
+#: ../output.py:1201
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Сукоб при обради: %s се сукоби са %s"
-#: ../output.py:1050
+#: ../output.py:1204
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
"--> Попуњавам скуп трансакције са изабраним пакетима. Молим вас, сачекајте."
-#: ../output.py:1054
+#: ../output.py:1208
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Преузимам заглавље за %s ради паковања у скуп трансакције."
@@ -897,7 +937,7 @@ msgstr ""
#: ../yumcommands.py:67
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
-msgstr "Грешка: потребно је да додате списак пакета %s-у"
+msgstr "Грешка: потребно је да додате списак пакета за %s"
#: ../yumcommands.py:73
msgid "Error: Need an item to match"
@@ -921,285 +961,287 @@ msgstr "Грешка: погрешан clean аргумент:%r"
msgid "No argument to shell"
msgstr "Не постоји аргумент за командно окружење"
-#: ../yumcommands.py:109
+#: ../yumcommands.py:108
#, python-format
msgid "Filename passed to shell: %s"
msgstr "Име датотеке је прослеђено командном окружењу: %s"
-#: ../yumcommands.py:113
+#: ../yumcommands.py:112
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr ""
"Не постоји датотека %s, која је прослеђена као аргумент командном окружењу."
-#: ../yumcommands.py:119
+#: ../yumcommands.py:118
msgid "Error: more than one file given as argument to shell."
msgstr ""
"Грешка: више од једне датотеке је прослеђено као аргумент командном окружењу."
-#: ../yumcommands.py:160
+#: ../yumcommands.py:167
msgid "PACKAGE..."
msgstr "ПАКЕТ..."
-#: ../yumcommands.py:163
+#: ../yumcommands.py:170
msgid "Install a package or packages on your system"
msgstr "Инсталирајте пакет или пакете на ваш систем"
-#: ../yumcommands.py:172
+#: ../yumcommands.py:178
msgid "Setting up Install Process"
msgstr "Постављам процес инсталације"
-#: ../yumcommands.py:183
+#: ../yumcommands.py:189
msgid "[PACKAGE...]"
msgstr "[ПАКЕТ...]"
-#: ../yumcommands.py:186
+#: ../yumcommands.py:192
msgid "Update a package or packages on your system"
msgstr "Ажурирај пакет или пакете на вашем систему"
-#: ../yumcommands.py:194
+#: ../yumcommands.py:199
msgid "Setting up Update Process"
msgstr "Постављам процес ажурирања"
-#: ../yumcommands.py:236
+#: ../yumcommands.py:241
msgid "Display details about a package or group of packages"
msgstr "Прикажи детаље о сваком пакету или групи пакета"
-#. Output the packages:
-#: ../yumcommands.py:261
+#: ../yumcommands.py:290
msgid "Installed Packages"
msgstr "Инсталирани пакети"
-#: ../yumcommands.py:263
+#: ../yumcommands.py:298
msgid "Available Packages"
msgstr "Доступни пакети"
-#: ../yumcommands.py:265
+#: ../yumcommands.py:302
msgid "Extra Packages"
msgstr "Додатни пакети"
-#: ../yumcommands.py:267
+#: ../yumcommands.py:306
msgid "Updated Packages"
msgstr "Ажурирани пакети"
-#: ../yumcommands.py:274 ../yumcommands.py:281
+#. This only happens in verbose mode
+#: ../yumcommands.py:314 ../yumcommands.py:321 ../yumcommands.py:598
msgid "Obsoleting Packages"
msgstr "Превазиђени пакети"
-#: ../yumcommands.py:283
+#: ../yumcommands.py:323
msgid "Recently Added Packages"
msgstr "Недавно додати пакети"
-#: ../yumcommands.py:290
+#: ../yumcommands.py:330
msgid "No matching Packages to list"
msgstr "Не постоје одговарајући пакети за излиставање"
-#: ../yumcommands.py:304
+#: ../yumcommands.py:344
msgid "List a package or groups of packages"
msgstr "Излистај пакете или групе пакета"
-#: ../yumcommands.py:316
+#: ../yumcommands.py:356
msgid "Remove a package or packages from your system"
msgstr "Уклоните пакет или пакете са вашег система"
-#: ../yumcommands.py:324
+#: ../yumcommands.py:363
msgid "Setting up Remove Process"
msgstr "Постављам процес уклањања"
-#: ../yumcommands.py:339
+#: ../yumcommands.py:377
msgid "Setting up Group Process"
msgstr "Постављам процес за групе"
-#: ../yumcommands.py:345
+#: ../yumcommands.py:383
msgid "No Groups on which to run command"
msgstr "Не постоји група над којом се може извршити команда"
-#: ../yumcommands.py:358
+#: ../yumcommands.py:396
msgid "List available package groups"
msgstr "Излистај доступне групе пакета"
-#: ../yumcommands.py:375
+#: ../yumcommands.py:413
msgid "Install the packages in a group on your system"
msgstr "Инсталирајте пакете у групи на вашем систему"
-#: ../yumcommands.py:397
+#: ../yumcommands.py:435
msgid "Remove the packages in a group from your system"
msgstr "Уклоните пакете у групи са вашег система"
-#: ../yumcommands.py:424
+#: ../yumcommands.py:462
msgid "Display details about a package group"
msgstr "Прикажи детаље о групи пакета"
-#: ../yumcommands.py:448
+#: ../yumcommands.py:486
msgid "Generate the metadata cache"
msgstr "Направи кеш са метаподацима"
-#: ../yumcommands.py:454
+#: ../yumcommands.py:492
msgid "Making cache files for all metadata files."
msgstr "Правим кеш датотеке за све датотеке са метаподацима."
-#: ../yumcommands.py:455
+#: ../yumcommands.py:493
msgid "This may take a while depending on the speed of this computer"
msgstr "Ово може да потраје у зависности од брзине вашег рачунара"
-#: ../yumcommands.py:476
+#: ../yumcommands.py:514
msgid "Metadata Cache Created"
msgstr "Направљен је кеш са метаподацима"
-#: ../yumcommands.py:490
+#: ../yumcommands.py:528
msgid "Remove cached data"
msgstr "Уклони кеширане податке"
-#: ../yumcommands.py:511
+#: ../yumcommands.py:549
msgid "Find what package provides the given value"
msgstr "Пронађи који пакет пружа дату вредност"
-#: ../yumcommands.py:531
+#: ../yumcommands.py:569
msgid "Check for available package updates"
msgstr "Проверите да ли су доступна ажурирања пакета"
-#: ../yumcommands.py:556
+#: ../yumcommands.py:618
msgid "Search package details for the given string"
msgstr "Претражите детаље о пакету за задату ниску"
-#: ../yumcommands.py:562
+#: ../yumcommands.py:624
msgid "Searching Packages: "
msgstr "Претражујем пакете: "
-#: ../yumcommands.py:579
+#: ../yumcommands.py:641
msgid "Update packages taking obsoletes into account"
msgstr "Ажурирајте пакете узимајући превазиђене у обзир"
-#: ../yumcommands.py:588
+#: ../yumcommands.py:649
msgid "Setting up Upgrade Process"
msgstr "Постављам процес надградње"
-#: ../yumcommands.py:602
+#: ../yumcommands.py:663
msgid "Install a local RPM"
msgstr "Инсталирај локални RPM"
-#: ../yumcommands.py:611
+#: ../yumcommands.py:671
msgid "Setting up Local Package Process"
msgstr "Постављам процес локалних пакета"
-#: ../yumcommands.py:630
+#: ../yumcommands.py:690
msgid "Determine which package provides the given dependency"
msgstr "Одреди који пакети пружају дату зависност"
-#: ../yumcommands.py:633
+#: ../yumcommands.py:693
msgid "Searching Packages for Dependency:"
msgstr "Претражујем пакете у потрази за зависностима:"
-#: ../yumcommands.py:647
+#: ../yumcommands.py:707
msgid "Run an interactive yum shell"
-msgstr "Извршавај интерактивно командно окружење yum-а"
+msgstr "Извршавај интерактивно yum командно окружење"
-#: ../yumcommands.py:653
+#: ../yumcommands.py:713
msgid "Setting up Yum Shell"
-msgstr "Постављам Yum командно окружење"
+msgstr "Постављам yum командно окружење"
-#: ../yumcommands.py:671
+#: ../yumcommands.py:731
msgid "List a package's dependencies"
msgstr "Излистај зависности пакета"
-#: ../yumcommands.py:677
+#: ../yumcommands.py:737
msgid "Finding dependencies: "
msgstr "Тражим зависности: "
-#: ../yumcommands.py:693
+#: ../yumcommands.py:753
msgid "Display the configured software repositories"
msgstr "Прикажи подешене софтверске ризнице"
-#: ../yumcommands.py:742
+#: ../yumcommands.py:801 ../yumcommands.py:802
msgid "enabled"
msgstr "укључена"
-#: ../yumcommands.py:751
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "disabled"
msgstr "искључена"
-#: ../yumcommands.py:760
-msgid "repo id"
-msgstr "репо id"
-
-#: ../yumcommands.py:761
-msgid "repo name"
-msgstr "репо име"
-
-#: ../yumcommands.py:761
-msgid "status"
-msgstr "статус"
-
-#: ../yumcommands.py:765
+#: ../yumcommands.py:825
msgid "Repo-id : "
-msgstr "ИБ ризнице : "
+msgstr "ИБ ризнице : "
-#: ../yumcommands.py:766
+#: ../yumcommands.py:826
msgid "Repo-name : "
-msgstr "Име ризнице : "
+msgstr "Име ризнице : "
-#: ../yumcommands.py:767
+#: ../yumcommands.py:827
msgid "Repo-status : "
-msgstr "Статус ризнице : "
+msgstr "Статус ризнице : "
-#: ../yumcommands.py:769
-#, fuzzy
+#: ../yumcommands.py:829
msgid "Repo-revision: "
-msgstr "Величина ризнице : "
+msgstr "Ревизија ризнице : "
-#: ../yumcommands.py:773
-#, fuzzy
+#: ../yumcommands.py:833
msgid "Repo-tags : "
-msgstr "Пакети ризнице : "
+msgstr "Ознаке ризнице : "
-#: ../yumcommands.py:779
-#, fuzzy
+#: ../yumcommands.py:839
msgid "Repo-distro-tags: "
-msgstr "Статус ризнице : "
+msgstr "Дистро ознаке ризнице: "
-#: ../yumcommands.py:784
+#: ../yumcommands.py:844
msgid "Repo-updated: "
-msgstr "Ризница ажурирана : "
+msgstr "Ризница ажурирана : "
-#: ../yumcommands.py:786
+#: ../yumcommands.py:846
msgid "Repo-pkgs : "
-msgstr "Пакети ризнице : "
+msgstr "Пакети ризнице : "
-#: ../yumcommands.py:787
+#: ../yumcommands.py:847
msgid "Repo-size : "
-msgstr "Величина ризнице : "
+msgstr "Величина ризнице : "
-#: ../yumcommands.py:794
+#: ../yumcommands.py:854
msgid "Repo-baseurl: "
-msgstr "Основни УРЛ ризнице: "
+msgstr "Основни УРЛ ризнице : "
-#: ../yumcommands.py:798
-#, fuzzy
+#: ../yumcommands.py:858
msgid "Repo-metalink: "
-msgstr "Име ризнице : "
+msgstr "Металинк ризнице : "
-#: ../yumcommands.py:801
+#: ../yumcommands.py:862
+msgid " Updated : "
+msgstr " Ажурирано : "
+
+#: ../yumcommands.py:865
msgid "Repo-mirrors: "
-msgstr "Одрази ризнице : "
+msgstr "Одрази ризнице : "
-#: ../yumcommands.py:805
+#: ../yumcommands.py:869
msgid "Repo-exclude: "
-msgstr "Ризница искључена : "
+msgstr "Ризница искључена : "
-#: ../yumcommands.py:809
+#: ../yumcommands.py:873
msgid "Repo-include: "
-msgstr "Ризница укључена : "
+msgstr "Ризница укључена : "
+
+#. Work out the first (id) and last (enabled/disalbed/count),
+#. then chop the middle (name)...
+#: ../yumcommands.py:883 ../yumcommands.py:909
+msgid "repo id"
+msgstr "репо id"
+
+#: ../yumcommands.py:897 ../yumcommands.py:898 ../yumcommands.py:912
+msgid "status"
+msgstr "статус"
+
+#: ../yumcommands.py:910
+msgid "repo name"
+msgstr "репо име"
-#: ../yumcommands.py:835
+#: ../yumcommands.py:936
msgid "Display a helpful usage message"
msgstr "Прикажи корисну поруку о употреби"
-#: ../yumcommands.py:869
+#: ../yumcommands.py:970
#, python-format
msgid "No help available for %s"
msgstr "Није доступна помоћ за %s"
-#: ../yumcommands.py:874
+#: ../yumcommands.py:975
msgid ""
"\n"
"\n"
@@ -1209,7 +1251,7 @@ msgstr ""
"\n"
"псеудоними: "
-#: ../yumcommands.py:876
+#: ../yumcommands.py:977
msgid ""
"\n"
"\n"
@@ -1219,15 +1261,27 @@ msgstr ""
"\n"
"псеудоним: "
-#: ../yumcommands.py:905
+#: ../yumcommands.py:1005
msgid "Setting up Reinstall Process"
msgstr "Постављам процес поновне инсталације"
-#: ../yumcommands.py:919
+#: ../yumcommands.py:1014
+msgid "Package(s) to reinstall"
+msgstr "Пакет(и) који ће се поново инсталирати"
+
+#: ../yumcommands.py:1021
msgid "reinstall a package"
msgstr "поновно инсталирам пакет"
-#: ../yummain.py:41
+#: ../yumcommands.py:1039
+msgid "Setting up Downgrade Process"
+msgstr "Постављам процес уназађивања"
+
+#: ../yumcommands.py:1046
+msgid "downgrade a package"
+msgstr "уназади пакет"
+
+#: ../yummain.py:42
msgid ""
"\n"
"\n"
@@ -1237,7 +1291,7 @@ msgstr ""
"\n"
"Излазим када корисник откаже"
-#: ../yummain.py:47
+#: ../yummain.py:48
msgid ""
"\n"
"\n"
@@ -1247,29 +1301,92 @@ msgstr ""
"\n"
"Излазим када се сломи цев"
-#: ../yummain.py:98
+#: ../yummain.py:126
+msgid "Running"
+msgstr "Извршава се"
+
+#: ../yummain.py:127
+msgid "Sleeping"
+msgstr "Успаван"
+
+#: ../yummain.py:128
+msgid "Uninteruptable"
+msgstr "Непрекидан"
+
+#: ../yummain.py:129
+msgid "Zombie"
+msgstr "Зомби"
+
+#: ../yummain.py:130
+msgid "Traced/Stopped"
+msgstr "Праћен/заустављен"
+
+#: ../yummain.py:131
+msgid "Unknown"
+msgstr "Непознат"
+
+#: ../yummain.py:135
+msgid " The other application is: PackageKit"
+msgstr " Други програм је: PackageKit"
+
+#: ../yummain.py:137
+#, python-format
+msgid " The other application is: %s"
+msgstr " Други програм је: %s"
+
+#: ../yummain.py:140
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr " Меморија: %5s RSS (%5sБ VSZ)"
+
+#: ../yummain.py:144
+#, python-format
+msgid " Started: %s - %s ago"
+msgstr " Покренут: %s - %s раније"
+
+#: ../yummain.py:146
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr " Стање : %s, pid: %d"
+
+#: ../yummain.py:171
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
"Неки други програм тренутно држи yum закључаним; чекам да тај програм "
"изађе..."
-#: ../yummain.py:125 ../yummain.py:164
+#: ../yummain.py:199 ../yummain.py:238
#, python-format
msgid "Error: %s"
msgstr "Грешка: %s"
-#: ../yummain.py:135 ../yummain.py:171
+#: ../yummain.py:209 ../yummain.py:250
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Непозната грешка(е): излазни код: %d:"
#. Depsolve stage
-#: ../yummain.py:142
+#: ../yummain.py:216
msgid "Resolving Dependencies"
msgstr "Разрешавам зависности"
-#: ../yummain.py:177
+#: ../yummain.py:240
+msgid " You could try using --skip-broken to work around the problem"
+msgstr ""
+" Можете да пробате употребу --skip-broken опције ради заобилажења проблема"
+
+#: ../yummain.py:241
+msgid ""
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+msgstr ""
+" Можете да пробате извршавање: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+
+#: ../yummain.py:256
msgid ""
"\n"
"Dependencies Resolved"
@@ -1277,11 +1394,11 @@ msgstr ""
"\n"
"Зависности су разрешене"
-#: ../yummain.py:191
+#: ../yummain.py:270
msgid "Complete!"
msgstr "Завршено!"
-#: ../yummain.py:238
+#: ../yummain.py:317
msgid ""
"\n"
"\n"
@@ -1295,192 +1412,192 @@ msgstr ""
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/depsolve.py:97
+#: ../yum/depsolve.py:99
msgid "Setting up TransactionSets before config class is up"
msgstr "Постављам TransactionSets пре него што се подигне класа подешавања"
-#: ../yum/depsolve.py:148
+#: ../yum/depsolve.py:150
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Погрешан tsflag у датотеци подешавања: %s"
-#: ../yum/depsolve.py:159
-#, fuzzy, python-format
+#: ../yum/depsolve.py:161
+#, python-format
msgid "Searching pkgSack for dep: %s"
-msgstr "тражим пакет %s"
+msgstr "Претражујем pkgSack за зависност: %s"
-#: ../yum/depsolve.py:182
-#, fuzzy, python-format
+#: ../yum/depsolve.py:184
+#, python-format
msgid "Potential match for %s from %s"
-msgstr "Постоји више од једног идентичног слагања у групи за %s"
+msgstr "Могуће слагање за %s од %s"
-#: ../yum/depsolve.py:190
-#, fuzzy, python-format
+#: ../yum/depsolve.py:192
+#, python-format
msgid "Matched %s to require for %s"
-msgstr "%s захтева: %s"
+msgstr "Повезан %s ради захтевања за %s"
-#: ../yum/depsolve.py:231
+#: ../yum/depsolve.py:233
#, python-format
msgid "Member: %s"
msgstr "Члан: %s"
-#: ../yum/depsolve.py:245 ../yum/depsolve.py:732
+#: ../yum/depsolve.py:247 ../yum/depsolve.py:739
#, python-format
msgid "%s converted to install"
msgstr "%s пребачен за инсталацију"
-#: ../yum/depsolve.py:252
+#: ../yum/depsolve.py:254
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Додајем пакет %s у начину рада %s"
-#: ../yum/depsolve.py:262
+#: ../yum/depsolve.py:264
#, python-format
msgid "Removing Package %s"
msgstr "Уклањам пакет %s"
-#: ../yum/depsolve.py:273
+#: ../yum/depsolve.py:275
#, python-format
msgid "%s requires: %s"
msgstr "%s захтева: %s"
-#: ../yum/depsolve.py:331
+#: ../yum/depsolve.py:333
msgid "Needed Require has already been looked up, cheating"
msgstr "Потребан захтев је већ потражен, обмањујем"
-#: ../yum/depsolve.py:341
+#: ../yum/depsolve.py:343
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "Потребан захтев није име пакета. Тражим: %s"
-#: ../yum/depsolve.py:348
+#: ../yum/depsolve.py:350
#, python-format
msgid "Potential Provider: %s"
msgstr "Могући снабдевач: %s"
-#: ../yum/depsolve.py:371
+#: ../yum/depsolve.py:373
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Режим је %s за снабдевача %s: %s"
-#: ../yum/depsolve.py:375
+#: ../yum/depsolve.py:377
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Режим за пакет који снабдева %s: %s"
-#: ../yum/depsolve.py:379
+#: ../yum/depsolve.py:381
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: %s пакет захтева да %s буде означен за брисање"
-#: ../yum/depsolve.py:391
+#: ../yum/depsolve.py:394
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "TSINFO: мењам %s са %s ради разрешавања зависности."
-#: ../yum/depsolve.py:394
+#: ../yum/depsolve.py:397
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: ажурирам %s ради разрешавања зависности."
-#: ../yum/depsolve.py:402
+#: ../yum/depsolve.py:405
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Не могу да пронађем путању ажурирања за зависност за: %s"
-#: ../yum/depsolve.py:412
+#: ../yum/depsolve.py:415
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Неразрешив захтев пакета %s за %s"
-#: ../yum/depsolve.py:435
+#: ../yum/depsolve.py:438
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Брзо повезивање пакета %s као захтева за %s"
#. is it already installed?
-#: ../yum/depsolve.py:477
+#: ../yum/depsolve.py:480
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr "%s је у пруженим пакетима али је већ инсталиран, уклањам га."
-#: ../yum/depsolve.py:492
+#: ../yum/depsolve.py:496
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr "Потенцијално разрешавање пакета %s има новији примерак у ts-у."
-#: ../yum/depsolve.py:503
+#: ../yum/depsolve.py:507
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "Потенцијално разрешавање пакета %s има инсталиран новији примерак."
-#: ../yum/depsolve.py:511 ../yum/depsolve.py:560
+#: ../yum/depsolve.py:515 ../yum/depsolve.py:564
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Недостаје зависност: %s је потребан од стране пакета %s"
-#: ../yum/depsolve.py:524
+#: ../yum/depsolve.py:528
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s је већ у ts-у, прескачем га"
-#: ../yum/depsolve.py:570
+#: ../yum/depsolve.py:574
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: означавам %s као ажурирање за %s"
-#: ../yum/depsolve.py:578
+#: ../yum/depsolve.py:582
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: означавам %s као инсталацију за %s"
-#: ../yum/depsolve.py:670 ../yum/depsolve.py:750
+#: ../yum/depsolve.py:675 ../yum/depsolve.py:757
msgid "Success - empty transaction"
msgstr "Успех - празна трансакција"
-#: ../yum/depsolve.py:709 ../yum/depsolve.py:722
+#: ../yum/depsolve.py:714 ../yum/depsolve.py:729
msgid "Restarting Loop"
msgstr "Поново покрећем петљу"
-#: ../yum/depsolve.py:738
+#: ../yum/depsolve.py:745
msgid "Dependency Process ending"
msgstr "Завршетак процеса зависности"
-#: ../yum/depsolve.py:744
+#: ../yum/depsolve.py:751
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s из %s има проблема са разрешавањем зависности"
-#: ../yum/depsolve.py:751
+#: ../yum/depsolve.py:758
msgid "Success - deps resolved"
msgstr "Успех - зависности су разрешене"
-#: ../yum/depsolve.py:765
+#: ../yum/depsolve.py:772
#, python-format
msgid "Checking deps for %s"
msgstr "Проверавам зависности за %s"
-#: ../yum/depsolve.py:848
+#: ../yum/depsolve.py:855
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "тражим %s као захтев за %s"
-#: ../yum/depsolve.py:988
+#: ../yum/depsolve.py:997
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Покрећем compare_providers() за %s"
-#: ../yum/depsolve.py:1016 ../yum/depsolve.py:1022
-#, fuzzy, python-format
+#: ../yum/depsolve.py:1025 ../yum/depsolve.py:1031
+#, python-format
msgid "better arch in po %s"
-msgstr "боља архитектура у po %s"
+msgstr "боља архитектура у пакету %s"
-#: ../yum/depsolve.py:1061
+#: ../yum/depsolve.py:1092
#, python-format
msgid "%s obsoletes %s"
msgstr "%s превазилази %s"
-#: ../yum/depsolve.py:1077
+#: ../yum/depsolve.py:1108
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1489,117 +1606,116 @@ msgstr ""
"archdist упоредио %s са %s на %s\n"
" Победник: %s"
-#: ../yum/depsolve.py:1084
+#: ../yum/depsolve.py:1115
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "заједнички изворни rpm %s и %s"
-#: ../yum/depsolve.py:1090
+#: ../yum/depsolve.py:1121
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "заједнички префикс %s између %s и %s"
-#: ../yum/depsolve.py:1098
+#: ../yum/depsolve.py:1129
#, python-format
msgid "Best Order: %s"
msgstr "Најбољи редослед: %s"
-#: ../yum/__init__.py:135
+#: ../yum/__init__.py:158
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:315
+#: ../yum/__init__.py:367
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Ризници %r недостаје име у подешавањима, користим id"
-#: ../yum/__init__.py:353
+#: ../yum/__init__.py:405
msgid "plugins already initialised"
msgstr "већ иницијализовани додаци"
-#: ../yum/__init__.py:360
+#: ../yum/__init__.py:412
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:370
+#: ../yum/__init__.py:423
msgid "Reading Local RPMDB"
msgstr "Читам локални RPMDB"
-#: ../yum/__init__.py:388
+#: ../yum/__init__.py:441
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:408
+#: ../yum/__init__.py:461
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:425
+#: ../yum/__init__.py:478
msgid "Setting up Package Sacks"
msgstr "Постављам групе пакета"
-#: ../yum/__init__.py:468
+#: ../yum/__init__.py:521
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "репо објекту за репо %s недостаје a _resetSack метода\n"
-#: ../yum/__init__.py:469
+#: ../yum/__init__.py:522
msgid "therefore this repo cannot be reset.\n"
msgstr "због тога се овај репо не може вратити на почетну поставку.\n"
-#: ../yum/__init__.py:474
+#: ../yum/__init__.py:527
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:486
+#: ../yum/__init__.py:539
msgid "Building updates object"
msgstr "Изграђујем објекат ажурирања"
-#: ../yum/__init__.py:517
+#: ../yum/__init__.py:570
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:541
+#: ../yum/__init__.py:595
msgid "Getting group metadata"
msgstr "Добављам метаподатке групе"
-#: ../yum/__init__.py:567
+#: ../yum/__init__.py:621
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Додајем датотеку групе из ризнице: %s"
-#: ../yum/__init__.py:576
+#: ../yum/__init__.py:630
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Није успело додавање датотеке групе за ризницу: %s - %s"
-#: ../yum/__init__.py:582
+#: ../yum/__init__.py:636
msgid "No Groups Available in any repository"
msgstr "Не постоји група која је доступна у било којој ризници"
-#: ../yum/__init__.py:632
+#: ../yum/__init__.py:686
msgid "Importing additional filelist information"
msgstr "Увозим додатне информације о списковима датотека"
-#: ../yum/__init__.py:641
-#, fuzzy
+#: ../yum/__init__.py:695
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
msgstr ""
-"Остале су недовршене трансакције. Можда би требало да извршите yum-complete-"
-"transaction да бисте их завршили."
+"Остале су недовршене трансакције. Можда би прво требало да извршите yum-"
+"complete-transaction да бисте их завршили."
-#: ../yum/__init__.py:698
+#: ../yum/__init__.py:761
#, python-format
msgid "Skip-broken round %i"
msgstr "Skip-broken етапа %i"
-#: ../yum/__init__.py:724
+#: ../yum/__init__.py:813
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Skip-broken је завршен у %i етапа "
-#: ../yum/__init__.py:725
+#: ../yum/__init__.py:814
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1607,93 +1723,93 @@ msgstr ""
"\n"
"Пакети су прескочени због проблема са зависностима:"
-#: ../yum/__init__.py:729
+#: ../yum/__init__.py:818
#, python-format
msgid " %s from %s"
msgstr " %s из %s"
-#: ../yum/__init__.py:816
+#: ../yum/__init__.py:958
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"Упозорење: дошло је до грешке у скриптици или неке друге некритичне грешке "
"током трансакције."
-#: ../yum/__init__.py:832
+#: ../yum/__init__.py:973
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Није успело уклањање датотеке трансакције %s"
-#: ../yum/__init__.py:873
+#: ../yum/__init__.py:1015
#, python-format
msgid "excluding for cost: %s from %s"
msgstr "изузимам из трошка: %s из %s"
-#: ../yum/__init__.py:904
+#: ../yum/__init__.py:1046
msgid "Excluding Packages in global exclude list"
msgstr "Изузимам пакете у глобалном списку за изузимање"
-#: ../yum/__init__.py:906
+#: ../yum/__init__.py:1048
#, python-format
msgid "Excluding Packages from %s"
msgstr "Изузимам пакете из %s"
-#: ../yum/__init__.py:933
+#: ../yum/__init__.py:1077
#, python-format
msgid "Reducing %s to included packages only"
msgstr "Сажимам %s само у садржане пакете"
-#: ../yum/__init__.py:939
+#: ../yum/__init__.py:1083
#, python-format
msgid "Keeping included package %s"
msgstr "Задржавам садржани пакет %s"
-#: ../yum/__init__.py:945
+#: ../yum/__init__.py:1089
#, python-format
msgid "Removing unmatched package %s"
msgstr "Уклањам неповезани пакет %s"
-#: ../yum/__init__.py:948
+#: ../yum/__init__.py:1092
msgid "Finished"
msgstr "Завршио"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:978
+#: ../yum/__init__.py:1122
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Нисам у могућности да проверим да ли је PID %s активан"
#. Another copy seems to be running.
-#: ../yum/__init__.py:982
+#: ../yum/__init__.py:1126
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Постоји закључавање %s: друга копија се извршава као pid %s."
-#: ../yum/__init__.py:1053
+#: ../yum/__init__.py:1196
msgid "Package does not match intended download"
msgstr "Пакет није одговарајући за намеравано преузимање"
-#: ../yum/__init__.py:1068
+#: ../yum/__init__.py:1211
msgid "Could not perform checksum"
msgstr "Не могу да извршим контролу суме"
-#: ../yum/__init__.py:1071
+#: ../yum/__init__.py:1214
msgid "Package does not match checksum"
msgstr "Пакет нема одговарајући контролну суму"
-#: ../yum/__init__.py:1114
+#: ../yum/__init__.py:1257
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
"пакет нема одговарајућу вредност контролне суме или је за %s укључено "
"кеширање"
-#: ../yum/__init__.py:1117 ../yum/__init__.py:1145
+#: ../yum/__init__.py:1260 ../yum/__init__.py:1289
#, python-format
msgid "using local copy of %s"
-msgstr "користим локални умножак %s-а"
+msgstr "користим локални %s умножак"
-#: ../yum/__init__.py:1159
+#: ../yum/__init__.py:1301
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1704,11 +1820,11 @@ msgstr ""
" * слободно је %s\n"
" * потребно је %s"
-#: ../yum/__init__.py:1206
+#: ../yum/__init__.py:1348
msgid "Header is not complete."
msgstr "Заглавље није потпуно."
-#: ../yum/__init__.py:1246
+#: ../yum/__init__.py:1385
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1716,62 +1832,62 @@ msgstr ""
"Заглавље није у локалном кешу и само начин рада са кеширањем је укључен. Не "
"могу да преузмем %s"
-#: ../yum/__init__.py:1301
+#: ../yum/__init__.py:1440
#, python-format
msgid "Public key for %s is not installed"
msgstr "Јавни кључ за %s није инсталиран"
-#: ../yum/__init__.py:1305
+#: ../yum/__init__.py:1444
#, python-format
msgid "Problem opening package %s"
msgstr "Проблем са отварањем пакета %s"
-#: ../yum/__init__.py:1313
+#: ../yum/__init__.py:1452
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Јавни кључ за %s није поверљив"
-#: ../yum/__init__.py:1317
+#: ../yum/__init__.py:1456
#, python-format
msgid "Package %s is not signed"
msgstr "Пакет %s није потписан"
-#: ../yum/__init__.py:1355
+#: ../yum/__init__.py:1494
#, python-format
msgid "Cannot remove %s"
msgstr "Не могу да уклоним %s"
-#: ../yum/__init__.py:1359
+#: ../yum/__init__.py:1498
#, python-format
msgid "%s removed"
msgstr "%s је уклоњен"
-#: ../yum/__init__.py:1396
+#: ../yum/__init__.py:1534
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Не могу да уклоним %s датотеку %s"
-#: ../yum/__init__.py:1400
+#: ../yum/__init__.py:1538
#, python-format
msgid "%s file %s removed"
msgstr "%s датотека %s је уклоњена"
-#: ../yum/__init__.py:1402
+#: ../yum/__init__.py:1540
#, python-format
msgid "%d %s files removed"
msgstr "%d %s датотеке су уклоњене"
-#: ../yum/__init__.py:1464
+#: ../yum/__init__.py:1609
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Постоји више од једног идентичног слагања у групи за %s"
-#: ../yum/__init__.py:1470
+#: ../yum/__init__.py:1615
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Ништа се не слаже са %s.%s %s:%s-%s из ажурирања"
-#: ../yum/__init__.py:1678
+#: ../yum/__init__.py:1833
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1779,177 +1895,172 @@ msgstr ""
"searchPackages() неће бити присутна у будућим Yum "
"верзијама. Уместо ње користите searchGenerator(). \n"
-#: ../yum/__init__.py:1716
+#: ../yum/__init__.py:1875
#, python-format
msgid "Searching %d packages"
msgstr "Претражујем %d пакете"
-#: ../yum/__init__.py:1720
+#: ../yum/__init__.py:1879
#, python-format
msgid "searching package %s"
msgstr "тражим пакет %s"
-#: ../yum/__init__.py:1732
+#: ../yum/__init__.py:1891
msgid "searching in file entries"
msgstr "тражим у уносима датотека"
-#: ../yum/__init__.py:1739
+#: ../yum/__init__.py:1898
msgid "searching in provides entries"
msgstr "тражим у уносима достављача"
-#: ../yum/__init__.py:1772
+#: ../yum/__init__.py:1931
#, python-format
msgid "Provides-match: %s"
msgstr "Доставља-слагање: %s"
-#: ../yum/__init__.py:1821
+#: ../yum/__init__.py:1980
msgid "No group data available for configured repositories"
msgstr "Нема доступних података о групама за подешене ризнице"
-#: ../yum/__init__.py:1847 ../yum/__init__.py:1866 ../yum/__init__.py:1897
-#: ../yum/__init__.py:1903 ../yum/__init__.py:1976 ../yum/__init__.py:1980
+#: ../yum/__init__.py:2011 ../yum/__init__.py:2030 ../yum/__init__.py:2061
+#: ../yum/__init__.py:2067 ../yum/__init__.py:2146 ../yum/__init__.py:2150
+#: ../yum/__init__.py:2446
#, python-format
msgid "No Group named %s exists"
msgstr "Не постоји група под именом %s"
-#: ../yum/__init__.py:1878 ../yum/__init__.py:1993
+#: ../yum/__init__.py:2042 ../yum/__init__.py:2163
#, python-format
msgid "package %s was not marked in group %s"
msgstr "пакет %s није означен у групи %s"
-#: ../yum/__init__.py:1925
+#: ../yum/__init__.py:2089
#, python-format
msgid "Adding package %s from group %s"
msgstr "Додајем пакет %s из групе %s"
-#: ../yum/__init__.py:1929
+#: ../yum/__init__.py:2093
#, python-format
msgid "No package named %s available to be installed"
msgstr "Ниједан пакет под именом %s није доступан за инсталацију"
-#: ../yum/__init__.py:2018
+#: ../yum/__init__.py:2190
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "Група пакета %s није нађена у packagesack-у"
-#: ../yum/__init__.py:2033
+#: ../yum/__init__.py:2204
msgid ""
"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
msgstr ""
"getInstalledPackageObject() ће нестати, користите self.rpmdb.searchPkgTuple"
"().\n"
-#: ../yum/__init__.py:2085 ../yum/__init__.py:2128
-msgid "Invalid versioned dependency string, try quoting it."
-msgstr ""
-"Неисправна ниска зависности са верзијом, покушајте да је обележите "
-"наводницима."
-
-#: ../yum/__init__.py:2087 ../yum/__init__.py:2130
+#: ../yum/__init__.py:2260 ../yum/__init__.py:2304
msgid "Invalid version flag"
msgstr "Погрешна ознака верзије"
-#: ../yum/__init__.py:2102 ../yum/__init__.py:2106
+#: ../yum/__init__.py:2275 ../yum/__init__.py:2279
#, python-format
msgid "No Package found for %s"
msgstr "Нема пронађених пакета за %s"
-#: ../yum/__init__.py:2305
+#: ../yum/__init__.py:2479
msgid "Package Object was not a package object instance"
msgstr "Објекат пакета није био примерак објекта пакета"
-#: ../yum/__init__.py:2309
+#: ../yum/__init__.py:2483
msgid "Nothing specified to install"
msgstr "Није одређено ништа за инсталацију"
-#. only one in there
-#: ../yum/__init__.py:2327
+#: ../yum/__init__.py:2499 ../yum/__init__.py:3126
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Проверавам виртуелну доставу или доставу датотеке за %s"
-#: ../yum/__init__.py:2333 ../yum/__init__.py:2715
+#: ../yum/__init__.py:2505 ../yum/__init__.py:2782 ../yum/__init__.py:2942
+#: ../yum/__init__.py:3132
#, python-format
msgid "No Match for argument: %s"
msgstr "Не постоји слагање за аргумент: %s"
-#: ../yum/__init__.py:2399
+#: ../yum/__init__.py:2579
#, python-format
msgid "Package %s installed and not available"
msgstr "Пакет %s је инсталиран и није доступан"
-#: ../yum/__init__.py:2402
+#: ../yum/__init__.py:2582
msgid "No package(s) available to install"
msgstr "Нема пакета доступних за инсталацију"
-#: ../yum/__init__.py:2414
+#: ../yum/__init__.py:2594
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Пакет: %s - већ је у скупу трансакције"
-#: ../yum/__init__.py:2427
+#: ../yum/__init__.py:2609
+#, python-format
+msgid "Package %s is obsoleted by %s, trying to install %s instead"
+msgstr "Пакет %s је замењен пакетом %s, покушавам да наместо инсталирам %s"
+
+#: ../yum/__init__.py:2617
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Већ је инсталирана најновија верзија пакета %s"
-#: ../yum/__init__.py:2434
+#: ../yum/__init__.py:2631
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
"Пакет који се поклапа са %s је већ инсталиран. Проверавам за новију верзију."
-#: ../yum/__init__.py:2444
-#, python-format
-msgid "Package %s is obsoleted by %s, trying to install %s instead"
-msgstr "Пакет %s је замењен пакетом %s, покушавам да наместо инсталирам %s"
-
#. update everything (the easy case)
-#: ../yum/__init__.py:2514
+#: ../yum/__init__.py:2717
msgid "Updating Everything"
msgstr "Ажурирам све"
-#: ../yum/__init__.py:2526 ../yum/__init__.py:2631 ../yum/__init__.py:2642
-#: ../yum/__init__.py:2664
+#: ../yum/__init__.py:2735 ../yum/__init__.py:2844 ../yum/__init__.py:2865
+#: ../yum/__init__.py:2891
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "Не ажурирам пакете који су већ превазиђени: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2622
+#: ../yum/__init__.py:2770 ../yum/__init__.py:2939
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: ../yum/__init__.py:2835
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Пакет је већ превазиђен: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2645 ../yum/__init__.py:2667
+#: ../yum/__init__.py:2868 ../yum/__init__.py:2894
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "Не ажурирам пакете који су већ ажурирани: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2712
-#, python-format
-msgid "%s"
-msgstr "%s"
-
-#: ../yum/__init__.py:2728
+#: ../yum/__init__.py:2955
msgid "No package matched to remove"
msgstr "Ниједан пакет није одређен за уклањање"
-#: ../yum/__init__.py:2762
+#: ../yum/__init__.py:2989
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Не могу да отворим датотеку: %s. Прескачем је."
-#: ../yum/__init__.py:2765
+#: ../yum/__init__.py:2992
#, python-format
msgid "Examining %s: %s"
msgstr "Испитујем %s: %s"
-#: ../yum/__init__.py:2773
+#: ../yum/__init__.py:3000
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
"Не могу да додам пакет %s у трансакцију. Архитектура није усаглашена: %s"
-#: ../yum/__init__.py:2781
+#: ../yum/__init__.py:3008
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -1958,80 +2069,94 @@ msgstr ""
"Пакет %s није инсталиран, не могу да га ажурирам. Извршите yum инсталацију "
"да бисте га инсталирали."
-#: ../yum/__init__.py:2814
+#: ../yum/__init__.py:3043
#, python-format
msgid "Excluding %s"
msgstr "Изузимам %s"
-#: ../yum/__init__.py:2819
+#: ../yum/__init__.py:3048
#, python-format
msgid "Marking %s to be installed"
msgstr "Означавам %s за инсталацију"
-#: ../yum/__init__.py:2825
+#: ../yum/__init__.py:3054
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Означавам %s као ажурирање за %s"
-#: ../yum/__init__.py:2832
+#: ../yum/__init__.py:3061
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: не ажурира инсталирани пакет."
-#: ../yum/__init__.py:2850
+#: ../yum/__init__.py:3076
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
"Проблем при поновној инсталацији: ниједан пакет није одређен за уклањање"
-#: ../yum/__init__.py:2861
+#: ../yum/__init__.py:3088 ../yum/__init__.py:3159
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Пакету %s су дозвољене многоструке инсталације, прескачем га"
-#: ../yum/__init__.py:2868
+#: ../yum/__init__.py:3097
msgid "Problem in reinstall: no package matched to install"
msgstr ""
"Проблем при поновној инсталацији: ниједан пакет није одређен за инсталацију"
-#: ../yum/__init__.py:2903
+#: ../yum/__init__.py:3151
+msgid "No package(s) available to downgrade"
+msgstr "Нема пакета доступних за уназађивање"
+
+#: ../yum/__init__.py:3182
+#, python-format
+msgid "No Match for available package: %s"
+msgstr "Нема доступног одговарајућег пакета: %s"
+
+#: ../yum/__init__.py:3188
+#, python-format
+msgid "Only Upgrade available on package: %s"
+msgstr "Само је надградња доступна за пакет: %s"
+
+#: ../yum/__init__.py:3249
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Добављам GPG кључ са %s"
-#: ../yum/__init__.py:2923
+#: ../yum/__init__.py:3269
msgid "GPG key retrieval failed: "
msgstr "Добављање GPG кључа није успело: "
-#: ../yum/__init__.py:2934
+#: ../yum/__init__.py:3280
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "Рашчлањивање GPG кључа није успело: кључ нема вредност %s"
-#: ../yum/__init__.py:2966
+#: ../yum/__init__.py:3312
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG кључ на %s (0x%s) је већ инсталиран"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:2971 ../yum/__init__.py:3033
+#: ../yum/__init__.py:3317 ../yum/__init__.py:3379
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Увозим GPG кључ 0x%s „%s“ из %s"
-#: ../yum/__init__.py:2988
+#: ../yum/__init__.py:3334
msgid "Not installing key"
msgstr "Не инсталирам кључ"
-#: ../yum/__init__.py:2994
+#: ../yum/__init__.py:3340
#, python-format
msgid "Key import failed (code %d)"
msgstr "Није успео увоз кључа (код %d)"
-#: ../yum/__init__.py:2995 ../yum/__init__.py:3054
+#: ../yum/__init__.py:3341 ../yum/__init__.py:3400
msgid "Key imported successfully"
msgstr "Кључ је успешно увезен"
-#: ../yum/__init__.py:3000 ../yum/__init__.py:3059
+#: ../yum/__init__.py:3346 ../yum/__init__.py:3405
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2042,73 +2167,78 @@ msgstr ""
"одговарајући за овај пакет.\n"
"Проверите да ли су подешени одговарајући УРЛ-ови кључева за ову ризницу."
-#: ../yum/__init__.py:3009
+#: ../yum/__init__.py:3355
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Увоз кључа(кључева) није помогао, погрешан кључ(кључеви)?"
-#: ../yum/__init__.py:3028
+#: ../yum/__init__.py:3374
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "GPG кључ на %s (0x%s) је већ увезен"
-#: ../yum/__init__.py:3048
+#: ../yum/__init__.py:3394
#, python-format
msgid "Not installing key for repo %s"
msgstr "Не инсталирам кључ за ризницу %s"
-#: ../yum/__init__.py:3053
+#: ../yum/__init__.py:3399
msgid "Key import failed"
msgstr "Није успео увоз кључа"
-#: ../yum/__init__.py:3144
+#: ../yum/__init__.py:3490
msgid "Unable to find a suitable mirror."
msgstr "Не могу да пронађем одговарајући одраз."
-#: ../yum/__init__.py:3146
+#: ../yum/__init__.py:3492
msgid "Errors were encountered while downloading packages."
msgstr "Појавиле су се грешке за време преузимања пакета."
-#: ../yum/__init__.py:3210
+#: ../yum/__init__.py:3533
+#, python-format
+msgid "Please report this error at %s"
+msgstr "Пријавите ову грешку код %s"
+
+#: ../yum/__init__.py:3557
msgid "Test Transaction Errors: "
msgstr "Грешке при провери трансакције: "
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:199
+#: ../yum/plugins.py:204
msgid "Loaded plugins: "
msgstr "Учитани додаци: "
-#: ../yum/plugins.py:213 ../yum/plugins.py:219
+#: ../yum/plugins.py:218 ../yum/plugins.py:224
#, python-format
msgid "No plugin match for: %s"
msgstr "Не постоји слагање за додатак: %s"
-#: ../yum/plugins.py:249
+#: ../yum/plugins.py:254
#, python-format
-msgid "\"%s\" plugin is disabled"
-msgstr "„%s“ додатак је искључен"
+msgid "Not loading \"%s\" plugin, as it is disabled"
+msgstr "Не учитавам додатак „%s“ пошто је искључен"
#. Give full backtrace:
-#: ../yum/plugins.py:261
+#: ../yum/plugins.py:266
#, python-format
msgid "Plugin \"%s\" can't be imported"
msgstr "Додатак „%s“ не може да буде увезен"
-#: ../yum/plugins.py:268
+#: ../yum/plugins.py:273
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr "Додатак „%s“ не одређује верзију захтеваног API-а"
-#: ../yum/plugins.py:273
+#: ../yum/plugins.py:278
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr "Додатак „%s“ захтева API %s. Подржани API је %s."
-#: ../yum/plugins.py:306
+#: ../yum/plugins.py:311
#, python-format
msgid "Loading \"%s\" plugin"
msgstr "Учитавам „%s“ додатак"
-#: ../yum/plugins.py:313
+#: ../yum/plugins.py:318
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
@@ -2116,19 +2246,19 @@ msgstr ""
"У путањи за претраживање додатака постоје два или више додатака под именом „%"
"s“"
-#: ../yum/plugins.py:333
+#: ../yum/plugins.py:338
#, python-format
msgid "Configuration file %s not found"
msgstr "Датотека подешавања %s није пронађена"
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:336
+#: ../yum/plugins.py:341
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr "Не могу да пронађем датотеку подешавања за додатак %s"
-#: ../yum/plugins.py:490
+#: ../yum/plugins.py:499
msgid "registration of commands not supported"
msgstr "регистрација команди није подржана"
@@ -2136,33 +2266,33 @@ msgstr "регистрација команди није подржана"
msgid "Repackaging"
msgstr "Поновно паковање"
-#: ../rpmUtils/oldUtils.py:26
+#: ../rpmUtils/oldUtils.py:33
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
msgstr "Заглавље се не може отворити или не одговара %s, %s."
-#: ../rpmUtils/oldUtils.py:46
+#: ../rpmUtils/oldUtils.py:53
#, python-format
msgid "RPM %s fails md5 check"
msgstr "Није успела md5 провера за %s RPM"
-#: ../rpmUtils/oldUtils.py:144
+#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
msgstr ""
"Не могу да отворим RPM базу података за потребе читања. Можда је већ у "
"употреби?"
-#: ../rpmUtils/oldUtils.py:174
+#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
msgstr "Примљено је празно заглавље, нешто је пошло наопако"
-#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr "Оштећено заглавље %s"
-#: ../rpmUtils/oldUtils.py:272
+#: ../rpmUtils/oldUtils.py:281
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "Грешка при отварању rpm-а %s - грешка %s"
diff --git a/po/sr@latin.po b/po/sr@latin.po
old mode 100755
new mode 100644
index 58af237..9253fd9
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-27 13:29+0000\n"
-"PO-Revision-Date: 2008-10-27 22:52+0000\n"
+"POT-Creation-Date: 2009-04-01 19:44+0000\n"
+"PO-Revision-Date: 2009-04-01 21:06+0100\n"
"Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
"Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../callback.py:48 ../output.py:777 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:933 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Ažuriram"
@@ -27,8 +27,7 @@ msgstr "Ažuriram"
msgid "Erasing"
msgstr "Brišem"
-#. Arch can't get "that big" ... so always use the max.
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:776
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:932
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Instaliram"
@@ -37,7 +36,7 @@ msgstr "Instaliram"
msgid "Obsoleted"
msgstr "Prevaziđeni"
-#: ../callback.py:54 ../output.py:891
+#: ../callback.py:54 ../output.py:1040
msgid "Updated"
msgstr "Ažurirani"
@@ -45,7 +44,7 @@ msgstr "Ažurirani"
msgid "Erased"
msgstr "Obrisani"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:889
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1038
msgid "Installed"
msgstr "Instalirani"
@@ -67,7 +66,7 @@ msgstr "Greška: pogrešno izlazno stanje: %s za %s"
msgid "Erased: %s"
msgstr "Obrisano: %s"
-#: ../callback.py:217 ../output.py:778
+#: ../callback.py:217 ../output.py:934
msgid "Removing"
msgstr "Uklanjam"
@@ -75,60 +74,60 @@ msgstr "Uklanjam"
msgid "Cleanup"
msgstr "Čišćenje"
-#: ../cli.py:105
+#: ../cli.py:104
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Naredba „%s“ je već definisana"
-#: ../cli.py:117
+#: ../cli.py:116
msgid "Setting up repositories"
msgstr "Postavljam riznice"
-#: ../cli.py:128
+#: ../cli.py:127
msgid "Reading repository metadata in from local files"
msgstr "Čitam metapodatke riznica iz lokalnih datoteka"
-#: ../cli.py:187 ../utils.py:71
+#: ../cli.py:190 ../utils.py:87
#, python-format
msgid "Config Error: %s"
msgstr "Greška pri podešavanju: %s"
-#: ../cli.py:190 ../cli.py:1128 ../utils.py:74
+#: ../cli.py:193 ../cli.py:1231 ../utils.py:90
#, python-format
msgid "Options Error: %s"
msgstr "Greška u opcijama: %s"
-#: ../cli.py:218
+#: ../cli.py:221
#, python-format
msgid " Installed: %s-%s at %s"
-msgstr " Instalirano: %s-%s na %s"
+msgstr " Instaliran : %s-%s %s"
-#: ../cli.py:220
-#, fuzzy, python-format
+#: ../cli.py:223
+#, python-format
msgid " Built : %s at %s"
-msgstr "URL : %s"
+msgstr " Napravio/la: %s %s"
-#: ../cli.py:222
-#, fuzzy, python-format
+#: ../cli.py:225
+#, python-format
msgid " Committed: %s at %s"
-msgstr "Objavljivač : %s"
+msgstr " Objavio/la : %s %s"
-#: ../cli.py:259
+#: ../cli.py:264
msgid "You need to give some command"
msgstr "Morate da unesete neku komandu"
-#: ../cli.py:301
+#: ../cli.py:307
msgid "Disk Requirements:\n"
msgstr "Zahtevi diska:\n"
-#: ../cli.py:303
+#: ../cli.py:309
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Potrebno je najmanje %dMB na %s sistemu datoteka.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:308
+#: ../cli.py:314
msgid ""
"Error Summary\n"
"-------------\n"
@@ -136,55 +135,56 @@ msgstr ""
"Sažetak grešaka\n"
"-------------\n"
-#: ../cli.py:351
+#: ../cli.py:357
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:381
+#: ../cli.py:393
msgid "Exiting on user Command"
msgstr "Izlazim na komandu korisnika"
-#: ../cli.py:385
+#: ../cli.py:397
msgid "Downloading Packages:"
msgstr "Preuzimam pakete:"
-#: ../cli.py:390
+#: ../cli.py:402
msgid "Error Downloading Packages:\n"
msgstr "Greška pri preuzimanju paketa:\n"
-#: ../cli.py:404 ../yum/__init__.py:3182
+#: ../cli.py:416 ../yum/__init__.py:3528
msgid "Running rpm_check_debug"
msgstr "Izvršavam rpm_check_debug"
-#: ../cli.py:407 ../yum/__init__.py:3185
+#: ../cli.py:419 ../yum/__init__.py:3531
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "GREŠKA sa rpm_check_debug u odnosu na depsolve:"
-#: ../cli.py:411 ../yum/__init__.py:3187
-msgid "Please report this error in bugzilla"
-msgstr "Molim vas, prijavite ovu grešku u bugzilli"
+#: ../cli.py:423
+#, python-format
+msgid "Please report this error in %s"
+msgstr "Prijavite ovu grešku u %s"
-#: ../cli.py:417
+#: ../cli.py:429
msgid "Running Transaction Test"
msgstr "Izvršavam proveru transakcije"
-#: ../cli.py:433
+#: ../cli.py:445
msgid "Finished Transaction Test"
msgstr "Završena je provera transakcije"
-#: ../cli.py:435
+#: ../cli.py:447
msgid "Transaction Check Error:\n"
msgstr "Greška pri proveri transakcije:\n"
-#: ../cli.py:442
+#: ../cli.py:454
msgid "Transaction Test Succeeded"
msgstr "Provera transakcije je uspela"
-#: ../cli.py:463
+#: ../cli.py:475
msgid "Running Transaction"
msgstr "Izvršavam transakciju"
-#: ../cli.py:493
+#: ../cli.py:505
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -192,72 +192,72 @@ msgstr ""
"Odbijam da automatski uvezem ključeve kada se izvršavanje ne nadgleda.\n"
"Za prevazilaženje ovoga koristite „-y“."
-#: ../cli.py:512 ../cli.py:545
+#: ../cli.py:524 ../cli.py:558
msgid " * Maybe you meant: "
msgstr " * Možda ste mislili: "
-#: ../cli.py:528 ../cli.py:536
+#: ../cli.py:541 ../cli.py:549
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "%s%s%s paket je dostupan, ali nije instaliran."
-#: ../cli.py:542 ../cli.py:577
+#: ../cli.py:555 ../cli.py:586 ../cli.py:666
#, python-format
msgid "No package %s%s%s available."
-msgstr "Ne postoji dostupan %s%s%s paket."
-
-#: ../cli.py:567
-msgid "Parsing package install arguments"
-msgstr "Raščlanjujem argumente instalacije paketa"
+msgstr "Ne postoji dostupan paket %s%s%s."
-#: ../cli.py:582 ../cli.py:657 ../yumcommands.py:912
+#: ../cli.py:591 ../cli.py:693
msgid "Package(s) to install"
msgstr "Paket(i) koji će se instalirati"
-#: ../cli.py:583 ../cli.py:658 ../yumcommands.py:150 ../yumcommands.py:913
+#: ../cli.py:592 ../cli.py:672 ../cli.py:694 ../yumcommands.py:157
+#: ../yumcommands.py:1015
msgid "Nothing to do"
msgstr "Nema šta da se radi"
-#: ../cli.py:616
+#: ../cli.py:625
#, python-format
msgid "%d packages marked for Update"
msgstr "%d paketi označeni za ažuriranje"
-#: ../cli.py:619
+#: ../cli.py:628
msgid "No Packages marked for Update"
msgstr "Nema paketa označenih za ažuriranje"
-#: ../cli.py:633
+#: ../cli.py:642
#, python-format
msgid "%d packages marked for removal"
msgstr "%d paketi označeni za uklanjanje"
-#: ../cli.py:636
+#: ../cli.py:645
msgid "No Packages marked for removal"
msgstr "Nema paketa označenih za uklanjanje"
-#: ../cli.py:648
+#: ../cli.py:671
+msgid "Package(s) to downgrade"
+msgstr "Paket(i) koji će se unazaditi"
+
+#: ../cli.py:684
msgid "No Packages Provided"
msgstr "Nijedan paket nije dobavljen"
-#: ../cli.py:689
-#, fuzzy
+#: ../cli.py:739
msgid "Matching packages for package list to user args"
-msgstr "Povezivanje paketa za spisak paketa po argumentima korisnika"
+msgstr "Povezivanje paketa za spisak paketa prema argumentima korisnika"
-#: ../cli.py:731
+#: ../cli.py:788
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Upozorenje: nije nađeno podudaranje za %s"
-#: ../cli.py:734
+#: ../cli.py:791
msgid "No Matches found"
msgstr "Nisu pronađena podudaranja"
-#: ../cli.py:773
+#: ../cli.py:830
#, python-format
msgid ""
-"Warning: 3.0.x versions of yum would erronously match against filenames.\n"
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
"Upozorenje: 3.0.x yum verzije bi greškom vršile podudaranje sa nazivima "
@@ -265,104 +265,108 @@ msgstr ""
" Možete upotrebiti „%s*/%s%s“ i/ili „%s*bin/%s%s“ da biste dobili takvo "
"ponašanje"
-#: ../cli.py:789
+#: ../cli.py:846
#, python-format
msgid "No Package Found for %s"
msgstr "Nisu pronađeni paketi za %s"
-#: ../cli.py:801
+#: ../cli.py:858
msgid "Cleaning up Everything"
msgstr "Čistim sve"
-#: ../cli.py:815
+#: ../cli.py:872
msgid "Cleaning up Headers"
msgstr "Čistim zaglavlja"
-#: ../cli.py:818
+#: ../cli.py:875
msgid "Cleaning up Packages"
msgstr "Čistim pakete"
-#: ../cli.py:821
+#: ../cli.py:878
msgid "Cleaning up xml metadata"
msgstr "Čistim xml metapodatke"
-#: ../cli.py:824
+#: ../cli.py:881
msgid "Cleaning up database cache"
msgstr "Čistim keš baze podataka"
-#: ../cli.py:827
+#: ../cli.py:884
msgid "Cleaning up expire-cache metadata"
msgstr "Čistim expire-cache metapodatke"
-#: ../cli.py:830
+#: ../cli.py:887
msgid "Cleaning up plugins"
msgstr "Čistim dodatke"
-#: ../cli.py:851
+#: ../cli.py:912
msgid "Installed Groups:"
msgstr "Instalirane grupe:"
-#: ../cli.py:858
+#: ../cli.py:924
msgid "Available Groups:"
msgstr "Dostupne grupe:"
-#: ../cli.py:864
+#: ../cli.py:934
msgid "Done"
msgstr "Urađeno"
-#: ../cli.py:875 ../cli.py:893 ../cli.py:899 ../yum/__init__.py:2274
+#: ../cli.py:945 ../cli.py:963 ../cli.py:969 ../yum/__init__.py:2420
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Upozorenje: grupa %s ne postoji."
-#: ../cli.py:903
+#: ../cli.py:973
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:905
+#: ../cli.py:975
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d paket(i) za instalaciju"
-#: ../cli.py:915 ../yum/__init__.py:2286
+#: ../cli.py:985 ../yum/__init__.py:2432
#, python-format
msgid "No group named %s exists"
msgstr "Ne postoji grupa pod imenom %s"
-#: ../cli.py:921
+#: ../cli.py:991
msgid "No packages to remove from groups"
msgstr "Nema paketa za uklanjanje iz grupa"
-#: ../cli.py:923
+#: ../cli.py:993
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d paket(i) za uklanjanje"
-#: ../cli.py:965
+#: ../cli.py:1035
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Paket %s je već instaliran, preskačem ga"
-#: ../cli.py:976
+#: ../cli.py:1046
#, 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:1002
+#: ../cli.py:1072
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
"Ne postoji instaliran drugi %s, dodajem ga u spisak za potencijalnu "
"instalaciju"
-#: ../cli.py:1021
+#: ../cli.py:1092
+msgid "Plugin Options"
+msgstr "Opcije dodatka"
+
+#: ../cli.py:1100
#, python-format
msgid "Command line error: %s"
msgstr "Greška komandne linije: %s"
-#: ../cli.py:1034
+#: ../cli.py:1113
#, python-format
msgid ""
"\n"
@@ -373,245 +377,258 @@ msgstr ""
"\n"
"%s: %s opcija zahteva argument"
-#: ../cli.py:1170
+#: ../cli.py:1171
+msgid "--color takes one of: auto, always, never"
+msgstr "--color prima jedan od sledećih: auto, always, never"
+
+#: ../cli.py:1278
msgid "show this help message and exit"
msgstr "prikaži ovu pomoćnu poruku i izađi"
-#: ../cli.py:1174
+#: ../cli.py:1282
msgid "be tolerant of errors"
msgstr "budi tolerantan na greške"
-#: ../cli.py:1176
+#: ../cli.py:1284
msgid "run entirely from cache, don't update cache"
msgstr "izvršavaj se u potpunosti iz keša, ne ažuriraj keš"
-#: ../cli.py:1178
+#: ../cli.py:1286
msgid "config file location"
msgstr "mesto datoteke podešavanja"
-#: ../cli.py:1180
+#: ../cli.py:1288
msgid "maximum command wait time"
msgstr "najduže vreme čekanja na komandu"
-#: ../cli.py:1182
+#: ../cli.py:1290
msgid "debugging output level"
msgstr "nivo izlaznog prikaza za pronalaženje grešaka"
-#: ../cli.py:1186
+#: ../cli.py:1294
msgid "show duplicates, in repos, in list/search commands"
msgstr ""
"prikazuj duplikate, u riznicama, u komandama za izlistavanje/pretraživanje"
-#: ../cli.py:1188
+#: ../cli.py:1296
msgid "error output level"
msgstr "nivo izlaznog prikaza grešaka"
-#: ../cli.py:1191
+#: ../cli.py:1299
msgid "quiet operation"
msgstr "tiha radnja"
-#: ../cli.py:1193
+#: ../cli.py:1301
msgid "verbose operation"
msgstr "opširna radnja"
-#: ../cli.py:1195
+#: ../cli.py:1303
msgid "answer yes for all questions"
msgstr "odgovori sa da na sva pitanja"
-#: ../cli.py:1197
+#: ../cli.py:1305
msgid "show Yum version and exit"
msgstr "prikaži Yum verziju i izađi"
-#: ../cli.py:1198
+#: ../cli.py:1306
msgid "set install root"
msgstr "postavi koreni direktorijum instalacije"
-#: ../cli.py:1202
+#: ../cli.py:1310
msgid "enable one or more repositories (wildcards allowed)"
msgstr "uključi jednu ili više riznica (skraćenice su dozvoljene)"
-#: ../cli.py:1206
+#: ../cli.py:1314
msgid "disable one or more repositories (wildcards allowed)"
msgstr "isključi jednu ili više riznica (skraćenice su dozvoljene)"
-#: ../cli.py:1209
+#: ../cli.py:1317
msgid "exclude package(s) by name or glob"
msgstr "izuzmi paket(e) po imenu ili globu"
-#: ../cli.py:1211
+#: ../cli.py:1319
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:1214
+#: ../cli.py:1322
msgid "enable obsoletes processing during updates"
msgstr "uključi obradu zastarelih paketa u toku ažuriranja"
-#: ../cli.py:1216
+#: ../cli.py:1324
msgid "disable Yum plugins"
msgstr "isključi dodatke za Yum"
-#: ../cli.py:1218
+#: ../cli.py:1326
msgid "disable gpg signature checking"
msgstr "isključi proveru gpg potpisa"
-#: ../cli.py:1220
+#: ../cli.py:1328
msgid "disable plugins by name"
msgstr "isključi dodatke po imenu"
-#: ../cli.py:1223
+#: ../cli.py:1331
msgid "enable plugins by name"
msgstr "uključi dodatke po imenu"
-#: ../cli.py:1226
+#: ../cli.py:1334
msgid "skip packages with depsolving problems"
msgstr "preskoči pakete koji imaju problema sa rešavanjem zavisnosti"
-#: ../output.py:236
+#: ../cli.py:1336
+msgid "control whether color is used"
+msgstr "kontroliše da li se koristi boja"
+
+#: ../output.py:301
msgid "Jan"
msgstr "jan"
-#: ../output.py:236
+#: ../output.py:301
msgid "Feb"
msgstr "feb"
-#: ../output.py:236
+#: ../output.py:301
msgid "Mar"
msgstr "mar"
-#: ../output.py:236
+#: ../output.py:301
msgid "Apr"
msgstr "apr"
-#: ../output.py:236
+#: ../output.py:301
msgid "May"
msgstr "maj"
-#: ../output.py:236
+#: ../output.py:301
msgid "Jun"
msgstr "jun"
-#: ../output.py:237
+#: ../output.py:302
msgid "Jul"
msgstr "jul"
-#: ../output.py:237
+#: ../output.py:302
msgid "Aug"
msgstr "avg"
-#: ../output.py:237
+#: ../output.py:302
msgid "Sep"
msgstr "sep"
-#: ../output.py:237
+#: ../output.py:302
msgid "Oct"
msgstr "okt"
-#: ../output.py:237
+#: ../output.py:302
msgid "Nov"
msgstr "nov"
-#: ../output.py:237
+#: ../output.py:302
msgid "Dec"
msgstr "dec"
-#: ../output.py:247
+#: ../output.py:312
msgid "Trying other mirror."
msgstr "Pokušavam drugi odraz."
-#: ../output.py:425
+#: ../output.py:534
#, python-format
msgid "Name : %s%s%s"
msgstr "Ime : %s%s%s"
-#: ../output.py:426
+#: ../output.py:535
#, python-format
msgid "Arch : %s"
msgstr "Arhitektura: %s"
-#: ../output.py:428
+#: ../output.py:537
#, python-format
msgid "Epoch : %s"
msgstr "Period : %s"
-#: ../output.py:429
+#: ../output.py:538
#, python-format
msgid "Version : %s"
msgstr "Verzija : %s"
-#: ../output.py:430
+#: ../output.py:539
#, python-format
msgid "Release : %s"
msgstr "Izdanje : %s"
-#: ../output.py:431
+#: ../output.py:540
#, python-format
msgid "Size : %s"
msgstr "Veličina : %s"
-#: ../output.py:432
+#: ../output.py:541
#, python-format
msgid "Repo : %s"
msgstr "Riznica : %s"
-#: ../output.py:434
+#: ../output.py:543
+#, python-format
+msgid "From repo : %s"
+msgstr "Iz riznice : %s"
+
+#: ../output.py:545
#, python-format
msgid "Committer : %s"
msgstr "Objavljivač: %s"
-#: ../output.py:435
-#, fuzzy, python-format
+#: ../output.py:546
+#, python-format
msgid "Committime : %s"
-msgstr "Objavljivač : %s"
+msgstr "Objavljen : %s"
-#: ../output.py:436
-#, fuzzy, python-format
+#: ../output.py:547
+#, python-format
msgid "Buildtime : %s"
-msgstr "Objavljivač : %s"
+msgstr "Napravljen : %s"
-#: ../output.py:438
-#, fuzzy, python-format
+#: ../output.py:549
+#, python-format
msgid "Installtime: %s"
-msgstr "Instalirani"
+msgstr "Instaliran : %s"
-#: ../output.py:439
+#: ../output.py:550
msgid "Summary : "
msgstr "Sažetak :"
-#: ../output.py:441
+#: ../output.py:552
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:442
+#: ../output.py:553
#, python-format
msgid "License : %s"
msgstr "Licenca : %s"
-#: ../output.py:443
+#: ../output.py:554
msgid "Description: "
msgstr "Opis : "
-#: ../output.py:500
+#: ../output.py:622
msgid "y"
msgstr "d"
-#: ../output.py:500
+#: ../output.py:622
msgid "yes"
msgstr "da"
-#: ../output.py:501
+#: ../output.py:623
msgid "n"
msgstr "n"
-#: ../output.py:501
+#: ../output.py:623
msgid "no"
msgstr "ne"
-#: ../output.py:505
+#: ../output.py:627
msgid "Is this ok [y/N]: "
msgstr "Da li je ovo u redu [d/N]: "
-#: ../output.py:587
+#: ../output.py:715
#, python-format
msgid ""
"\n"
@@ -620,132 +637,142 @@ msgstr ""
"\n"
"Grupa: %s"
-#: ../output.py:594
+#: ../output.py:719
+#, python-format
+msgid " Group-Id: %s"
+msgstr " IB grupe: %s"
+
+#: ../output.py:724
#, python-format
msgid " Description: %s"
msgstr " Opis: %s"
-#: ../output.py:596
+#: ../output.py:726
msgid " Mandatory Packages:"
msgstr " Obavezni paketi:"
-#: ../output.py:597
+#: ../output.py:727
msgid " Default Packages:"
msgstr " Podrazumevani paketi:"
-#: ../output.py:598
+#: ../output.py:728
msgid " Optional Packages:"
msgstr " Izborni paketi:"
-#: ../output.py:599
+#: ../output.py:729
msgid " Conditional Packages:"
msgstr " Uslovljeni paketi:"
-#: ../output.py:619
+#: ../output.py:749
#, python-format
msgid "package: %s"
msgstr "paket: %s"
-#: ../output.py:621
+#: ../output.py:751
msgid " No dependencies for this package"
msgstr " Ne postoje zavisnosti ovog paketa"
-#: ../output.py:626
+#: ../output.py:756
#, python-format
msgid " dependency: %s"
msgstr " zavisnost: %s"
-#: ../output.py:628
+#: ../output.py:758
msgid " Unsatisfied dependency"
msgstr " Nezadovoljena zavisnost"
-#: ../output.py:700
+#: ../output.py:830
+#, python-format
+msgid "Repo : %s"
+msgstr "Riznica : %s"
+
+#: ../output.py:831
msgid "Matched from:"
-msgstr "Povezan iz:"
+msgstr "Povezan iz :"
-#: ../output.py:708
+#: ../output.py:839
msgid "Description : "
msgstr "Opis : "
-#: ../output.py:711
+#: ../output.py:842
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:714
+#: ../output.py:845
#, python-format
msgid "License : %s"
msgstr "Licenca : %s"
-#: ../output.py:717
+#: ../output.py:848
#, python-format
msgid "Filename : %s"
msgstr "Ime datoteke: %s"
-#: ../output.py:721
+#: ../output.py:852
msgid "Other : "
msgstr "Ostalo : "
-#: ../output.py:753
+#: ../output.py:885
msgid "There was an error calculating total download size"
msgstr "Dogodila se greška pri računanju ukupne veličine za preuzimanje"
-#: ../output.py:758
+#: ../output.py:890
#, python-format
msgid "Total size: %s"
msgstr "Ukupna veličina: %s"
-#: ../output.py:761
+#: ../output.py:893
#, python-format
msgid "Total download size: %s"
msgstr "Ukupna veličina za preuzimanje: %s"
-#: ../output.py:779
+#: ../output.py:935
msgid "Installing for dependencies"
msgstr "Instaliram zbog zavisnosti"
-#: ../output.py:780
+#: ../output.py:936
msgid "Updating for dependencies"
msgstr "Ažuriram zbog zavisnosti"
-#: ../output.py:781
+#: ../output.py:937
msgid "Removing for dependencies"
msgstr "Uklanjam zbog zavisnosti"
-#: ../output.py:782 ../output.py:893
+#: ../output.py:944 ../output.py:1042
msgid "Skipped (dependency problems)"
msgstr "Preskočeno (problemi sa zavisnostima)"
-#: ../output.py:818
+#: ../output.py:965
msgid "Package"
msgstr "Paket"
-#: ../output.py:818
+#: ../output.py:965
msgid "Arch"
msgstr "Arhitektura"
-#: ../output.py:819
+#: ../output.py:966
msgid "Version"
msgstr "Verzija"
-#: ../output.py:819
+#: ../output.py:966
msgid "Repository"
msgstr "Riznica"
-#: ../output.py:820
+#: ../output.py:967
msgid "Size"
msgstr "Veličina"
-#: ../output.py:831
+#: ../output.py:979
#, python-format
msgid ""
-" replacing %s.%s %s\n"
+" replacing %s%s%s.%s %s\n"
"\n"
msgstr ""
-" uklanjam %s.%s %s\n"
+" zamenjujem %s%s%s.%s %s\n"
"\n"
-#: ../output.py:839
+#: ../output.py:988
#, python-format
msgid ""
"\n"
@@ -762,27 +789,40 @@ msgstr ""
"Ažuriranje %5.5s paket(a) \n"
"Uklanjanje %5.5s paket(a) \n"
-#: ../output.py:887
+#: ../output.py:1036
msgid "Removed"
msgstr "Uklonjeno"
-#: ../output.py:888
+#: ../output.py:1037
msgid "Dependency Removed"
msgstr "Zavisnost uklonjena"
-#: ../output.py:890
+#: ../output.py:1039
msgid "Dependency Installed"
msgstr "Zavisnost instalirana"
-#: ../output.py:892
+#: ../output.py:1041
msgid "Dependency Updated"
msgstr "Zavisnost ažurirana"
-#: ../output.py:894
+#: ../output.py:1043
msgid "Replaced"
msgstr "Zamenjeno"
-#: ../output.py:967
+#: ../output.py:1044
+msgid "Failed"
+msgstr "Neuspeh"
+
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1110
+msgid "two"
+msgstr "dva"
+
+#. For translators: This is output like:
+#. Current download cancelled, interrupt (ctrl-c) again within two seconds
+#. to exit.
+#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#: ../output.py:1121
#, python-format
msgid ""
"\n"
@@ -793,68 +833,68 @@ msgstr ""
" Trenutno preuzimanje je obustavljeno, %sinterrupt (ctrl-c) još jednom%s u "
"toku %s%s%s sekundi da biste izašli.\n"
-#: ../output.py:977
+#: ../output.py:1131
msgid "user interrupt"
msgstr "prekid od strane korisnika"
-#: ../output.py:993
+#: ../output.py:1147
msgid "Total"
msgstr "Ukupno"
-#: ../output.py:1007
+#: ../output.py:1161
msgid "installed"
msgstr "instaliran"
-#: ../output.py:1008
+#: ../output.py:1162
msgid "updated"
msgstr "ažuriran"
-#: ../output.py:1009
+#: ../output.py:1163
msgid "obsoleted"
msgstr "prevaziđen"
-#: ../output.py:1010
+#: ../output.py:1164
msgid "erased"
msgstr "obrisan"
-#: ../output.py:1014
+#: ../output.py:1168
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Paket %s.%s %s:%s-%s postavljen da bude %s"
-#: ../output.py:1021
+#: ../output.py:1175
msgid "--> Running transaction check"
msgstr "--> Izvršava se provera transakcije"
-#: ../output.py:1026
+#: ../output.py:1180
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Ponovno pokretanje razrešavanja zavisnosti sa novim promenama."
-#: ../output.py:1031
+#: ../output.py:1185
msgid "--> Finished Dependency Resolution"
msgstr "--> Završeno je razrešavanje zavisnosti"
-#: ../output.py:1036
+#: ../output.py:1190
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Obrađujem zavisnost: %s za paket: %s"
-#: ../output.py:1041
+#: ../output.py:1195
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Nerazrešena zavisnost: %s"
-#: ../output.py:1047
+#: ../output.py:1201
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Sukob pri obradi: %s se sukobi sa %s"
-#: ../output.py:1050
+#: ../output.py:1204
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
"--> Popunjavam skup transakcije sa izabranim paketima. Molim vas, sačekajte."
-#: ../output.py:1054
+#: ../output.py:1208
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Preuzimam zaglavlje za %s radi pakovanja u skup transakcije."
@@ -897,7 +937,7 @@ msgstr ""
#: ../yumcommands.py:67
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
-msgstr "Greška: potrebno je da dodate spisak paketa %s-u"
+msgstr "Greška: potrebno je da dodate spisak paketa za %s"
#: ../yumcommands.py:73
msgid "Error: Need an item to match"
@@ -921,286 +961,288 @@ msgstr "Greška: pogrešan clean argument:%r"
msgid "No argument to shell"
msgstr "Ne postoji argument za komandno okruženje"
-#: ../yumcommands.py:109
+#: ../yumcommands.py:108
#, python-format
msgid "Filename passed to shell: %s"
msgstr "Ime datoteke je prosleđeno komandnom okruženju: %s"
-#: ../yumcommands.py:113
+#: ../yumcommands.py:112
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr ""
"Ne postoji datoteka %s, koja je prosleđena kao argument komandnom okruženju."
-#: ../yumcommands.py:119
+#: ../yumcommands.py:118
msgid "Error: more than one file given as argument to shell."
msgstr ""
"Greška: više od jedne datoteke je prosleđeno kao argument komandnom "
"okruženju."
-#: ../yumcommands.py:160
+#: ../yumcommands.py:167
msgid "PACKAGE..."
msgstr "PAKET..."
-#: ../yumcommands.py:163
+#: ../yumcommands.py:170
msgid "Install a package or packages on your system"
msgstr "Instalirajte paket ili pakete na vaš sistem"
-#: ../yumcommands.py:172
+#: ../yumcommands.py:178
msgid "Setting up Install Process"
msgstr "Postavljam proces instalacije"
-#: ../yumcommands.py:183
+#: ../yumcommands.py:189
msgid "[PACKAGE...]"
msgstr "[PAKET...]"
-#: ../yumcommands.py:186
+#: ../yumcommands.py:192
msgid "Update a package or packages on your system"
msgstr "Ažuriraj paket ili pakete na vašem sistemu"
-#: ../yumcommands.py:194
+#: ../yumcommands.py:199
msgid "Setting up Update Process"
msgstr "Postavljam proces ažuriranja"
-#: ../yumcommands.py:236
+#: ../yumcommands.py:241
msgid "Display details about a package or group of packages"
msgstr "Prikaži detalje o svakom paketu ili grupi paketa"
-#. Output the packages:
-#: ../yumcommands.py:261
+#: ../yumcommands.py:290
msgid "Installed Packages"
msgstr "Instalirani paketi"
-#: ../yumcommands.py:263
+#: ../yumcommands.py:298
msgid "Available Packages"
msgstr "Dostupni paketi"
-#: ../yumcommands.py:265
+#: ../yumcommands.py:302
msgid "Extra Packages"
msgstr "Dodatni paketi"
-#: ../yumcommands.py:267
+#: ../yumcommands.py:306
msgid "Updated Packages"
msgstr "Ažurirani paketi"
-#: ../yumcommands.py:274 ../yumcommands.py:281
+#. This only happens in verbose mode
+#: ../yumcommands.py:314 ../yumcommands.py:321 ../yumcommands.py:598
msgid "Obsoleting Packages"
msgstr "Prevaziđeni paketi"
-#: ../yumcommands.py:283
+#: ../yumcommands.py:323
msgid "Recently Added Packages"
msgstr "Nedavno dodati paketi"
-#: ../yumcommands.py:290
+#: ../yumcommands.py:330
msgid "No matching Packages to list"
msgstr "Ne postoje odgovarajući paketi za izlistavanje"
-#: ../yumcommands.py:304
+#: ../yumcommands.py:344
msgid "List a package or groups of packages"
msgstr "Izlistaj pakete ili grupe paketa"
-#: ../yumcommands.py:316
+#: ../yumcommands.py:356
msgid "Remove a package or packages from your system"
msgstr "Uklonite paket ili pakete sa vašeg sistema"
-#: ../yumcommands.py:324
+#: ../yumcommands.py:363
msgid "Setting up Remove Process"
msgstr "Postavljam proces uklanjanja"
-#: ../yumcommands.py:339
+#: ../yumcommands.py:377
msgid "Setting up Group Process"
msgstr "Postavljam proces za grupe"
-#: ../yumcommands.py:345
+#: ../yumcommands.py:383
msgid "No Groups on which to run command"
msgstr "Ne postoji grupa nad kojom se može izvršiti komanda"
-#: ../yumcommands.py:358
+#: ../yumcommands.py:396
msgid "List available package groups"
msgstr "Izlistaj dostupne grupe paketa"
-#: ../yumcommands.py:375
+#: ../yumcommands.py:413
msgid "Install the packages in a group on your system"
msgstr "Instalirajte pakete u grupi na vašem sistemu"
-#: ../yumcommands.py:397
+#: ../yumcommands.py:435
msgid "Remove the packages in a group from your system"
msgstr "Uklonite pakete u grupi sa vašeg sistema"
-#: ../yumcommands.py:424
+#: ../yumcommands.py:462
msgid "Display details about a package group"
msgstr "Prikaži detalje o grupi paketa"
-#: ../yumcommands.py:448
+#: ../yumcommands.py:486
msgid "Generate the metadata cache"
msgstr "Napravi keš sa metapodacima"
-#: ../yumcommands.py:454
+#: ../yumcommands.py:492
msgid "Making cache files for all metadata files."
msgstr "Pravim keš datoteke za sve datoteke sa metapodacima."
-#: ../yumcommands.py:455
+#: ../yumcommands.py:493
msgid "This may take a while depending on the speed of this computer"
msgstr "Ovo može da potraje u zavisnosti od brzine vašeg računara"
-#: ../yumcommands.py:476
+#: ../yumcommands.py:514
msgid "Metadata Cache Created"
msgstr "Napravljen je keš sa metapodacima"
-#: ../yumcommands.py:490
+#: ../yumcommands.py:528
msgid "Remove cached data"
msgstr "Ukloni keširane podatke"
-#: ../yumcommands.py:511
+#: ../yumcommands.py:549
msgid "Find what package provides the given value"
msgstr "Pronađi koji paket pruža datu vrednost"
-#: ../yumcommands.py:531
+#: ../yumcommands.py:569
msgid "Check for available package updates"
msgstr "Proverite da li su dostupna ažuriranja paketa"
-#: ../yumcommands.py:556
+#: ../yumcommands.py:618
msgid "Search package details for the given string"
msgstr "Pretražite detalje o paketu za zadatu nisku"
-#: ../yumcommands.py:562
+#: ../yumcommands.py:624
msgid "Searching Packages: "
msgstr "Pretražujem pakete: "
-#: ../yumcommands.py:579
+#: ../yumcommands.py:641
msgid "Update packages taking obsoletes into account"
msgstr "Ažurirajte pakete uzimajući prevaziđene u obzir"
-#: ../yumcommands.py:588
+#: ../yumcommands.py:649
msgid "Setting up Upgrade Process"
msgstr "Postavljam proces nadgradnje"
-#: ../yumcommands.py:602
+#: ../yumcommands.py:663
msgid "Install a local RPM"
msgstr "Instaliraj lokalni RPM"
-#: ../yumcommands.py:611
+#: ../yumcommands.py:671
msgid "Setting up Local Package Process"
msgstr "Postavljam proces lokalnih paketa"
-#: ../yumcommands.py:630
+#: ../yumcommands.py:690
msgid "Determine which package provides the given dependency"
msgstr "Odredi koji paketi pružaju datu zavisnost"
-#: ../yumcommands.py:633
+#: ../yumcommands.py:693
msgid "Searching Packages for Dependency:"
msgstr "Pretražujem pakete u potrazi za zavisnostima:"
-#: ../yumcommands.py:647
+#: ../yumcommands.py:707
msgid "Run an interactive yum shell"
-msgstr "Izvršavaj interaktivno komandno okruženje yum-a"
+msgstr "Izvršavaj interaktivno yum komandno okruženje"
-#: ../yumcommands.py:653
+#: ../yumcommands.py:713
msgid "Setting up Yum Shell"
-msgstr "Postavljam Yum komandno okruženje"
+msgstr "Postavljam yum komandno okruženje"
-#: ../yumcommands.py:671
+#: ../yumcommands.py:731
msgid "List a package's dependencies"
msgstr "Izlistaj zavisnosti paketa"
-#: ../yumcommands.py:677
+#: ../yumcommands.py:737
msgid "Finding dependencies: "
msgstr "Tražim zavisnosti: "
-#: ../yumcommands.py:693
+#: ../yumcommands.py:753
msgid "Display the configured software repositories"
msgstr "Prikaži podešene softverske riznice"
-#: ../yumcommands.py:742
+#: ../yumcommands.py:801 ../yumcommands.py:802
msgid "enabled"
msgstr "uključena"
-#: ../yumcommands.py:751
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "disabled"
msgstr "isključena"
-#: ../yumcommands.py:760
-msgid "repo id"
-msgstr "repo id"
-
-#: ../yumcommands.py:761
-msgid "repo name"
-msgstr "repo ime"
-
-#: ../yumcommands.py:761
-msgid "status"
-msgstr "status"
-
-#: ../yumcommands.py:765
+#: ../yumcommands.py:825
msgid "Repo-id : "
-msgstr "IB riznice : "
+msgstr "IB riznice : "
-#: ../yumcommands.py:766
+#: ../yumcommands.py:826
msgid "Repo-name : "
-msgstr "Ime riznice : "
+msgstr "Ime riznice : "
-#: ../yumcommands.py:767
+#: ../yumcommands.py:827
msgid "Repo-status : "
-msgstr "Status riznice : "
+msgstr "Status riznice : "
-#: ../yumcommands.py:769
-#, fuzzy
+#: ../yumcommands.py:829
msgid "Repo-revision: "
-msgstr "Veličina riznice : "
+msgstr "Revizija riznice : "
-#: ../yumcommands.py:773
-#, fuzzy
+#: ../yumcommands.py:833
msgid "Repo-tags : "
-msgstr "Paketi riznice : "
+msgstr "Oznake riznice : "
-#: ../yumcommands.py:779
-#, fuzzy
+#: ../yumcommands.py:839
msgid "Repo-distro-tags: "
-msgstr "Status riznice : "
+msgstr "Distro oznake riznice: "
-#: ../yumcommands.py:784
+#: ../yumcommands.py:844
msgid "Repo-updated: "
-msgstr "Riznica ažurirana : "
+msgstr "Riznica ažurirana : "
-#: ../yumcommands.py:786
+#: ../yumcommands.py:846
msgid "Repo-pkgs : "
-msgstr "Paketi riznice : "
+msgstr "Paketi riznice : "
-#: ../yumcommands.py:787
+#: ../yumcommands.py:847
msgid "Repo-size : "
-msgstr "Veličina riznice : "
+msgstr "Veličina riznice : "
-#: ../yumcommands.py:794
+#: ../yumcommands.py:854
msgid "Repo-baseurl: "
-msgstr "Osnovni URL riznice: "
+msgstr "Osnovni URL riznice : "
-#: ../yumcommands.py:798
-#, fuzzy
+#: ../yumcommands.py:858
msgid "Repo-metalink: "
-msgstr "Ime riznice : "
+msgstr "Metalink riznice : "
-#: ../yumcommands.py:801
+#: ../yumcommands.py:862
+msgid " Updated : "
+msgstr " Ažurirano : "
+
+#: ../yumcommands.py:865
msgid "Repo-mirrors: "
-msgstr "Odrazi riznice : "
+msgstr "Odrazi riznice : "
-#: ../yumcommands.py:805
+#: ../yumcommands.py:869
msgid "Repo-exclude: "
-msgstr "Riznica isključena : "
+msgstr "Riznica isključena : "
-#: ../yumcommands.py:809
+#: ../yumcommands.py:873
msgid "Repo-include: "
-msgstr "Riznica uključena : "
+msgstr "Riznica uključena : "
+
+#. Work out the first (id) and last (enabled/disalbed/count),
+#. then chop the middle (name)...
+#: ../yumcommands.py:883 ../yumcommands.py:909
+msgid "repo id"
+msgstr "repo id"
+
+#: ../yumcommands.py:897 ../yumcommands.py:898 ../yumcommands.py:912
+msgid "status"
+msgstr "status"
-#: ../yumcommands.py:835
+#: ../yumcommands.py:910
+msgid "repo name"
+msgstr "repo ime"
+
+#: ../yumcommands.py:936
msgid "Display a helpful usage message"
msgstr "Prikaži korisnu poruku o upotrebi"
-#: ../yumcommands.py:869
+#: ../yumcommands.py:970
#, python-format
msgid "No help available for %s"
msgstr "Nije dostupna pomoć za %s"
-#: ../yumcommands.py:874
+#: ../yumcommands.py:975
msgid ""
"\n"
"\n"
@@ -1210,7 +1252,7 @@ msgstr ""
"\n"
"pseudonimi: "
-#: ../yumcommands.py:876
+#: ../yumcommands.py:977
msgid ""
"\n"
"\n"
@@ -1220,15 +1262,27 @@ msgstr ""
"\n"
"pseudonim: "
-#: ../yumcommands.py:905
+#: ../yumcommands.py:1005
msgid "Setting up Reinstall Process"
msgstr "Postavljam proces ponovne instalacije"
-#: ../yumcommands.py:919
+#: ../yumcommands.py:1014
+msgid "Package(s) to reinstall"
+msgstr "Paket(i) koji će se ponovo instalirati"
+
+#: ../yumcommands.py:1021
msgid "reinstall a package"
msgstr "ponovno instaliram paket"
-#: ../yummain.py:41
+#: ../yumcommands.py:1039
+msgid "Setting up Downgrade Process"
+msgstr "Postavljam proces unazađivanja"
+
+#: ../yumcommands.py:1046
+msgid "downgrade a package"
+msgstr "unazadi paket"
+
+#: ../yummain.py:42
msgid ""
"\n"
"\n"
@@ -1238,7 +1292,7 @@ msgstr ""
"\n"
"Izlazim kada korisnik otkaže"
-#: ../yummain.py:47
+#: ../yummain.py:48
msgid ""
"\n"
"\n"
@@ -1248,29 +1302,92 @@ msgstr ""
"\n"
"Izlazim kada se slomi cev"
-#: ../yummain.py:98
+#: ../yummain.py:126
+msgid "Running"
+msgstr "Izvršava se"
+
+#: ../yummain.py:127
+msgid "Sleeping"
+msgstr "Uspavan"
+
+#: ../yummain.py:128
+msgid "Uninteruptable"
+msgstr "Neprekidan"
+
+#: ../yummain.py:129
+msgid "Zombie"
+msgstr "Zombi"
+
+#: ../yummain.py:130
+msgid "Traced/Stopped"
+msgstr "Praćen/zaustavljen"
+
+#: ../yummain.py:131
+msgid "Unknown"
+msgstr "Nepoznat"
+
+#: ../yummain.py:135
+msgid " The other application is: PackageKit"
+msgstr " Drugi program je: PackageKit"
+
+#: ../yummain.py:137
+#, python-format
+msgid " The other application is: %s"
+msgstr " Drugi program je: %s"
+
+#: ../yummain.py:140
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr " Memorija: %5s RSS (%5sB VSZ)"
+
+#: ../yummain.py:144
+#, python-format
+msgid " Started: %s - %s ago"
+msgstr " Pokrenut: %s - %s ranije"
+
+#: ../yummain.py:146
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr " Stanje : %s, pid: %d"
+
+#: ../yummain.py:171
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
"Neki drugi program trenutno drži yum zaključanim; čekam da taj program "
"izađe..."
-#: ../yummain.py:125 ../yummain.py:164
+#: ../yummain.py:199 ../yummain.py:238
#, python-format
msgid "Error: %s"
msgstr "Greška: %s"
-#: ../yummain.py:135 ../yummain.py:171
+#: ../yummain.py:209 ../yummain.py:250
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Nepoznata greška(e): izlazni kod: %d:"
#. Depsolve stage
-#: ../yummain.py:142
+#: ../yummain.py:216
msgid "Resolving Dependencies"
msgstr "Razrešavam zavisnosti"
-#: ../yummain.py:177
+#: ../yummain.py:240
+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"
+
+#: ../yummain.py:241
+msgid ""
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+msgstr ""
+" Možete da probate izvršavanje: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+
+#: ../yummain.py:256
msgid ""
"\n"
"Dependencies Resolved"
@@ -1278,11 +1395,11 @@ msgstr ""
"\n"
"Zavisnosti su razrešene"
-#: ../yummain.py:191
+#: ../yummain.py:270
msgid "Complete!"
msgstr "Završeno!"
-#: ../yummain.py:238
+#: ../yummain.py:317
msgid ""
"\n"
"\n"
@@ -1294,194 +1411,194 @@ msgstr ""
#: ../yum/depsolve.py:84
msgid "doTsSetup() will go away in a future version of Yum.\n"
-msgstr "doTsSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
+msgstr "doTsSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/depsolve.py:97
+#: ../yum/depsolve.py:99
msgid "Setting up TransactionSets before config class is up"
msgstr "Postavljam TransactionSets pre nego što se podigne klasa podešavanja"
-#: ../yum/depsolve.py:148
+#: ../yum/depsolve.py:150
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Pogrešan tsflag u datoteci podešavanja: %s"
-#: ../yum/depsolve.py:159
-#, fuzzy, python-format
+#: ../yum/depsolve.py:161
+#, python-format
msgid "Searching pkgSack for dep: %s"
-msgstr "tražim paket %s"
+msgstr "Pretražujem pkgSack za zavisnost: %s"
-#: ../yum/depsolve.py:182
-#, fuzzy, python-format
+#: ../yum/depsolve.py:184
+#, python-format
msgid "Potential match for %s from %s"
-msgstr "Postoji više od jednog identičnog slaganja u grupi za %s"
+msgstr "Moguće slaganje za %s od %s"
-#: ../yum/depsolve.py:190
-#, fuzzy, python-format
+#: ../yum/depsolve.py:192
+#, python-format
msgid "Matched %s to require for %s"
-msgstr "%s zahteva: %s"
+msgstr "Povezan %s radi zahtevanja za %s"
-#: ../yum/depsolve.py:231
+#: ../yum/depsolve.py:233
#, python-format
msgid "Member: %s"
msgstr "Član: %s"
-#: ../yum/depsolve.py:245 ../yum/depsolve.py:732
+#: ../yum/depsolve.py:247 ../yum/depsolve.py:739
#, python-format
msgid "%s converted to install"
msgstr "%s prebačen za instalaciju"
-#: ../yum/depsolve.py:252
+#: ../yum/depsolve.py:254
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Dodajem paket %s u načinu rada %s"
-#: ../yum/depsolve.py:262
+#: ../yum/depsolve.py:264
#, python-format
msgid "Removing Package %s"
msgstr "Uklanjam paket %s"
-#: ../yum/depsolve.py:273
+#: ../yum/depsolve.py:275
#, python-format
msgid "%s requires: %s"
msgstr "%s zahteva: %s"
-#: ../yum/depsolve.py:331
+#: ../yum/depsolve.py:333
msgid "Needed Require has already been looked up, cheating"
msgstr "Potreban zahtev je već potražen, obmanjujem"
-#: ../yum/depsolve.py:341
+#: ../yum/depsolve.py:343
#, 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:348
+#: ../yum/depsolve.py:350
#, python-format
msgid "Potential Provider: %s"
msgstr "Mogući snabdevač: %s"
-#: ../yum/depsolve.py:371
+#: ../yum/depsolve.py:373
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Režim je %s za snabdevača %s: %s"
-#: ../yum/depsolve.py:375
+#: ../yum/depsolve.py:377
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Režim za paket koji snabdeva %s: %s"
-#: ../yum/depsolve.py:379
+#: ../yum/depsolve.py:381
#, 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:391
+#: ../yum/depsolve.py:394
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "TSINFO: menjam %s sa %s radi razrešavanja zavisnosti."
-#: ../yum/depsolve.py:394
+#: ../yum/depsolve.py:397
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: ažuriram %s radi razrešavanja zavisnosti."
-#: ../yum/depsolve.py:402
+#: ../yum/depsolve.py:405
#, 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:412
+#: ../yum/depsolve.py:415
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Nerazrešiv zahtev paketa %s za %s"
-#: ../yum/depsolve.py:435
+#: ../yum/depsolve.py:438
#, 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:477
+#: ../yum/depsolve.py:480
#, 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:492
+#: ../yum/depsolve.py:496
#, 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:503
+#: ../yum/depsolve.py:507
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "Potencijalno razrešavanje paketa %s ima instaliran noviji primerak."
-#: ../yum/depsolve.py:511 ../yum/depsolve.py:560
+#: ../yum/depsolve.py:515 ../yum/depsolve.py:564
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Nedostaje zavisnost: %s je potreban od strane paketa %s"
-#: ../yum/depsolve.py:524
+#: ../yum/depsolve.py:528
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s je već u ts-u, preskačem ga"
-#: ../yum/depsolve.py:570
+#: ../yum/depsolve.py:574
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: označavam %s kao ažuriranje za %s"
-#: ../yum/depsolve.py:578
+#: ../yum/depsolve.py:582
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: označavam %s kao instalaciju za %s"
-#: ../yum/depsolve.py:670 ../yum/depsolve.py:750
+#: ../yum/depsolve.py:675 ../yum/depsolve.py:757
msgid "Success - empty transaction"
msgstr "Uspeh - prazna transakcija"
-#: ../yum/depsolve.py:709 ../yum/depsolve.py:722
+#: ../yum/depsolve.py:714 ../yum/depsolve.py:729
msgid "Restarting Loop"
msgstr "Ponovo pokrećem petlju"
-#: ../yum/depsolve.py:738
+#: ../yum/depsolve.py:745
msgid "Dependency Process ending"
msgstr "Završetak procesa zavisnosti"
-#: ../yum/depsolve.py:744
+#: ../yum/depsolve.py:751
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s iz %s ima problema sa razrešavanjem zavisnosti"
-#: ../yum/depsolve.py:751
+#: ../yum/depsolve.py:758
msgid "Success - deps resolved"
msgstr "Uspeh - zavisnosti su razrešene"
-#: ../yum/depsolve.py:765
+#: ../yum/depsolve.py:772
#, python-format
msgid "Checking deps for %s"
msgstr "Proveravam zavisnosti za %s"
-#: ../yum/depsolve.py:848
+#: ../yum/depsolve.py:855
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "tražim %s kao zahtev za %s"
-#: ../yum/depsolve.py:988
+#: ../yum/depsolve.py:997
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Pokrećem compare_providers() za %s"
-#: ../yum/depsolve.py:1016 ../yum/depsolve.py:1022
-#, fuzzy, python-format
+#: ../yum/depsolve.py:1025 ../yum/depsolve.py:1031
+#, python-format
msgid "better arch in po %s"
-msgstr "bolja arhitektura u po %s"
+msgstr "bolja arhitektura u paketu %s"
-#: ../yum/depsolve.py:1061
+#: ../yum/depsolve.py:1092
#, python-format
msgid "%s obsoletes %s"
msgstr "%s prevazilazi %s"
-#: ../yum/depsolve.py:1077
+#: ../yum/depsolve.py:1108
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1490,117 +1607,116 @@ msgstr ""
"archdist uporedio %s sa %s na %s\n"
" Pobednik: %s"
-#: ../yum/depsolve.py:1084
+#: ../yum/depsolve.py:1115
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "zajednički izvorni rpm %s i %s"
-#: ../yum/depsolve.py:1090
+#: ../yum/depsolve.py:1121
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "zajednički prefiks %s između %s i %s"
-#: ../yum/depsolve.py:1098
+#: ../yum/depsolve.py:1129
#, python-format
msgid "Best Order: %s"
msgstr "Najbolji redosled: %s"
-#: ../yum/__init__.py:135
+#: ../yum/__init__.py:158
msgid "doConfigSetup() will go away in a future version of Yum.\n"
-msgstr "doConfigSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
+msgstr "doConfigSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:315
+#: ../yum/__init__.py:367
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Riznici %r nedostaje ime u podešavanjima, koristim id"
-#: ../yum/__init__.py:353
+#: ../yum/__init__.py:405
msgid "plugins already initialised"
msgstr "već inicijalizovani dodaci"
-#: ../yum/__init__.py:360
+#: ../yum/__init__.py:412
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
-msgstr "doRpmDBSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
+msgstr "doRpmDBSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:370
+#: ../yum/__init__.py:423
msgid "Reading Local RPMDB"
msgstr "Čitam lokalni RPMDB"
-#: ../yum/__init__.py:388
+#: ../yum/__init__.py:441
msgid "doRepoSetup() will go away in a future version of Yum.\n"
-msgstr "doRepoSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
+msgstr "doRepoSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:408
+#: ../yum/__init__.py:461
msgid "doSackSetup() will go away in a future version of Yum.\n"
-msgstr "doSackSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
+msgstr "doSackSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:425
+#: ../yum/__init__.py:478
msgid "Setting up Package Sacks"
msgstr "Postavljam grupe paketa"
-#: ../yum/__init__.py:468
+#: ../yum/__init__.py:521
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "repo objektu za repo %s nedostaje a _resetSack metoda\n"
-#: ../yum/__init__.py:469
+#: ../yum/__init__.py:522
msgid "therefore this repo cannot be reset.\n"
msgstr "zbog toga se ovaj repo ne može vratiti na početnu postavku.\n"
-#: ../yum/__init__.py:474
+#: ../yum/__init__.py:527
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
-msgstr "doUpdateSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
+msgstr "doUpdateSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:486
+#: ../yum/__init__.py:539
msgid "Building updates object"
msgstr "Izgrađujem objekat ažuriranja"
-#: ../yum/__init__.py:517
+#: ../yum/__init__.py:570
msgid "doGroupSetup() will go away in a future version of Yum.\n"
-msgstr "doGroupSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
+msgstr "doGroupSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:541
+#: ../yum/__init__.py:595
msgid "Getting group metadata"
msgstr "Dobavljam metapodatke grupe"
-#: ../yum/__init__.py:567
+#: ../yum/__init__.py:621
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Dodajem datoteku grupe iz riznice: %s"
-#: ../yum/__init__.py:576
+#: ../yum/__init__.py:630
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Nije uspelo dodavanje datoteke grupe za riznicu: %s - %s"
-#: ../yum/__init__.py:582
+#: ../yum/__init__.py:636
msgid "No Groups Available in any repository"
msgstr "Ne postoji grupa koja je dostupna u bilo kojoj riznici"
-#: ../yum/__init__.py:632
+#: ../yum/__init__.py:686
msgid "Importing additional filelist information"
msgstr "Uvozim dodatne informacije o spiskovima datoteka"
-#: ../yum/__init__.py:641
-#, fuzzy
+#: ../yum/__init__.py:695
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
msgstr ""
-"Ostale su nedovršene transakcije. Možda bi trebalo da izvršite yum-complete-"
-"transaction da biste ih završili."
+"Ostale su nedovršene transakcije. Možda bi prvo trebalo da izvršite yum-"
+"complete-transaction da biste ih završili."
-#: ../yum/__init__.py:698
+#: ../yum/__init__.py:761
#, python-format
msgid "Skip-broken round %i"
msgstr "Skip-broken etapa %i"
-#: ../yum/__init__.py:724
+#: ../yum/__init__.py:813
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Skip-broken je završen u %i etapa "
-#: ../yum/__init__.py:725
+#: ../yum/__init__.py:814
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1608,93 +1724,93 @@ msgstr ""
"\n"
"Paketi su preskočeni zbog problema sa zavisnostima:"
-#: ../yum/__init__.py:729
+#: ../yum/__init__.py:818
#, python-format
msgid " %s from %s"
msgstr " %s iz %s"
-#: ../yum/__init__.py:816
+#: ../yum/__init__.py:958
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"Upozorenje: došlo je do greške u skriptici ili neke druge nekritične greške "
"tokom transakcije."
-#: ../yum/__init__.py:832
+#: ../yum/__init__.py:973
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Nije uspelo uklanjanje datoteke transakcije %s"
-#: ../yum/__init__.py:873
+#: ../yum/__init__.py:1015
#, python-format
msgid "excluding for cost: %s from %s"
msgstr "izuzimam iz troška: %s iz %s"
-#: ../yum/__init__.py:904
+#: ../yum/__init__.py:1046
msgid "Excluding Packages in global exclude list"
msgstr "Izuzimam pakete u globalnom spisku za izuzimanje"
-#: ../yum/__init__.py:906
+#: ../yum/__init__.py:1048
#, python-format
msgid "Excluding Packages from %s"
msgstr "Izuzimam pakete iz %s"
-#: ../yum/__init__.py:933
+#: ../yum/__init__.py:1077
#, python-format
msgid "Reducing %s to included packages only"
msgstr "Sažimam %s samo u sadržane pakete"
-#: ../yum/__init__.py:939
+#: ../yum/__init__.py:1083
#, python-format
msgid "Keeping included package %s"
msgstr "Zadržavam sadržani paket %s"
-#: ../yum/__init__.py:945
+#: ../yum/__init__.py:1089
#, python-format
msgid "Removing unmatched package %s"
msgstr "Uklanjam nepovezani paket %s"
-#: ../yum/__init__.py:948
+#: ../yum/__init__.py:1092
msgid "Finished"
msgstr "Završio"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:978
+#: ../yum/__init__.py:1122
#, 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:982
+#: ../yum/__init__.py:1126
#, 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."
-#: ../yum/__init__.py:1053
+#: ../yum/__init__.py:1196
msgid "Package does not match intended download"
msgstr "Paket nije odgovarajući za nameravano preuzimanje"
-#: ../yum/__init__.py:1068
+#: ../yum/__init__.py:1211
msgid "Could not perform checksum"
msgstr "Ne mogu da izvršim kontrolu sume"
-#: ../yum/__init__.py:1071
+#: ../yum/__init__.py:1214
msgid "Package does not match checksum"
msgstr "Paket nema odgovarajući kontrolnu sumu"
-#: ../yum/__init__.py:1114
+#: ../yum/__init__.py:1257
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
"paket nema odgovarajuću vrednost kontrolne sume ili je za %s uključeno "
"keširanje"
-#: ../yum/__init__.py:1117 ../yum/__init__.py:1145
+#: ../yum/__init__.py:1260 ../yum/__init__.py:1289
#, python-format
msgid "using local copy of %s"
-msgstr "koristim lokalni umnožak %s-a"
+msgstr "koristim lokalni %s umnožak"
-#: ../yum/__init__.py:1159
+#: ../yum/__init__.py:1301
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1705,11 +1821,11 @@ msgstr ""
" * slobodno je %s\n"
" * potrebno je %s"
-#: ../yum/__init__.py:1206
+#: ../yum/__init__.py:1348
msgid "Header is not complete."
msgstr "Zaglavlje nije potpuno."
-#: ../yum/__init__.py:1246
+#: ../yum/__init__.py:1385
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1717,62 +1833,62 @@ 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:1301
+#: ../yum/__init__.py:1440
#, python-format
msgid "Public key for %s is not installed"
msgstr "Javni ključ za %s nije instaliran"
-#: ../yum/__init__.py:1305
+#: ../yum/__init__.py:1444
#, python-format
msgid "Problem opening package %s"
msgstr "Problem sa otvaranjem paketa %s"
-#: ../yum/__init__.py:1313
+#: ../yum/__init__.py:1452
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Javni ključ za %s nije poverljiv"
-#: ../yum/__init__.py:1317
+#: ../yum/__init__.py:1456
#, python-format
msgid "Package %s is not signed"
msgstr "Paket %s nije potpisan"
-#: ../yum/__init__.py:1355
+#: ../yum/__init__.py:1494
#, python-format
msgid "Cannot remove %s"
msgstr "Ne mogu da uklonim %s"
-#: ../yum/__init__.py:1359
+#: ../yum/__init__.py:1498
#, python-format
msgid "%s removed"
msgstr "%s je uklonjen"
-#: ../yum/__init__.py:1396
+#: ../yum/__init__.py:1534
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Ne mogu da uklonim %s datoteku %s"
-#: ../yum/__init__.py:1400
+#: ../yum/__init__.py:1538
#, python-format
msgid "%s file %s removed"
msgstr "%s datoteka %s je uklonjena"
-#: ../yum/__init__.py:1402
+#: ../yum/__init__.py:1540
#, python-format
msgid "%d %s files removed"
msgstr "%d %s datoteke su uklonjene"
-#: ../yum/__init__.py:1464
+#: ../yum/__init__.py:1609
#, 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:1470
+#: ../yum/__init__.py:1615
#, 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:1678
+#: ../yum/__init__.py:1833
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1780,177 +1896,172 @@ msgstr ""
"searchPackages() neće biti prisutna u budućim Yum "
"verzijama. Umesto nje koristite searchGenerator(). \n"
-#: ../yum/__init__.py:1716
+#: ../yum/__init__.py:1875
#, python-format
msgid "Searching %d packages"
msgstr "Pretražujem %d pakete"
-#: ../yum/__init__.py:1720
+#: ../yum/__init__.py:1879
#, python-format
msgid "searching package %s"
msgstr "tražim paket %s"
-#: ../yum/__init__.py:1732
+#: ../yum/__init__.py:1891
msgid "searching in file entries"
msgstr "tražim u unosima datoteka"
-#: ../yum/__init__.py:1739
+#: ../yum/__init__.py:1898
msgid "searching in provides entries"
msgstr "tražim u unosima dostavljača"
-#: ../yum/__init__.py:1772
+#: ../yum/__init__.py:1931
#, python-format
msgid "Provides-match: %s"
msgstr "Dostavlja-slaganje: %s"
-#: ../yum/__init__.py:1821
+#: ../yum/__init__.py:1980
msgid "No group data available for configured repositories"
msgstr "Nema dostupnih podataka o grupama za podešene riznice"
-#: ../yum/__init__.py:1847 ../yum/__init__.py:1866 ../yum/__init__.py:1897
-#: ../yum/__init__.py:1903 ../yum/__init__.py:1976 ../yum/__init__.py:1980
+#: ../yum/__init__.py:2011 ../yum/__init__.py:2030 ../yum/__init__.py:2061
+#: ../yum/__init__.py:2067 ../yum/__init__.py:2146 ../yum/__init__.py:2150
+#: ../yum/__init__.py:2446
#, python-format
msgid "No Group named %s exists"
msgstr "Ne postoji grupa pod imenom %s"
-#: ../yum/__init__.py:1878 ../yum/__init__.py:1993
+#: ../yum/__init__.py:2042 ../yum/__init__.py:2163
#, python-format
msgid "package %s was not marked in group %s"
msgstr "paket %s nije označen u grupi %s"
-#: ../yum/__init__.py:1925
+#: ../yum/__init__.py:2089
#, python-format
msgid "Adding package %s from group %s"
msgstr "Dodajem paket %s iz grupe %s"
-#: ../yum/__init__.py:1929
+#: ../yum/__init__.py:2093
#, python-format
msgid "No package named %s available to be installed"
msgstr "Nijedan paket pod imenom %s nije dostupan za instalaciju"
-#: ../yum/__init__.py:2018
-#, fuzzy, python-format
+#: ../yum/__init__.py:2190
+#, python-format
msgid "Package tuple %s could not be found in packagesack"
-msgstr "Grupa paketa %s nije nađena u packagesack-u"
+msgstr "Grupa paketa %s nije nađena u packagesacku"
-#: ../yum/__init__.py:2033
+#: ../yum/__init__.py:2204
msgid ""
"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
msgstr ""
"getInstalledPackageObject() će nestati, koristite self.rpmdb.searchPkgTuple"
"().\n"
-#: ../yum/__init__.py:2085 ../yum/__init__.py:2128
-msgid "Invalid versioned dependency string, try quoting it."
-msgstr ""
-"Neispravna niska zavisnosti sa verzijom, pokušajte da je obeležite "
-"navodnicima."
-
-#: ../yum/__init__.py:2087 ../yum/__init__.py:2130
+#: ../yum/__init__.py:2260 ../yum/__init__.py:2304
msgid "Invalid version flag"
msgstr "Pogrešna oznaka verzije"
-#: ../yum/__init__.py:2102 ../yum/__init__.py:2106
+#: ../yum/__init__.py:2275 ../yum/__init__.py:2279
#, python-format
msgid "No Package found for %s"
msgstr "Nema pronađenih paketa za %s"
-#: ../yum/__init__.py:2305
+#: ../yum/__init__.py:2479
msgid "Package Object was not a package object instance"
msgstr "Objekat paketa nije bio primerak objekta paketa"
-#: ../yum/__init__.py:2309
+#: ../yum/__init__.py:2483
msgid "Nothing specified to install"
msgstr "Nije određeno ništa za instalaciju"
-#. only one in there
-#: ../yum/__init__.py:2327
+#: ../yum/__init__.py:2499 ../yum/__init__.py:3126
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Proveravam virtuelnu dostavu ili dostavu datoteke za %s"
-#: ../yum/__init__.py:2333 ../yum/__init__.py:2715
+#: ../yum/__init__.py:2505 ../yum/__init__.py:2782 ../yum/__init__.py:2942
+#: ../yum/__init__.py:3132
#, python-format
msgid "No Match for argument: %s"
msgstr "Ne postoji slaganje za argument: %s"
-#: ../yum/__init__.py:2399
+#: ../yum/__init__.py:2579
#, python-format
msgid "Package %s installed and not available"
msgstr "Paket %s je instaliran i nije dostupan"
-#: ../yum/__init__.py:2402
+#: ../yum/__init__.py:2582
msgid "No package(s) available to install"
msgstr "Nema paketa dostupnih za instalaciju"
-#: ../yum/__init__.py:2414
+#: ../yum/__init__.py:2594
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Paket: %s - već je u skupu transakcije"
-#: ../yum/__init__.py:2427
+#: ../yum/__init__.py:2609
+#, 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:2617
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Već je instalirana najnovija verzija paketa %s"
-#: ../yum/__init__.py:2434
+#: ../yum/__init__.py:2631
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
"Paket koji se poklapa sa %s je već instaliran. Proveravam za noviju verziju."
-#: ../yum/__init__.py:2444
-#, 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"
-
#. update everything (the easy case)
-#: ../yum/__init__.py:2514
+#: ../yum/__init__.py:2717
msgid "Updating Everything"
msgstr "Ažuriram sve"
-#: ../yum/__init__.py:2526 ../yum/__init__.py:2631 ../yum/__init__.py:2642
-#: ../yum/__init__.py:2664
+#: ../yum/__init__.py:2735 ../yum/__init__.py:2844 ../yum/__init__.py:2865
+#: ../yum/__init__.py:2891
#, 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:2622
+#: ../yum/__init__.py:2770 ../yum/__init__.py:2939
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: ../yum/__init__.py:2835
#, 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:2645 ../yum/__init__.py:2667
+#: ../yum/__init__.py:2868 ../yum/__init__.py:2894
#, 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"
-#: ../yum/__init__.py:2712
-#, python-format
-msgid "%s"
-msgstr "%s"
-
-#: ../yum/__init__.py:2728
+#: ../yum/__init__.py:2955
msgid "No package matched to remove"
msgstr "Nijedan paket nije određen za uklanjanje"
-#: ../yum/__init__.py:2762
+#: ../yum/__init__.py:2989
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Ne mogu da otvorim datoteku: %s. Preskačem je."
-#: ../yum/__init__.py:2765
+#: ../yum/__init__.py:2992
#, python-format
msgid "Examining %s: %s"
msgstr "Ispitujem %s: %s"
-#: ../yum/__init__.py:2773
+#: ../yum/__init__.py:3000
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
"Ne mogu da dodam paket %s u transakciju. Arhitektura nije usaglašena: %s"
-#: ../yum/__init__.py:2781
+#: ../yum/__init__.py:3008
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -1959,80 +2070,94 @@ msgstr ""
"Paket %s nije instaliran, ne mogu da ga ažuriram. Izvršite yum instalaciju "
"da biste ga instalirali."
-#: ../yum/__init__.py:2814
+#: ../yum/__init__.py:3043
#, python-format
msgid "Excluding %s"
msgstr "Izuzimam %s"
-#: ../yum/__init__.py:2819
+#: ../yum/__init__.py:3048
#, python-format
msgid "Marking %s to be installed"
msgstr "Označavam %s za instalaciju"
-#: ../yum/__init__.py:2825
+#: ../yum/__init__.py:3054
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Označavam %s kao ažuriranje za %s"
-#: ../yum/__init__.py:2832
+#: ../yum/__init__.py:3061
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: ne ažurira instalirani paket."
-#: ../yum/__init__.py:2850
+#: ../yum/__init__.py:3076
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
"Problem pri ponovnoj instalaciji: nijedan paket nije određen za uklanjanje"
-#: ../yum/__init__.py:2861
+#: ../yum/__init__.py:3088 ../yum/__init__.py:3159
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Paketu %s su dozvoljene mnogostruke instalacije, preskačem ga"
-#: ../yum/__init__.py:2868
+#: ../yum/__init__.py:3097
msgid "Problem in reinstall: no package matched to install"
msgstr ""
"Problem pri ponovnoj instalaciji: nijedan paket nije određen za instalaciju"
-#: ../yum/__init__.py:2903
+#: ../yum/__init__.py:3151
+msgid "No package(s) available to downgrade"
+msgstr "Nema paketa dostupnih za unazađivanje"
+
+#: ../yum/__init__.py:3182
+#, python-format
+msgid "No Match for available package: %s"
+msgstr "Nema dostupnog odgovarajućeg paketa: %s"
+
+#: ../yum/__init__.py:3188
+#, python-format
+msgid "Only Upgrade available on package: %s"
+msgstr "Samo je nadgradnja dostupna za paket: %s"
+
+#: ../yum/__init__.py:3249
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Dobavljam GPG ključ sa %s"
-#: ../yum/__init__.py:2923
+#: ../yum/__init__.py:3269
msgid "GPG key retrieval failed: "
msgstr "Dobavljanje GPG ključa nije uspelo: "
-#: ../yum/__init__.py:2934
+#: ../yum/__init__.py:3280
#, 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:2966
+#: ../yum/__init__.py:3312
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG ključ na %s (0x%s) je već instaliran"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:2971 ../yum/__init__.py:3033
+#: ../yum/__init__.py:3317 ../yum/__init__.py:3379
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Uvozim GPG ključ 0x%s „%s“ iz %s"
-#: ../yum/__init__.py:2988
+#: ../yum/__init__.py:3334
msgid "Not installing key"
msgstr "Ne instaliram ključ"
-#: ../yum/__init__.py:2994
+#: ../yum/__init__.py:3340
#, python-format
msgid "Key import failed (code %d)"
msgstr "Nije uspeo uvoz ključa (kod %d)"
-#: ../yum/__init__.py:2995 ../yum/__init__.py:3054
+#: ../yum/__init__.py:3341 ../yum/__init__.py:3400
msgid "Key imported successfully"
msgstr "Ključ je uspešno uvezen"
-#: ../yum/__init__.py:3000 ../yum/__init__.py:3059
+#: ../yum/__init__.py:3346 ../yum/__init__.py:3405
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2043,73 +2168,78 @@ msgstr ""
"odgovarajući za ovaj paket.\n"
"Proverite da li su podešeni odgovarajući URL-ovi ključeva za ovu riznicu."
-#: ../yum/__init__.py:3009
+#: ../yum/__init__.py:3355
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:3028
+#: ../yum/__init__.py:3374
#, 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:3048
+#: ../yum/__init__.py:3394
#, python-format
msgid "Not installing key for repo %s"
msgstr "Ne instaliram ključ za riznicu %s"
-#: ../yum/__init__.py:3053
+#: ../yum/__init__.py:3399
msgid "Key import failed"
msgstr "Nije uspeo uvoz ključa"
-#: ../yum/__init__.py:3144
+#: ../yum/__init__.py:3490
msgid "Unable to find a suitable mirror."
msgstr "Ne mogu da pronađem odgovarajući odraz."
-#: ../yum/__init__.py:3146
+#: ../yum/__init__.py:3492
msgid "Errors were encountered while downloading packages."
msgstr "Pojavile su se greške za vreme preuzimanja paketa."
-#: ../yum/__init__.py:3210
+#: ../yum/__init__.py:3533
+#, python-format
+msgid "Please report this error at %s"
+msgstr "Prijavite ovu grešku kod %s"
+
+#: ../yum/__init__.py:3557
msgid "Test Transaction Errors: "
msgstr "Greške pri proveri transakcije: "
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:199
+#: ../yum/plugins.py:204
msgid "Loaded plugins: "
msgstr "Učitani dodaci: "
-#: ../yum/plugins.py:213 ../yum/plugins.py:219
+#: ../yum/plugins.py:218 ../yum/plugins.py:224
#, python-format
msgid "No plugin match for: %s"
msgstr "Ne postoji slaganje za dodatak: %s"
-#: ../yum/plugins.py:249
+#: ../yum/plugins.py:254
#, python-format
-msgid "\"%s\" plugin is disabled"
-msgstr "„%s“ dodatak je isključen"
+msgid "Not loading \"%s\" plugin, as it is disabled"
+msgstr "Ne učitavam dodatak „%s“ pošto je isključen"
#. Give full backtrace:
-#: ../yum/plugins.py:261
+#: ../yum/plugins.py:266
#, python-format
msgid "Plugin \"%s\" can't be imported"
msgstr "Dodatak „%s“ ne može da bude uvezen"
-#: ../yum/plugins.py:268
+#: ../yum/plugins.py:273
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr "Dodatak „%s“ ne određuje verziju zahtevanog API-a"
-#: ../yum/plugins.py:273
+#: ../yum/plugins.py:278
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr "Dodatak „%s“ zahteva API %s. Podržani API je %s."
-#: ../yum/plugins.py:306
+#: ../yum/plugins.py:311
#, python-format
msgid "Loading \"%s\" plugin"
msgstr "Učitavam „%s“ dodatak"
-#: ../yum/plugins.py:313
+#: ../yum/plugins.py:318
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
@@ -2117,19 +2247,19 @@ msgstr ""
"U putanji za pretraživanje dodataka postoje dva ili više dodataka pod imenom "
"„%s“"
-#: ../yum/plugins.py:333
+#: ../yum/plugins.py:338
#, python-format
msgid "Configuration file %s not found"
msgstr "Datoteka podešavanja %s nije pronađena"
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:336
+#: ../yum/plugins.py:341
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr "Ne mogu da pronađem datoteku podešavanja za dodatak %s"
-#: ../yum/plugins.py:490
+#: ../yum/plugins.py:499
msgid "registration of commands not supported"
msgstr "registracija komandi nije podržana"
@@ -2137,33 +2267,33 @@ msgstr "registracija komandi nije podržana"
msgid "Repackaging"
msgstr "Ponovno pakovanje"
-#: ../rpmUtils/oldUtils.py:26
+#: ../rpmUtils/oldUtils.py:33
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
msgstr "Zaglavlje se ne može otvoriti ili ne odgovara %s, %s."
-#: ../rpmUtils/oldUtils.py:46
+#: ../rpmUtils/oldUtils.py:53
#, python-format
msgid "RPM %s fails md5 check"
msgstr "Nije uspela md5 provera za %s RPM"
-#: ../rpmUtils/oldUtils.py:144
+#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
msgstr ""
"Ne mogu da otvorim RPM bazu podataka za potrebe čitanja. Možda je već u "
"upotrebi?"
-#: ../rpmUtils/oldUtils.py:174
+#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
msgstr "Primljeno je prazno zaglavlje, nešto je pošlo naopako"
-#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr "Oštećeno zaglavlje %s"
-#: ../rpmUtils/oldUtils.py:272
+#: ../rpmUtils/oldUtils.py:281
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "Greška pri otvaranju rpm-a %s - greška %s"
diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index e3a036e..e88cbde 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -163,7 +163,7 @@ def getBestArchFromList(archlist, myarch=None):
val1 = archDifference(myarch, thisarch)
val2 = archDifference(myarch, arch)
if val1 == 0 and val2 == 0:
- continue
+ continue
if val1 < val2:
if val1 == 0:
thisarch = arch
diff --git a/rpmUtils/miscutils.py b/rpmUtils/miscutils.py
index ee8cd79..0e04194 100644
--- a/rpmUtils/miscutils.py
+++ b/rpmUtils/miscutils.py
@@ -111,7 +111,11 @@ def pkgTupleFromHeader(hdr):
None epoch to 0, as well."""
name = hdr['name']
- if hdr[rpm.RPMTAG_SOURCERPM]:
+
+ # RPMTAG_SOURCEPACKAGE: RPMTAG_SOURCERPM is not necessarily there for
+ # e.g. gpg-pubkeys imported with older rpm versions
+ # http://lists.baseurl.org/pipermail/yum/2009-January/022275.html
+ if hdr[rpm.RPMTAG_SOURCERPM] or hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1:
arch = hdr['arch']
else:
arch = 'src'
diff --git a/rpmUtils/oldUtils.py b/rpmUtils/oldUtils.py
index 1216ce4..8957685 100644
--- a/rpmUtils/oldUtils.py
+++ b/rpmUtils/oldUtils.py
@@ -6,12 +6,19 @@ import os
import gzip
import sys
from gzip import write32u, FNAME
+from urlgrabber.grabber import URLGrabError
+from zlib import error as zlibError
+def log(num, msg):
+ print >>sys.stderr, msg
+errorlog = log
def _(msg):
return msg
+# pylint: disable-msg=E0602
+
def checkheader(headerfile, name, arch):
"""check a header by opening it and comparing the results to the name and arch
we believe it to be for. if it fails raise URLGrabError(-1)"""
@@ -168,6 +175,8 @@ def _gzipOpen(filename, mode="rb", compresslevel=9):
return GzipFile(filename, mode, compresslevel)
class RPM_Base_Work:
+ def __init__(self):
+ self.hdr = None
def _getTag(self, tag):
if self.hdr is None:
diff --git a/rpmUtils/updates.py b/rpmUtils/updates.py
index 5506273..0e697bc 100644
--- a/rpmUtils/updates.py
+++ b/rpmUtils/updates.py
@@ -335,7 +335,7 @@ class Updates:
try:
newpkgs[(n, a)].remove((e, v, r))
except ValueError:
- pass
+ pass
# get rid of all the empty dict entries:
for nakey in newpkgs.keys():
diff --git a/test/yum-leak-test.py b/test/yum-leak-test.py
index bce4550..299db51 100755
--- a/test/yum-leak-test.py
+++ b/test/yum-leak-test.py
@@ -1,6 +1,6 @@
#! /usr/bin/python -tt
-import yum, os, sys, time, gc
+import yum, os, time, gc
from urlgrabber.progress import format_number
def out_mem(pid):
diff --git a/test/yum-pylintrc b/test/yum-pylintrc
new file mode 100644
index 0000000..f7aee50
--- /dev/null
+++ b/test/yum-pylintrc
@@ -0,0 +1,338 @@
+# 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.
+#rcfile=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=="execfile('test/pylint-setup.py')"
+
+# Profiled execution.
+profile=no
+
+# Add <file or directory> to the black list. It should be a base name, not a
+# path. You may set this option multiple times.
+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=
+
+
+[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(s) with the given id(s).
+#enable-msg=
+
+# 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)
+# W0612: *Unused variable %r* ( dont care if x,y,z = f() and y,z is not used)
+# W0212: *Access to a protected member %s of a client class* (if sucks, but we do that a lot)
+# W0613: *Unused argument %r*
+# W0602: *Using global for %r but no assigment is done*
+# W0511: Used when a warning note as FIXME or XXX is detected
+# W0401: *Wildcard import %s*
+# W0614: *Unused import %s from wildcard import*
+# W0232: *Class has no __init__ method*
+# W0201: *Attribute %r defined outside __init__*
+# W0603: *Using the global statement*
+# W0621: *Redefining name %r from outer scope (line %s)*
+# W0142: *Used * or ** magic*
+# W0102: *Dangerous default value %s as argument*
+# W0105: *String statement has no effect*
+# W0702: *No exception type(s) specified*
+# W0231: *__init__ method from base class %r is not called*
+# E0202: *An attribute inherited from %s hide this method*
+# W0622: *Redefining built-in %r*
+# W0403: *Relative import %r*
+# W0223: *Method %r is abstract in class %r but is not overridden*
+# W0104: *Statement seems to have no effect*
+# W1001: *Use of "property" on an old style class*
+# W0221: *Arguments number differs from %s method*
+# W0703: *Catch "Exception"*
+# W1010: *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)
+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,W1010,W0631
+
+
+[REPORTS]
+
+# set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html
+output-format=text
+
+# Include message's id in output
+include-ids=yes
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells wether 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
+# number of statements analyzed. This is used by the global evaluation report
+# (R0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# 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=
+
+
+# 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=__.*__
+
+# Regular expression which should only match correct module names
+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]*)|(__.*__))$
+
+# 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}$
+
+# Regular expression which should only match correct method names
+method-rgx=[a-z_][a-z0-9_A-Z]{2,30}$
+
+# Regular expression which should only match correct instance attribute names
+attr-rgx=[a-z_][a-z0-9_A-Z]{2,30}$
+
+# Regular expression which should only match correct argument names
+argument-rgx=[a-z_][a-z0-9_A-Z]{0,30}$
+
+# Regular expression which should only match correct variable names
+variable-rgx=[a-z_][a-z0-9_A-Z]{0,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
+
+# 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
+
+
+# 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.
+init-import=no
+
+# A regular expression matching names used for dummy variables (i.e. not used).
+dummy-variables-rgx=_|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+# try to find bugs in the code using type inference
+#
+[TYPECHECK]
+
+# 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
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamicaly set).
+ignored-classes=SQLObject,NullTranslations
+
+# When zope mode is activated, consider the acquired-members option to ignore
+# access to some undefined attributes.
+zope=no
+
+# 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
+
+
+# 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)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report R0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report R0402 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
+
+# Maximum number of locals for function / method body
+max-locals=30
+
+# Maximum number of return / yield for function / method body
+max-returns=10
+
+# Maximum number of branch for function / method body
+max-branchs=25
+
+# Maximum number of statements in function / method body
+max-statements=100
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+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
diff --git a/utils.py b/utils.py
index ab99a4c..5456c68 100644
--- a/utils.py
+++ b/utils.py
@@ -19,19 +19,27 @@ import time
import yum
from cli import *
from yum import _
+from optparse import OptionGroup
import yum.plugins as plugins
class YumUtilBase(YumBaseCli):
def __init__(self,name,ver,usage):
YumBaseCli.__init__(self)
- self._parser = YumOptionParser(base=self,usage=usage)
+ self._parser = YumOptionParser(base=self,utils=True,usage=usage)
self._usage = usage
self._utilName = name
self._utilVer = ver
+ self._option_group = OptionGroup(self._parser, "%s options" % self._utilName,"")
+ self._parser.add_option_group(self._option_group)
+
def getOptionParser(self):
return self._parser
+
+ def getOptionGroup(self):
+ """ Get an option group to add non inherited options"""
+ return self._option_group
def waitForLock(self):
lockerr = ""
diff --git a/yum-updatesd.py b/yum-updatesd.py
index ac05f2b..f96940c 100644
--- a/yum-updatesd.py
+++ b/yum-updatesd.py
@@ -28,7 +28,6 @@
# $ dbus-send --system --print-reply --type=method_call \
# --dest=edu.duke.linux.yum /Updatesd edu.duke.linux.yum.CheckNow
-import gettext
import os
import sys
import time
@@ -40,7 +39,7 @@ import gobject
import smtplib
import threading
from optparse import OptionParser
-from email.MIMEText import MIMEText
+from email.mime.text import MIMEText
@@ -84,8 +83,8 @@ class UpdateEmitter(object):
pass
def setupFailed(self, error, translation_domain):
- """Emitted when plugin initialization failed."""
- pass
+ """Emitted when plugin initialization failed."""
+ pass
class SyslogUpdateEmitter(UpdateEmitter):
diff --git a/yum.spec b/yum.spec
index 0208cf1..f260ba9 100644
--- a/yum.spec
+++ b/yum.spec
@@ -22,6 +22,8 @@ Requires: pygpgme
Prereq: /sbin/chkconfig, /sbin/service, coreutils
Conflicts: yum-skip-broken
Obsoletes: yum-basearchonly
+Obsoletes: yum-allow-downgrade < 1.1.20-0
+Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0
%description
Yum is a utility that can check for and automatically download and
diff --git a/yum/Errors.py b/yum/Errors.py
index de777a6..322765e 100644
--- a/yum/Errors.py
+++ b/yum/Errors.py
@@ -86,6 +86,9 @@ class RemoveError(YumBaseError):
class ReinstallError(YumBaseError):
pass
+class DowngradeError(YumBaseError):
+ pass
+
class RepoMDError(YumBaseError):
pass
diff --git a/yum/__init__.py b/yum/__init__.py
index d71b2f3..89d8773 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -55,7 +55,7 @@ import transactioninfo
import urlgrabber
from urlgrabber.grabber import URLGrabber, URLGrabError
from urlgrabber.progress import format_number
-from packageSack import packagesNewestByNameArch
+from packageSack import packagesNewestByNameArch, ListPackageSack
import depsolve
import plugins
import logginglevels
@@ -65,10 +65,10 @@ import callbacks
import warnings
warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
-from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage
+from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage, comparePoEVR
from constants import *
from yum.rpmtrans import RPMTransaction,SimpleCliCallBack
-from misc import to_unicode
+from yum.i18n import to_unicode
import string
@@ -305,7 +305,7 @@ class YumBase(depsolve.Depsolve):
if bad:
self.logger.warning("Bad id for repo: %s, byte = %s %d" %
- (section, bad, section.find(byte)))
+ (section, bad, section.find(bad)))
continue
try:
@@ -687,6 +687,19 @@ class YumBase(depsolve.Depsolve):
self.verbose_logger.log(logginglevels.INFO_2, msg)
self.repos.populateSack(mdtype='filelists')
+ def yumUtilsMsg(self, func, prog):
+ """ Output a message that the tool requires the yum-utils package,
+ if not installed. """
+ if self.rpmdb.contains(name="yum-utils"):
+ return
+
+ hibeg, hiend = "", ""
+ if hasattr(self, 'term'):
+ hibeg, hiend = self.term.MODE['bold'], self.term.MODE['normal']
+
+ func(_("The program %s%s%s is found in the yum-utils package.") %
+ (hibeg, prog, hiend))
+
def buildTransaction(self, unfinished_transactions_check=True):
"""go through the packages in the transaction set, find them in the
packageSack or rpmdb, and pack up the ts accordingly"""
@@ -695,6 +708,7 @@ class YumBase(depsolve.Depsolve):
msg = _('There are unfinished transactions remaining. You might ' \
'consider running yum-complete-transaction first to finish them.' )
self.logger.critical(msg)
+ base.yumUtilsMsg(self.logger.critical, "yum-complete-transaction")
time.sleep(3)
self.plugins.run('preresolve')
@@ -974,8 +988,19 @@ class YumBase(depsolve.Depsolve):
self.rpmdb.dropCachedData() # drop out the rpm cache so we don't step on bad hdr indexes
self.plugins.run('posttrans')
+ # sync up what just happened versus what is in the rpmdb
+ self.verifyTransaction()
return resultobject
+ def verifyTransaction(self):
+ """checks that the transaction did what we expected it to do. Also
+ propagates our external yumdb info"""
+
+ # 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
+ pass
+
def costExcludePackages(self):
"""exclude packages if they have an identical package in another repo
and their repo.cost value is the greater one"""
@@ -1175,6 +1200,9 @@ class YumBase(depsolve.Depsolve):
if type(fo) is types.InstanceType:
fo = fo.filename
+
+ if fo != po.localPkg():
+ po.localpath = fo
if not po.verifyLocalPkg():
failed = True
@@ -1190,8 +1218,12 @@ class YumBase(depsolve.Depsolve):
cursize = os.stat(fo)[6]
totsize = long(po.size)
if cursize >= totsize and not po.repo.cache:
- os.unlink(fo)
-
+ # if the path to the file is NOT inside the cachedir then don't
+ # unlink it b/c it is probably a file:// url and possibly
+ # unlinkable
+ if fo.startswith(po.repo.cachedir):
+ os.unlink(fo)
+
if raiseError:
raise URLGrabError(-1, _('Package does not match intended download'))
else:
@@ -1222,8 +1254,7 @@ class YumBase(depsolve.Depsolve):
a = apo.getDiscNum()
b = bpo.getDiscNum()
if a is None and b is None:
- # Download smallest pkgs first
- return apo.size - bpo.size
+ return cmp(apo, bpo)
if a is None:
return -1
if b is None:
@@ -1565,7 +1596,7 @@ class YumBase(depsolve.Depsolve):
ndinst = {} # Newest versions by name.arch
for po in self.rpmdb.returnPackages(patterns=patterns,
ignore_case=ic):
- dinst[po.pkgtup] = po;
+ dinst[po.pkgtup] = po
if showdups:
continue
key = (po.name, po.arch)
@@ -1578,10 +1609,10 @@ class YumBase(depsolve.Depsolve):
ignore_case=ic)
else:
try:
- avail = self.pkgSack.returnNewestByNameArch(patterns=patterns,
+ avail = self.pkgSack.returnNewestByNameArch(patterns=patterns,
ignore_case=ic)
except Errors.PackageSackError:
- avail = []
+ avail = []
for pkg in avail:
if showdups:
@@ -1627,10 +1658,10 @@ class YumBase(depsolve.Depsolve):
ignore_case=ic)
else:
try:
- avail = self.pkgSack.returnNewestByNameArch(patterns=patterns,
+ avail = self.pkgSack.returnNewestByNameArch(patterns=patterns,
ignore_case=ic)
except Errors.PackageSackError:
- avail = []
+ avail = []
for pkg in avail:
if showdups:
@@ -1683,10 +1714,10 @@ class YumBase(depsolve.Depsolve):
ignore_case=ic)
else:
try:
- avail = self.pkgSack.returnNewestByNameArch(patterns=patterns,
+ avail = self.pkgSack.returnNewestByNameArch(patterns=patterns,
ignore_case=ic)
except Errors.PackageSackError:
- avail = []
+ avail = []
for po in avail:
ftime = int(po.filetime)
@@ -1860,7 +1891,10 @@ class YumBase(depsolve.Depsolve):
canBeFile = True
else:
isglob = True
- canBeFile = True
+ if arg[0] != '/' and not misc.re_glob(arg[0]):
+ canBeFile = False
+ else:
+ canBeFile = True
if not isglob:
usedDepString = True
@@ -1883,7 +1917,7 @@ class YumBase(depsolve.Depsolve):
# then it is not a globbed file we have matched it precisely
tmpvalues.append(arg)
- if isglob:
+ if isglob and canBeFile:
self.verbose_logger.log(logginglevels.DEBUG_2,
_('searching in file entries'))
for thisfile in po.dirlist + po.filelist + po.ghostlist:
@@ -2185,7 +2219,6 @@ class YumBase(depsolve.Depsolve):
if len(pkgs) == 0:
raise Errors.DepError, _('Package tuple %s could not be found in packagesack') % str(pkgtup)
- return None
if len(pkgs) > 1: # boy it'd be nice to do something smarter here FIXME
result = pkgs[0]
@@ -2241,18 +2274,22 @@ class YumBase(depsolve.Depsolve):
# either it is 'dep (some operator) e:v-r'
# or /file/dep
# or packagename
- depname = depstring
- depflags = None
- depver = None
-
- if depstring[0] != '/':
- # not a file dep - look at it for being versioned
- dep_split = depstring.split()
- if len(dep_split) == 3:
- depname, flagsymbol, depver = dep_split
- if not flagsymbol in SYMBOLFLAGS:
- raise Errors.YumBaseError, _('Invalid version flag')
- depflags = SYMBOLFLAGS[flagsymbol]
+ # or a full dep tuple
+ if type(depstring) == types.TupleType:
+ (depname, depflags, depver) = depstring
+ else:
+ depname = depstring
+ depflags = None
+ depver = None
+
+ if depstring[0] != '/':
+ # not a file dep - look at it for being versioned
+ dep_split = depstring.split()
+ if len(dep_split) == 3:
+ depname, flagsymbol, depver = dep_split
+ if not flagsymbol in SYMBOLFLAGS:
+ raise Errors.YumBaseError, _('Invalid version flag')
+ depflags = SYMBOLFLAGS[flagsymbol]
sack = self.whatProvides(depname, depflags, depver)
results = sack.returnPackages()
@@ -2268,7 +2305,8 @@ class YumBase(depsolve.Depsolve):
except Errors.YumBaseError:
raise Errors.YumBaseError, _('No Package found for %s') % depstring
- result = self._bestPackageFromList(pkglist)
+ ps = ListPackageSack(pkglist)
+ result = self._bestPackageFromList(ps.returnNewestByNameArch())
if result is None:
raise Errors.YumBaseError, _('No Package found for %s') % depstring
@@ -2282,18 +2320,21 @@ class YumBase(depsolve.Depsolve):
# either it is 'dep (some operator) e:v-r'
# or /file/dep
# or packagename
- depname = depstring
- depflags = None
- depver = None
-
- if depstring[0] != '/':
- # not a file dep - look at it for being versioned
- dep_split = depstring.split()
- if len(dep_split) == 3:
- depname, flagsymbol, depver = dep_split
- if not flagsymbol in SYMBOLFLAGS:
- raise Errors.YumBaseError, _('Invalid version flag')
- depflags = SYMBOLFLAGS[flagsymbol]
+ if type(depstring) == types.TupleType:
+ (depname, depflags, depver) = depstring
+ else:
+ depname = depstring
+ depflags = None
+ depver = None
+
+ if depstring[0] != '/':
+ # not a file dep - look at it for being versioned
+ dep_split = depstring.split()
+ if len(dep_split) == 3:
+ depname, flagsymbol, depver = dep_split
+ if not flagsymbol in SYMBOLFLAGS:
+ raise Errors.YumBaseError, _('Invalid version flag')
+ depflags = SYMBOLFLAGS[flagsymbol]
return self.rpmdb.getProvides(depname, depflags, depver).keys()
@@ -2425,6 +2466,21 @@ class YumBase(depsolve.Depsolve):
tx_return.extend(txmbrs)
return tx_return
+ # Note that this returns available pkgs, and not txmbrs like the other
+ # _at_group* functions.
+ def _at_groupdowngrade(self, pattern):
+ " Do downgrade of a group via. leading @ on the cmd line."
+ assert pattern[0] == '@'
+ grpid = pattern[1:]
+
+ thesegroups = self.comps.return_groups(grpid)
+ if not thesegroups:
+ raise Errors.GroupsError, _("No Group named %s exists") % grpid
+ pkgnames = set()
+ for thisgroup in thesegroups:
+ pkgnames.update(thisgroup.packages)
+ return self.pkgSack.searchNames(pkgnames)
+
def _find_obsoletees(self, po):
""" Return the pkgs. that are obsoleted by the po we pass in. """
for (obstup, inst_tup) in self.up.getObsoletersTuples(name=po.name):
@@ -2432,6 +2488,11 @@ class YumBase(depsolve.Depsolve):
installed_pkg = self.rpmdb.searchPkgTuple(inst_tup)[0]
yield installed_pkg
+ def _add_prob_flags(self, *flags):
+ """ Add all of the passed flags to the tsInfo.probFilterFlags array. """
+ for flag in flags:
+ if flag not in self.tsInfo.probFilterFlags:
+ self.tsInfo.probFilterFlags.append(flag)
def install(self, po=None, **kwargs):
"""try to mark for install the item specified. Uses provided package
@@ -2501,23 +2562,23 @@ class YumBase(depsolve.Depsolve):
if rpmUtils.arch.isMultiLibArch():
if was_pattern or not nevra_dict['arch']: # and only if they
# they didn't specify an arch
- if self.conf.multilib_policy == 'best':
- pkgs_by_name = {}
- use = []
- not_added = []
- best = rpmUtils.arch.legitMultiArchesInSameLib()
- best.append('noarch')
- for pkg in pkgs:
- if pkg.arch in best:
- pkgs_by_name[pkg.name] = 1
- use.append(pkg)
- else:
- not_added.append(pkg)
- for pkg in not_added:
- if not pkg.name in pkgs_by_name:
- use.append(pkg)
+ if self.conf.multilib_policy == 'best':
+ pkgs_by_name = {}
+ use = []
+ not_added = []
+ best = rpmUtils.arch.legitMultiArchesInSameLib()
+ best.append('noarch')
+ for pkg in pkgs:
+ if pkg.arch in best:
+ pkgs_by_name[pkg.name] = 1
+ use.append(pkg)
+ else:
+ not_added.append(pkg)
+ for pkg in not_added:
+ if not pkg.name in pkgs_by_name:
+ use.append(pkg)
- pkgs = use
+ pkgs = use
pkgs = packagesNewestByNameArch(pkgs)
@@ -2533,6 +2594,7 @@ class YumBase(depsolve.Depsolve):
lst.extend(self.bestPackagesFromList(pkgs))
pkgs = lst
+
if not pkgs:
# Do we still want to return errors here?
# We don't in the cases below, so I didn't here...
@@ -2545,8 +2607,8 @@ class YumBase(depsolve.Depsolve):
# yum --disablerepo='*' install '*'
# etc. ... see RHBZ#480402
if False:
- for pkg in pkgs:
- self.verbose_logger.warning(_('Package %s installed and not available'), pkg)
+ for pkg in pkgs:
+ self.verbose_logger.warning(_('Package %s installed and not available'), pkg)
if pkgs:
return []
raise Errors.InstallError, _('No package(s) available to install')
@@ -2589,8 +2651,15 @@ class YumBase(depsolve.Depsolve):
# make sure we don't have a name.arch of this already installed
# if so pass it to update b/c it should be able to figure it out
- if self.rpmdb.contains(name=po.name, arch=po.arch) and not self.allowedMultipleInstalls(po):
- if not self.tsInfo.getMembersWithState(po.pkgtup, TS_REMOVE_STATES):
+ # if self.rpmdb.contains(name=po.name, arch=po.arch) and not self.allowedMultipleInstalls(po):
+ if not self.allowedMultipleInstalls(po):
+ found = True
+ for ipkg in self.rpmdb.searchNevra(name=po.name, arch=po.arch):
+ found = False
+ if self.tsInfo.getMembersWithState(ipkg.pkgtup, TS_REMOVE_STATES):
+ found = True
+ break
+ if not found:
self.verbose_logger.warning(_('Package matching %s already installed. Checking for update.'), po)
txmbrs = self.update(po=po)
tx_return.extend(txmbrs)
@@ -2602,8 +2671,13 @@ class YumBase(depsolve.Depsolve):
# or some other oddity. If it is - then modify the problem filter to cope
for ipkg in self.rpmdb.searchNevra(name=po.name, arch=po.arch):
- if ipkg.EVR > po.EVR:
- self.tsInfo.probFilterFlags.append(rpm.RPMPROB_FILTER_OLDPACKAGE)
+ if ipkg.verEQ(po):
+ self._add_prob_flags(rpm.RPMPROB_FILTER_REPLACEPKG,
+ rpm.RPMPROB_FILTER_REPLACENEWFILES,
+ rpm.RPMPROB_FILTER_REPLACEOLDFILES)
+ break
+ if ipkg.verGT(po):
+ self._add_prob_flags(rpm.RPMPROB_FILTER_OLDPACKAGE)
break
# it doesn't obsolete anything. If it does, mark that in the tsInfo, too
@@ -2732,8 +2806,7 @@ class YumBase(depsolve.Depsolve):
# Always look for available packages, it doesn't seem to do any
# harm (apart from some time). And it fixes weird edge cases where
# "update a" (which requires a new b) is different from "update b"
- (e, m, u) = self.pkgSack.matchPackageNames([kwargs['pattern']])
- availpkgs.extend(e)
+ m =self.pkgSack.returnNewestByNameArch(patterns=[kwargs['pattern']])
availpkgs.extend(m)
if not availpkgs and not instpkgs:
@@ -2984,20 +3057,22 @@ class YumBase(depsolve.Depsolve):
installpkgs.append(po)
else:
donothingpkgs.append(po)
+ elif self.allowedMultipleInstalls(po):
+ installpkgs.append(po)
else:
donothingpkgs.append(po)
# handle excludes for a localinstall
toexc = []
if len(self.conf.exclude) > 0:
- exactmatch, matched, unmatched = \
+ exactmatch, matched, unmatched = \
parsePackages(installpkgs + map(lambda x: x[0], updatepkgs),
self.conf.exclude, casematch=1)
- toexc = exactmatch + matched
+ toexc = exactmatch + matched
if po in toexc:
- self.verbose_logger.debug(_('Excluding %s'), po)
- return tx_return
+ self.verbose_logger.debug(_('Excluding %s'), po)
+ return tx_return
for po in installpkgs:
self.verbose_logger.log(logginglevels.INFO_2,
@@ -3022,12 +3097,9 @@ class YumBase(depsolve.Depsolve):
"""Setup the problem filters to allow a reinstall to work, then
pass everything off to install"""
- if rpm.RPMPROB_FILTER_REPLACEPKG not in self.tsInfo.probFilterFlags:
- self.tsInfo.probFilterFlags.append(rpm.RPMPROB_FILTER_REPLACEPKG)
- if rpm.RPMPROB_FILTER_REPLACENEWFILES not in self.tsInfo.probFilterFlags:
- self.tsInfo.probFilterFlags.append(rpm.RPMPROB_FILTER_REPLACENEWFILES)
- if rpm.RPMPROB_FILTER_REPLACEOLDFILES not in self.tsInfo.probFilterFlags:
- self.tsInfo.probFilterFlags.append(rpm.RPMPROB_FILTER_REPLACEOLDFILES)
+ self._add_prob_flags(rpm.RPMPROB_FILTER_REPLACEPKG,
+ rpm.RPMPROB_FILTER_REPLACENEWFILES,
+ rpm.RPMPROB_FILTER_REPLACEOLDFILES)
tx_mbrs = []
tx_mbrs.extend(self.remove(po, **kwargs))
@@ -3059,12 +3131,129 @@ class YumBase(depsolve.Depsolve):
tx_mbrs.extend(new_members)
return tx_mbrs
+ def downgrade(self, po=None, **kwargs):
+ """ Try to downgrade a package. Works like:
+ % yum shell <<EOL
+ remove abcd
+ install abcd-<old-version>
+ run
+ EOL """
+
+ if not po and not kwargs:
+ raise Errors.DowngradeError, 'Nothing specified to remove'
+ doing_group_pkgs = False
+ if po:
+ apkgs = [po]
+ elif 'pattern' in kwargs:
+ if kwargs['pattern'][0] == '@':
+ apkgs = self._at_groupdowngrade(kwargs['pattern'])
+ doing_group_pkgs = True # Don't warn. about some things
+ else:
+ apkgs = self.pkgSack.returnPackages(patterns=[kwargs['pattern']],
+ ignore_case=False)
+ if not apkgs:
+ arg = kwargs['pattern']
+ self.verbose_logger.debug(_('Checking for virtual provide or file-provide for %s'),
+ arg)
+
+ try:
+ apkgs = self.returnPackagesByDep(arg)
+ except yum.Errors.YumBaseError, e:
+ self.logger.critical(_('No Match for argument: %s') % arg)
+
+ else:
+ nevra_dict = self._nevra_kwarg_parse(kwargs)
+ apkgs = self.pkgSack.searchNevra(name=nevra_dict['name'],
+ epoch=nevra_dict['epoch'],
+ arch=nevra_dict['arch'],
+ ver=nevra_dict['version'],
+ rel=nevra_dict['release'])
+ if not apkgs:
+ # Do we still want to return errors here?
+ # We don't in the cases below, so I didn't here...
+ if 'pattern' in kwargs:
+ pkgs = self.rpmdb.returnPackages(patterns=[kwargs['pattern']],
+ ignore_case=False)
+ if 'name' in kwargs:
+ pkgs = self.rpmdb.searchNevra(name=kwargs['name'])
+ if pkgs:
+ return []
+ raise Errors.DowngradeError, _('No package(s) available to downgrade')
+
+ warned_names = set()
+ # Skip kernel etc.
+ tapkgs = []
+ for pkg in apkgs:
+ if self.allowedMultipleInstalls(pkg):
+ if pkg.name not in warned_names:
+ msg = _("Package %s is allowed multiple installs, skipping") % pkg
+ self.verbose_logger.log(logginglevels.INFO_2, msg)
+ warned_names.add(pkg.name)
+ continue
+ tapkgs.append(pkg)
+ apkgs = tapkgs
+
+ # Find installed versions of "to downgrade pkgs"
+ apkg_names = set()
+ for pkg in apkgs:
+ apkg_names.add(pkg.name)
+ ipkgs = self.rpmdb.searchNames(list(apkg_names))
+
+ latest_installed = {}
+ for pkg in ipkgs:
+ latest_installed[pkg.name] = pkg
+
+ # Find "latest downgrade", ie. latest available pkg before
+ # installed version.
+ downgrade_apkgs = {}
+ for pkg in sorted(apkgs):
+ if pkg.name not in latest_installed:
+ if pkg.name not in warned_names and not doing_group_pkgs:
+ msg = _('No Match for available package: %s') % pkg
+ self.logger.critical(msg)
+ warned_names.add(pkg.name)
+ continue
+ if pkg.verGE(latest_installed[pkg.name]):
+ if pkg.name not in warned_names:
+ msg = _('Only Upgrade available on package: %s') % pkg
+ self.logger.critical(msg)
+ warned_names.add(pkg.name)
+ continue
+ warned_names.add(pkg.name)
+ if (pkg.name in downgrade_apkgs and
+ pkg.verLE(downgrade_apkgs[pkg.name])):
+ continue # Skip older than "latest downgrade"
+ downgrade_apkgs[pkg.name] = pkg
+
+ tx_return = []
+ for po in ipkgs:
+ if po.name not in downgrade_apkgs:
+ continue
+ itxmbr = self.tsInfo.addErase(po)
+ atxmbr = self.tsInfo.addInstall(downgrade_apkgs[po.name])
+ if not atxmbr: # Fail?
+ self.tsInfo.remove(itxmbr.pkgtup)
+ continue
+ self._add_prob_flags(rpm.RPMPROB_FILTER_OLDPACKAGE)
+ tx_return.append(itxmbr)
+ tx_return.append(atxmbr)
+
+ return tx_return
def _nevra_kwarg_parse(self, kwargs):
returndict = {}
+ if 'pkgtup' in kwargs:
+ (n, a, e, v, r) = kwargs['pkgtup']
+ returndict['name'] = n
+ returndict['epoch'] = e
+ returndict['arch'] = a
+ returndict['version'] = v
+ returndict['release'] = r
+ return returndict
+
returndict['name'] = kwargs.get('name')
returndict['epoch'] = kwargs.get('epoch')
returndict['arch'] = kwargs.get('arch')
@@ -3270,7 +3459,7 @@ class YumBase(depsolve.Depsolve):
installed = self.rpmdb.searchNevra(name=m.name)
if len(installed) >= self.conf.installonly_limit - 1: # since we're adding one
numleft = len(installed) - self.conf.installonly_limit + 1
- installed.sort(packages.comparePoEVR)
+ installed.sort(comparePoEVR)
for po in installed:
if (po.version, po.release) == (cur_kernel_v, cur_kernel_r):
# don't remove running
@@ -3349,7 +3538,7 @@ class YumBase(depsolve.Depsolve):
# Verified ok, or verify not req'd
continue
elif result == 1:
- self.getKeyForPackage(po, self._askForGPGKeyImport)
+ self.getKeyForPackage(po, self._askForGPGKeyImport)
else:
raise Errors.YumGPGCheckError, errmsg
@@ -3398,7 +3587,7 @@ class YumBase(depsolve.Depsolve):
if len( tserrors ) > 0:
errstring = _('Test Transaction Errors: ')
for descr in tserrors:
- errstring += ' %s\n' % descr
+ errstring += ' %s\n' % descr
raise Errors.YumTestTransactionError, errstring
del self.ts
diff --git a/yum/comps.py b/yum/comps.py
index ac20652..2048c77 100755
--- a/yum/comps.py
+++ b/yum/comps.py
@@ -26,7 +26,8 @@ from Errors import CompsException
# switch all compsexceptions to grouperrors after api break
import fnmatch
import re
-from yum.misc import to_unicode, get_my_lang_code
+from yum.i18n import to_unicode
+from misc import get_my_lang_code
lang_attr = '{http://www.w3.org/XML/1998/namespace}lang'
@@ -517,7 +518,6 @@ class Comps(object):
self.add_category(category)
except SyntaxError, e:
raise CompsException, "comps file is empty/damaged"
- del parser
del parser
diff --git a/yum/config.py b/yum/config.py
index d3ace8f..9a47f1c 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -800,7 +800,10 @@ def readMainConfig(startupconf):
# Apply the installroot to directory options
for option in ('cachedir', 'logfile', 'persistdir'):
path = getattr(yumconf, option)
- setattr(yumconf, option, yumconf.installroot + path)
+ ir_path = yumconf.installroot + path
+ ir_path = ir_path.replace('//', '/') # os.path.normpath won't fix this and
+ # it annoys me
+ setattr(yumconf, option, ir_path)
# Add in some extra attributes which aren't actually configuration values
yumconf.yumvar = yumvars
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 2061376..819adac 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -45,14 +45,14 @@ 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 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
flags = {"GT": rpm.RPMSENSE_GREATER,
"GE": rpm.RPMSENSE_EQUAL | rpm.RPMSENSE_GREATER,
"LT": rpm.RPMSENSE_LESS,
@@ -996,6 +996,12 @@ class Depsolve(object):
self.verbose_logger.log(logginglevels.DEBUG_4,
_("Running compare_providers() for %s") %(str(pkgs)))
+ def _cmp_best_providers(x, y):
+ """ Compare first by score, and then compare the pkgs if the score
+ is the same. Note that this sorts in reverse. """
+ ret = cmp(y[1], x[1])
+ if ret: return ret
+ return cmp(y[0], x[0])
def _common_prefix_len(x, y, minlen=2):
num = min(len(x), len(y))
@@ -1084,17 +1090,14 @@ class Depsolve(object):
if po == nextpo:
continue
obsoleted = False
- for obs in nextpo.obsoletes:
- if po.inPrcoRange('provides', obs):
- obsoleted = True
+ poprovtup = (po.name, 'EQ', (po.epoch, po.ver, po.release))
+ if nextpo.inPrcoRange('obsoletes', poprovtup):
+ obsoleted = True
+ pkgresults[po] -= 1024
- self.verbose_logger.log(logginglevels.DEBUG_4,
- _("%s obsoletes %s") % (po, nextpo))
+ self.verbose_logger.log(logginglevels.DEBUG_4,
+ _("%s obsoletes %s") % (nextpo, po))
- if obsoleted:
- pkgresults[po] -= 1024
- break
-
if reqpo:
arches = (reqpo.arch, getBestArch())
else:
@@ -1124,7 +1127,7 @@ class Depsolve(object):
pkgresults[po] += (len(po.name)*-1)
- bestorder = sorted(pkgresults.items(), key=itemgetter(1), reverse=True)
+ bestorder = sorted(pkgresults.items(), cmp=_cmp_best_providers)
self.verbose_logger.log(logginglevels.DEBUG_4,
_('Best Order: %s' % str(bestorder)))
diff --git a/yum/i18n.py b/yum/i18n.py
index 1a3d204..e8ab4ac 100755
--- a/yum/i18n.py
+++ b/yum/i18n.py
@@ -72,13 +72,13 @@ def __utf8_bisearch(ucs, table):
return False
while max >= min:
- mid = (min + max) / 2;
+ mid = (min + max) / 2
if ucs > table[mid][1]:
- min = mid + 1;
+ min = mid + 1
elif ucs < table[mid][0]:
- max = mid - 1;
+ max = mid - 1
else:
- return True
+ return True
return False
@@ -294,6 +294,30 @@ def utf8_valid(msg):
return False
return True
+def _utf8_width_le(width, *args):
+ """ Minor speed hack, we often want to know "does X fit in Y". It takes
+ "a while" to work out a utf8_width() (see above), and we know that a
+ utf8 character is always <= byte. So given:
+
+ assert bytes >= characters
+ characters <= width?
+
+ ...we can change to:
+
+ bytes <= width or characters <= width
+
+ ...and bytes are much faster. """
+ # This assumes that all args. are utf8.
+ ret = 0
+ for arg in args:
+ ret += len(arg)
+ if ret <= width:
+ return True
+ ret = 0
+ for arg in args:
+ ret += utf8_width(arg)
+ return ret <= width
+
def utf8_text_wrap(text, width=70, initial_indent='', subsequent_indent=''):
""" Works like we want textwrap.wrap() to work, uses utf-8 data and
doesn't screw up lists/blocks/etc. """
@@ -320,6 +344,8 @@ def utf8_text_wrap(text, width=70, initial_indent='', subsequent_indent=''):
if byte != ' ':
break
count += 1
+ if byte not in ("-", "*", ".", "o", '\xe2'):
+ return count, 0
list_chr = utf8_width_chop(line[count:], 1)[1]
if list_chr in ("-", "*", ".", "o",
"\xe2\x80\xa2", "\xe2\x80\xa3", "\xe2\x88\x98"):
@@ -362,7 +388,7 @@ def utf8_text_wrap(text, width=70, initial_indent='', subsequent_indent=''):
line = line.lstrip(' ')
cspc_indent = lspc_indent
- if (utf8_width(indent) + utf8_width(line)) <= width:
+ if _utf8_width_le(width, indent, line):
wrap_last = False
ret.append(indent + line)
indent = subsequent_indent
@@ -374,9 +400,9 @@ def utf8_text_wrap(text, width=70, initial_indent='', subsequent_indent=''):
spcs = cspc_indent
if not spcs and csab >= 4:
spcs = csab
- while words:
- word = words.pop(0)
- if (utf8_width(line) + utf8_width(word)) > width:
+ for word in words:
+ if (not _utf8_width_le(width, line, word) and
+ utf8_width(line) > utf8_width(subsequent_indent)):
ret.append(line.rstrip(' '))
line = subsequent_indent + ' ' * spcs
line += word
@@ -434,7 +460,7 @@ try:
import gettext
t = gettext.translation('yum', fallback=True)
_ = t.ugettext
- P_ = t.nugettext
+ P_ = t.ungettext
except:
'''
Something went wrong so we make a dummy _() wrapper there is just
diff --git a/yum/mdparser.py b/yum/mdparser.py
index e668744..c74608d 100644
--- a/yum/mdparser.py
+++ b/yum/mdparser.py
@@ -200,7 +200,6 @@ def test():
for pkg in parser:
print '-' * 40
print pkg
- pass
print 'read: %s packages (%s suggested)' % (parser.count, parser.total)
diff --git a/yum/misc.py b/yum/misc.py
index e0d3388..6daf4f1 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -43,7 +43,10 @@ except ImportError:
raise ValueError, "Bad checksum type"
from Errors import MiscError
-from i18n import to_unicode, to_unicode_maybe, to_utf8, to_str
+# These are API things, so we can't remove them even if they aren't used here.
+# pylint: disable-msg=W0611
+from i18n import to_utf8, to_unicode
+# pylint: enable-msg=W0611
_share_data_store = {}
_share_data_store_u = {}
@@ -308,8 +311,8 @@ def getFileList(path, ext, filelist):
filelist = getFileList(path + '/' + d, ext, filelist)
else:
if d[-extlen:].lower() == '%s' % (ext):
- newpath = os.path.normpath(path + '/' + d)
- filelist.append(newpath)
+ newpath = os.path.normpath(path + '/' + d)
+ filelist.append(newpath)
return filelist
@@ -696,6 +699,7 @@ def seq_max_split(seq, max_entries):
""" Given a seq, split into a list of lists of length max_entries each. """
ret = []
num = len(seq)
+ seq = list(seq) # Trying to use a set/etc. here is bad
beg = 0
while num > max_entries:
end = beg + max_entries
diff --git a/yum/packageSack.py b/yum/packageSack.py
index bad2e62..f405217 100644
--- a/yum/packageSack.py
+++ b/yum/packageSack.py
@@ -609,7 +609,7 @@ class PackageSack(PackageSackBase):
self._checkIndexes(failure='build')
returnList = []
if name[0] == '/':
- returnList.extend(self.searchFiles(name))
+ returnList.extend(self.searchFiles(name))
if self.provides.has_key(name):
returnList.extend(self.provides[name])
return returnList
diff --git a/yum/packages.py b/yum/packages.py
index a7e81e6..f19b5f5 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -42,7 +42,6 @@ urlparse.uses_fragment.append("media")
# For verify
import pwd
import grp
-import sys
def comparePoEVR(po1, po2):
"""
@@ -522,6 +521,7 @@ class YumAvailablePackage(PackageObject, RpmBase):
self.repo = repo
self.state = None
self._loadedfiles = False
+ self._verify_local_pkg_cache = None
if pkgdict != None:
self.importFromDict(pkgdict)
@@ -671,6 +671,21 @@ class YumAvailablePackage(PackageObject, RpmBase):
"""check the package checksum vs the localPkg
return True if pkg is good, False if not"""
+ # This is called a few times now, so we want some way to not have to
+ # read+checksum "large" datasets multiple times per. transaction.
+ try:
+ nst = os.stat(self.localPkg())
+ except OSError, e:
+ return False
+ if (hasattr(self, '_verify_local_pkg_cache') and
+ self._verify_local_pkg_cache):
+ ost = self._verify_local_pkg_cache
+ if (ost.st_ino == nst.st_ino and
+ ost.st_dev == nst.st_dev and
+ ost.st_mtime == nst.st_mtime and
+ ost.st_size == nst.st_size):
+ return True
+
(csum_type, csum) = self.returnIdSum()
try:
@@ -681,6 +696,8 @@ class YumAvailablePackage(PackageObject, RpmBase):
if filesum != csum:
return False
+ self._verify_local_pkg_cache = nst
+
return True
def prcoPrintable(self, prcoTuple):
@@ -1076,6 +1093,9 @@ class YumHeaderPackage(YumAvailablePackage):
def __getattr__(self, thing):
#FIXME - if an error - return AttributeError, not KeyError
# ONLY FIX THIS AFTER THE API BREAK
+ if thing.startswith('__') and thing.endswith('__'):
+ if not hasattr(self, thing):
+ raise AttributeError, "%s has no attribute %s" % (self, thing)
return self.hdr[thing]
def doepoch(self):
@@ -1153,13 +1173,12 @@ class YumHeaderPackage(YumAvailablePackage):
is a pre-requires or a not"""
# FIXME this should probably be put in rpmUtils.miscutils since
# - that's what it is
- newflag = flag
if flag is not None:
- newflag = flag & rpm.RPMSENSE_PREREQ
- if newflag == rpm.RPMSENSE_PREREQ:
+ # Note: RPMSENSE_PREREQ == 0 since rpm-4.4'ish
+ if flag & (rpm.RPMSENSE_PREREQ |
+ rpm.RPMSENSE_SCRIPT_PRE |
+ rpm.RPMSENSE_SCRIPT_POST):
return 1
- else:
- return 0
return 0
def _requires_with_pre(self):
diff --git a/yum/pgpmsg.py b/yum/pgpmsg.py
index 04ab346..2d9e7d9 100644
--- a/yum/pgpmsg.py
+++ b/yum/pgpmsg.py
@@ -449,7 +449,7 @@ class public_key(pgp_packet) :
idx_save = idx
self.version, idx = get_whole_int(msg, idx, 1)
if self.version != 2 and self.version != 3 and self.version != 4 :
- raise 'unknown public key packet version %d at %d' % (self.version, idx_save)
+ raise RuntimeError('unknown public key packet version %d at %d' % (self.version, idx_save))
if self.version == 2 : # map v2 into v3 for coding simplicity since they're structurally the same
self.version = 3
self.timestamp, idx = get_whole_number(msg, idx, 4)
@@ -471,7 +471,7 @@ class public_key(pgp_packet) :
self.pk_elgamal_grp_gen_g, idx = get_mpi(msg, idx)
self.pk_elgamal_pub_key, idx = get_mpi(msg, idx)
else :
- raise "unknown public key algorithm %d at %d" % (self.pk_algo, idx_save)
+ raise RuntimeError("unknown public key algorithm %d at %d" % (self.pk_algo, idx_save))
def __str__(self) :
sio = cStringIO.StringIO()
@@ -746,7 +746,7 @@ class signature(pgp_packet) :
sp, idx = self.deserialize_subpacket(msg, idx)
self.unhashed_subpaks.append(sp)
else :
- raise 'unknown signature packet version %d at %d' % (self.version, idx)
+ raise RuntimeError('unknown signature packet version %d at %d' % (self.version, idx))
self.hash_frag, idx = get_whole_number(msg, idx, 2)
if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
self.rsa_sig, idx = get_mpi(msg, idx)
@@ -754,7 +754,7 @@ class signature(pgp_packet) :
self.dsa_sig_r, idx = get_mpi(msg, idx)
self.dsa_sig_s, idx = get_mpi(msg, idx)
else :
- raise 'unknown public-key algorithm (%d) in signature at %d' % (self.pk_algo, idx)
+ raise RuntimeError('unknown public-key algorithm (%d) in signature at %d' % (self.pk_algo, idx))
return idx
def __str__(self) :
@@ -1079,7 +1079,7 @@ def decode(msg) :
if debug :
debug.write(pkt.__str__() + "\n")
else :
- raise 'unknown pgp packet type %d at %d' % (pkt_typ, idx)
+ raise RuntimeError('unknown pgp packet type %d at %d' % (pkt_typ, idx))
pkt_list.append(pkt)
diff --git a/yum/plugins.py b/yum/plugins.py
index cfc8bd6..cff1fa1 100644
--- a/yum/plugins.py
+++ b/yum/plugins.py
@@ -37,7 +37,7 @@ from weakref import proxy as weakref
from yum import _
-from yum.i18n import utf8_width, utf8_width_fill
+from yum.i18n import utf8_width
# TODO: expose rpm package sack objects to plugins (once finished)
# TODO: allow plugins to use the existing config stuff to define options for
@@ -410,6 +410,9 @@ class PluginConduit:
@return: the global optparse.OptionParser instance used by Yum. May be
None if an OptionParser isn't in use.
'''
+ # ' xemacs highlighting hack
+ # This isn't API compatible :(
+ # return self._parent.optparser.plugin_option_group
return self._parent.optparser
def confString(self, section, opt, default=None):
@@ -420,6 +423,7 @@ class PluginConduit:
@param default: Value to read if option is missing.
@return: String option value read, or default if option was missing.
'''
+ # ' xemacs highlighting hack
return config.getOption(self._conf, section, opt, config.Option(default))
def confInt(self, section, opt, default=None):
diff --git a/yum/repos.py b/yum/repos.py
index 63d1493..5d9a343 100644
--- a/yum/repos.py
+++ b/yum/repos.py
@@ -25,6 +25,18 @@ from packageSack import MetaSack
from weakref import proxy as weakref
+class _wrap_ayum_getKeyForRepo:
+ """ This is a wrapper for calling YumBase.getKeyForRepo() because
+ otherwise we take a real reference through the bound method and
+ that is d00m (this applies to YumBase and RepoStorage, hence why
+ we have a seperate class).
+ A "better" fix might be to explicitly pass the YumBase instance to
+ the callback ... API change! """
+ def __init__(self, ayum):
+ self.ayum = weakref(ayum)
+ def __call__(self, repo, callback=None):
+ return self.ayum.getKeyForRepo(repo, callback)
+
class RepoStorage:
"""This class contains multiple repositories and core configuration data
about them."""
@@ -44,15 +56,9 @@ class RepoStorage:
# need to be set from outside of the repos object to do anything
# even quasi-useful
# defaults to what is probably sane-ish
- self.gpg_import_func = self._wrap_ayum_getKeyForRepo
+ self.gpg_import_func = _wrap_ayum_getKeyForRepo(ayum)
self.confirm_func = None
- def _wrap_ayum_getKeyForRepo(repo, callback=None):
- """ This is a wrapper for calling self.ayum.getKeyForRepo() because
- otherwise we take a real reference through the bound method and
- that is d00m. """
- return self.ayum.getKeyForRepo(repo, callback)
-
def doSetup(self, thisrepo = None):
self.ayum.plugins.run('prereposetup')
@@ -65,14 +71,9 @@ class RepoStorage:
if len(repos) < 1:
self.logger.debug('No Repositories Available to Set Up')
- num = 1
for repo in repos:
repo.setup(self.ayum.conf.cache, self.ayum.mediagrabber,
gpg_import_func = self.gpg_import_func, confirm_func=self.confirm_func)
- num += 1
-
- if self.callback and len(repos) > 0:
- self.callback.progressbar(num, len(repos), repo.id)
self._setup = True
self.ayum.plugins.run('postreposetup')
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 171ae92..1abe6b6 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -28,7 +28,7 @@ from packageSack import PackageSackBase
import fnmatch
import re
-from misc import to_unicode
+from yum.i18n import to_unicode
import constants
class RPMInstalledPackage(YumInstalledPackage):
@@ -54,15 +54,22 @@ class RPMInstalledPackage(YumInstalledPackage):
ts = self.rpmdb.readOnlyTS()
mi = ts.dbMatch(0, self.idx)
- return mi.next()
- return self.hdr
+ try:
+ return mi.next()
+ except StopIteration:
+ raise Errors.PackageSackError, 'Rpmdb changed underneath us'
def __getattr__(self, varname):
self.hdr = val = self._get_hdr()
self._has_hdr = True
+ if varname.startswith('__') and varname.endswith('__'):
+ if not hasattr(self, varname):
+ raise AttributeError, "%s has no attribute %s" % (self, varname)
+
if varname != 'hdr': # This is unusual, for anything that happens
val = val[varname] # a lot we should preload at __init__.
# Also note that pkg.no_value raises KeyError.
+
return val
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 07f402b..8919fbd 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -33,8 +33,8 @@ import rpmUtils.miscutils
import sqlutils
import constants
import operator
-import time
-from yum.misc import seq_max_split, to_utf8, to_unicode
+from yum.misc import seq_max_split
+from yum.i18n import to_utf8, to_unicode
import sys
def catchSqliteException(func):
@@ -71,6 +71,7 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
self.repo = repo
self.state = None
self._loadedfiles = False
+ self._files = None
self._read_db_obj(db_obj)
# for stupid metadata created without epochs listed in the version tag
# die die
@@ -83,6 +84,7 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
self._changelog = None
self._hash = None
+
files = property(fget=lambda self: self._loadFiles())
@@ -141,6 +143,10 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
'license' : 'rpm_license',
'checksum_value' : 'pkgId',
}
+
+ if varname.startswith('__') and varname.endswith('__'):
+ if not hasattr(self, varname):
+ raise AttributeError, varname
dbname = varname
if db2simplemap.has_key(varname):
@@ -223,7 +229,7 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
def returnIdSum(self):
- return (self.checksum_type, self.pkgId)
+ return (self.checksum_type, self.pkgId)
def returnChangelog(self):
self._loadChangelog()
@@ -879,7 +885,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
return self._search("requires", name, flags, version)
@catchSqliteException
- def searchNames(self, names):
+ def searchNames(self, names=[]):
"""return a list of packages matching any of the given names. This is
only a match on package name, nothing else"""
@@ -930,7 +936,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
# If it's not a provides or a filename, we are done
if prcotype != "provides":
return results
- if not glob and name[0] != '/':
+ if name[0] != '/' and (not glob or not misc.re_glob(name[0])):
return results
# If it is a filename, search the primary.xml file info
@@ -1013,7 +1019,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
def db2class(self, db, nevra_only=False):
print 'die die die die die db2class'
- pass
class tmpObject:
pass
y = tmpObject()
diff --git a/yum/sqlutils.py b/yum/sqlutils.py
index 58b63ab..fda380e 100644
--- a/yum/sqlutils.py
+++ b/yum/sqlutils.py
@@ -25,112 +25,112 @@ except ImportError:
import sqlite
class TokenizeError(Exception):
- """Tokenizer error class"""
- pass
+ """Tokenizer error class"""
+ pass
def Tokenize(str, whitespace=" \t\r\n", quotes="\"", escapes="\\"):
- """String tokenizer
-
- This function tokenizes a string while taking quotation and
- escaping into account.
-
- >>> import dhm.strtools
- >>> dhm.strtools.Tokenize("this is a test")
- ['this', 'is', 'a', 'test']
- >>> dhm.strtools.Tokenize("this \"is a\" test")
- ['this', 'is a', 'test']
- >>> dhm.strtools.Tokenize("this \\\"is\\\" a test")
- ['this', '"is"', 'a', 'test']
- >>> dhm.strtools.Tokenize("this \"is a test")
- Traceback (most recent call last):
- File "<stdin>", line 1, in ?
- File "/usr/local/lib/python2.2/site-packages/dhm/strtools.py", line 80, in Tokenize
- raise TokenizeError, "Unexpected end of string in quoted text"
- dhm.strtools.TokenizeError: Unexecpted end of string in quoted text
-
- @param str: string to tokenize
- @type str: string
- @param whitespace: whitespace characters seperating tokens
- @type whitespace: string
- @param quotes: legal quoting characters
- @type quotes: string
- @param escapes: characters which can escape quoting characters
- @type escapes: string
- @return: list of tokens
- @rtype: sequence of strings
- """
- (buffer, tokens, curtoken, quote)=(str, [], None, None)
-
- try:
- while buffer:
- if buffer[0]==quote:
- quote=None
- elif (quote==None) and (buffer[0] in quotes):
- quote=buffer[0]
- elif buffer[0] in whitespace:
- if quote!=None:
- curtoken+=buffer[0]
- else:
- tokens.append(curtoken)
- curtoken=None
- while buffer[1] in whitespace:
- buffer=buffer[1:]
- elif buffer[0] in escapes:
- if curtoken==None:
- curtoken=buffer[1]
- else:
- curtoken+=buffer[1]
- buffer=buffer[1:]
- else:
- if curtoken==None:
- curtoken=buffer[0]
- else:
- curtoken+=buffer[0]
-
- buffer=buffer[1:]
- except IndexError:
- raise TokenizeError, "Unexpected end of string"
-
- if quote:
- raise TokenizeError, "Unexpected end of string in quoted text"
-
- if curtoken!=None:
- tokens.append(curtoken)
-
- return tokens
+ """String tokenizer
+
+ This function tokenizes a string while taking quotation and
+ escaping into account.
+
+ >>> import dhm.strtools
+ >>> dhm.strtools.Tokenize("this is a test")
+ ['this', 'is', 'a', 'test']
+ >>> dhm.strtools.Tokenize("this \"is a\" test")
+ ['this', 'is a', 'test']
+ >>> dhm.strtools.Tokenize("this \\\"is\\\" a test")
+ ['this', '"is"', 'a', 'test']
+ >>> dhm.strtools.Tokenize("this \"is a test")
+ Traceback (most recent call last):
+ File "<stdin>", line 1, in ?
+ File "/usr/local/lib/python2.2/site-packages/dhm/strtools.py", line 80, in Tokenize
+ raise TokenizeError, "Unexpected end of string in quoted text"
+ dhm.strtools.TokenizeError: Unexecpted end of string in quoted text
+
+ @param str: string to tokenize
+ @type str: string
+ @param whitespace: whitespace characters seperating tokens
+ @type whitespace: string
+ @param quotes: legal quoting characters
+ @type quotes: string
+ @param escapes: characters which can escape quoting characters
+ @type escapes: string
+ @return: list of tokens
+ @rtype: sequence of strings
+ """
+ (buffer, tokens, curtoken, quote)=(str, [], None, None)
+
+ try:
+ while buffer:
+ if buffer[0]==quote:
+ quote=None
+ elif (quote==None) and (buffer[0] in quotes):
+ quote=buffer[0]
+ elif buffer[0] in whitespace:
+ if quote!=None:
+ curtoken+=buffer[0]
+ else:
+ tokens.append(curtoken)
+ curtoken=None
+ while buffer[1] in whitespace:
+ buffer=buffer[1:]
+ elif buffer[0] in escapes:
+ if curtoken==None:
+ curtoken=buffer[1]
+ else:
+ curtoken+=buffer[1]
+ buffer=buffer[1:]
+ else:
+ if curtoken==None:
+ curtoken=buffer[0]
+ else:
+ curtoken+=buffer[0]
+
+ buffer=buffer[1:]
+ except IndexError:
+ raise TokenizeError, "Unexpected end of string"
+
+ if quote:
+ raise TokenizeError, "Unexpected end of string in quoted text"
+
+ if curtoken!=None:
+ tokens.append(curtoken)
+
+ return tokens
def QmarkToPyformat(query, params):
- """Convert from qmark to pyformat parameter style.
-
- The python DB-API 2.0 specifies four different possible parameter
- styles that can be used by drivers. This function convers from the
- qmark style to pyformat style.
-
- @param query: SQL query to transform
- @type query: string
- @param params: arguments to query
- @type params: sequence of strings
- @return: converted query and parameters
- @rtype: tuple with the new command and a dictionary of arguments
- """
- tokens=Tokenize(query, quotes="'")
- output=[]
- count=1
- for token in tokens:
- if token.endswith("?"):
- output.append(token[:-1] + "%%(param%d)s" % count)
- count+=1
- else:
- output.append(token)
-
- dict={}
- count=1
- for param in params:
- dict["param%d" % count]=param
- count+=1
-
- return (" ".join(output), dict)
+ """Convert from qmark to pyformat parameter style.
+
+ The python DB-API 2.0 specifies four different possible parameter
+ styles that can be used by drivers. This function convers from the
+ qmark style to pyformat style.
+
+ @param query: SQL query to transform
+ @type query: string
+ @param params: arguments to query
+ @type params: sequence of strings
+ @return: converted query and parameters
+ @rtype: tuple with the new command and a dictionary of arguments
+ """
+ tokens=Tokenize(query, quotes="'")
+ output=[]
+ count=1
+ for token in tokens:
+ if token.endswith("?"):
+ output.append(token[:-1] + "%%(param%d)s" % count)
+ count+=1
+ else:
+ output.append(token)
+
+ dict={}
+ count=1
+ for param in params:
+ dict["param%d" % count]=param
+ count+=1
+
+ return (" ".join(output), dict)
def executeSQLPyFormat(cursor, query, params=None):
@@ -168,4 +168,3 @@ else:
executeSQL = executeSQLPyFormat
-
diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py
index 3bb616b..f17e331 100644
--- a/yum/transactioninfo.py
+++ b/yum/transactioninfo.py
@@ -313,7 +313,7 @@ class TransactionData:
takes a packages object and returns a TransactionMember Object"""
if self._allowedMultipleInstalls(po):
- return self.addTrueInstall(po)
+ return self.addTrueInstall(po)
txmbr = TransactionMember(po)
txmbr.current_state = TS_AVAILABLE
@@ -355,7 +355,7 @@ class TransactionData:
takes a packages object and returns a TransactionMember Object"""
if self._allowedMultipleInstalls(po):
- return self.addTrueInstall(po)
+ return self.addTrueInstall(po)
txmbr = TransactionMember(po)
txmbr.current_state = TS_AVAILABLE
@@ -563,10 +563,7 @@ class TransactionMember:
self.depends_on.append(po)
def __cmp__(self, other):
- result = cmp(self.name, other.name)
- if not result:
- return cmp(id(self), id(other))
- return result
+ return cmp(self.po, other.po)
def __hash__(self):
return object.__hash__(self)
diff --git a/yum/update_md.py b/yum/update_md.py
index bd87c31..9b1f07b 100644
--- a/yum/update_md.py
+++ b/yum/update_md.py
@@ -27,6 +27,7 @@ import gzip
from yum.i18n import utf8_text_wrap, to_utf8
from yum.yumRepo import YumRepository
from yum.misc import to_xml
+import Errors
import rpmUtils.miscutils
@@ -295,11 +296,16 @@ class UpdateMetadata(object):
The root update metadata object.
"""
- def __init__(self):
+ def __init__(self, repos=[]):
self._notices = {}
self._cache = {} # a pkg nvr => notice cache for quick lookups
self._no_cache = {} # a pkg name only => notice list
self._repos = [] # list of repo ids that we've parsed
+ for repo in repos:
+ try: # attempt to grab the updateinfo.xml.gz from the repodata
+ self.add(repo)
+ except Errors.RepoMDError:
+ continue # No metadata found for this repo
def get_notices(self, name=None):
""" Return all notices. """
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index e5774bb..d9e2d77 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -253,7 +253,7 @@ class YumRepository(Repository, config.RepoConf):
# throw in some stubs for things that will be set by the config class
self.basecachedir = ""
self.cost = 1000
- self.copy_local = 1
+ self.copy_local = 0
# holder for stuff we've grabbed
self.retrieved = { 'primary':0, 'filelists':0, 'other':0, 'group':0,
'updateinfo':0}
@@ -344,15 +344,6 @@ class YumRepository(Repository, config.RepoConf):
thisdata = self.repoXML.getData('group')
return thisdata.location
-
- def __cmp__(self, other):
- if self.id > other.id:
- return 1
- elif self.id < other.id:
- return -1
- else:
- return 0
-
def __str__(self):
return self.id
@@ -830,6 +821,10 @@ class YumRepository(Repository, config.RepoConf):
if self.metalink and not os.path.exists(mlfn):
self._metadataCurrent = False
if self._metadataCurrent is None:
+ repomdfn = self.cachedir + '/' + 'repomd.xml'
+ if not os.path.exists(repomdfn):
+ self._metadataCurrent = False
+ if self._metadataCurrent is None:
self._metadataCurrent = self.withinCacheAge(self.metadata_cookie,
self.metadata_expire)
return self._metadataCurrent
@@ -1525,7 +1520,7 @@ class YumRepository(Repository, config.RepoConf):
self.interrupt_callback = callback
self._callbacks_changed = True
- def _readMirrorList(self, fo):
+ def _readMirrorList(self, fo, url=None):
""" read the mirror list from the specified file object """
returnlist = []
@@ -1534,7 +1529,9 @@ class YumRepository(Repository, config.RepoConf):
try:
content = fo.readlines()
except Exception, e:
- print "Could not read mirrorlist %s error was \n%s" %(url, e)
+ if url is None: # Shouldn't happen
+ url = "<unknown>"
+ print "Could not read mirrorlist %s, error was \n%s" %(url, e)
content = []
for line in content:
if re.match('^\s*\#.*', line) or re.match('^\s*$', line):
@@ -1560,6 +1557,7 @@ class YumRepository(Repository, config.RepoConf):
if self.withinCacheAge(self.mirrorlist_file, self.mirrorlist_expire):
cacheok = True
fo = open(self.mirrorlist_file, 'r')
+ url = 'file://' + self.mirrorlist_file # just to keep self._readMirrorList(fo,url) happy
else:
url = self.mirrorlist
scheme = urlparse.urlparse(url)[0]
@@ -1571,7 +1569,7 @@ class YumRepository(Repository, config.RepoConf):
print "Could not retrieve mirrorlist %s error was\n%s" % (url, e)
fo = None
- (returnlist, content) = self._readMirrorList(fo)
+ (returnlist, content) = self._readMirrorList(fo, url)
if returnlist:
if not self.cache and not cacheok:
@@ -1616,10 +1614,11 @@ class YumRepository(Repository, config.RepoConf):
"""attempts to copy the metadata file from the system-wide cache,
if possible"""
return self._preload_file_from_system_cache(filename)
+
def _preload_pkg_from_system_cache(self, pkg):
"""attempts to copy the package from the system-wide cache,
if possible"""
- return self._preload_file_from_system_cache(filename,subdir='packages/')
+ return self._preload_file_from_system_cache(pkg.localPkg(),subdir='packages/')
def getMirrorList(mirrorlist, pdict = None):
diff --git a/yumcommands.py b/yumcommands.py
index fee8060..aa459e6 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -28,8 +28,7 @@ import operator
import locale
import fnmatch
import time
-from yum.misc import to_unicode
-from yum.i18n import utf8_width, utf8_width_fill
+from yum.i18n import utf8_width, utf8_width_fill, to_unicode
def checkRootUID(base):
"""
@@ -105,7 +104,6 @@ def checkShellArg(base, basecmd, extcmds):
"""
if len(extcmds) == 0:
base.verbose_logger.debug(_("No argument to shell"))
- pass
elif len(extcmds) == 1:
base.verbose_logger.debug(_("Filename passed to shell: %s"),
extcmds[0])
@@ -736,11 +734,11 @@ class DepListCommand(YumCommand):
checkPackageArg(base, basecmd, extcmds)
def doCommand(self, base, basecmd, extcmds):
- self.doneCommand(base, _("Finding dependencies: "))
- try:
- return base.deplist(extcmds)
- except yum.Errors.YumBaseError, e:
- return 1, [str(e)]
+ self.doneCommand(base, _("Finding dependencies: "))
+ try:
+ return base.deplist(extcmds)
+ except yum.Errors.YumBaseError, e:
+ return 1, [str(e)]
class RepoListCommand(YumCommand):
@@ -859,6 +857,10 @@ class RepoListCommand(YumCommand):
if repo.metalink:
out += [base.fmtKeyValFill(_("Repo-metalink: "),
repo.metalink)]
+ if enabled:
+ ts = repo.metalink_data.repomd.timestamp
+ out += [base.fmtKeyValFill(_(" Updated : "),
+ time.ctime(ts))]
elif repo.mirrorlist:
out += [base.fmtKeyValFill(_("Repo-mirrors: "),
repo.mirrorlist)]
@@ -1003,11 +1005,13 @@ class ReInstallCommand(YumCommand):
self.doneCommand(base, _("Setting up Reinstall Process"))
oldcount = len(base.tsInfo)
try:
+ # FIXME: Due to not having reinstallPkgs() we don't get
+ # localreinstall and maybe_you_meant features.
for item in extcmds:
base.reinstall(pattern=item)
if len(base.tsInfo) > oldcount:
- return 2, [_('Package(s) to install')]
+ return 2, [_('Package(s) to reinstall')]
return 0, [_('Nothing to do')]
except yum.Errors.YumBaseError, e:
@@ -1016,6 +1020,30 @@ class ReInstallCommand(YumCommand):
def getSummary(self):
return _("reinstall a package")
+ def needTs(self, base, basecmd, extcmds):
+ return False
+
+class DowngradeCommand(YumCommand):
+ def getNames(self):
+ return ['downgrade']
+
+ def getUsage(self):
+ return "PACKAGE..."
+
+ def doCheck(self, base, basecmd, extcmds):
+ checkRootUID(base)
+ checkGPGKey(base)
+ checkPackageArg(base, basecmd, extcmds)
+
+ def doCommand(self, base, basecmd, extcmds):
+ self.doneCommand(base, _("Setting up Downgrade Process"))
+ try:
+ return base.downgradePkgs(extcmds)
+ except yum.Errors.YumBaseError, e:
+ return 1, [str(e)]
+
+ def getSummary(self):
+ return _("downgrade a package")
def needTs(self, base, basecmd, extcmds):
return False
diff --git a/yummain.py b/yummain.py
index 4d330af..30fb831 100755
--- a/yummain.py
+++ b/yummain.py
@@ -28,7 +28,7 @@ from yum import Errors
from yum import plugins
from yum import logginglevels
from yum import _
-from yum.misc import to_unicode
+from yum.i18n import to_unicode
import yum.misc
import cli
@@ -241,6 +241,7 @@ def main(args):
verbose_logger.info(_(" You could try running: package-cleanup --problems\n"
" package-cleanup --dupes\n"
" rpm -Va --nofiles --nodigest"))
+ base.yumUtilsMsg(verbose_logger.info, "package-cleanup")
if unlock(): return 200
return 1
elif result == 2: