[yum] latest head
Seth Vidal
skvidal at fedoraproject.org
Fri Sep 10 17:48:19 UTC 2010
commit 6c7e5918a416cec866d31dcdabb9a781ff5fb1b0
Author: Seth Vidal <skvidal at fedoraproject.org>
Date: Fri Sep 10 13:48:17 2010 -0400
latest head
yum-HEAD.patch |29013 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
yum.spec | 6 +-
2 files changed, 28932 insertions(+), 87 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index e7fde27..d99a58b 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -1,93 +1,28594 @@
+diff --git a/cli.py b/cli.py
+index 9542b7a..0accd35 100644
+--- a/cli.py
++++ b/cli.py
+@@ -327,14 +327,34 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+
+ self.yum_cli_commands[self.basecmd].doCheck(self, self.basecmd, self.extcmds)
+
++ def _shell_history_write(self):
++ if not hasattr(self, '_shell_history_cmds'):
++ return
++ if not self._shell_history_cmds:
++ return
++
++ data = self._shell_history_cmds
++ # Turn: [["a", "b"], ["c", "d"]] => "a b\nc d\n"
++ data = [" ".join(cmds) for cmds in data]
++ data.append('')
++ data = "\n".join(data)
++ self.history.write_addon_data('shell-cmds', data)
++
+ def doShell(self):
+ """do a shell-like interface for yum commands"""
+
+ yumshell = shell.YumShell(base=self)
++
++ # We share this array...
++ self._shell_history_cmds = yumshell._shell_history_cmds
++
+ if len(self.extcmds) == 0:
+ yumshell.cmdloop()
+ else:
+ yumshell.script()
++
++ del self._shell_history_cmds
++
+ return yumshell.result, yumshell.resultmsgs
+
+ def errorSummary(self, errstring):
+@@ -931,22 +951,71 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+ searchlist = ['name', 'summary', 'description', 'url']
+ dups = self.conf.showdupesfromrepos
+ args = map(to_unicode, args)
++
++ okeys = set()
++ akeys = set() # All keys, used to see if nothing matched
++ mkeys = set() # "Main" set of keys for N/S search (biggest term. hit).
++ pos = set()
++
++ def _print_match_section(text):
++ # Print them in the order they were passed
++ used_keys = [arg for arg in args if arg in keys]
++ print self.fmtSection(text % ", ".join(used_keys))
++
++ # First try just the name/summary fields, and if we get any hits
++ # don't do the other stuff. Unless the user overrides via. "all".
++ if len(args) > 1 and args[0] == 'all':
++ args.pop(0)
++ else:
++ matching = self.searchGenerator(['name', 'summary'], args,
++ showdups=dups, keys=True)
++ for (po, keys, matched_value) in matching:
++ if keys != okeys:
++ if akeys:
++ if len(mkeys) == len(args):
++ break
++ print ""
++ else:
++ mkeys = set(keys)
++ _print_match_section(_('N/S Matched: %s'))
++ okeys = keys
++ pos.add(po)
++ akeys.update(keys)
++ self.matchcallback(po, matched_value, args)
++
+ matching = self.searchGenerator(searchlist, args,
+ showdups=dups, keys=True)
+-
++
+ okeys = set()
+- akeys = set()
++
++ # If we got a hit with just name/summary then we only care about hits
++ # with _more_ search terms. Thus. if we hit all our search terms. do
++ # nothing.
++ if len(mkeys) == len(args):
++ print ""
++ if len(args) == 1:
++ msg = _(' Name and summary matches %sonly%s, use "search all" for everything.')
++ else:
++ msg = _(' Full name and summary matches %sonly%s, use "search all" for everything.')
++ print msg % (self.term.MODE['bold'], self.term.MODE['normal'])
++ matching = []
++
+ for (po, keys, matched_value) in matching:
++ if len(keys) <= len(mkeys) or po in pos:
++ continue # Don't print stuff from N/S...
++
+ if keys != okeys:
+ if akeys:
+ print ""
+- # Print them in the order they were passed
+- used_keys = [arg for arg in args if arg in keys]
+- print self.fmtSection(_('Matched: %s') % ", ".join(used_keys))
++ _print_match_section(_('Matched: %s'))
+ okeys = keys
+ akeys.update(keys)
+ self.matchcallback(po, matched_value, args)
+
++ if mkeys and len(mkeys) != len(args):
++ print ""
++ print _(' Name and summary matches %smostly%s, use "search all" for everything.') % (self.term.MODE['bold'], self.term.MODE['normal'])
++
+ for arg in args:
+ if arg not in akeys:
+ self.logger.warning(_('Warning: No matches found for: %s'), arg)
+diff --git a/docs/yum.8 b/docs/yum.8
+index 281bf17..5586b24 100644
+--- a/docs/yum.8
++++ b/docs/yum.8
+@@ -155,9 +155,14 @@ or file. Just use a specific name or a file-glob-syntax wildcards to list
+ the packages available or installed that provide that feature or file\&.
+ .IP
+ .IP "\fBsearch\fP"
+-Is used to find any packages matching a string in the description, summary
+-and package name fields of an rpm. Useful for finding a package
+-you do not know by name but know by some word related to it.
++This is used to find packages when you know something about the package but
++aren't sure of it's name. By default search will try searching just package
++names and summaries, but if that "fails" it will then try descriptions and url.
++
++Yum search orders the results so that those packages matching more terms will
++appear first.
++
++You can force searching everything by specifying "all" as the first argument.
+ .IP
+ .IP "\fBinfo\fP"
+ Is used to list a description and summary information about available
+@@ -549,11 +554,6 @@ Eliminate the sqlite cache used for faster access to metadata.
+ Using this option will force yum to download the sqlite metadata the next time
+ it is run, or recreate the sqlite metadata if using an older repo.
+
+-.IP "\fByum clean dbcache\fP"
+-Eliminate the sqlite cache used for faster access to metadata.
+-Using this option will force yum to download the sqlite metadata the next time
+-it is run, or recreate the sqlite metadata if using an older repo.
+-
+ .IP "\fByum clean rpmdb\fP"
+ Eliminate any cached data from the local rpmdb.
+
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
-index 49d98c6..25b2c7d 100644
+index 49d98c6..8acc8f4 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -134,9 +134,13 @@ an i686 package to update an i386 package. Default is `1'.
- .IP
- \fBinstallonlypkgs \fR
--List of packages that should only ever be installed, never updated. Kernels
--in particular fall into this category. Defaults to kernel, kernel-smp,
--kernel-bigmem, kernel-enterprise, kernel-debug, kernel-unsupported.
-+List of package provides that should only ever be installed, never updated.
-+Kernels in particular fall into this category. Defaults to kernel,
-+kernel-bigmem, kernel-enterprise, kernel-smp, kernel-modules, kernel-debug,
-+kernel-unsupported, kernel-source, kernel-devel, kernel-PAE, kernel-PAE-debug.
+ .IP
+ \fBinstallonlypkgs \fR
+-List of packages that should only ever be installed, never updated. Kernels
+-in particular fall into this category. Defaults to kernel, kernel-smp,
+-kernel-bigmem, kernel-enterprise, kernel-debug, kernel-unsupported.
++List of package provides that should only ever be installed, never updated.
++Kernels in particular fall into this category. Defaults to kernel,
++kernel-bigmem, kernel-enterprise, kernel-smp, kernel-modules, kernel-debug,
++kernel-unsupported, kernel-source, kernel-devel, kernel-PAE, kernel-PAE-debug.
++
++Note that because these are provides, and not just package names, kernel-devel
++will also apply to kernel-debug-devel, etc.
+
+ .IP
+ \fBinstallonly_limit \fR
+@@ -361,6 +365,14 @@ username to use for proxy
+ password for this proxy
+
+ .IP
++\fBusername \fR
++username to use for basic authentication to a repo or really any url.
++
++.IP
++\fBpassword \fR
++password to use with the username for basic authentication.
++
++.IP
+ \fBplugins \fR
+ Either `0' or `1'. Global switch to enable or disable yum plugins. Default is
+ `0' (plugins disabled). See the \fBPLUGINS\fR section of the \fByum(8)\fR man
+@@ -734,6 +746,17 @@ If this is unset it inherits it from the global setting
+ password for this proxy.
+ If this is unset it inherits it from the global setting
+
++
++.IP
++\fBusername \fR
++username to use for basic authentication to a repo or really any url.
++If this is unset it inherits it from the global setting
++
++.IP
++\fBpassword \fR
++password to use with the username for basic authentication.
++If this is unset it inherits it from the global setting
++
+ .IP
+ \fBcost \fR
+ relative cost of accessing this repository. Useful for weighing one repo's packages
+diff --git a/etc/yum.bash b/etc/yum.bash
+index 3e6e243..057a9ac 100644
+--- a/etc/yum.bash
++++ b/etc/yum.bash
+@@ -153,9 +153,9 @@ _yum()
+ case $prev in
+ history)
+ COMPREPLY=( $( compgen -W 'info list summary undo redo
+- new' -- "$cur" ) )
++ new addon-info' -- "$cur" ) )
+ ;;
+- undo|redo)
++ undo|redo|addon-info)
+ COMPREPLY=( $( compgen -W "last $( $yum -d 0 -C history \
+ 2>/dev/null | \
+ sed -ne 's/^[[:space:]]*\([0-9]\{1,\}\).*/\1/p' )" \
+diff --git a/output.py b/output.py
+index 3a90995..ec4bd45 100755
+--- a/output.py
++++ b/output.py
+@@ -1378,7 +1378,7 @@ to exit.
+
+ fmt = "%s | %s | %s | %s | %s"
+ print fmt % (utf8_width_fill(_("ID"), 6, 6),
+- utf8_width_fill(_("Login user"), 22, 22),
++ utf8_width_fill(_("Login user"), 24, 24),
+ utf8_width_fill(_("Date and time"), 16, 16),
+ utf8_width_fill(_("Action(s)"), 14, 14),
+ utf8_width_fill(_("Altered"), 7, 7))
+@@ -1393,11 +1393,11 @@ to exit.
+ break
+
+ done += 1
+- name = self._pwd_ui_username(old.loginuid, 22)
++ name = self._pwd_ui_username(old.loginuid, 24)
+ tm = time.strftime("%Y-%m-%d %H:%M",
+ time.localtime(old.beg_timestamp))
+ num, uiacts = self._history_uiactions(old.trans_data)
+- name = utf8_width_fill(name, 22, 22)
++ name = utf8_width_fill(name, 24, 24)
+ uiacts = utf8_width_fill(uiacts, 14, 14)
+ rmark = lmark = ' '
+ if old.return_code is None:
+@@ -1629,23 +1629,24 @@ to exit.
+ num += 1
+ print "%4d" % num, line
+
++ _history_state2uistate = {'True-Install' : _('Install'),
++ 'Install' : _('Install'),
++ 'Dep-Install' : _('Dep-Install'),
++ 'Obsoleted' : _('Obsoleted'),
++ 'Obsoleting' : _('Obsoleting'),
++ 'Erase' : _('Erase'),
++ 'Reinstall' : _('Reinstall'),
++ 'Downgrade' : _('Downgrade'),
++ 'Downgraded' : _('Downgraded'),
++ 'Update' : _('Update'),
++ 'Updated' : _('Updated'),
++ }
+ def historyInfoCmdPkgsAltered(self, old, pats=[]):
+ last = None
+ # Note that these don't use _simple_pkg() because we are showing what
+ # happened to them in the transaction ... not the difference between the
+ # version in the transaction and now.
+- all_uistates = {'True-Install' : _('Install'),
+- 'Install' : _('Install'),
+- 'Dep-Install' : _('Dep-Install'),
+- 'Obsoleted' : _('Obsoleted'),
+- 'Obsoleting' : _('Obsoleting'),
+- 'Erase' : _('Erase'),
+- 'Reinstall' : _('Reinstall'),
+- 'Downgrade' : _('Downgrade'),
+- 'Downgraded' : _('Downgraded'),
+- 'Update' : _('Update'),
+- 'Updated' : _('Updated'),
+- }
++ all_uistates = self._history_state2uistate
+ maxlen = 0
+ for hpkg in old.trans_data:
+ uistate = all_uistates.get(hpkg.state, hpkg.state)
+@@ -1754,13 +1755,14 @@ to exit.
+ tid = None
+ if len(extcmds) > 1:
+ tid = extcmds[1]
+- try:
+- int(tid)
+- except ValueError:
+- self.logger.critical(_('No transaction ID given'))
+- return 1, ['Failed history addon-info']
+- except TypeError:
+- pass # No tid arg. passed, use last...
++ if tid == 'last':
++ tid = None
++ if tid is not None:
++ try:
++ int(tid)
++ except ValueError:
++ self.logger.critical(_('Bad transaction ID given'))
++ return 1, ['Failed history addon-info']
+
+ if tid is not None:
+ old = self.history.old(tids=[tid])
+@@ -1794,6 +1796,85 @@ to exit.
+
+ print ''
+
++ def historyPackageListCmd(self, extcmds):
++ """ Shows the user a list of data about the history, from the point
++ of a package(s) instead of via. transactions. """
++ tids = self.history.search(extcmds)
++ if not tids:
++ self.logger.critical(_('Bad package(s), given (nothing found)'))
++ return 1, ['Failed history package-list']
++
++ all_uistates = self._history_state2uistate
++
++ fmt = "%s | %s | %s"
++ # REALLY Needs to use columns!
++ print fmt % (utf8_width_fill(_("ID"), 6, 6),
++ utf8_width_fill(_("Action(s)"), 14, 14),
++ utf8_width_fill(_("Package"), 53, 53))
++ print "-" * 79
++ fmt = "%6u | %s | %-50s"
++ for old in self.history.old(tids):
++ last = None
++
++ # Copy and paste from list ... uh.
++ rmark = lmark = ' '
++ if old.return_code is None:
++ rmark = lmark = '*'
++ elif old.return_code:
++ rmark = lmark = '#'
++ # We don't check .errors, because return_code will be non-0
++ elif old.output:
++ rmark = lmark = 'E'
++ elif old.rpmdb_problems:
++ rmark = lmark = 'P'
++ elif old.trans_skip:
++ rmark = lmark = 's'
++ if old.altered_lt_rpmdb:
++ rmark = '<'
++ if old.altered_gt_rpmdb:
++ lmark = '>'
++
++ for hpkg in old.trans_data: # Find a pkg to go with each cmd...
++ x,m,u = yum.packages.parsePackages([hpkg], extcmds)
++ if not x and not m:
++ continue
++
++ uistate = all_uistates.get(hpkg.state, hpkg.state)
++ uistate = utf8_width_fill(uistate, 14)
++
++ # To chop the name off we need nevra strings, str(pkg) gives
++ # envra so we have to do it by hand ... *sigh*.
++ cn = hpkg.ui_nevra
++
++ # Should probably use columns here...
++ if False: pass
++ elif (last is not None and
++ last.state == 'Updated' and last.name == hpkg.name and
++ hpkg.state == 'Update'):
++ ln = len(hpkg.name) + 1
++ cn = (" " * ln) + cn[ln:]
++ elif (last is not None and
++ last.state == 'Downgrade' and last.name == hpkg.name and
++ hpkg.state == 'Downgraded'):
++ ln = len(hpkg.name) + 1
++ cn = (" " * ln) + cn[ln:]
++ else:
++ last = None
++ if hpkg.state in ('Updated', 'Downgrade'):
++ last = hpkg
++
++ print fmt % (old.tid, uistate, cn), "%s%s" % (lmark,rmark)
++
++ # And, again, copy and paste...
++ lastdbv = self.history.last()
++ if lastdbv is None:
++ self._rpmdb_warn_checks(warn=False)
++ else:
++ # If this is the last transaction, is good and it doesn't
++ # match the current rpmdb ... then mark it as bad.
++ rpmdbv = self.rpmdb.simpleVersion(main_only=True)[0]
++ if lastdbv.end_rpmdbversion != rpmdbv:
++ self._rpmdb_warn_checks()
+
+
+ class DepSolveProgressCallBack:
+@@ -1882,10 +1963,12 @@ class DepSolveProgressCallBack:
+ msg += _('\n Not found')
+ return msg
+
+- ipkgs = set()
+- for pkg in sorted(yb.rpmdb.getProvides(needname)):
++ def _run_inst_pkg(pkg, msg):
+ nevr = (pkg.name, pkg.epoch, pkg.version, pkg.release)
+- ipkgs.add(nevr)
++ if nevr in seen_pkgs or (pkg.verEQ(last) and pkg.arch == last.arch):
++ return msg
++
++ seen_pkgs.add(nevr)
+ action = _('Installed')
+ rmed = yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_REMOVE_STATES)
+ if rmed:
+@@ -1901,21 +1984,40 @@ class DepSolveProgressCallBack:
+ if rtype not in relmap:
+ continue
+ nevr = (rpkg.name, rpkg.epoch, rpkg.version, rpkg.release)
+- ipkgs.add(nevr)
++ seen_pkgs.add(nevr)
+ msg += _msg_pkg(relmap[rtype], rpkg, needname)
++ return msg
+
+- last = None
+- for pkg in sorted(yb.pkgSack.getProvides(needname)):
++ def _run_avail_pkg(pkg, msg):
+ # We don't want to see installed packages, or N packages of the
+ # same version, from different repos.
+ nevr = (pkg.name, pkg.epoch, pkg.version, pkg.release)
+- if nevr in ipkgs or (pkg.verEQ(last) and pkg.arch == last.arch):
+- continue
+- last = pkg
++ if nevr in seen_pkgs or (pkg.verEQ(last) and pkg.arch == last.arch):
++ return False, last, msg
++ seen_pkgs.add(nevr)
+ action = _('Available')
+ if yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_INSTALL_STATES):
+ action = _('Installing')
+ msg += _msg_pkg(action, pkg, needname)
++ return True, pkg, msg
++
++ last = None
++ seen_pkgs = set()
++ for pkg in sorted(yb.rpmdb.getProvides(needname)):
++ msg = _run_inst_pkg(pkg, msg)
++
++ available_names = set()
++ for pkg in sorted(yb.pkgSack.getProvides(needname)):
++ tst, last, msg = _run_avail_pkg(pkg, msg)
++ if tst:
++ available_names.add(pkg.name)
++
++ last = None
++ for pkg in sorted(yb.rpmdb.searchNames(available_names)):
++ msg = _run_inst_pkg(pkg, msg)
++ last = None
++ for pkg in sorted(yb.pkgSack.searchNames(available_names)):
++ tst, last, msg = _run_avail_pkg(pkg, msg)
+ return msg
+
+ def procConflict(self, name, confname):
+diff --git a/po/es.po b/po/es.po
+index 4ac1f0a..0d6fc4d 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -8,7 +8,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: Fedora Spanish translation of yum.yum-3_2_X.\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-02-11 10:54-0500\n"
++"POT-Creation-Date: 2010-08-17 10:15-0400\n"
+ "PO-Revision-Date: \n"
+ "Last-Translator: Héctor Daniel Cabrera <logan at fedoraproject.org>\n"
+ "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
+@@ -19,7 +19,7 @@ msgstr ""
+ "X-Poedit-Country: ARGENTINA\n"
+
+ #: ../callback.py:48
+-#: ../output.py:947
++#: ../output.py:1027
+ #: ../yum/rpmtrans.py:72
+ msgid "Updating"
+ msgstr "Actualizando"
+@@ -32,8 +32,8 @@ msgstr "Eliminando"
+ #: ../callback.py:50
+ #: ../callback.py:51
+ #: ../callback.py:53
+-#: ../output.py:946
+-#: ../output.py:1659
++#: ../output.py:1026
++#: ../output.py:1919
+ #: ../yum/rpmtrans.py:74
+ #: ../yum/rpmtrans.py:75
+ #: ../yum/rpmtrans.py:77
+@@ -42,29 +42,30 @@ msgstr "Instalando"
+
+ #: ../callback.py:52
+ #: ../callback.py:58
+-#: ../output.py:1484
++#: ../output.py:1640
+ #: ../yum/rpmtrans.py:76
+ msgid "Obsoleted"
+ msgstr "Obsoleto"
+
+ #: ../callback.py:54
+-#: ../output.py:1070
+-#: ../output.py:1442
+-#: ../output.py:1491
++#: ../output.py:1157
++#: ../output.py:1518
++#: ../output.py:1647
+ msgid "Updated"
+ msgstr "Actualizado"
+
+ #: ../callback.py:55
+-#: ../output.py:1438
++#: ../output.py:1517
+ msgid "Erased"
+ msgstr "Eliminado"
+
+ #: ../callback.py:56
+ #: ../callback.py:57
+ #: ../callback.py:59
+-#: ../output.py:1068
+-#: ../output.py:1434
+-#: ../output.py:1646
++#: ../output.py:1155
++#: ../output.py:1517
++#: ../output.py:1519
++#: ../output.py:1891
+ msgid "Installed"
+ msgstr "Instalado"
+
+@@ -87,8 +88,8 @@ msgid "Erased: %s"
+ msgstr "Eliminado: %s"
+
+ #: ../callback.py:217
+-#: ../output.py:948
+-#: ../output.py:1648
++#: ../output.py:1028
++#: ../output.py:1894
+ msgid "Removing"
+ msgstr "Eliminando"
+
+@@ -97,68 +98,68 @@ msgstr "Eliminando"
+ msgid "Cleanup"
+ msgstr "Limpieza"
+
+-#: ../cli.py:107
++#: ../cli.py:108
+ #, python-format
+ msgid "Command \"%s\" already defined"
+ msgstr "El comando \"%s\" ya ha sido definido"
+
+-#: ../cli.py:119
++#: ../cli.py:120
+ msgid "Setting up repositories"
+ msgstr "Configurando los repositorios"
+
+-#: ../cli.py:130
++#: ../cli.py:131
+ msgid "Reading repository metadata in from local files"
+ msgstr "Leyendo en archivos locales los metadatos de los repositorios"
+
+-#: ../cli.py:194
+-#: ../utils.py:193
++#: ../cli.py:234
++#: ../utils.py:254
+ #, python-format
+ msgid "Config Error: %s"
+ msgstr "Error de configuración: %s"
+
+-#: ../cli.py:197
+-#: ../cli.py:1272
+-#: ../utils.py:196
++#: ../cli.py:237
++#: ../cli.py:1403
++#: ../utils.py:257
+ #, python-format
+ msgid "Options Error: %s"
+ msgstr "Error de opciones: %s"
+
+-#: ../cli.py:227
++#: ../cli.py:267
+ #, python-format
+ msgid " Installed: %s-%s at %s"
+ msgstr " Instalado: %s-%s en %s"
+
+-#: ../cli.py:229
++#: ../cli.py:269
+ #, python-format
+ msgid " Built : %s at %s"
+ msgstr " Construido: %s en %s"
+
+-#: ../cli.py:231
++#: ../cli.py:271
+ #, python-format
+ msgid " Committed: %s at %s"
+ msgstr " Enviado: %s en %s"
+
+-#: ../cli.py:270
++#: ../cli.py:310
+ msgid "You need to give some command"
+ msgstr "Necesita ingresar algún comando"
+
+-#: ../cli.py:284
++#: ../cli.py:324
+ #, python-format
+ msgid "No such command: %s. Please use %s --help"
+ msgstr "No existe el comando: %s. Por favor, utilice %s --help"
+
+-#: ../cli.py:314
++#: ../cli.py:354
+ msgid "Disk Requirements:\n"
+ msgstr "Requerimientos de disco:\n"
+
+-#: ../cli.py:316
++#: ../cli.py:356
+ #, python-format
+ msgid " At least %dMB more space needed on the %s filesystem.\n"
+ msgstr " Como mínimo se necesitan %dMB más en el sistema de archivos %s.\n"
+
+ #. TODO: simplify the dependency errors?
+ #. Fixup the summary
+-#: ../cli.py:321
++#: ../cli.py:361
+ msgid ""
+ "Error Summary\n"
+ "-------------\n"
+@@ -166,63 +167,63 @@ msgstr ""
+ "Resumen de errores\n"
+ "-------------\n"
+
+-#: ../cli.py:364
++#: ../cli.py:404
+ msgid "Trying to run the transaction but nothing to do. Exiting."
+ msgstr "Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo."
+
+-#: ../cli.py:403
++#: ../cli.py:451
+ msgid "Exiting on user Command"
+ msgstr "Saliendo de acuerdo al comando del usuario"
+
+-#: ../cli.py:407
++#: ../cli.py:455
+ msgid "Downloading Packages:"
+ msgstr "Descargando paquetes:"
+
+-#: ../cli.py:412
++#: ../cli.py:460
+ msgid "Error Downloading Packages:\n"
+ msgstr "Error al descargar los paquetes:\n"
+
+-#: ../cli.py:426
+-#: ../yum/__init__.py:4195
++#: ../cli.py:474
++#: ../yum/__init__.py:4559
+ msgid "Running rpm_check_debug"
+ msgstr "Ejecutando el rpm_check_debug"
+
+-#: ../cli.py:435
+-#: ../yum/__init__.py:4204
++#: ../cli.py:483
++#: ../yum/__init__.py:4568
+ msgid "ERROR You need to update rpm to handle:"
+ msgstr "ERROR Necesita actualizar el rpm para manipular:"
+
+-#: ../cli.py:437
+-#: ../yum/__init__.py:4207
++#: ../cli.py:485
++#: ../yum/__init__.py:4571
+ msgid "ERROR with rpm_check_debug vs depsolve:"
+ msgstr "ERROR con el rpm_check_debug vs depsolve:"
+
+-#: ../cli.py:443
++#: ../cli.py:491
+ msgid "RPM needs to be updated"
+ msgstr "El RPM necesita ser actualizado"
+
+-#: ../cli.py:444
++#: ../cli.py:492
+ #, python-format
+ msgid "Please report this error in %s"
+ msgstr "Por favor, reporte este error en %s"
+
+-#: ../cli.py:450
++#: ../cli.py:498
+ msgid "Running Transaction Test"
+ msgstr "Ejecutando prueba de transacción"
+
+-#: ../cli.py:466
++#: ../cli.py:514
+ msgid "Transaction Check Error:\n"
+ msgstr "Error en la verificación de la transacción:\n"
+
+-#: ../cli.py:473
++#: ../cli.py:521
+ msgid "Transaction Test Succeeded"
+ msgstr "La prueba de transacción ha sido exitosa"
+
+-#: ../cli.py:495
++#: ../cli.py:543
+ msgid "Running Transaction"
+ msgstr "Ejecutando transacción"
+
+-#: ../cli.py:525
++#: ../cli.py:573
+ msgid ""
+ "Refusing to automatically import keys when running unattended.\n"
+ "Use \"-y\" to override."
+@@ -230,92 +231,102 @@ msgstr ""
+ "Se rechaza la importación automática de claves cuando se ejecuta desatendida.\n"
+ "Utilice \"-y\" para forzar."
+
+-#: ../cli.py:544
+-#: ../cli.py:578
++#: ../cli.py:592
++#: ../cli.py:626
+ msgid " * Maybe you meant: "
+ msgstr " * Tal vez quería decir: "
+
+-#: ../cli.py:561
+-#: ../cli.py:569
++#: ../cli.py:609
++#: ../cli.py:617
+ #, python-format
+ msgid "Package(s) %s%s%s available, but not installed."
+ msgstr "El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) instalado."
+
+-#: ../cli.py:575
+-#: ../cli.py:607
+-#: ../cli.py:687
++#: ../cli.py:623
++#: ../cli.py:656
++#: ../cli.py:810
+ #, python-format
+ msgid "No package %s%s%s available."
+ msgstr "No existe disponible ningún paquete %s%s%s."
+
+-#: ../cli.py:612
+-#: ../cli.py:748
++#: ../cli.py:663
++#: ../cli.py:875
+ msgid "Package(s) to install"
+ msgstr "Paquete(s) a instalarse"
+
+-#: ../cli.py:613
+-#: ../cli.py:693
+-#: ../cli.py:727
+-#: ../cli.py:749
+-#: ../yumcommands.py:160
++#: ../cli.py:666
++#: ../cli.py:667
++#: ../cli.py:816
++#: ../cli.py:850
++#: ../cli.py:876
++#: ../yumcommands.py:179
+ msgid "Nothing to do"
+ msgstr "Nada para hacer"
+
+-#: ../cli.py:647
++#: ../cli.py:701
+ #, python-format
+ msgid "%d packages marked for Update"
+ msgstr "%d paquetes han sido seleccionados para ser actualizados"
+
+-#: ../cli.py:650
++#: ../cli.py:704
+ msgid "No Packages marked for Update"
+ msgstr "No se han seleccionando paquetes para ser actualizados"
+
+-#: ../cli.py:664
++#: ../cli.py:770
++#, python-format
++msgid "%d packages marked for Distribution Synchronization"
++msgstr "%d paquetes han sido seleccionados para Sincronización de distribución"
++
++#: ../cli.py:773
++msgid "No Packages marked for Distribution Synchronization"
++msgstr "No se han seleccionado paquetes para Sincronización de distribución"
++
++#: ../cli.py:787
+ #, python-format
+ msgid "%d packages marked for removal"
+ msgstr "%d paquetes han sido seleccionados para ser eliminados"
+
+-#: ../cli.py:667
++#: ../cli.py:790
+ msgid "No Packages marked for removal"
+ msgstr "No se han seleccionado paquetes para ser eliminados"
+
+-#: ../cli.py:692
++#: ../cli.py:815
+ msgid "Package(s) to downgrade"
+ msgstr "Paquete(s) a desactualizar"
+
+-#: ../cli.py:717
++#: ../cli.py:840
+ #, python-format
+ msgid " (from %s)"
+ msgstr " (desde %s)"
+
+-#: ../cli.py:719
++#: ../cli.py:841
+ #, python-format
+ msgid "Installed package %s%s%s%s not available."
+ msgstr "El paquete instalado %s%s%s%s no se encuentra disponible."
+
+-#: ../cli.py:726
++#: ../cli.py:849
+ msgid "Package(s) to reinstall"
+ msgstr "Paquete(s) a reinstalar"
+
+-#: ../cli.py:739
++#: ../cli.py:862
+ msgid "No Packages Provided"
+ msgstr "No se ha ofrecido ningún paquete"
+
+-#: ../cli.py:818
++#: ../cli.py:945
+ #, python-format
+ msgid "Matched: %s"
+ msgstr "Concordante: %s"
+
+-#: ../cli.py:825
++#: ../cli.py:952
+ #, python-format
+ msgid "Warning: No matches found for: %s"
+ msgstr "Aviso: No se ha encontrado ningún resultado para: %s"
+
+-#: ../cli.py:828
++#: ../cli.py:955
+ msgid "No Matches found"
+ msgstr "No se ha encontrado ningún resultado"
+
+-#: ../cli.py:868
++#: ../cli.py:995
+ #, python-format
+ msgid ""
+ "Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+@@ -324,113 +335,117 @@ msgstr ""
+ "Aviso: las versiones 3.0.x de yum podrían hacer corresponder equivocadamente los nombres de los archivos.\n"
+ " Puede usar \"%s*/%s%s\" y/o \"%s*bin/%s%s\" para conseguir eso"
+
+-#: ../cli.py:884
++#: ../cli.py:1011
+ #, python-format
+ msgid "No Package Found for %s"
+ msgstr "No se ha encontrado ningún paquete para %s"
+
+-#: ../cli.py:896
++#: ../cli.py:1021
++msgid "Cleaning repos: "
++msgstr "Limpiando repositorios:"
++
++#: ../cli.py:1026
+ msgid "Cleaning up Everything"
+ msgstr "Limpiando todo"
+
+-#: ../cli.py:912
++#: ../cli.py:1042
+ msgid "Cleaning up Headers"
+ msgstr "Limpiando encabezados"
+
+-#: ../cli.py:915
++#: ../cli.py:1045
+ msgid "Cleaning up Packages"
+ msgstr "Limpiando paquetes"
+
+-#: ../cli.py:918
++#: ../cli.py:1048
+ msgid "Cleaning up xml metadata"
+ msgstr "Limpiando metadatos xml"
+
+-#: ../cli.py:921
++#: ../cli.py:1051
+ msgid "Cleaning up database cache"
+ msgstr "Limpiando el caché de la base de datos"
+
+-#: ../cli.py:924
++#: ../cli.py:1054
+ msgid "Cleaning up expire-cache metadata"
+ msgstr "Limpiando metadatos expirados del caché"
+
+-#: ../cli.py:927
++#: ../cli.py:1057
+ msgid "Cleaning up cached rpmdb data"
+ msgstr "Limpiando datos de rpmdb en el caché"
+
+-#: ../cli.py:930
++#: ../cli.py:1060
+ msgid "Cleaning up plugins"
+ msgstr "Limpiando complementos"
+
+-#: ../cli.py:955
++#: ../cli.py:1085
+ msgid "Installed Groups:"
+ msgstr "Grupos instalados:"
+
+-#: ../cli.py:967
++#: ../cli.py:1097
+ msgid "Available Groups:"
+ msgstr "Grupos disponibles:"
+
+-#: ../cli.py:977
++#: ../cli.py:1107
+ msgid "Done"
+ msgstr "Listo"
+
+-#: ../cli.py:988
+-#: ../cli.py:1006
+-#: ../cli.py:1012
+-#: ../yum/__init__.py:2788
++#: ../cli.py:1118
++#: ../cli.py:1136
++#: ../cli.py:1142
++#: ../yum/__init__.py:3069
+ #, python-format
+ msgid "Warning: Group %s does not exist."
+ msgstr "Aviso: el grupo %s no existe."
+
+-#: ../cli.py:1016
++#: ../cli.py:1146
+ msgid "No packages in any requested group available to install or update"
+ msgstr "En los grupos solicitados no existe disponible ningún paquete para ser instalado o actualizado"
+
+-#: ../cli.py:1018
++#: ../cli.py:1148
+ #, python-format
+ msgid "%d Package(s) to Install"
+ msgstr "%d paquete(s) a instalar"
+
+-#: ../cli.py:1028
+-#: ../yum/__init__.py:2800
++#: ../cli.py:1158
++#: ../yum/__init__.py:3081
+ #, python-format
+ msgid "No group named %s exists"
+ msgstr "No existe ningún grupo denominado %s"
+
+-#: ../cli.py:1034
++#: ../cli.py:1164
+ msgid "No packages to remove from groups"
+ msgstr "No existen paquetes a eliminarse de los grupos"
+
+-#: ../cli.py:1036
++#: ../cli.py:1166
+ #, python-format
+ msgid "%d Package(s) to remove"
+ msgstr "%d paquete(s) a eliminar"
+
+-#: ../cli.py:1078
++#: ../cli.py:1208
+ #, python-format
+ msgid "Package %s is already installed, skipping"
+ msgstr "Ya se encuentra instalado el paquete %s, ignorando"
+
+-#: ../cli.py:1089
++#: ../cli.py:1219
+ #, python-format
+ msgid "Discarding non-comparable pkg %s.%s"
+ msgstr "Descartando paquete no comparable %s.%s"
+
+ #. we've not got any installed that match n or n+a
+-#: ../cli.py:1115
++#: ../cli.py:1245
+ #, python-format
+ msgid "No other %s installed, adding to list for potential install"
+ msgstr "No existe instalado otro %s, agregando a la lista para instalación posible"
+
+-#: ../cli.py:1135
++#: ../cli.py:1265
+ msgid "Plugin Options"
+ msgstr "Opciones de complementos"
+
+-#: ../cli.py:1143
++#: ../cli.py:1273
+ #, python-format
+ msgid "Command line error: %s"
+ msgstr "Error en la línea de comando: %s"
+
+-#: ../cli.py:1156
++#: ../cli.py:1287
+ #, python-format
+ msgid ""
+ "\n"
+@@ -441,114 +456,118 @@ msgstr ""
+ "\n"
+ "%s: la opción %s necesita un argumento"
+
+-#: ../cli.py:1209
++#: ../cli.py:1340
+ msgid "--color takes one of: auto, always, never"
+ msgstr "--color acepta una de las siguientes opciones: auto, always, never"
+
+-#: ../cli.py:1319
++#: ../cli.py:1450
+ msgid "show this help message and exit"
+ msgstr "muestra este mensaje de ayuda y cierra"
+
+-#: ../cli.py:1323
++#: ../cli.py:1454
+ msgid "be tolerant of errors"
+ msgstr "sea tolerante con los errores"
+
+-#: ../cli.py:1326
++#: ../cli.py:1457
+ msgid "run entirely from system cache, don't update cache"
+ msgstr "se ejecuta completamente a partir del caché, pero no lo actualiza"
+
+-#: ../cli.py:1329
++#: ../cli.py:1460
+ msgid "config file location"
+ msgstr "configurar ubicación de archivo"
+
+-#: ../cli.py:1332
++#: ../cli.py:1463
+ msgid "maximum command wait time"
+ msgstr "tiempo máximo de espera del comando"
+
+-#: ../cli.py:1334
++#: ../cli.py:1465
+ msgid "debugging output level"
+ msgstr "nivel de depuración de la salida"
+
+-#: ../cli.py:1338
++#: ../cli.py:1469
+ msgid "show duplicates, in repos, in list/search commands"
+ msgstr "muestra duplicados en los repositorios, y en los comandos para mostrar/buscar"
+
+-#: ../cli.py:1340
++#: ../cli.py:1471
+ msgid "error output level"
+ msgstr "nivel de error de la salida"
+
+-#: ../cli.py:1343
++#: ../cli.py:1474
+ msgid "debugging output level for rpm"
+ msgstr "nivel de depuración de salida para rpm"
+
+-#: ../cli.py:1346
++#: ../cli.py:1477
+ msgid "quiet operation"
+ msgstr "operación discreta"
+
+-#: ../cli.py:1348
++#: ../cli.py:1479
+ msgid "verbose operation"
+ msgstr "operación detallada"
+
+-#: ../cli.py:1350
++#: ../cli.py:1481
+ msgid "answer yes for all questions"
+ msgstr "responde \"si\" a todas las preguntas"
+
+-#: ../cli.py:1352
++#: ../cli.py:1483
+ msgid "show Yum version and exit"
+ msgstr "muestra la versión de Yum y finaliza"
+
+-#: ../cli.py:1353
++#: ../cli.py:1484
+ msgid "set install root"
+ msgstr "define la raíz de instalación"
+
+-#: ../cli.py:1357
++#: ../cli.py:1488
+ msgid "enable one or more repositories (wildcards allowed)"
+ msgstr "activa uno o más repositorios (los comodines son permitidos)"
+
+-#: ../cli.py:1361
++#: ../cli.py:1492
+ msgid "disable one or more repositories (wildcards allowed)"
+ msgstr "desactiva uno o más repositorios (los comodines son permitidos)"
+
+-#: ../cli.py:1364
++#: ../cli.py:1495
+ msgid "exclude package(s) by name or glob"
+ msgstr "excluya paquete(s) de acuerdo a su nombre o glob "
+
+-#: ../cli.py:1366
++#: ../cli.py:1497
+ msgid "disable exclude from main, for a repo or for everything"
+ msgstr "deshabilita la posibilidad de exclusión desde main, para un repositorio o para todos"
+
+-#: ../cli.py:1369
++#: ../cli.py:1500
+ msgid "enable obsoletes processing during updates"
+ msgstr "habilita el proceso de paquetes obsoletos durante las actualizaciones"
+
+-#: ../cli.py:1371
++#: ../cli.py:1502
+ msgid "disable Yum plugins"
+ msgstr "deshabilita los complementos de Yum"
+
+-#: ../cli.py:1373
++#: ../cli.py:1504
+ msgid "disable gpg signature checking"
+ msgstr "deshabilita la verificación de firmas GPG"
+
+-#: ../cli.py:1375
++#: ../cli.py:1506
+ msgid "disable plugins by name"
+ msgstr "deshabilita complementos de acuerdo a su nombre"
+
+-#: ../cli.py:1378
++#: ../cli.py:1509
+ msgid "enable plugins by name"
+ msgstr "habilita complementos de acuerdo a su nombre"
+
+-#: ../cli.py:1381
++#: ../cli.py:1512
+ msgid "skip packages with depsolving problems"
+ msgstr "ignora paquetes con problemas de resolución de dependencias"
+
+-#: ../cli.py:1383
++#: ../cli.py:1514
+ msgid "control whether color is used"
+ msgstr "controla la utilización de colores"
+
+-#: ../cli.py:1385
++#: ../cli.py:1516
+ msgid "set value of $releasever in yum config and repo files"
+ msgstr "define el valor de $releasever en los aarchivos de configuración de yum y de los repositorios"
+
++#: ../cli.py:1518
++msgid "set arbitrary config and repo options"
++msgstr "define una configuración arbitraria y opciones de los repositorios"
++
+ #: ../output.py:305
+ msgid "Jan"
+ msgstr "Ene"
+@@ -601,104 +620,117 @@ msgstr "Dic"
+ msgid "Trying other mirror."
+ msgstr "Intentando con otro espejo."
+
+-#: ../output.py:534
++#: ../output.py:579
+ #, python-format
+-msgid "Name : %s%s%s"
+-msgstr "Nombre : %s%s%s"
++msgid "Name : %s%s%s"
++msgstr "Nombre : %s%s%s"
+
+-#: ../output.py:535
++#: ../output.py:580
+ #, python-format
+-msgid "Arch : %s"
+-msgstr "Arquitectura : %s"
++msgid "Arch : %s"
++msgstr "Arquitectura : %s"
+
+-#: ../output.py:537
++#: ../output.py:582
+ #, python-format
+-msgid "Epoch : %s"
+-msgstr "Período : %s"
++msgid "Epoch : %s"
++msgstr "Período : %s"
+
+-#: ../output.py:538
++#: ../output.py:583
+ #, python-format
+-msgid "Version : %s"
+-msgstr "Versión : %s"
++msgid "Version : %s"
++msgstr "Versión : %s"
+
+-#: ../output.py:539
++#: ../output.py:584
+ #, python-format
+-msgid "Release : %s"
+-msgstr "Lanzamiento : %s"
++msgid "Release : %s"
++msgstr "Lanzamiento : %s"
+
+-#: ../output.py:540
++#: ../output.py:585
+ #, python-format
+-msgid "Size : %s"
+-msgstr "Tamaño : %s"
++msgid "Size : %s"
++msgstr "Tamaño : %s"
+
+-#: ../output.py:541
++#: ../output.py:586
++#: ../output.py:890
+ #, python-format
+-msgid "Repo : %s"
+-msgstr "Repositorio : %s"
++msgid "Repo : %s"
++msgstr "Repositorio : %s"
+
+-#: ../output.py:543
++#: ../output.py:588
+ #, python-format
+-msgid "From repo : %s"
+-msgstr "Desde el repositorio : %s"
++msgid "From repo : %s"
++msgstr "Desde el repositorio : %s"
+
+-#: ../output.py:545
++#: ../output.py:590
+ #, python-format
+-msgid "Committer : %s"
+-msgstr "Enviado por : %s"
++msgid "Committer : %s"
++msgstr "Enviado por : %s"
+
+-#: ../output.py:546
++#: ../output.py:591
+ #, python-format
+-msgid "Committime : %s"
+-msgstr "Horario del envio : %s"
++msgid "Committime : %s"
++msgstr "Horario del envío : %s"
+
+-#: ../output.py:547
++#: ../output.py:592
+ #, python-format
+-msgid "Buildtime : %s"
+-msgstr "Horario de la construcción : %s"
++msgid "Buildtime : %s"
++msgstr "Horario de la construcción : %s"
+
+-#: ../output.py:549
++#: ../output.py:594
+ #, python-format
+-msgid "Installtime: %s"
++msgid "Install time: %s"
+ msgstr "Horario de la instalación: %s"
+
+-#: ../output.py:550
+-msgid "Summary : "
+-msgstr "Resumen : "
++#: ../output.py:602
++#, python-format
++msgid "Installed by: %s"
++msgstr "Instalado por: %s"
++
++#: ../output.py:609
++#, python-format
++msgid "Changed by : %s"
++msgstr "Modificado por : %s "
++
++#: ../output.py:610
++msgid "Summary : "
++msgstr "Resumen : "
+
+-#: ../output.py:552
++#: ../output.py:612
++#: ../output.py:903
+ #, python-format
+-msgid "URL : %s"
+-msgstr "URL : %s"
++msgid "URL : %s"
++msgstr "URL : %s"
+
+-#: ../output.py:553
+-msgid "License : "
+-msgstr "Licencia : "
++#: ../output.py:613
++msgid "License : "
++msgstr "Licencia : "
+
+-#: ../output.py:554
+-msgid "Description: "
+-msgstr "Descripción:"
++#: ../output.py:614
++#: ../output.py:900
++msgid "Description : "
++msgstr "Descripción :"
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "y"
+ msgstr "s"
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "yes"
+ msgstr "si"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "n"
+ msgstr "n"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "no"
+ msgstr "no"
+
+-#: ../output.py:627
++#: ../output.py:687
+ msgid "Is this ok [y/N]: "
+ msgstr "Está de acuerdo [s/N]:"
+
+-#: ../output.py:715
++#: ../output.py:775
+ #, python-format
+ msgid ""
+ "\n"
+@@ -707,152 +739,143 @@ msgstr ""
+ "\n"
+ "Grupo: %s"
+
+-#: ../output.py:719
++#: ../output.py:779
+ #, python-format
+ msgid " Group-Id: %s"
+ msgstr " Group-Id: %s"
+
+-#: ../output.py:724
++#: ../output.py:784
+ #, python-format
+ msgid " Description: %s"
+ msgstr " Descripción: %s"
+
+-#: ../output.py:726
++#: ../output.py:786
+ msgid " Mandatory Packages:"
+ msgstr " Paquetes obligatorios:"
+
+-#: ../output.py:727
++#: ../output.py:787
+ msgid " Default Packages:"
+ msgstr " Paquetes predeterminados:"
+
+-#: ../output.py:728
++#: ../output.py:788
+ msgid " Optional Packages:"
+ msgstr " Paquetes opcionales:"
+
+-#: ../output.py:729
++#: ../output.py:789
+ msgid " Conditional Packages:"
+ msgstr " Paquetes condicionales:"
+
+-#: ../output.py:749
++#: ../output.py:809
+ #, python-format
+ msgid "package: %s"
+ msgstr "paquete: %s"
+
+-#: ../output.py:751
++#: ../output.py:811
+ msgid " No dependencies for this package"
+ msgstr " No existen dependencias para este paquete"
+
+-#: ../output.py:756
++#: ../output.py:816
+ #, python-format
+ msgid " dependency: %s"
+ msgstr " dependencia: %s"
+
+-#: ../output.py:758
++#: ../output.py:818
+ msgid " Unsatisfied dependency"
+ msgstr " Dependencia no satisfecha"
+
+-#: ../output.py:830
+-#, python-format
+-msgid "Repo : %s"
+-msgstr "Repositorio : %s"
+-
+-#: ../output.py:831
++#: ../output.py:891
+ msgid "Matched from:"
+ msgstr "Resultado obtenido desde:"
+
+-#: ../output.py:840
+-msgid "Description : "
+-msgstr "Descripción :"
+-
+-#: ../output.py:843
+-#, python-format
+-msgid "URL : %s"
+-msgstr "URL : %s"
+-
+-#: ../output.py:846
++#: ../output.py:906
+ #, python-format
+ msgid "License : %s"
+ msgstr "Licencia : %s"
+
+-#: ../output.py:849
++#: ../output.py:909
+ #, python-format
+ msgid "Filename : %s"
+ msgstr "Nombre del archivo : %s"
+
+-#: ../output.py:853
++#: ../output.py:913
+ msgid "Other : "
+ msgstr "Otro : "
+
+-#: ../output.py:896
++#: ../output.py:956
+ msgid "There was an error calculating total download size"
+ msgstr "Hubo un error mientras se calculaba el tamaño total de la descarga"
+
+-#: ../output.py:901
++#: ../output.py:961
+ #, python-format
+ msgid "Total size: %s"
+ msgstr "Tamaño total: %s"
+
+-#: ../output.py:904
++#: ../output.py:964
+ #, python-format
+ msgid "Total download size: %s"
+ msgstr "Tamaño total de la descarga: %s"
+
+-#: ../output.py:908
++#: ../output.py:968
++#: ../output.py:988
+ #, python-format
+ msgid "Installed size: %s"
+ msgstr "Tamaño instalado: %s"
+
+-#: ../output.py:949
++#: ../output.py:984
++msgid "There was an error calculating installed size"
++msgstr "Hubo un error mientras se calculaba el tamaño instalado"
++
++#: ../output.py:1029
+ msgid "Reinstalling"
+ msgstr "Reinstalando"
+
+-#: ../output.py:950
++#: ../output.py:1030
+ msgid "Downgrading"
+ msgstr "Desactualizando"
+
+-#: ../output.py:951
++#: ../output.py:1031
+ msgid "Installing for dependencies"
+ msgstr "Instalando para las dependencias"
+
+-#: ../output.py:952
++#: ../output.py:1032
+ msgid "Updating for dependencies"
+ msgstr "Actualizando para las dependencias"
+
+-#: ../output.py:953
++#: ../output.py:1033
+ msgid "Removing for dependencies"
+ msgstr "Eliminando para las dependencias"
+
+-#: ../output.py:960
+-#: ../output.py:1072
++#: ../output.py:1040
++#: ../output.py:1159
+ msgid "Skipped (dependency problems)"
+ msgstr "Ignorando (problemas de dependencias)"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Package"
+ msgstr "Paquete"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Arch"
+ msgstr "Arquitectura"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Version"
+ msgstr "Versión"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Repository"
+ msgstr "Repositorio"
+
+-#: ../output.py:985
++#: ../output.py:1065
+ msgid "Size"
+ msgstr "Tamaño"
+
+-#: ../output.py:997
++#: ../output.py:1077
+ #, python-format
+ msgid " replacing %s%s%s.%s %s\n"
+ msgstr " reemplazando %s%s%s.%s %s\n"
+
+-#: ../output.py:1006
++#: ../output.py:1086
+ #, python-format
+ msgid ""
+ "\n"
+@@ -863,52 +886,57 @@ msgstr ""
+ "Resumen de la transacción\n"
+ "%s\n"
+
+-#: ../output.py:1013
++#: ../output.py:1097
+ #, python-format
+-msgid ""
+-"Install %5.5s Package(s)\n"
+-"Upgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Instalar %5.5s Paquete(s)\n"
+-"Actualizar %5.5s Paquete(s)\n"
++msgid "Install %5.5s Package(s)\n"
++msgstr "Instalar %5.5s Paquete(s)\n"
+
+-#: ../output.py:1022
++#: ../output.py:1101
+ #, python-format
+-msgid ""
+-"Remove %5.5s Package(s)\n"
+-"Reinstall %5.5s Package(s)\n"
+-"Downgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Eliminar %5.5s Paquete(s)\n"
+-"Reinstalar %5.5s Paquete(s)\n"
+-"Desactualizar %5.5s Paquete(s)\n"
++msgid "Upgrade %5.5s Package(s)\n"
++msgstr "Actualizar %5.5s Paquete(s)\n"
++
++#: ../output.py:1105
++#, python-format
++msgid "Remove %5.5s Package(s)\n"
++msgstr "Eliminar %5.5s Paquete(s)\n"
++
++#: ../output.py:1109
++#, python-format
++msgid "Reinstall %5.5s Package(s)\n"
++msgstr "Reinstalar %5.5s Paquete(s)\n"
++
++#: ../output.py:1113
++#, python-format
++msgid "Downgrade %5.5s Package(s)\n"
++msgstr "Desactualizar %5.5s Paquete(s)\n"
+
+-#: ../output.py:1066
++#: ../output.py:1153
+ msgid "Removed"
+ msgstr "Eliminado(s)"
+
+-#: ../output.py:1067
++#: ../output.py:1154
+ msgid "Dependency Removed"
+ msgstr "Dependencia(s) eliminada(s)"
+
+-#: ../output.py:1069
++#: ../output.py:1156
+ msgid "Dependency Installed"
+ msgstr "Dependencia(s) instalada(s)"
+
+-#: ../output.py:1071
++#: ../output.py:1158
+ msgid "Dependency Updated"
+ msgstr "Dependencia(s) actualizada(s)"
+
+-#: ../output.py:1073
++#: ../output.py:1160
+ msgid "Replaced"
+ msgstr "Sustituido(s)"
+
+-#: ../output.py:1074
++#: ../output.py:1161
+ msgid "Failed"
+ msgstr "Falló"
+
+ #. Delta between C-c's so we treat as exit
+-#: ../output.py:1140
++#: ../output.py:1245
+ msgid "two"
+ msgstr "dos"
+
+@@ -916,7 +944,7 @@ msgstr "dos"
+ #. Current download cancelled, interrupt (ctrl-c) again within two seconds
+ #. to exit.
+ #. Where "interupt (ctrl-c) again" and "two" are highlighted.
+-#: ../output.py:1151
++#: ../output.py:1256
+ #, python-format
+ msgid ""
+ "\n"
+@@ -927,280 +955,340 @@ msgstr ""
+ " Se ha cancelado la descarga actual, %sinterrumpa con (ctrl-c) nuevamente%s dentro de %s%s%s segundos\n"
+ "para finalizar.\n"
+
+-#: ../output.py:1162
++#: ../output.py:1267
+ msgid "user interrupt"
+ msgstr "interrupción solicitada por el usuario"
+
+-#: ../output.py:1180
++#: ../output.py:1285
+ msgid "Total"
+ msgstr "Total"
+
+-#: ../output.py:1202
++#: ../output.py:1307
+ msgid "I"
+ msgstr "I"
+
+-#: ../output.py:1203
++#: ../output.py:1308
+ msgid "O"
+ msgstr "O"
+
+-#: ../output.py:1204
++#: ../output.py:1309
+ msgid "E"
+ msgstr "E"
+
+-#: ../output.py:1205
++#: ../output.py:1310
+ msgid "R"
+ msgstr "R"
+
+-#: ../output.py:1206
++#: ../output.py:1311
+ msgid "D"
+ msgstr "D"
+
+-#: ../output.py:1207
++#: ../output.py:1312
+ msgid "U"
+ msgstr "U"
+
+-#: ../output.py:1217
++#: ../output.py:1323
+ msgid "<unset>"
+ msgstr "<no definido>"
+
+-#: ../output.py:1218
++#: ../output.py:1324
+ msgid "System"
+ msgstr "Sistema"
+
+-#: ../output.py:1254
++#: ../output.py:1368
+ msgid "Bad transaction IDs, or package(s), given"
+ msgstr "Se ha(n) indicado paquete(s), o IDs de transacciones erróneas"
+
+-#: ../output.py:1266
++#: ../output.py:1380
+ msgid "ID"
+ msgstr "ID"
+
+-#: ../output.py:1267
+-#: ../output.py:1520
++#: ../output.py:1381
++#: ../output.py:1699
+ msgid "Login user"
+ msgstr "Registro de usuario"
+
+-#: ../output.py:1268
++#: ../output.py:1382
+ msgid "Date and time"
+ msgstr "Día y hora"
+
+-#: ../output.py:1269
+-#: ../output.py:1522
++#: ../output.py:1383
++#: ../output.py:1701
+ msgid "Action(s)"
+ msgstr "Acción(es)"
+
+-#: ../output.py:1270
+-#: ../output.py:1523
++#: ../output.py:1384
++#: ../output.py:1702
+ msgid "Altered"
+ msgstr "Modificado"
+
+-#: ../output.py:1310
++#: ../output.py:1431
++#: ../output.py:1760
+ msgid "No transaction ID given"
+ msgstr "No se ha indicado un ID de transacción"
+
+-#: ../output.py:1336
++#: ../output.py:1457
+ msgid "Bad transaction ID given"
+ msgstr "Se ha indicado un ID de transacción no válido "
+
+-#: ../output.py:1341
++#: ../output.py:1462
+ msgid "Not found given transaction ID"
+ msgstr "No se ha encontrado el ID de transacción indicado"
+
+-#: ../output.py:1349
++#: ../output.py:1470
+ msgid "Found more than one transaction ID!"
+ msgstr "¡Se ha encontrado más de un ID de transacción!"
+
+-#: ../output.py:1370
++#: ../output.py:1491
++#: ../output.py:1770
+ msgid "No transaction ID, or package, given"
+ msgstr "No se ha indicado ningún paquete, o ID de transacción"
+
+-#: ../output.py:1396
++#: ../output.py:1518
++#: ../output.py:1645
++msgid "Downgraded"
++msgstr "Desactualizado"
++
++#: ../output.py:1519
++msgid "Not installed"
++msgstr "No instalado"
++
++#: ../output.py:1520
++msgid "Older"
++msgstr "Antiguos"
++
++#: ../output.py:1520
++msgid "Newer"
++msgstr "Nuevos"
++
++#: ../output.py:1552
+ msgid "Transaction ID :"
+ msgstr "ID de transacción :"
+
+-#: ../output.py:1398
++#: ../output.py:1554
+ msgid "Begin time :"
+ msgstr "Hora inicial :"
+
+-#: ../output.py:1401
+-#: ../output.py:1403
++#: ../output.py:1557
++#: ../output.py:1559
+ msgid "Begin rpmdb :"
+ msgstr "Rpmdb inicial :"
+
+-#: ../output.py:1417
++#: ../output.py:1573
+ #, python-format
+ msgid "(%s seconds)"
+ msgstr "(%s segundos)"
+
+-#: ../output.py:1418
++#: ../output.py:1574
+ msgid "End time :"
+ msgstr "Hora final : "
+
+-#: ../output.py:1421
+-#: ../output.py:1423
++#: ../output.py:1577
++#: ../output.py:1579
+ msgid "End rpmdb :"
+ msgstr "Rpmdb final :"
+
+-#: ../output.py:1424
++#: ../output.py:1580
+ msgid "User :"
+ msgstr "Usuario :"
+
+-#: ../output.py:1426
+-#: ../output.py:1428
+-#: ../output.py:1430
++#: ../output.py:1582
++#: ../output.py:1584
++#: ../output.py:1586
+ msgid "Return-Code :"
+ msgstr "Codigo-obtenido :"
+
+-#: ../output.py:1426
++#: ../output.py:1582
+ msgid "Aborted"
+ msgstr "Abortado"
+
+-#: ../output.py:1428
++#: ../output.py:1584
+ msgid "Failure:"
+ msgstr "Falla:"
+
+-#: ../output.py:1430
++#: ../output.py:1586
+ msgid "Success"
+ msgstr "Exito"
+
+-#: ../output.py:1431
+-msgid "Transaction performed with:"
+-msgstr "Transacción realizada con:"
++#: ../output.py:1589
++msgid "Command Line :"
++msgstr "Línea de comando :"
+
+-#: ../output.py:1444
+-#: ../output.py:1489
+-msgid "Downgraded"
+-msgstr "Desactualizado"
++#: ../output.py:1597
++#, python-format
++msgid "Additional non-default information stored: %d"
++msgstr "Información adicional no predeterminada almacenada: %d"
+
+-#. multiple versions installed, both older and newer
+-#: ../output.py:1446
+-msgid "Weird"
+-msgstr "Extraño"
++#: ../output.py:1600
++msgid "Transaction performed with:"
++msgstr "Transacción realizada con:"
+
+-#: ../output.py:1448
++#: ../output.py:1603
+ msgid "Packages Altered:"
+ msgstr "Paquetes modificados:"
+
+-#: ../output.py:1451
++#: ../output.py:1607
++msgid "Packages Skipped:"
++msgstr "Paquetes ignorados:"
++
++#: ../output.py:1612
++msgid "Rpmdb Problems:"
++msgstr "Problemas en la base de datos RPM: "
++
++#: ../output.py:1620
+ msgid "Scriptlet output:"
+ msgstr "Información del scriptlet:"
+
+-#: ../output.py:1457
++#: ../output.py:1626
+ msgid "Errors:"
+ msgstr "Errores:"
+
+-#: ../output.py:1481
+-#: ../output.py:1482
++#. Note that these don't use _simple_pkg() because we are showing what
++#. happened to them in the transaction ... not the difference between the
++#. version in the transaction and now.
++#: ../output.py:1637
++#: ../output.py:1638
+ msgid "Install"
+ msgstr "Instalar"
+
+-#: ../output.py:1483
++#: ../output.py:1639
+ msgid "Dep-Install"
+ msgstr "Instalación de dependencias"
+
+-#: ../output.py:1485
++#: ../output.py:1641
+ msgid "Obsoleting"
+ msgstr "Convirtiendo en obsoleto"
+
+-#: ../output.py:1486
++#: ../output.py:1642
+ msgid "Erase"
+ msgstr "Eliminar"
+
+-#: ../output.py:1487
++#: ../output.py:1643
+ msgid "Reinstall"
+ msgstr "Reinstalar"
+
+-#: ../output.py:1488
++#: ../output.py:1644
+ msgid "Downgrade"
+ msgstr "Desactualizar"
+
+-#: ../output.py:1490
++#: ../output.py:1646
+ msgid "Update"
+ msgstr "Actualizar"
+
+-#: ../output.py:1521
++#: ../output.py:1700
+ msgid "Time"
+ msgstr "Hora"
+
+-#: ../output.py:1547
++#: ../output.py:1726
+ msgid "Last day"
+ msgstr "Ultimo día"
+
+-#: ../output.py:1548
++#: ../output.py:1727
+ msgid "Last week"
+ msgstr "Ultima semana"
+
+-#: ../output.py:1549
++#: ../output.py:1728
+ msgid "Last 2 weeks"
+ msgstr "Ultimas 2 semanas"
+
+ #. US default :p
+-#: ../output.py:1550
++#: ../output.py:1729
+ msgid "Last 3 months"
+ msgstr "Ultimos 3 meses"
+
+-#: ../output.py:1551
++#: ../output.py:1730
+ msgid "Last 6 months"
+ msgstr "Ultimos 6 meses"
+
+-#: ../output.py:1552
++#: ../output.py:1731
+ msgid "Last year"
+ msgstr "Ultimo año"
+
+-#: ../output.py:1553
++#: ../output.py:1732
+ msgid "Over a year ago"
+ msgstr "Hace más de un año"
+
+-#: ../output.py:1585
++#: ../output.py:1774
++#, python-format
++msgid "No Transaction %s found"
++msgstr "No se ha encontrado una transacción %s"
++
++#: ../output.py:1780
++msgid "Transaction ID:"
++msgstr "ID de transacción :"
++
++#: ../output.py:1781
++msgid "Available additional history information:"
++msgstr "Información de historial adicional disponible:"
++
++#: ../output.py:1793
++#, python-format
++msgid "%s: No additional data found by this name"
++msgstr "%s No ha sido encontrada información adicional con este nombre"
++
++#: ../output.py:1809
+ msgid "installed"
+ msgstr "instalado"
+
+-#: ../output.py:1586
++#: ../output.py:1810
+ msgid "updated"
+ msgstr "actualizado"
+
+-#: ../output.py:1587
++#: ../output.py:1811
+ msgid "obsoleted"
+ msgstr "obsoleto"
+
+-#: ../output.py:1588
++#: ../output.py:1812
+ msgid "erased"
+ msgstr "eliminado"
+
+-#: ../output.py:1592
++#: ../output.py:1813
++msgid "reinstalled"
++msgstr "reinstalado"
++
++#: ../output.py:1814
++msgid "downgraded"
++msgstr "desactualizado"
++
++#: ../output.py:1818
+ #, python-format
+ msgid "---> Package %s.%s %s:%s-%s set to be %s"
+ msgstr "---> Paquete %s.%s %s:%s-%s definido para ser %s"
+
+-#: ../output.py:1599
++#: ../output.py:1825
+ msgid "--> Running transaction check"
+ msgstr "--> Ejecutando prueba de transacción"
+
+-#: ../output.py:1604
++#: ../output.py:1830
+ msgid "--> Restarting Dependency Resolution with new changes."
+ msgstr "--> Reiniciando la resolución de las dependencias con las nuevas modificaciones."
+
+-#: ../output.py:1609
++#: ../output.py:1835
+ msgid "--> Finished Dependency Resolution"
+ msgstr "--> Resolución de dependencias finalizada"
+
+-#: ../output.py:1614
+-#: ../output.py:1619
++#: ../output.py:1840
++#: ../output.py:1845
+ #, python-format
+ msgid "--> Processing Dependency: %s for package: %s"
+ msgstr "--> Procesando dependencias: %s para el paquete: %s"
+
+-#: ../output.py:1623
++#: ../output.py:1850
++#, python-format
++msgid "---> Keeping package: %s"
++msgstr "---> Manteniendo el paquete: %s"
++
++#: ../output.py:1853
+ #, python-format
+ msgid "--> Unresolved Dependency: %s"
+ msgstr "--> Dependencia no resuelta: %s"
+
+-#: ../output.py:1634
++#: ../output.py:1864
+ #, python-format
+ msgid "Package: %s"
+ msgstr "Paquete: %s"
+
+-#: ../output.py:1636
++#: ../output.py:1866
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1209,8 +1297,7 @@ msgstr ""
+ "\n"
+ " Necesita: %s"
+
+-#: ../output.py:1649
+-#: ../output.py:1660
++#: ../output.py:1875
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1219,85 +1306,105 @@ msgstr ""
+ "\n"
+ " %s: %s (%s)"
+
+-#: ../output.py:1657
++#: ../output.py:1880
++#, python-format
++msgid ""
++"\n"
++" %s"
++msgstr ""
++"\n"
++" %s"
++
++#: ../output.py:1882
++msgid ""
++"\n"
++" Not found"
++msgstr ""
++"\n"
++" No encontrado"
++
++#. These should be the only three things we care about:
++#: ../output.py:1897
++msgid "Updated By"
++msgstr "Actualizado por"
++
++#: ../output.py:1898
++msgid "Downgraded By"
++msgstr "Desactualizado por"
++
++#: ../output.py:1899
++msgid "Obsoleted By"
++msgstr "Obsoleto por"
++
++#: ../output.py:1917
+ msgid "Available"
+ msgstr "Disponible"
+
+-#: ../output.py:1665
+-#: ../output.py:1670
++#: ../output.py:1944
++#: ../output.py:1949
+ #, python-format
+ msgid "--> Processing Conflict: %s conflicts %s"
+ msgstr "--> Procesando conflictos: %s choca con %s"
+
+-#: ../output.py:1674
++#: ../output.py:1953
+ msgid "--> Populating transaction set with selected packages. Please wait."
+ msgstr "--> Construyendo el conjunto de las transacciones con los paquetes seleccionados. Por favor aguarde."
+
+-#: ../output.py:1678
++#: ../output.py:1957
+ #, python-format
+ msgid "---> Downloading header for %s to pack into transaction set."
+ msgstr "---> Descargando el encabezado de %s para incluirlo en el conjunto de transacciones."
+
+-#: ../utils.py:93
++#: ../utils.py:94
+ msgid "Running"
+ msgstr "Ejecutando"
+
+-#: ../utils.py:94
++#: ../utils.py:95
+ msgid "Sleeping"
+ msgstr "Durmiendo"
+
+-#: ../utils.py:95
++#: ../utils.py:96
+ msgid "Uninterruptible"
+ msgstr "Ininterrumplible"
+
+-#: ../utils.py:96
++#: ../utils.py:97
+ msgid "Zombie"
+ msgstr "Zombi"
+
+-#: ../utils.py:97
++#: ../utils.py:98
+ msgid "Traced/Stopped"
+ msgstr "Rastreado/Detenido"
+
+-#: ../utils.py:98
+-#: ../yumcommands.py:917
++#: ../utils.py:99
++#: ../yumcommands.py:972
+ msgid "Unknown"
+ msgstr "Desconocido"
+
+-#: ../utils.py:109
++#: ../utils.py:110
+ msgid " The other application is: PackageKit"
+ msgstr " La otra aplicación es: PackageKit"
+
+-#: ../utils.py:111
++#: ../utils.py:112
+ #, python-format
+ msgid " The other application is: %s"
+ msgstr " La otra aplicación es: %s"
+
+-#: ../utils.py:114
++#: ../utils.py:115
+ #, python-format
+ msgid " Memory : %5s RSS (%5sB VSZ)"
+ msgstr " Memoria : %5s RSS (%5sB VSZ)"
+
+-#: ../utils.py:119
++#: ../utils.py:120
+ #, python-format
+ msgid " Started: %s - %s ago"
+ msgstr " Iniciado: %s - %s atrás"
+
+-#: ../utils.py:121
++#: ../utils.py:122
+ #, python-format
+ msgid " State : %s, pid: %d"
+ msgstr " Estado : %s, pid: %d"
+
+-#: ../utils.py:199
+-#, python-format
+-msgid "PluginExit Error: %s"
+-msgstr "Error de PluginExit: %s"
+-
+-#: ../utils.py:202
+-#, python-format
+-msgid "Yum Error: %s"
+-msgstr "Error de yum: %s"
+-
+-#: ../utils.py:235
++#: ../utils.py:143
+ #: ../yummain.py:42
+ msgid ""
+ "\n"
+@@ -1308,7 +1415,7 @@ msgstr ""
+ "\n"
+ "Saliendo por cancelación del usuario"
+
+-#: ../utils.py:241
++#: ../utils.py:149
+ #: ../yummain.py:48
+ msgid ""
+ "\n"
+@@ -1319,7 +1426,7 @@ msgstr ""
+ "\n"
+ "Saliendo por tubería rota"
+
+-#: ../utils.py:243
++#: ../utils.py:151
+ #: ../yummain.py:50
+ #, python-format
+ msgid ""
+@@ -1331,8 +1438,57 @@ msgstr ""
+ "\n"
+ "%s"
+
+-#: ../utils.py:282
+-#: ../yummain.py:211
++#: ../utils.py:201
++#: ../yummain.py:107
++msgid "Another app is currently holding the yum lock; exiting as configured by exit_on_lock"
++msgstr "Otra aplicación tiene retenido el bloqueo de Yum; finalizando de acuerdo a la configuración de exit_on_lock"
++
++#: ../utils.py:260
++#, python-format
++msgid "PluginExit Error: %s"
++msgstr "Error de PluginExit: %s"
++
++#: ../utils.py:263
++#, python-format
++msgid "Yum Error: %s"
++msgstr "Error de yum: %s"
++
++#: ../utils.py:315
++#: ../yummain.py:134
++#: ../yummain.py:173
++#, python-format
++msgid "Error: %s"
++msgstr "Error: %s"
++
++#: ../utils.py:319
++#: ../yummain.py:177
++msgid " You could try using --skip-broken to work around the problem"
++msgstr " Podría intentar utilizar el comando --skip-broken para sortear el problema"
++
++#: ../utils.py:321
++#: ../yummain.py:179
++#: ../yummain.py:212
++msgid " You could try running: rpm -Va --nofiles --nodigest"
++msgstr "Podría intentar ejecutar: rpm- Va --nofiles --nodigest"
++
++#: ../utils.py:328
++#: ../yummain.py:144
++#: ../yummain.py:186
++#, python-format
++msgid "Unknown Error(s): Exit Code: %d:"
++msgstr "Error(es) desconocido(s): Código de salida: %d:"
++
++#: ../utils.py:334
++#: ../yummain.py:192
++msgid ""
++"\n"
++"Dependencies Resolved"
++msgstr ""
++"\n"
++"Dependencias resueltas"
++
++#: ../utils.py:349
++#: ../yummain.py:215
+ msgid "Complete!"
+ msgstr "¡Listo!"
+
+@@ -1411,301 +1567,320 @@ msgstr "El archivo %s indicado como argumento para el shell no existe."
+ msgid "Error: more than one file given as argument to shell."
+ msgstr "Error: se ha indicado más de un archivo como argumento para el shell"
+
+-#: ../yumcommands.py:170
++#: ../yumcommands.py:138
++msgid ""
++"There are no enabled repos.\n"
++" Run \"yum repolist all\" to see the repos you have.\n"
++" You can enable repos with yum-config-manager --enable <repo>"
++msgstr ""
++"No existen repositorios habilitados.\n"
++" Ejecute \"yum repolist all\" para conocer los repositorios existentes.\n"
++" Puede habilitarlos con yum-config-manager --enable <repositorio>"
++
++#: ../yumcommands.py:189
+ msgid "PACKAGE..."
+ msgstr "PAQUETE..."
+
+-#: ../yumcommands.py:173
++#: ../yumcommands.py:192
+ msgid "Install a package or packages on your system"
+ msgstr "Instala uno o varios paquetes en su sistema"
+
+-#: ../yumcommands.py:181
++#: ../yumcommands.py:201
+ msgid "Setting up Install Process"
+ msgstr "Configurando el proceso de instalación"
+
+-#: ../yumcommands.py:192
++#: ../yumcommands.py:212
++#: ../yumcommands.py:234
+ msgid "[PACKAGE...]"
+ msgstr "[PAQUETE...]"
+
+-#: ../yumcommands.py:195
++#: ../yumcommands.py:215
+ msgid "Update a package or packages on your system"
+ msgstr "Actualiza uno o varios paquetes en su sistema"
+
+-#: ../yumcommands.py:202
++#: ../yumcommands.py:223
+ msgid "Setting up Update Process"
+ msgstr "Configurando el proceso de actualización"
+
+-#: ../yumcommands.py:244
++#: ../yumcommands.py:237
++msgid "Synchronize installed packages to the latest available versions"
++msgstr "Sincroniza los paquetes instalados a las últimas versiones disponibles"
++
++#: ../yumcommands.py:245
++msgid "Setting up Distribution Synchronization Process"
++msgstr "Definiendo el proceso de Sincronización de la distribución"
++
++#: ../yumcommands.py:288
+ msgid "Display details about a package or group of packages"
+ msgstr "Muestra detalles acerca de un paquete o de un grupo de paquetes"
+
+-#: ../yumcommands.py:293
++#: ../yumcommands.py:337
+ msgid "Installed Packages"
+ msgstr "Paquetes instalados"
+
+-#: ../yumcommands.py:301
++#: ../yumcommands.py:345
+ msgid "Available Packages"
+ msgstr "Paquetes disponibles"
+
+-#: ../yumcommands.py:305
++#: ../yumcommands.py:349
+ msgid "Extra Packages"
+ msgstr "Paquetes extra"
+
+-#: ../yumcommands.py:309
++#: ../yumcommands.py:353
+ msgid "Updated Packages"
+ msgstr "Paquetes actualizados"
+
+ #. This only happens in verbose mode
+-#: ../yumcommands.py:317
+-#: ../yumcommands.py:324
+-#: ../yumcommands.py:601
++#: ../yumcommands.py:361
++#: ../yumcommands.py:368
++#: ../yumcommands.py:655
+ msgid "Obsoleting Packages"
+ msgstr "Convirtiendo paquetes en obsoletos"
+
+-#: ../yumcommands.py:326
++#: ../yumcommands.py:370
+ msgid "Recently Added Packages"
+ msgstr "Paquetes añadidos recientemente"
+
+-#: ../yumcommands.py:333
++#: ../yumcommands.py:377
+ msgid "No matching Packages to list"
+ msgstr "No hay paquetes que se correspondan con la lista"
+
+-#: ../yumcommands.py:347
++#: ../yumcommands.py:391
+ msgid "List a package or groups of packages"
+ msgstr "Muestra un paquete o grupos de paquete"
+
+-#: ../yumcommands.py:359
++#: ../yumcommands.py:403
+ msgid "Remove a package or packages from your system"
+ msgstr "Elimina uno o varios paquetes de su sistema"
+
+-#: ../yumcommands.py:366
++#: ../yumcommands.py:410
+ msgid "Setting up Remove Process"
+ msgstr "Configurando el proceso de eliminación"
+
+-#: ../yumcommands.py:380
++#: ../yumcommands.py:424
+ msgid "Setting up Group Process"
+ msgstr "Configurando el proceso de grupo"
+
+-#: ../yumcommands.py:386
++#: ../yumcommands.py:430
+ msgid "No Groups on which to run command"
+ msgstr "No existen grupos sobre los cuales ejecutar el comando"
+
+-#: ../yumcommands.py:399
++#: ../yumcommands.py:443
+ msgid "List available package groups"
+ msgstr "Muestra los grupos de paquetes disponibles"
+
+-#: ../yumcommands.py:416
++#: ../yumcommands.py:463
+ msgid "Install the packages in a group on your system"
+ msgstr "Instala los paquetes en un grupo de su sistema"
+
+-#: ../yumcommands.py:438
++#: ../yumcommands.py:486
+ msgid "Remove the packages in a group from your system"
+ msgstr "Elimina los paquetes de un grupo de su sistema"
+
+-#: ../yumcommands.py:465
++#: ../yumcommands.py:514
+ msgid "Display details about a package group"
+ msgstr "Muestra detalles acerca de un grupo de paquetes"
+
+-#: ../yumcommands.py:489
++#: ../yumcommands.py:539
+ msgid "Generate the metadata cache"
+ msgstr "Genera el caché de metadatos"
+
+-#: ../yumcommands.py:495
++#: ../yumcommands.py:545
+ msgid "Making cache files for all metadata files."
+ msgstr "Creando los archivos de caché para todos los archivos de metadatos."
+
+-#: ../yumcommands.py:496
++#: ../yumcommands.py:546
+ msgid "This may take a while depending on the speed of this computer"
+ msgstr "Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo"
+
+-#: ../yumcommands.py:517
++#: ../yumcommands.py:567
+ msgid "Metadata Cache Created"
+ msgstr "Se ha creado el caché de metadatos"
+
+-#: ../yumcommands.py:531
++#: ../yumcommands.py:581
+ msgid "Remove cached data"
+ msgstr "Elimina los datos del caché"
+
+-#: ../yumcommands.py:551
++#: ../yumcommands.py:602
+ msgid "Find what package provides the given value"
+ msgstr "Localiza el paquete que ofrezca el valor indicado"
+
+-#: ../yumcommands.py:571
++#: ../yumcommands.py:622
+ msgid "Check for available package updates"
+ msgstr "Verifica la existencia de actualizaciones de paquetes"
+
+-#: ../yumcommands.py:621
++#: ../yumcommands.py:675
+ msgid "Search package details for the given string"
+ msgstr "Busca detalles en los paquetes para la cadena indicada"
+
+-#: ../yumcommands.py:627
++#: ../yumcommands.py:681
+ msgid "Searching Packages: "
+ msgstr "Buscando paquetes:"
+
+-#: ../yumcommands.py:644
++#: ../yumcommands.py:698
+ msgid "Update packages taking obsoletes into account"
+ msgstr "Actualiza los paquetes tomando en cuenta los obsoletos"
+
+-#: ../yumcommands.py:652
++#: ../yumcommands.py:707
+ msgid "Setting up Upgrade Process"
+ msgstr "Configurando el proceso de actualización"
+
+-#: ../yumcommands.py:666
++#: ../yumcommands.py:721
+ msgid "Install a local RPM"
+ msgstr "Instala un RPM local"
+
+-#: ../yumcommands.py:674
++#: ../yumcommands.py:729
+ msgid "Setting up Local Package Process"
+ msgstr "Configurando el proceso de instalación local de paquetes"
+
+-#: ../yumcommands.py:693
++#: ../yumcommands.py:748
+ msgid "Determine which package provides the given dependency"
+ msgstr "Determina qué paquetes ofrecen la dependencia indicada"
+
+-#: ../yumcommands.py:696
++#: ../yumcommands.py:751
+ msgid "Searching Packages for Dependency:"
+ msgstr "Buscando paquetes para la dependencia:"
+
+-#: ../yumcommands.py:710
++#: ../yumcommands.py:765
+ msgid "Run an interactive yum shell"
+ msgstr "Ejecuta una shell de Yum interactiva "
+
+-#: ../yumcommands.py:716
++#: ../yumcommands.py:771
+ msgid "Setting up Yum Shell"
+ msgstr "Configurando la shell de Yum"
+
+-#: ../yumcommands.py:734
++#: ../yumcommands.py:789
+ msgid "List a package's dependencies"
+ msgstr "Muestra las dependencias que necesita un paquete"
+
+-#: ../yumcommands.py:740
++#: ../yumcommands.py:795
+ msgid "Finding dependencies: "
+ msgstr "Buscando dependencias:"
+
+-#: ../yumcommands.py:756
++#: ../yumcommands.py:811
+ msgid "Display the configured software repositories"
+ msgstr "Muestra los repositorios de software configurados"
+
+-#: ../yumcommands.py:822
+-#: ../yumcommands.py:823
++#: ../yumcommands.py:877
++#: ../yumcommands.py:878
+ msgid "enabled"
+ msgstr "habilitado"
+
+-#: ../yumcommands.py:849
+-#: ../yumcommands.py:850
++#: ../yumcommands.py:904
++#: ../yumcommands.py:905
+ msgid "disabled"
+ msgstr "deshabilitado"
+
+-#: ../yumcommands.py:866
++#: ../yumcommands.py:921
+ msgid "Repo-id : "
+ msgstr "Repo-id : "
+
+-#: ../yumcommands.py:867
++#: ../yumcommands.py:922
+ msgid "Repo-name : "
+ msgstr "Repo-name : "
+
+-#: ../yumcommands.py:870
++#: ../yumcommands.py:925
+ msgid "Repo-status : "
+ msgstr "Repo-status : "
+
+-#: ../yumcommands.py:873
++#: ../yumcommands.py:928
+ msgid "Repo-revision: "
+ msgstr "Repo-revision: "
+
+-#: ../yumcommands.py:877
++#: ../yumcommands.py:932
+ msgid "Repo-tags : "
+ msgstr "Repo-tags : "
+
+-#: ../yumcommands.py:883
++#: ../yumcommands.py:938
+ msgid "Repo-distro-tags: "
+ msgstr "Repo-distro-tags: "
+
+-#: ../yumcommands.py:888
++#: ../yumcommands.py:943
+ msgid "Repo-updated : "
+ msgstr "Repo-updated : "
+
+-#: ../yumcommands.py:890
++#: ../yumcommands.py:945
+ msgid "Repo-pkgs : "
+ msgstr "Repo-pkgs : "
+
+-#: ../yumcommands.py:891
++#: ../yumcommands.py:946
+ msgid "Repo-size : "
+ msgstr "Repo-size : "
+
+-#: ../yumcommands.py:898
++#: ../yumcommands.py:953
+ msgid "Repo-baseurl : "
+ msgstr "Repo-baseurl : "
+
+-#: ../yumcommands.py:906
++#: ../yumcommands.py:961
+ msgid "Repo-metalink: "
+ msgstr "Repo-metalink: "
+
+-#: ../yumcommands.py:910
++#: ../yumcommands.py:965
+ msgid " Updated : "
+ msgstr " Actualizados : "
+
+-#: ../yumcommands.py:913
++#: ../yumcommands.py:968
+ msgid "Repo-mirrors : "
+ msgstr "Repo-mirrors : "
+
+-#: ../yumcommands.py:923
++#: ../yumcommands.py:978
+ #, python-format
+ msgid "Never (last: %s)"
+ msgstr "Nunca (último: %s)"
+
+-#: ../yumcommands.py:925
++#: ../yumcommands.py:980
+ #, python-format
+ msgid "Instant (last: %s)"
+ msgstr "Instante (último: %s)"
+
+-#: ../yumcommands.py:928
++#: ../yumcommands.py:983
+ #, python-format
+ msgid "%s second(s) (last: %s)"
+ msgstr "%s segundo(s) (último: %s)"
+
+-#: ../yumcommands.py:930
++#: ../yumcommands.py:985
+ msgid "Repo-expire : "
+ msgstr "Repo-expire : "
+
+-#: ../yumcommands.py:933
++#: ../yumcommands.py:988
+ msgid "Repo-exclude : "
+ msgstr "Repo-exclude : "
+
+-#: ../yumcommands.py:937
++#: ../yumcommands.py:992
+ msgid "Repo-include : "
+ msgstr "Repo-include : "
+
+-#: ../yumcommands.py:941
++#: ../yumcommands.py:996
+ msgid "Repo-excluded: "
+ msgstr "Repositorio excluído:"
+
+ #. Work out the first (id) and last (enabled/disalbed/count),
+ #. then chop the middle (name)...
+-#: ../yumcommands.py:951
+-#: ../yumcommands.py:980
++#: ../yumcommands.py:1006
++#: ../yumcommands.py:1035
+ msgid "repo id"
+ msgstr "id del repositorio"
+
+-#: ../yumcommands.py:968
+-#: ../yumcommands.py:969
+-#: ../yumcommands.py:987
++#: ../yumcommands.py:1023
++#: ../yumcommands.py:1024
++#: ../yumcommands.py:1042
+ msgid "status"
+ msgstr "estado"
+
+-#: ../yumcommands.py:981
++#: ../yumcommands.py:1036
+ msgid "repo name"
+ msgstr "nombre del repositorio"
+
+-#: ../yumcommands.py:1018
++#: ../yumcommands.py:1073
+ msgid "Display a helpful usage message"
+ msgstr "Muestra un mensaje de ayuda del uso"
+
+-#: ../yumcommands.py:1052
++#: ../yumcommands.py:1107
+ #, python-format
+ msgid "No help available for %s"
+ msgstr "No existe asistencia disponible para %s"
+
+-#: ../yumcommands.py:1057
++#: ../yumcommands.py:1112
+ msgid ""
+ "\n"
+ "\n"
+@@ -1715,7 +1890,7 @@ msgstr ""
+ "\n"
+ "apodos: "
+
+-#: ../yumcommands.py:1059
++#: ../yumcommands.py:1114
+ msgid ""
+ "\n"
+ "\n"
+@@ -1725,106 +1900,81 @@ msgstr ""
+ "\n"
+ "apodo: "
+
+-#: ../yumcommands.py:1087
++#: ../yumcommands.py:1143
+ msgid "Setting up Reinstall Process"
+ msgstr "Configurando el proceso de reinstalación"
+
+-#: ../yumcommands.py:1095
++#: ../yumcommands.py:1151
+ msgid "reinstall a package"
+ msgstr "reinstalar un paquete"
+
+-#: ../yumcommands.py:1113
++#: ../yumcommands.py:1170
+ msgid "Setting up Downgrade Process"
+ msgstr "Configurando el proceso de desactualización"
+
+-#: ../yumcommands.py:1120
++#: ../yumcommands.py:1177
+ msgid "downgrade a package"
+ msgstr "desactualizar un paquete a una versión anterior"
+
+-#: ../yumcommands.py:1134
++#: ../yumcommands.py:1191
+ msgid "Display a version for the machine and/or available repos."
+ msgstr "Muestra una versión para la máquina y/o los repositorios disponibles."
+
+-#: ../yumcommands.py:1173
++#: ../yumcommands.py:1230
+ msgid " Yum version groups:"
+ msgstr " Grupos de la versión de Yum:"
+
+-#: ../yumcommands.py:1183
++#: ../yumcommands.py:1240
+ msgid " Group :"
+ msgstr " Grupo :"
+
+-#: ../yumcommands.py:1184
++#: ../yumcommands.py:1241
+ msgid " Packages:"
+ msgstr " Paquetes:"
+
+-#: ../yumcommands.py:1213
++#: ../yumcommands.py:1270
+ msgid "Installed:"
+ msgstr "Instalado:"
+
+-#: ../yumcommands.py:1218
++#: ../yumcommands.py:1278
+ msgid "Group-Installed:"
+ msgstr "Grupo-Instalado:"
+
+-#: ../yumcommands.py:1227
++#: ../yumcommands.py:1287
+ msgid "Available:"
+ msgstr "Disponible:"
+
+-#: ../yumcommands.py:1233
++#: ../yumcommands.py:1296
+ msgid "Group-Available:"
+ msgstr "Grupo-Disponible:"
+
+-#: ../yumcommands.py:1272
++#: ../yumcommands.py:1335
+ msgid "Display, or use, the transaction history"
+ msgstr "Mostrar, o utilizar, el historial de la transacción"
+
+-#: ../yumcommands.py:1300
++#: ../yumcommands.py:1363
+ #, python-format
+ msgid "Invalid history sub-command, use: %s."
+ msgstr "Sub-comando de historia no válido, utilice: %s"
+
+-#: ../yumcommands.py:1345
++#: ../yumcommands.py:1370
++msgid "You don't have access to the history DB."
++msgstr "No posee acceso a la base de datos del historial."
++
++#: ../yumcommands.py:1413
+ msgid "Check for problems in the rpmdb"
+ msgstr "Verifica si hay problemas en la base de datos (rpmdb)"
+
+-#: ../yummain.py:102
++#: ../yummain.py:103
+ msgid "Another app is currently holding the yum lock; waiting for it to exit..."
+ msgstr "Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... "
+
+-#: ../yummain.py:130
+-#: ../yummain.py:169
+-#, python-format
+-msgid "Error: %s"
+-msgstr "Error: %s"
+-
+-#: ../yummain.py:140
+-#: ../yummain.py:182
+-#, python-format
+-msgid "Unknown Error(s): Exit Code: %d:"
+-msgstr "Error(es) desconocido(s): Código de salida: %d:"
+-
+ #. Depsolve stage
+-#: ../yummain.py:147
++#: ../yummain.py:151
+ msgid "Resolving Dependencies"
+ msgstr "Resolviendo dependencias"
+
+-#: ../yummain.py:173
+-msgid " You could try using --skip-broken to work around the problem"
+-msgstr " Podría intentar utilizar el comando --skip-broken para sortear el problema"
+-
+-#: ../yummain.py:175
+-#: ../yummain.py:208
+-msgid " You could try running: rpm -Va --nofiles --nodigest"
+-msgstr "Podría intentar ejecutar: rpm- Va --nofiles --nodigest"
+-
+-#: ../yummain.py:188
+-msgid ""
+-"\n"
+-"Dependencies Resolved"
+-msgstr ""
+-"\n"
+-"Dependencias resueltas"
+-
+-#: ../yummain.py:265
++#: ../yummain.py:269
+ msgid ""
+ "\n"
+ "\n"
+@@ -1842,139 +1992,129 @@ msgstr "doTsSetup() desaparecerá en alguna versión posterior de Yum.\n"
+ msgid "Setting up TransactionSets before config class is up"
+ msgstr "Configurando TransactionSets antes de la activación de clase de configuración"
+
+-#: ../yum/depsolve.py:148
++#: ../yum/depsolve.py:151
+ #, python-format
+ msgid "Invalid tsflag in config file: %s"
+ msgstr "tsflag no válido en el archivo de configuración: %s"
+
+-#: ../yum/depsolve.py:159
++#: ../yum/depsolve.py:162
+ #, python-format
+ msgid "Searching pkgSack for dep: %s"
+ msgstr "Buscando pkgSack para la dependencia: %s"
+
+-#: ../yum/depsolve.py:175
+-#, python-format
+-msgid "Potential match for %s from %s"
+-msgstr "Posible correspondencia para %s desde %s"
+-
+-#: ../yum/depsolve.py:183
+-#, python-format
+-msgid "Matched %s to require for %s"
+-msgstr "Se ha encontrado %s para poder solicitar %s"
+-
+-#: ../yum/depsolve.py:225
++#: ../yum/depsolve.py:205
+ #, python-format
+ msgid "Member: %s"
+ msgstr "Miembro: %s"
+
+-#: ../yum/depsolve.py:239
++#: ../yum/depsolve.py:219
+ #: ../yum/depsolve.py:754
+ #, python-format
+ msgid "%s converted to install"
+ msgstr "%s convertido para instalar"
+
+-#: ../yum/depsolve.py:246
++#: ../yum/depsolve.py:226
+ #, python-format
+ msgid "Adding Package %s in mode %s"
+ msgstr "Agregando paquete %s en modo %s"
+
+-#: ../yum/depsolve.py:256
++#: ../yum/depsolve.py:242
+ #, python-format
+ msgid "Removing Package %s"
+ msgstr "Eliminando paquete %s"
+
+-#: ../yum/depsolve.py:278
++#: ../yum/depsolve.py:264
+ #, python-format
+ msgid "%s requires: %s"
+ msgstr "%s necesita: %s"
+
+-#: ../yum/depsolve.py:319
++#: ../yum/depsolve.py:305
+ #, python-format
+ msgid "%s requires %s"
+ msgstr "%s necesita %s"
+
+-#: ../yum/depsolve.py:346
++#: ../yum/depsolve.py:332
+ msgid "Needed Require has already been looked up, cheating"
+ msgstr "El requerimiento que se necesita ya fue buscado, haciendo trampa"
+
+-#: ../yum/depsolve.py:356
++#: ../yum/depsolve.py:342
+ #, python-format
+ msgid "Needed Require is not a package name. Looking up: %s"
+ msgstr "El requerimiento necesitado no es un nombre de paquete. Buscando: %s"
+
+-#: ../yum/depsolve.py:363
++#: ../yum/depsolve.py:349
+ #, python-format
+ msgid "Potential Provider: %s"
+ msgstr "Proveedor posible: %s"
+
+-#: ../yum/depsolve.py:386
++#: ../yum/depsolve.py:372
+ #, python-format
+ msgid "Mode is %s for provider of %s: %s"
+ msgstr "El modo es %s para el proveedor de %s: %s"
+
+-#: ../yum/depsolve.py:390
++#: ../yum/depsolve.py:376
+ #, python-format
+ msgid "Mode for pkg providing %s: %s"
+ msgstr "Modo para el paquete que ofrece %s: %s"
+
+-#: ../yum/depsolve.py:394
++#: ../yum/depsolve.py:380
+ #, python-format
+ msgid "TSINFO: %s package requiring %s marked as erase"
+ msgstr "TSINFO: el paquete %s que necesita %s ha sido marcado para eliminarse"
+
+-#: ../yum/depsolve.py:407
++#: ../yum/depsolve.py:393
+ #, python-format
+ msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+ msgstr "TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la dependencia."
+
+-#: ../yum/depsolve.py:410
++#: ../yum/depsolve.py:396
+ #, python-format
+ msgid "TSINFO: Updating %s to resolve dep."
+ msgstr "TSINFO: Actualizando %s para resolver la dependencia."
+
+-#: ../yum/depsolve.py:418
++#: ../yum/depsolve.py:404
+ #, python-format
+ msgid "Cannot find an update path for dep for: %s"
+ msgstr "No es posible encontrar un camino de actualización para la dependencia para: %s"
+
+-#: ../yum/depsolve.py:449
++#: ../yum/depsolve.py:435
+ #, python-format
+ msgid "Quick matched %s to require for %s"
+ msgstr "Rápidamente se ha localizado %s al ser requerido por %s"
+
+ #. is it already installed?
+-#: ../yum/depsolve.py:491
++#: ../yum/depsolve.py:477
+ #, python-format
+ msgid "%s is in providing packages but it is already installed, removing."
+ msgstr "%s se encuentra entre los paquetes provistos, pero ya está instalado, eliminando. "
+
+-#: ../yum/depsolve.py:507
++#: ../yum/depsolve.py:493
+ #, python-format
+ msgid "Potential resolving package %s has newer instance in ts."
+ msgstr "El paquete de solución posible %s posee una nueva instancia en ts."
+
+-#: ../yum/depsolve.py:518
++#: ../yum/depsolve.py:504
+ #, python-format
+ msgid "Potential resolving package %s has newer instance installed."
+ msgstr "El paquete de solución posible %s posee una nueva instancia ya instalada."
+
+-#: ../yum/depsolve.py:536
++#: ../yum/depsolve.py:522
+ #, python-format
+ msgid "%s already in ts, skipping this one"
+ msgstr "%s ya se encuentra en ts, ignorándolo"
+
+-#: ../yum/depsolve.py:578
++#: ../yum/depsolve.py:571
+ #, python-format
+ msgid "TSINFO: Marking %s as update for %s"
+ msgstr "TSINFO: Seleccionado %s como actualización de %s"
+
+-#: ../yum/depsolve.py:586
++#: ../yum/depsolve.py:580
+ #, python-format
+ msgid "TSINFO: Marking %s as install for %s"
+ msgstr "TSINFO: Seleccionando %s como una instalación para %s"
+
+ #: ../yum/depsolve.py:690
+-#: ../yum/depsolve.py:781
++#: ../yum/depsolve.py:780
+ msgid "Success - empty transaction"
+ msgstr "Exito - transacción vacía"
+
+@@ -1992,37 +2132,37 @@ msgstr "Finalizando el proceso de dependencias"
+ msgid "%s from %s has depsolving problems"
+ msgstr "%s desde %s tiene problemas de resolución de dependencias"
+
+-#: ../yum/depsolve.py:782
++#: ../yum/depsolve.py:781
+ msgid "Success - deps resolved"
+ msgstr "Exito - dependencias resueltas"
+
+-#: ../yum/depsolve.py:796
++#: ../yum/depsolve.py:802
+ #, python-format
+ msgid "Checking deps for %s"
+ msgstr "Verificando dependencias para %s"
+
+-#: ../yum/depsolve.py:874
++#: ../yum/depsolve.py:888
+ #, python-format
+ msgid "looking for %s as a requirement of %s"
+ msgstr "localizando a %s como un requerimiento de %s"
+
+-#: ../yum/depsolve.py:1090
++#: ../yum/depsolve.py:1119
+ #, python-format
+ msgid "Running compare_providers() for %s"
+ msgstr "Ejecutando compare_providers() para %s"
+
+-#: ../yum/depsolve.py:1117
+-#: ../yum/depsolve.py:1123
++#: ../yum/depsolve.py:1146
++#: ../yum/depsolve.py:1152
+ #, python-format
+ msgid "better arch in po %s"
+ msgstr "mejor arquitectura en po %s"
+
+-#: ../yum/depsolve.py:1218
++#: ../yum/depsolve.py:1244
+ #, python-format
+ msgid "%s obsoletes %s"
+ msgstr "%s hace obsoleto a %s"
+
+-#: ../yum/depsolve.py:1230
++#: ../yum/depsolve.py:1256
+ #, python-format
+ msgid ""
+ "archdist compared %s to %s on %s\n"
+@@ -2031,137 +2171,162 @@ msgstr ""
+ "archdist comparó %s con %s en %s\n"
+ " Vencedor: %s"
+
+-#: ../yum/depsolve.py:1237
++#: ../yum/depsolve.py:1264
+ #, python-format
+ msgid "common sourcerpm %s and %s"
+ msgstr "sourcerpm común %s y %s"
+
+-#: ../yum/depsolve.py:1241
++#: ../yum/depsolve.py:1268
+ #, python-format
+ msgid "base package %s is installed for %s"
+ msgstr "el paquete principal %s está instalado para %s"
+
+-#: ../yum/depsolve.py:1247
++#: ../yum/depsolve.py:1274
+ #, python-format
+ msgid "common prefix of %s between %s and %s"
+ msgstr "prefijo común de %s entre %s y %s"
+
+-#: ../yum/depsolve.py:1256
++#: ../yum/depsolve.py:1305
++#, python-format
++msgid "requires minimal: %d"
++msgstr "requires el mínimo: %d"
++
++#: ../yum/depsolve.py:1309
++#, python-format
++msgid " Winner: %s"
++msgstr " Ganador: %s"
++
++#: ../yum/depsolve.py:1314
++#, python-format
++msgid " Loser(with %d): %s"
++msgstr " Perdedor(con %d): %s"
++
++#: ../yum/depsolve.py:1330
+ #, python-format
+ msgid "Best Order: %s"
+ msgstr "Mejor orden: %s"
+
+-#: ../yum/__init__.py:192
++#: ../yum/__init__.py:214
+ msgid "doConfigSetup() will go away in a future version of Yum.\n"
+ msgstr "doConfigSetup() desaparecerá en alguna versión posterior de Yum.\n"
+
+-#: ../yum/__init__.py:424
++#: ../yum/__init__.py:453
++#, python-format
++msgid "Repository %r: Error parsing config: %s"
++msgstr "Repositorio %r: Error analizando la configuración: %s"
++
++#: ../yum/__init__.py:459
+ #, python-format
+ msgid "Repository %r is missing name in configuration, using id"
+ msgstr "Al repositorio %r le falta un nombre en su configuración, utilizando el id"
+
+-#: ../yum/__init__.py:462
++#: ../yum/__init__.py:497
+ msgid "plugins already initialised"
+ msgstr "los complementos ya se encuentran inicializados"
+
+-#: ../yum/__init__.py:469
++#: ../yum/__init__.py:504
+ msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+ msgstr "doRpmDBSetup() desaparecerá en alguna versión posterior de Yum.\n"
+
+-#: ../yum/__init__.py:480
++#: ../yum/__init__.py:515
+ msgid "Reading Local RPMDB"
+ msgstr "Leyendo RPDMDB local"
+
+-#: ../yum/__init__.py:504
++#: ../yum/__init__.py:538
+ msgid "doRepoSetup() will go away in a future version of Yum.\n"
+ msgstr "doRepoSetup() desaparecerá en alguna versión posterior de Yum.\n"
+
+-#: ../yum/__init__.py:524
++#: ../yum/__init__.py:577
+ msgid "doSackSetup() will go away in a future version of Yum.\n"
+ msgstr "doSackSetup() desaparecerá en alguna versión posterior de Yum.\n"
+
+-#: ../yum/__init__.py:554
++#: ../yum/__init__.py:607
+ msgid "Setting up Package Sacks"
+ msgstr "Configurando sacos de paquetes"
+
+-#: ../yum/__init__.py:599
++#: ../yum/__init__.py:652
+ #, python-format
+ msgid "repo object for repo %s lacks a _resetSack method\n"
+ msgstr "el objeto del repositorio para el repositorio %s necesita de un método a _resetSack\n"
+
+-#: ../yum/__init__.py:600
++#: ../yum/__init__.py:653
+ msgid "therefore this repo cannot be reset.\n"
+ msgstr "por lo tanto, este repositorio no puede ser restaurado.\n"
+
+-#: ../yum/__init__.py:605
++#: ../yum/__init__.py:658
+ msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+ msgstr "doUpdateSetup() desaparecerá en alguna versión posterior de Yum.\n"
+
+-#: ../yum/__init__.py:617
++#: ../yum/__init__.py:670
+ msgid "Building updates object"
+ msgstr "Construyendo objeto de actualizaciones"
+
+-#: ../yum/__init__.py:652
++#: ../yum/__init__.py:709
+ msgid "doGroupSetup() will go away in a future version of Yum.\n"
+ msgstr "doGroupSetup() desaparecerá en alguna versión posterior de Yum.\n"
+
+-#: ../yum/__init__.py:677
++#: ../yum/__init__.py:734
+ msgid "Getting group metadata"
+ msgstr "Obteniendo metadatos de grupo"
+
+-#: ../yum/__init__.py:703
++#: ../yum/__init__.py:760
+ #, python-format
+ msgid "Adding group file from repository: %s"
+ msgstr "Agregando archivo de grupos desde el repositorio: %s"
+
+-#: ../yum/__init__.py:712
++#: ../yum/__init__.py:769
+ #, python-format
+ msgid "Failed to add groups file for repository: %s - %s"
+ msgstr "Falló al agregarse el archivo de grupos desde el repositorio: %s - %s"
+
+-#: ../yum/__init__.py:718
++#: ../yum/__init__.py:775
+ msgid "No Groups Available in any repository"
+ msgstr "No hay grupos disponibles en ningún repositorio"
+
+-#: ../yum/__init__.py:730
++#: ../yum/__init__.py:787
+ msgid "Getting pkgtags metadata"
+ msgstr "Obteniendo metadatos de etiquetas de paquete (pkgtags)"
+
+-#: ../yum/__init__.py:740
++#: ../yum/__init__.py:797
+ #, python-format
+ msgid "Adding tags from repository: %s"
+ msgstr "Agregando etiquetas del repositorio: %s"
+
+-#: ../yum/__init__.py:749
++#: ../yum/__init__.py:806
+ #, python-format
+ msgid "Failed to add Pkg Tags for repository: %s - %s"
+ msgstr "Falló al agregarse etiquetas de paquetes para el repositorio: %s - %s"
+
+-#: ../yum/__init__.py:827
++#: ../yum/__init__.py:884
+ msgid "Importing additional filelist information"
+ msgstr "Importando información adicional de listas de archivo"
+
+-#: ../yum/__init__.py:841
++#: ../yum/__init__.py:898
+ #, python-format
+ msgid "The program %s%s%s is found in the yum-utils package."
+ msgstr "El programa %s%s%s se encuentra en el paquete yum-utils."
+
+-#: ../yum/__init__.py:849
++#: ../yum/__init__.py:906
+ msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them."
+ msgstr "Existen transacciones restantes no finalizadas. Podría considerar primero ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas."
+
++#: ../yum/__init__.py:985
++#, python-format
++msgid "Trying to remove \"%s\", which is protected"
++msgstr "Intentando eliminar \"%s\", que está protegido"
++
+ #. Kind of hacky
+-#: ../yum/__init__.py:922
++#: ../yum/__init__.py:1044
+ #, python-format
+ msgid "Skip-broken round %i"
+ msgstr "Etapa %i ignorando dependencias rotas"
+
+-#: ../yum/__init__.py:975
++#: ../yum/__init__.py:1101
+ #, python-format
+ msgid "Skip-broken took %i rounds "
+ msgstr "El proceso de ignorar dependencias rotas llevó %i vueltas"
+
+-#: ../yum/__init__.py:976
++#: ../yum/__init__.py:1102
+ msgid ""
+ "\n"
+ "Packages skipped because of dependency problems:"
+@@ -2169,88 +2334,109 @@ msgstr ""
+ "\n"
+ "Paquetes ignorados por problemas de dependencias:"
+
+-#: ../yum/__init__.py:980
++#: ../yum/__init__.py:1106
+ #, python-format
+ msgid " %s from %s"
+ msgstr " %s de %s"
+
+-#: ../yum/__init__.py:1121
++#. FIXME: _N()
++#: ../yum/__init__.py:1251
++#, python-format
++msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:"
++msgstr "** Se ha encontrado %d problema(s) pre existentes en la base de datos RPM, este es el resultado de 'yum check':"
++
++#: ../yum/__init__.py:1255
+ msgid "Warning: RPMDB altered outside of yum."
+ msgstr "Advertencia: Las bases de datos (RPMDB) han sido modificadas por un elemento ajeno a yum."
+
+-#: ../yum/__init__.py:1126
++#: ../yum/__init__.py:1267
+ msgid "missing requires"
+ msgstr "no se encuentra necesita"
+
+-#: ../yum/__init__.py:1127
++#: ../yum/__init__.py:1268
+ msgid "installed conflict"
+ msgstr "conflicto instalado"
+
+-#: ../yum/__init__.py:1180
++#: ../yum/__init__.py:1366
+ msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
+ msgstr "Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la transacción."
+
+-#: ../yum/__init__.py:1198
++#: ../yum/__init__.py:1376
++msgid "Transaction couldn't start:"
++msgstr "La transacción no pudo iniciarse:"
++
++#. should this be 'to_unicoded'?
++#: ../yum/__init__.py:1379
++msgid "Could not run transaction."
++msgstr "No se pudo ejecutar la transacción"
++
++#: ../yum/__init__.py:1392
+ #, python-format
+ msgid "Failed to remove transaction file %s"
+ msgstr "Falló al eliminar archivo de transacción %s"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1227
++#: ../yum/__init__.py:1424
+ #, python-format
+ msgid "%s was supposed to be installed but is not!"
+ msgstr "¡se suponía que %s estuviera instalado, pero no lo está! "
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1266
++#: ../yum/__init__.py:1486
+ #, python-format
+ msgid "%s was supposed to be removed but is not!"
+ msgstr "¡se suponía que %s estuviera eliminado, pero no lo está! "
+
++#: ../yum/__init__.py:1597
++#, python-format
++msgid "Could not open lock %s: %s"
++msgstr "No se pudo abrir el bloqueo %s: %s"
++
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1386
++#: ../yum/__init__.py:1614
+ #, python-format
+ msgid "Unable to check if PID %s is active"
+ msgstr "No es posible verificar si se encuentra activo el PID %s"
+
+ #. Another copy seems to be running.
+-#: ../yum/__init__.py:1390
++#: ../yum/__init__.py:1618
+ #, python-format
+ msgid "Existing lock %s: another copy is running as pid %s."
+ msgstr "Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s."
+
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1425
++#: ../yum/__init__.py:1653
+ #, python-format
+ msgid "Could not create lock at %s: %s "
+ msgstr "No se ha podido crear el bloqueo en %s: %s"
+
+-#: ../yum/__init__.py:1470
+-msgid "Package does not match intended download. Suggestion: run yum clean metadata"
+-msgstr "El paquete no se corresponde con la descarga pretendida. Sugerimos ejecutar el siguiente comando: yum clean metadata"
++#: ../yum/__init__.py:1698
++#, python-format
++msgid "Package does not match intended download. Suggestion: run yum --enablerepo=%s clean metadata"
++msgstr "El paquete no se corresponde con la descarga pretendida. Sugerimos ejecutar el siguiente comando: yum --enablerepo=%s clean metadata"
+
+-#: ../yum/__init__.py:1486
++#: ../yum/__init__.py:1714
+ msgid "Could not perform checksum"
+ msgstr "No se pudo realizar una suma de verificación"
+
+-#: ../yum/__init__.py:1489
++#: ../yum/__init__.py:1717
+ msgid "Package does not match checksum"
+ msgstr "El paquete no se corresponde con la suma de verificación"
+
+-#: ../yum/__init__.py:1531
++#: ../yum/__init__.py:1769
+ #, python-format
+ msgid "package fails checksum but caching is enabled for %s"
+ msgstr "el paquete no ha superado la suma de verificación, pero el caché se encuentra habilitado para %s"
+
+-#: ../yum/__init__.py:1534
+-#: ../yum/__init__.py:1563
++#: ../yum/__init__.py:1772
++#: ../yum/__init__.py:1801
+ #, python-format
+ msgid "using local copy of %s"
+ msgstr "utilizando una copia local de %s"
+
+-#: ../yum/__init__.py:1575
++#: ../yum/__init__.py:1813
+ #, python-format
+ msgid ""
+ "Insufficient space in download directory %s\n"
+@@ -2261,378 +2447,419 @@ msgstr ""
+ " * libre %s\n"
+ " * necesario %s"
+
+-#: ../yum/__init__.py:1624
++#: ../yum/__init__.py:1862
+ msgid "Header is not complete."
+ msgstr "El encabezado no está completo."
+
+-#: ../yum/__init__.py:1661
++#: ../yum/__init__.py:1899
+ #, python-format
+ msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
+ msgstr "El encabezado no se encuentra en el caché local, y está habilitado el modo de solo cacheo. No es posible descargar %s"
+
+-#: ../yum/__init__.py:1716
++#: ../yum/__init__.py:1954
+ #, python-format
+ msgid "Public key for %s is not installed"
+ msgstr "No se ha instalado la llave pública de %s "
+
+-#: ../yum/__init__.py:1720
++#: ../yum/__init__.py:1958
+ #, python-format
+ msgid "Problem opening package %s"
+ msgstr "Problemas abriendo el paquete %s"
+
+-#: ../yum/__init__.py:1728
++#: ../yum/__init__.py:1966
+ #, python-format
+ msgid "Public key for %s is not trusted"
+ msgstr "La llave pública de %s no es confiable"
+
+-#: ../yum/__init__.py:1732
++#: ../yum/__init__.py:1970
+ #, python-format
+ msgid "Package %s is not signed"
+ msgstr "El paquete %s no está firmado"
+
+-#: ../yum/__init__.py:1770
++#: ../yum/__init__.py:2008
+ #, python-format
+ msgid "Cannot remove %s"
+ msgstr "No es posible eliminar %s"
+
+-#: ../yum/__init__.py:1774
++#: ../yum/__init__.py:2012
+ #, python-format
+ msgid "%s removed"
+ msgstr "%s eliminado"
+
+-#: ../yum/__init__.py:1820
++#: ../yum/__init__.py:2058
+ #, python-format
+ msgid "Cannot remove %s file %s"
+ msgstr "No es posible eliminar %s archivo %s"
+
+-#: ../yum/__init__.py:1824
++#: ../yum/__init__.py:2062
+ #, python-format
+ msgid "%s file %s removed"
+ msgstr "%s archivo %s eliminado"
+
+-#: ../yum/__init__.py:1826
++#: ../yum/__init__.py:2064
+ #, python-format
+ msgid "%d %s files removed"
+ msgstr "%d %s archivos eliminados"
+
+-#: ../yum/__init__.py:1895
++#: ../yum/__init__.py:2133
+ #, python-format
+ msgid "More than one identical match in sack for %s"
+ msgstr "Más de una correspondencia exacta en el saco para %s"
+
+-#: ../yum/__init__.py:1901
++#: ../yum/__init__.py:2139
+ #, python-format
+ msgid "Nothing matches %s.%s %s:%s-%s from update"
+ msgstr "Nada se corresponde con %s.%s %s:%s-%s desde la actualización"
+
+-#: ../yum/__init__.py:2180
++#: ../yum/__init__.py:2433
+ msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
+ msgstr "searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar utilice searchGenerator(). \n"
+
+-#: ../yum/__init__.py:2219
++#: ../yum/__init__.py:2472
+ #, python-format
+ msgid "Searching %d packages"
+ msgstr "Buscando %d paquetes"
+
+-#: ../yum/__init__.py:2223
++#: ../yum/__init__.py:2476
+ #, python-format
+ msgid "searching package %s"
+ msgstr "buscando paquete %s"
+
+-#: ../yum/__init__.py:2235
++#: ../yum/__init__.py:2488
+ msgid "searching in file entries"
+ msgstr "buscando en las entradas de archivo"
+
+-#: ../yum/__init__.py:2242
++#: ../yum/__init__.py:2495
+ msgid "searching in provides entries"
+ msgstr "buscando en las entradas \"provee\""
+
+-#: ../yum/__init__.py:2275
++#: ../yum/__init__.py:2528
+ #, python-format
+ msgid "Provides-match: %s"
+ msgstr "Lo que se ha indicado combina con: %s"
+
+-#: ../yum/__init__.py:2324
++#: ../yum/__init__.py:2577
+ msgid "No group data available for configured repositories"
+ msgstr "No existen datos de grupo disponibles en los repositorios configurados"
+
+-#: ../yum/__init__.py:2355
+-#: ../yum/__init__.py:2374
+-#: ../yum/__init__.py:2405
+-#: ../yum/__init__.py:2411
+-#: ../yum/__init__.py:2493
+-#: ../yum/__init__.py:2497
+-#: ../yum/__init__.py:2814
++#: ../yum/__init__.py:2608
++#: ../yum/__init__.py:2627
++#: ../yum/__init__.py:2658
++#: ../yum/__init__.py:2664
++#: ../yum/__init__.py:2746
++#: ../yum/__init__.py:2750
++#: ../yum/__init__.py:3095
+ #, python-format
+ msgid "No Group named %s exists"
+ msgstr "No existe un grupo denominado %s"
+
+-#: ../yum/__init__.py:2386
+-#: ../yum/__init__.py:2513
++#: ../yum/__init__.py:2639
++#: ../yum/__init__.py:2766
+ #, python-format
+ msgid "package %s was not marked in group %s"
+ msgstr "el paquete %s no fue marcado en el grupo %s"
+
+-#: ../yum/__init__.py:2433
++#: ../yum/__init__.py:2686
+ #, python-format
+ msgid "Adding package %s from group %s"
+ msgstr "Agregando paquete %s del grupo %s"
+
+-#: ../yum/__init__.py:2437
++#: ../yum/__init__.py:2690
+ #, python-format
+ msgid "No package named %s available to be installed"
+ msgstr "No existe un paquete denominado %s disponible para ser instalado"
+
+-#: ../yum/__init__.py:2539
++#. This can happen due to excludes after .up has
++#. happened.
++#: ../yum/__init__.py:2794
+ #, python-format
+ msgid "Package tuple %s could not be found in packagesack"
+ msgstr "La tupla %s de paquetes no pudo ser encontrada en el saco de paquetes"
+
+-#: ../yum/__init__.py:2558
++#: ../yum/__init__.py:2813
+ #, python-format
+ msgid "Package tuple %s could not be found in rpmdb"
+ msgstr "La tupla %s de paquetes no pudo ser encontrada en la base de datos"
+
+-#: ../yum/__init__.py:2614
+-#: ../yum/__init__.py:2664
+-msgid "Invalid version flag"
+-msgstr "Marca de versión no válida"
+-
+-#: ../yum/__init__.py:2634
+-#: ../yum/__init__.py:2639
++#: ../yum/__init__.py:2868
++#: ../yum/__init__.py:2873
+ #, python-format
+ msgid "No Package found for %s"
+ msgstr "No se ha encontrado ningún paquete para %s"
+
+-#: ../yum/__init__.py:2855
++#: ../yum/__init__.py:2901
++msgid "Invalid version flag"
++msgstr "Marca de versión no válida"
++
++#: ../yum/__init__.py:3145
+ msgid "Package Object was not a package object instance"
+ msgstr "El objeto de paquete no era una instancia de objeto de paquete"
+
+-#: ../yum/__init__.py:2859
++#: ../yum/__init__.py:3149
+ msgid "Nothing specified to install"
+ msgstr "No se ha indicado nada para instalar"
+
+-#: ../yum/__init__.py:2875
+-#: ../yum/__init__.py:3652
++#: ../yum/__init__.py:3168
++#: ../yum/__init__.py:3992
+ #, python-format
+ msgid "Checking for virtual provide or file-provide for %s"
+ msgstr "Verificando la provision virtual o provision de archivo de %s"
+
+-#: ../yum/__init__.py:2881
+-#: ../yum/__init__.py:3197
+-#: ../yum/__init__.py:3365
+-#: ../yum/__init__.py:3658
++#: ../yum/__init__.py:3174
++#: ../yum/__init__.py:3504
++#: ../yum/__init__.py:3684
++#: ../yum/__init__.py:3998
+ #, python-format
+ msgid "No Match for argument: %s"
+ msgstr "No hay nada concordante con el argumento: %s"
+
+-#: ../yum/__init__.py:2957
++#: ../yum/__init__.py:3250
+ #, python-format
+ msgid "Package %s installed and not available"
+ msgstr "El paquete %s está instalado y no se encuentra disponible"
+
+-#: ../yum/__init__.py:2960
++#: ../yum/__init__.py:3253
+ msgid "No package(s) available to install"
+ msgstr "No existe(n) paquete(s) disponible(s) para instalar"
+
+-#: ../yum/__init__.py:2972
++#: ../yum/__init__.py:3265
+ #, python-format
+ msgid "Package: %s - already in transaction set"
+ msgstr "Paquete: %s - ya se encuentra en un conjunto de transacción"
+
+-#: ../yum/__init__.py:2998
++#: ../yum/__init__.py:3291
+ #, python-format
+ msgid "Package %s is obsoleted by %s which is already installed"
+ msgstr "El paquete %s se hace obsoleto con %s, que ya se encuentra instalado"
+
+-#: ../yum/__init__.py:3001
++#: ../yum/__init__.py:3296
++#, python-format
++msgid "Package %s is obsoleted by %s, but obsoleting package does not provide for requirements"
++msgstr "El paquete %s se hace obsoleto con %s, pero el paquete que lo hace obsoleto no ofrece requerimientos"
++
++#: ../yum/__init__.py:3299
+ #, python-format
+ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+ msgstr "El paquete %s se hace obsoleto con %s, en su lugar se está intentando instalar %s"
+
+-#: ../yum/__init__.py:3009
++#: ../yum/__init__.py:3307
+ #, python-format
+ msgid "Package %s already installed and latest version"
+ msgstr "El paquete %s ya se encuentra instalado con su versión más reciente"
+
+-#: ../yum/__init__.py:3023
++#: ../yum/__init__.py:3321
+ #, python-format
+ msgid "Package matching %s already installed. Checking for update."
+ msgstr "El paquete concordante con %s ya se encuentra instalado. Verificando si puede actualizarse."
+
+ #. update everything (the easy case)
+-#: ../yum/__init__.py:3126
++#: ../yum/__init__.py:3424
+ msgid "Updating Everything"
+ msgstr "Actualizando todo"
+
+-#: ../yum/__init__.py:3147
+-#: ../yum/__init__.py:3262
+-#: ../yum/__init__.py:3289
+-#: ../yum/__init__.py:3315
++#: ../yum/__init__.py:3448
++#: ../yum/__init__.py:3577
++#: ../yum/__init__.py:3604
++#: ../yum/__init__.py:3630
+ #, python-format
+ msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+ msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3182
+-#: ../yum/__init__.py:3362
++#: ../yum/__init__.py:3489
++#: ../yum/__init__.py:3680
+ #, python-format
+ msgid "%s"
+ msgstr "%s"
+
+-#: ../yum/__init__.py:3253
++#: ../yum/__init__.py:3566
+ #, python-format
+ msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+ msgstr "El paquete ya es obsoleto: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3284
++#: ../yum/__init__.py:3599
+ #, python-format
+ msgid "Not Updating Package that is obsoleted: %s"
+ msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s"
+
+-#: ../yum/__init__.py:3293
+-#: ../yum/__init__.py:3319
++#: ../yum/__init__.py:3608
++#: ../yum/__init__.py:3634
+ #, python-format
+ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+ msgstr "Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3378
++#: ../yum/__init__.py:3697
+ msgid "No package matched to remove"
+ msgstr "No hay paquete correspondiente para ser eliminado"
+
+-#: ../yum/__init__.py:3412
++#: ../yum/__init__.py:3703
++#, python-format
++msgid "Skipping the running kernel: %s"
++msgstr "Salteando el kernel en ejecución: %s"
++
++#: ../yum/__init__.py:3709
++#, python-format
++msgid "Removing %s from the transaction"
++msgstr "Eliminando %s de la transacción"
++
++#: ../yum/__init__.py:3744
+ #, python-format
+ msgid "Cannot open: %s. Skipping."
+ msgstr "No es posible abrir: %s. Ignorando."
+
+-#: ../yum/__init__.py:3415
+-#: ../yum/__init__.py:3514
+-#: ../yum/__init__.py:3598
++#: ../yum/__init__.py:3747
++#: ../yum/__init__.py:3859
++#: ../yum/__init__.py:3935
+ #, python-format
+ msgid "Examining %s: %s"
+ msgstr "Examinando %s: %s"
+
+-#: ../yum/__init__.py:3423
+-#: ../yum/__init__.py:3517
+-#: ../yum/__init__.py:3601
++#: ../yum/__init__.py:3751
++#, python-format
++msgid "Cannot localinstall deltarpm: %s. Skipping."
++msgstr "No es posible realizar una instalación local de deltarpm: %s. Ignorando."
++
++#: ../yum/__init__.py:3760
++#: ../yum/__init__.py:3862
++#: ../yum/__init__.py:3938
+ #, python-format
+ msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+ msgstr "No es posible añadir el paquete %s a la transacción. La arquitectura no es compatible: %s"
+
+-#: ../yum/__init__.py:3431
++#: ../yum/__init__.py:3766
++#, python-format
++msgid "Cannot install package %s. It is obsoleted by installed package %s"
++msgstr "No es posible instalar el paquete %s. Se encuentra obsoleto debido al paquete instalado %s"
++
++#: ../yum/__init__.py:3774
+ #, python-format
+ msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
+ msgstr "El paquete %s no está instalado, no puede actualizarse. En su lugar, para instalarlo, ejecute el comando yum install."
+
+-#: ../yum/__init__.py:3460
+-#: ../yum/__init__.py:3522
+-#: ../yum/__init__.py:3606
++#: ../yum/__init__.py:3803
++#: ../yum/__init__.py:3867
++#: ../yum/__init__.py:3943
+ #, python-format
+ msgid "Excluding %s"
+ msgstr "Excluyendo %s"
+
+-#: ../yum/__init__.py:3465
++#: ../yum/__init__.py:3808
+ #, python-format
+ msgid "Marking %s to be installed"
+ msgstr "Marcando %s para ser instalado"
+
+-#: ../yum/__init__.py:3471
++#: ../yum/__init__.py:3814
+ #, python-format
+ msgid "Marking %s as an update to %s"
+ msgstr "Marcando %s como una actualización de %s"
+
+-#: ../yum/__init__.py:3478
++#: ../yum/__init__.py:3821
+ #, python-format
+ msgid "%s: does not update installed package."
+ msgstr "%s: no actualiza el paquete instalado."
+
+-#: ../yum/__init__.py:3511
+-#: ../yum/__init__.py:3595
++#: ../yum/__init__.py:3856
++#: ../yum/__init__.py:3932
+ #, python-format
+ msgid "Cannot open file: %s. Skipping."
+ msgstr "No es posible abrir el archivo: %s. Ignorando."
+
+-#: ../yum/__init__.py:3541
++#: ../yum/__init__.py:3886
+ msgid "Problem in reinstall: no package matched to remove"
+ msgstr "Problema al reinstalar: no existe ningún paquete concordante para eliminar"
+
+-#: ../yum/__init__.py:3554
+-#: ../yum/__init__.py:3686
+-#, python-format
+-msgid "Package %s is allowed multiple installs, skipping"
+-msgstr "El paquete %s permite múltiples instalaciones, ignorando"
+-
+-#: ../yum/__init__.py:3575
++#: ../yum/__init__.py:3912
+ #, python-format
+ msgid "Problem in reinstall: no package %s matched to install"
+ msgstr "Problema al reinstalar: no existe ningún paquete concordante con %s para instalar"
+
+-#: ../yum/__init__.py:3678
++#: ../yum/__init__.py:4018
+ msgid "No package(s) available to downgrade"
+ msgstr "No existe(n) paquete(s) disponible(s) para desactualizar"
+
+-#: ../yum/__init__.py:3731
++#: ../yum/__init__.py:4026
++#, python-format
++msgid "Package %s is allowed multiple installs, skipping"
++msgstr "El paquete %s permite múltiples instalaciones, ignorando"
++
++#: ../yum/__init__.py:4072
+ #, python-format
+ msgid "No Match for available package: %s"
+ msgstr "Ninguna correspondencia disponible para el paquete: %s"
+
+-#: ../yum/__init__.py:3738
++#: ../yum/__init__.py:4079
+ #, python-format
+ msgid "Only Upgrade available on package: %s"
+ msgstr "Solo existe la posibilidad de actualizar el paquete: %s"
+
+-#: ../yum/__init__.py:3808
+-#: ../yum/__init__.py:3845
++#: ../yum/__init__.py:4149
++#: ../yum/__init__.py:4186
+ #, python-format
+ msgid "Failed to downgrade: %s"
+ msgstr "Falló al desactualizar: %s"
+
+-#: ../yum/__init__.py:3877
++#: ../yum/__init__.py:4218
+ #, python-format
+ msgid "Retrieving GPG key from %s"
+ msgstr "Obteniendo llave GPG desde %s"
+
+-#: ../yum/__init__.py:3897
++#: ../yum/__init__.py:4238
+ msgid "GPG key retrieval failed: "
+ msgstr "La obtención de la llave GPG ha fallado:"
+
+-#: ../yum/__init__.py:3903
++#: ../yum/__init__.py:4244
+ #, python-format
+ msgid "Invalid GPG Key from %s: %s"
+ msgstr "Llave GPG no válida de %s: %s"
+
+-#: ../yum/__init__.py:3912
++#: ../yum/__init__.py:4253
+ #, python-format
+ msgid "GPG key parsing failed: key does not have value %s"
+ msgstr "El análisis de la llave GPG ha fallado: la llave no posee valor %s"
+
+-#: ../yum/__init__.py:3944
++#: ../yum/__init__.py:4267
+ #, python-format
+-msgid "GPG key at %s (0x%s) is already installed"
+-msgstr "La llave GPG de %s (0x%s) ya se encuentra instalada"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid : %s\n"
++" Package: %s (%s)\n"
++" From : %s"
++msgstr ""
++"Importando la llave GPG 0x%s:\n"
++" Id de usuario : %s\n"
++" Paquete: %s (%s)\n"
++" Desde : %s"
+
+-#. Try installing/updating GPG key
+-#: ../yum/__init__.py:3949
+-#: ../yum/__init__.py:4011
++#: ../yum/__init__.py:4275
+ #, python-format
+-msgid "Importing GPG key 0x%s \"%s\" from %s"
+-msgstr "Importando la llave GPG 0x%s \"%s\" desde %s"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid: \"%s\"\n"
++" From : %s"
++msgstr ""
++"Importando la llave GPG 0x%s:\n"
++" Id de usuario : \"%s\"\n"
++" Desde : %s"
+
+-#: ../yum/__init__.py:3966
++#: ../yum/__init__.py:4307
++#, python-format
++msgid "GPG key at %s (0x%s) is already installed"
++msgstr "La llave GPG de %s (0x%s) ya se encuentra instalada"
++
++#: ../yum/__init__.py:4326
+ msgid "Not installing key"
+ msgstr "No se está instalando la llave"
+
+-#: ../yum/__init__.py:3972
++#: ../yum/__init__.py:4332
+ #, python-format
+ msgid "Key import failed (code %d)"
+ msgstr "La importación de la llave falló (código %d)"
+
+-#: ../yum/__init__.py:3973
+-#: ../yum/__init__.py:4032
++#: ../yum/__init__.py:4333
++#: ../yum/__init__.py:4389
+ msgid "Key imported successfully"
+ msgstr "La llave ha sido importada exitosamente"
+
+-#: ../yum/__init__.py:3978
+-#: ../yum/__init__.py:4037
++#: ../yum/__init__.py:4338
+ #, python-format
+ msgid ""
+ "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
+@@ -2641,101 +2868,110 @@ msgstr ""
+ "Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero con este paquete no son correctas.\n"
+ "Verifique que las URLs de la llave para este repositorio estén correctamente configuradas."
+
+-#: ../yum/__init__.py:3987
++#: ../yum/__init__.py:4347
+ msgid "Import of key(s) didn't help, wrong key(s)?"
+ msgstr "La importación de la(s) llave(s) no funcionó, ¿llave(s) equivocada(s)?"
+
+-#: ../yum/__init__.py:4006
++#: ../yum/__init__.py:4366
+ #, python-format
+ msgid "GPG key at %s (0x%s) is already imported"
+ msgstr "La llave GPG de %s (0x%s) ya ha sido importada"
+
+-#: ../yum/__init__.py:4026
++#: ../yum/__init__.py:4383
+ #, python-format
+ msgid "Not installing key for repo %s"
+ msgstr "No se está instalando la llave para el repositorio %s"
+
+-#: ../yum/__init__.py:4031
++#: ../yum/__init__.py:4388
+ msgid "Key import failed"
+ msgstr "Falló la importación de la llave"
+
+-#: ../yum/__init__.py:4157
++#: ../yum/__init__.py:4394
++#, python-format
++msgid ""
++"The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n"
++"Check that the correct key URLs are configured for this repository."
++msgstr ""
++"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero no son correctas.\n"
++"Verifique que se encuentren correctamente configuradas las URLs de la llave para este repositorio."
++
++#: ../yum/__init__.py:4521
+ msgid "Unable to find a suitable mirror."
+ msgstr "No es posible encontrar un espejo que funcione."
+
+-#: ../yum/__init__.py:4159
++#: ../yum/__init__.py:4523
+ msgid "Errors were encountered while downloading packages."
+ msgstr "Fueron encontrados errores mientras los paquetes eran descargados."
+
+-#: ../yum/__init__.py:4209
++#: ../yum/__init__.py:4573
+ #, python-format
+ msgid "Please report this error at %s"
+ msgstr "Por favor, informe este error en %s"
+
+-#: ../yum/__init__.py:4233
++#: ../yum/__init__.py:4597
+ msgid "Test Transaction Errors: "
+ msgstr "Errores de la prueba de transacción:"
+
+-#: ../yum/__init__.py:4334
++#: ../yum/__init__.py:4700
+ #, python-format
+ msgid "Could not set cachedir: %s"
+ msgstr "No se ha podido definir un directorio de chaché: %s"
+
+ #. Mostly copied from YumOutput._outKeyValFill()
+-#: ../yum/plugins.py:202
++#: ../yum/plugins.py:208
+ msgid "Loaded plugins: "
+ msgstr "Complementos cargados:"
+
+-#: ../yum/plugins.py:216
+ #: ../yum/plugins.py:222
++#: ../yum/plugins.py:228
+ #, python-format
+ msgid "No plugin match for: %s"
+ msgstr "No hay un complemento que se corresponda con: %s"
+
+-#: ../yum/plugins.py:252
++#: ../yum/plugins.py:258
+ #, python-format
+ msgid "Not loading \"%s\" plugin, as it is disabled"
+ msgstr "El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado"
+
+ #. Give full backtrace:
+-#: ../yum/plugins.py:264
++#: ../yum/plugins.py:270
+ #, python-format
+ msgid "Plugin \"%s\" can't be imported"
+ msgstr "El complemento \"%s\" no puede ser importado"
+
+-#: ../yum/plugins.py:271
++#: ../yum/plugins.py:277
+ #, python-format
+ msgid "Plugin \"%s\" doesn't specify required API version"
+ msgstr "El complemento \"%s\" no especifica la versión de API requerida"
+
+-#: ../yum/plugins.py:276
++#: ../yum/plugins.py:282
+ #, python-format
+ msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+ msgstr "El complemento \"%s\" requiere el API %s. El API soportado es %s."
+
+-#: ../yum/plugins.py:309
++#: ../yum/plugins.py:315
+ #, python-format
+ msgid "Loading \"%s\" plugin"
+ msgstr "Cargando el complemento \"%s\""
+
+-#: ../yum/plugins.py:316
++#: ../yum/plugins.py:322
+ #, python-format
+ msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
+ msgstr "Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda de complementos "
+
+-#: ../yum/plugins.py:336
++#: ../yum/plugins.py:342
+ #, python-format
+ msgid "Configuration file %s not found"
+ msgstr "No se encuentra el archivo de configuración %s"
+
+ #. for
+ #. Configuration files for the plugin not found
+-#: ../yum/plugins.py:339
++#: ../yum/plugins.py:345
+ #, python-format
+ msgid "Unable to find configuration file for plugin %s"
+ msgstr "No es posible encontrar el archivo de configuración para el complemento %s"
+
+-#: ../yum/plugins.py:501
++#: ../yum/plugins.py:507
+ msgid "registration of commands not supported"
+ msgstr "registro de comando no soportado"
+
+@@ -2752,6 +2988,16 @@ msgstr "se ha instalado choca con"
+ msgid "%s is a duplicate with %s"
+ msgstr "%s es uin duplicado con %s"
+
++#: ../yum/rpmsack.py:122
++#, python-format
++msgid "%s is obsoleted by %s"
++msgstr "%s hace obsoleto a %s"
++
++#: ../yum/rpmsack.py:130
++#, python-format
++msgid "%s provides %s but it cannot be found"
++msgstr "%s ofrece %s, pero no puede ser encontrado"
++
+ #: ../yum/rpmtrans.py:79
+ msgid "Repackaging"
+ msgstr "Reempaquetando"
+@@ -2787,8 +3033,36 @@ msgstr "Encabezado %s dañado"
+ msgid "Error opening rpm %s - error %s"
+ msgstr "Error al abrir el rpm %s - error %s"
+
++#~ msgid "Repo : %s"
++#~ msgstr "Repositorio : %s"
++
++#~ msgid "URL : %s"
++#~ msgstr "URL : %s"
++
++#~ msgid "Description: "
++#~ msgstr "Descripción:"
++
++#~ msgid ""
++#~ "Remove %5.5s Package(s)\n"
++#~ "Reinstall %5.5s Package(s)\n"
++#~ "Downgrade %5.5s Package(s)\n"
++#~ msgstr ""
++#~ "Eliminar %5.5s Paquete(s)\n"
++#~ "Reinstalar %5.5s Paquete(s)\n"
++#~ "Desactualizar %5.5s Paquete(s)\n"
++
++#~ msgid "Weird"
++#~ msgstr "Extraño"
++
++#~ msgid "Potential match for %s from %s"
++#~ msgstr "Posible correspondencia para %s desde %s"
++
++#~ msgid "Matched %s to require for %s"
++#~ msgstr "Se ha encontrado %s para poder solicitar %s"
++
+ #~ msgid "Finished Transaction Test"
+ #~ msgstr "Prueba de transacción finalizada"
++
+ #~ msgid ""
+ #~ " You could try running: package-cleanup --problems\n"
+ #~ " package-cleanup --dupes\n"
+@@ -2797,16 +3071,18 @@ msgstr "Error al abrir el rpm %s - error %s"
+ #~ " Podría intentar ejecutar: package-cleanup --problems\n"
+ #~ " package-cleanup --dupes\n"
+ #~ " rpm -Va --nofiles --nodigest"
++
+ #~ msgid "Unresolvable requirement %s for %s"
+ #~ msgstr "Requerimiento %s irresoluble para %s"
++
+ #~ msgid "Missing Dependency: %s is needed by package %s"
+ #~ msgstr ""
+ #~ "No se encuentra una dependencia: es necesario %s para poder instalar el "
+ #~ "paquete %s"
++
+ #~ msgid ""
+ #~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
+ #~ "().\n"
+ #~ msgstr ""
+ #~ "getInstalledPackageObject() desaparecerá en alguna versión próxima de "
+ #~ "Yum, utilice en su lugar self.rpmdb.searchPkgTuple().\n"
+-
+diff --git a/po/fr.po b/po/fr.po
+index 7fecb6d..aaf18d8 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -3,7 +3,7 @@
+ # This file is distributed under the same license as the PACKAGE package.
+ #
+ # Johan Cwiklinski <johan at x-tnd.be>, 2008.
+-# Thomas Canniot <mrtom at fedoraproject.org>, 2008, 2009.
++# Thomas Canniot <mrtom at fedoraproject.org>, 2008, 2009, 2010.
+ # Michaël Ughetto <telimektar1er at gmail.com>, 2008.
+ # Thomas Canniot <thomas.canniot at mrtomlinux.org>, 2009.
+ # Pablo Martin-Gomez <pablo.martin-gomez at laposte.net>, 2010.
+@@ -11,45 +11,46 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: yum.master\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-10-15 15:45+0200\n"
+-"PO-Revision-Date: 2010-01-19 20:03+0100\n"
+-"Last-Translator: Pablo Martin-Gomez <pablo.martin-gomez at laposte.net>\n"
+-"Language-Team: Français <fedora-trans-fr at redhat.com>\n"
++"POT-Creation-Date: 2010-08-17 10:15-0400\n"
++"PO-Revision-Date: 2010-09-05 11:02+0200\n"
++"Last-Translator: Thomas Canniot <mrtom at fedoraproject.org>\n"
++"Language-Team: French <trans-fr at lists.fedoraproject.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: Lokalize 0.3\n"
++"X-Generator: Lokalize 1.1\n"
+ "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+-#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
++#: ../callback.py:48 ../output.py:1027 ../yum/rpmtrans.py:72
+ msgid "Updating"
+ msgstr "Mise à jour"
+
+-#: ../callback.py:49 ../yum/rpmtrans.py:72
++#: ../callback.py:49 ../yum/rpmtrans.py:73
+ msgid "Erasing"
+ msgstr "Suppression"
+
+-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
+-#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1026
++#: ../output.py:1919 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
++#: ../yum/rpmtrans.py:77
+ msgid "Installing"
+ msgstr "Installation"
+
+-#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
++#: ../callback.py:52 ../callback.py:58 ../output.py:1640 ../yum/rpmtrans.py:76
+ msgid "Obsoleted"
+ msgstr "Obsolète"
+
+-#: ../callback.py:54 ../output.py:1063 ../output.py:1403
++#: ../callback.py:54 ../output.py:1157 ../output.py:1518 ../output.py:1647
+ msgid "Updated"
+-msgstr "Mis à jour"
++msgstr "Mis à jour "
+
+-#: ../callback.py:55 ../output.py:1399
++#: ../callback.py:55 ../output.py:1517
+ msgid "Erased"
+-msgstr "Supprimé"
++msgstr "Supprimé(s) "
+
+-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+-#: ../output.py:1395
++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1155
++#: ../output.py:1517 ../output.py:1519 ../output.py:1891
+ msgid "Installed"
+-msgstr "Installé"
++msgstr "Installés"
+
+ #: ../callback.py:130
+ msgid "No header - huh?"
+@@ -69,68 +70,73 @@ msgstr "Erreur : statut de sortie invalide : %s pour %s"
+ msgid "Erased: %s"
+ msgstr "Supprimé : %s"
+
+-#: ../callback.py:217 ../output.py:941
++#: ../callback.py:217 ../output.py:1028 ../output.py:1894
+ msgid "Removing"
+ msgstr "Suppression"
+
+-#: ../callback.py:219 ../yum/rpmtrans.py:77
++#: ../callback.py:219 ../yum/rpmtrans.py:78
+ msgid "Cleanup"
+ msgstr "Nettoyage"
+
+-#: ../cli.py:106
++#: ../cli.py:108
+ #, python-format
+ msgid "Command \"%s\" already defined"
+ msgstr "Commande « %s » déjà définie"
+
+-#: ../cli.py:118
++#: ../cli.py:120
+ msgid "Setting up repositories"
+ msgstr "Configuration des dépôts"
+
+-#: ../cli.py:129
++#: ../cli.py:131
+ msgid "Reading repository metadata in from local files"
+ msgstr "Lecture des méta données du dépôt depuis les fichiers locaux"
+
+-#: ../cli.py:192 ../utils.py:107
++#: ../cli.py:234 ../utils.py:254
+ #, python-format
+ msgid "Config Error: %s"
+ msgstr "Erreur de configuration : %s"
+
+-#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
++#: ../cli.py:237 ../cli.py:1403 ../utils.py:257
+ #, python-format
+ msgid "Options Error: %s"
+ msgstr "Erreur d'options : %s"
+
+-#: ../cli.py:223
++#: ../cli.py:267
+ #, python-format
+ msgid " Installed: %s-%s at %s"
+-msgstr " Installé : %s-%s à %s"
++msgstr " Installés : %s-%s à %s"
+
+-#: ../cli.py:225
++#: ../cli.py:269
+ #, python-format
+ msgid " Built : %s at %s"
+ msgstr " Compilé : %s à %s"
+
+-#: ../cli.py:227
++#: ../cli.py:271
+ #, python-format
+ msgid " Committed: %s at %s"
+ msgstr " Commité : %s à %s"
+
+-#: ../cli.py:266
++#: ../cli.py:310
+ msgid "You need to give some command"
+ msgstr "Vous devez spécifier des commandes"
+
+-#: ../cli.py:309
++#: ../cli.py:324
++#, python-format
++msgid "No such command: %s. Please use %s --help"
++msgstr "Aucune commande telle que : %s. Veuillez utiliser %s --help"
++
++#: ../cli.py:354
+ msgid "Disk Requirements:\n"
+ msgstr "Besoins en espace disque :\n"
+
+-#: ../cli.py:311
++#: ../cli.py:356
+ #, python-format
+-msgid " At least %dMB needed on the %s filesystem.\n"
+-msgstr "Au moins %dMB requis sur le système de fichiers %s.\n"
++msgid " At least %dMB more space needed on the %s filesystem.\n"
++msgstr " Au moins %dMio requis sur le système de fichiers %s.\n"
+
+ #. TODO: simplify the dependency errors?
+ #. Fixup the summary
+-#: ../cli.py:316
++#: ../cli.py:361
+ msgid ""
+ "Error Summary\n"
+ "-------------\n"
+@@ -138,66 +144,62 @@ msgstr ""
+ "Résumé des erreurs\n"
+ "-------------\n"
+
+-#: ../cli.py:359
++#: ../cli.py:404
+ msgid "Trying to run the transaction but nothing to do. Exiting."
+ msgstr ""
+ "Tentative d'exécution de la transaction mais aucune tâche à effectuer. "
+ "Sortie."
+
+-#: ../cli.py:395
++#: ../cli.py:451
+ msgid "Exiting on user Command"
+ msgstr "Arrêt à la demande de l'utilisateur"
+
+-#: ../cli.py:399
++#: ../cli.py:455
+ msgid "Downloading Packages:"
+ msgstr "Téléchargement des paquets :"
+
+-#: ../cli.py:404
++#: ../cli.py:460
+ msgid "Error Downloading Packages:\n"
+ msgstr "Erreur durant le téléchargement des paquets :\n"
+
+-#: ../cli.py:418 ../yum/__init__.py:4014
++#: ../cli.py:474 ../yum/__init__.py:4559
+ msgid "Running rpm_check_debug"
+ msgstr "Lancement de rpm_check_debug"
+
+-#: ../cli.py:427 ../yum/__init__.py:4023
++#: ../cli.py:483 ../yum/__init__.py:4568
+ msgid "ERROR You need to update rpm to handle:"
+ msgstr "ERREUR Vous devez mettre à jour rpm pour manipuler :"
+
+-#: ../cli.py:429 ../yum/__init__.py:4026
++#: ../cli.py:485 ../yum/__init__.py:4571
+ msgid "ERROR with rpm_check_debug vs depsolve:"
+ msgstr "ERREUR de résolution de dépendance par rpm_check_debug :"
+
+-#: ../cli.py:435
++#: ../cli.py:491
+ msgid "RPM needs to be updated"
+ msgstr "RPM doit être mis à jour"
+
+-#: ../cli.py:436
++#: ../cli.py:492
+ #, python-format
+ msgid "Please report this error in %s"
+ msgstr "Veuillez reporter cette erreur dans %s"
+
+-#: ../cli.py:442
++#: ../cli.py:498
+ msgid "Running Transaction Test"
+ msgstr "Lancement de la transaction de test"
+
+-#: ../cli.py:458
+-msgid "Finished Transaction Test"
+-msgstr "Transaction de test terminée"
+-
+-#: ../cli.py:460
++#: ../cli.py:514
+ msgid "Transaction Check Error:\n"
+ msgstr "Erreur du contrôle de transaction :\n"
+
+-#: ../cli.py:467
++#: ../cli.py:521
+ msgid "Transaction Test Succeeded"
+ msgstr "Transaction de test réussie"
+
+-#: ../cli.py:489
++#: ../cli.py:543
+ msgid "Running Transaction"
+ msgstr "Lancement de la transaction"
+
+-#: ../cli.py:519
++#: ../cli.py:573
+ msgid ""
+ "Refusing to automatically import keys when running unattended.\n"
+ "Use \"-y\" to override."
+@@ -206,79 +208,93 @@ msgstr ""
+ "inattendue.\n"
+ "Utilisez l'option « -y » pour passer outre."
+
+-#: ../cli.py:538 ../cli.py:572
++#: ../cli.py:592 ../cli.py:626
+ msgid " * Maybe you meant: "
+ msgstr " * Vouliez-vous dire : "
+
+-#: ../cli.py:555 ../cli.py:563
++#: ../cli.py:609 ../cli.py:617
+ #, python-format
+ msgid "Package(s) %s%s%s available, but not installed."
+ msgstr "Paquet(s) %s%s%s disponible(s), mais non installé(s)."
+
+-#: ../cli.py:569 ../cli.py:600 ../cli.py:678
++#: ../cli.py:623 ../cli.py:656 ../cli.py:810
+ #, python-format
+ msgid "No package %s%s%s available."
+ msgstr "Aucun paquet %s%s%s disponible."
+
+-#: ../cli.py:605 ../cli.py:738
++#: ../cli.py:663 ../cli.py:875
+ msgid "Package(s) to install"
+ msgstr "Paquet(s) à installer"
+
+-#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+-#: ../yumcommands.py:159
++#: ../cli.py:666 ../cli.py:667 ../cli.py:816 ../cli.py:850 ../cli.py:876
++#: ../yumcommands.py:179
+ msgid "Nothing to do"
+ msgstr "Rien à faire"
+
+-#: ../cli.py:639
++#: ../cli.py:701
+ #, python-format
+ msgid "%d packages marked for Update"
+ msgstr "%d paquets marqués pour mise à jour"
+
+-#: ../cli.py:642
++#: ../cli.py:704
+ msgid "No Packages marked for Update"
+ msgstr "Aucun paquet marqué pour mise à jour"
+
+-#: ../cli.py:656
++#: ../cli.py:770
++#, python-format
++msgid "%d packages marked for Distribution Synchronization"
++msgstr "%d paquets marqués pour la synchronisation de la distribution"
++
++#: ../cli.py:773
++msgid "No Packages marked for Distribution Synchronization"
++msgstr "Aucun paquet marqué pour la synchronisation de la distribution"
++
++#: ../cli.py:787
+ #, python-format
+ msgid "%d packages marked for removal"
+ msgstr "%d paquets marqués pour suppression"
+
+-#: ../cli.py:659
++#: ../cli.py:790
+ msgid "No Packages marked for removal"
+ msgstr "Aucun paquet marqué pour suppression"
+
+-#: ../cli.py:683
++#: ../cli.py:815
+ msgid "Package(s) to downgrade"
+ msgstr "Paquet(s) à rétrograder"
+
+-#: ../cli.py:707
++#: ../cli.py:840
+ #, python-format
+ msgid " (from %s)"
+ msgstr "(depuis %s)"
+
+-#: ../cli.py:709
++#: ../cli.py:841
+ #, python-format
+ msgid "Installed package %s%s%s%s not available."
+-msgstr "Paquet installé %s%s%s%s indisponible."
++msgstr "Paquets installés %s%s%s%s indisponibles."
+
+-#: ../cli.py:716
++#: ../cli.py:849
+ msgid "Package(s) to reinstall"
+ msgstr "Paquet(s) à ré-installer"
+
+-#: ../cli.py:729
++#: ../cli.py:862
+ msgid "No Packages Provided"
+ msgstr "Pas de paquet fourni"
+
+-#: ../cli.py:813
++#: ../cli.py:945
++#, python-format
++msgid "Matched: %s"
++msgstr "Marqué : %s"
++
++#: ../cli.py:952
+ #, python-format
+ msgid "Warning: No matches found for: %s"
+ msgstr "Attention : Aucune correspondance trouvée pour : %s"
+
+-#: ../cli.py:816
++#: ../cli.py:955
+ msgid "No Matches found"
+ msgstr "Aucune correspondance trouvée"
+
+-#: ../cli.py:855
++#: ../cli.py:995
+ #, python-format
+ msgid ""
+ "Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+@@ -289,108 +305,116 @@ msgstr ""
+ "Vous pouvez utiliser « %s*/%s%s » et/ou « %s*bin/%s%s » pour obtenir ce "
+ "comportement"
+
+-#: ../cli.py:871
++#: ../cli.py:1011
+ #, python-format
+ msgid "No Package Found for %s"
+ msgstr "Aucun paquet trouvé pour %s"
+
+-#: ../cli.py:883
++#: ../cli.py:1021
++msgid "Cleaning repos: "
++msgstr "Nettoyage des dépôts : "
++
++#: ../cli.py:1026
+ msgid "Cleaning up Everything"
+ msgstr "Nettoyage complet"
+
+-#: ../cli.py:897
++#: ../cli.py:1042
+ msgid "Cleaning up Headers"
+ msgstr "Nettoyage des en-têtes"
+
+-#: ../cli.py:900
++#: ../cli.py:1045
+ msgid "Cleaning up Packages"
+ msgstr "Nettoyage des paquets"
+
+-#: ../cli.py:903
++#: ../cli.py:1048
+ msgid "Cleaning up xml metadata"
+ msgstr "Nettoyage des méta données xml"
+
+-#: ../cli.py:906
++#: ../cli.py:1051
+ msgid "Cleaning up database cache"
+ msgstr "Nettoyage du cache de la base de données"
+
+-#: ../cli.py:909
++#: ../cli.py:1054
+ msgid "Cleaning up expire-cache metadata"
+ msgstr "Nettoyage des méta données expirées dans le cache"
+
+-#: ../cli.py:912
++#: ../cli.py:1057
++msgid "Cleaning up cached rpmdb data"
++msgstr "Nettoyage des données du cache de RPMDB"
++
++#: ../cli.py:1060
+ msgid "Cleaning up plugins"
+ msgstr "Nettoyage des modules complémentaires"
+
+-#: ../cli.py:937
++#: ../cli.py:1085
+ msgid "Installed Groups:"
+ msgstr "Groupes installés :"
+
+-#: ../cli.py:949
++#: ../cli.py:1097
+ msgid "Available Groups:"
+ msgstr "Groupes disponibles :"
+
+-#: ../cli.py:959
++#: ../cli.py:1107
+ msgid "Done"
+ msgstr "Effectué"
+
+-#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
++#: ../cli.py:1118 ../cli.py:1136 ../cli.py:1142 ../yum/__init__.py:3069
+ #, python-format
+ msgid "Warning: Group %s does not exist."
+ msgstr "Attention : le groupe %s n'existe pas."
+
+-#: ../cli.py:998
++#: ../cli.py:1146
+ msgid "No packages in any requested group available to install or update"
+ msgstr ""
+ "Aucun paquet disponible pour installation ou mise à jour dans les groupes "
+ "demandés"
+
+-#: ../cli.py:1000
++#: ../cli.py:1148
+ #, python-format
+ msgid "%d Package(s) to Install"
+ msgstr "%d paquet(s) à installer"
+
+-#: ../cli.py:1010 ../yum/__init__.py:2641
++#: ../cli.py:1158 ../yum/__init__.py:3081
+ #, python-format
+ msgid "No group named %s exists"
+ msgstr "Aucun groupe nommé %s n'existe"
+
+-#: ../cli.py:1016
++#: ../cli.py:1164
+ msgid "No packages to remove from groups"
+ msgstr "Aucun paquet du groupe à supprimer"
+
+-#: ../cli.py:1018
++#: ../cli.py:1166
+ #, python-format
+ msgid "%d Package(s) to remove"
+ msgstr "%d paquet(s) à supprimer"
+
+-#: ../cli.py:1060
++#: ../cli.py:1208
+ #, python-format
+ msgid "Package %s is already installed, skipping"
+ msgstr "Le paquet %s est déjà installé, omission"
+
+-#: ../cli.py:1071
++#: ../cli.py:1219
+ #, python-format
+ msgid "Discarding non-comparable pkg %s.%s"
+ msgstr "Rejet du paquet non comparable %s.%s"
+
+ #. we've not got any installed that match n or n+a
+-#: ../cli.py:1097
++#: ../cli.py:1245
+ #, python-format
+ msgid "No other %s installed, adding to list for potential install"
+ msgstr ""
+ "Pas d'autre %s installé, ajout à la liste pour installation potentielle"
+
+-#: ../cli.py:1117
++#: ../cli.py:1265
+ msgid "Plugin Options"
+ msgstr "Options du plugin"
+
+-#: ../cli.py:1125
++#: ../cli.py:1273
+ #, python-format
+ msgid "Command line error: %s"
+ msgstr "Erreur sur la ligne de commande : %s"
+
+-#: ../cli.py:1138
++#: ../cli.py:1287
+ #, python-format
+ msgid ""
+ "\n"
+@@ -401,108 +425,122 @@ msgstr ""
+ "\n"
+ "%s : l'option %s requiert un argument"
+
+-#: ../cli.py:1191
++#: ../cli.py:1340
+ msgid "--color takes one of: auto, always, never"
+ msgstr "--color accepte les paramètres : auto, always, never"
+
+-#: ../cli.py:1298
++#: ../cli.py:1450
+ msgid "show this help message and exit"
+ msgstr "affiche ce message d'aide et quitte"
+
+-#: ../cli.py:1302
++#: ../cli.py:1454
+ msgid "be tolerant of errors"
+ msgstr "tolérer les erreurs"
+
+-#: ../cli.py:1304
+-msgid "run entirely from cache, don't update cache"
++#: ../cli.py:1457
++msgid "run entirely from system cache, don't update cache"
+ msgstr "exécuter entièrement depuis le cache, ne pas le mettre à jour"
+
+-#: ../cli.py:1306
++#: ../cli.py:1460
+ msgid "config file location"
+ msgstr "emplacement du fichier de configuration"
+
+-#: ../cli.py:1308
++#: ../cli.py:1463
+ msgid "maximum command wait time"
+ msgstr "temps d'attente maximum de la commande"
+
+-#: ../cli.py:1310
++#: ../cli.py:1465
+ msgid "debugging output level"
+ msgstr "niveau de déboguage pour la sortie"
+
+-#: ../cli.py:1314
++#: ../cli.py:1469
+ msgid "show duplicates, in repos, in list/search commands"
+ msgstr "afficher les doublons, dans les dépôts, pour les commandes list/search"
+
+-#: ../cli.py:1316
++#: ../cli.py:1471
+ msgid "error output level"
+ msgstr "niveau d'erreur pour la sortie"
+
+-#: ../cli.py:1319
++#: ../cli.py:1474
++msgid "debugging output level for rpm"
++msgstr "niveau de déboguage pour rpm"
++
++#: ../cli.py:1477
+ msgid "quiet operation"
+ msgstr "opération silencieuse"
+
+-#: ../cli.py:1321
++#: ../cli.py:1479
+ msgid "verbose operation"
+ msgstr "opération verbeuse"
+
+-#: ../cli.py:1323
++#: ../cli.py:1481
+ msgid "answer yes for all questions"
+ msgstr "répondre oui à toutes les questions"
+
+-#: ../cli.py:1325
++#: ../cli.py:1483
+ msgid "show Yum version and exit"
+ msgstr "affiche la version de Yum et quitte"
+
+-#: ../cli.py:1326
++#: ../cli.py:1484
+ msgid "set install root"
+ msgstr "définit la racine d'installation"
+
+-#: ../cli.py:1330
++#: ../cli.py:1488
+ msgid "enable one or more repositories (wildcards allowed)"
+ msgstr "active un ou plusieurs dépôts (jokers autorisés)"
+
+-#: ../cli.py:1334
++#: ../cli.py:1492
+ msgid "disable one or more repositories (wildcards allowed)"
+ msgstr "désactive un ou plusieurs dépôts (jokers autorisés)"
+
+-#: ../cli.py:1337
++#: ../cli.py:1495
+ msgid "exclude package(s) by name or glob"
+ msgstr "exclut des paquets par nom ou caractère générique"
+
+-#: ../cli.py:1339
++#: ../cli.py:1497
+ msgid "disable exclude from main, for a repo or for everything"
+ msgstr ""
+ "désactive l'exclusion pour le dépôt principal, pour un dépôt particulier ou "
+ "pour tout"
+
+-#: ../cli.py:1342
++#: ../cli.py:1500
+ msgid "enable obsoletes processing during updates"
+ msgstr "active le traitement des paquets obsolètes pendant les mises à jour"
+
+-#: ../cli.py:1344
++#: ../cli.py:1502
+ msgid "disable Yum plugins"
+ msgstr "désactive les modules complémentaires Yum"
+
+-#: ../cli.py:1346
++#: ../cli.py:1504
+ msgid "disable gpg signature checking"
+ msgstr "désactive la vérification de clé gpg"
+
+-#: ../cli.py:1348
++#: ../cli.py:1506
+ msgid "disable plugins by name"
+ msgstr "désactive les modules complémentaires par nom"
+
+-#: ../cli.py:1351
++#: ../cli.py:1509
+ msgid "enable plugins by name"
+ msgstr "active les modules complémentaires par nom"
+
+-#: ../cli.py:1354
++#: ../cli.py:1512
+ msgid "skip packages with depsolving problems"
+ msgstr "omettre les paquets qui ont des problèmes de dépendances"
+
+-#: ../cli.py:1356
++#: ../cli.py:1514
+ msgid "control whether color is used"
+ msgstr "contrôle l'utilisation de la couleur"
+
++#: ../cli.py:1516
++msgid "set value of $releasever in yum config and repo files"
++msgstr ""
++"configuration de la valeur de $releasever dans le fichier de configuration "
++"de yum et dans les fichiers des dépôts."
++
++#: ../cli.py:1518
++msgid "set arbitrary config and repo options"
++msgstr "réinitialise la configuration ainsi que les options des dépôts"
++
+ #: ../output.py:305
+ msgid "Jan"
+ msgstr "Jan"
+@@ -555,105 +593,114 @@ msgstr "Déc"
+ msgid "Trying other mirror."
+ msgstr "Essai d'un autre miroir."
+
+-#: ../output.py:538
++#: ../output.py:579
+ #, python-format
+-msgid "Name : %s%s%s"
+-msgstr "Nom : %s%s%s"
++msgid "Name : %s%s%s"
++msgstr "Nom : %s%s%s"
+
+-#: ../output.py:539
++#: ../output.py:580
+ #, python-format
+-msgid "Arch : %s"
+-msgstr "Architecture : %s"
++msgid "Arch : %s"
++msgstr "Architecture : %s"
+
+-#: ../output.py:541
++#: ../output.py:582
+ #, python-format
+-msgid "Epoch : %s"
+-msgstr "Date : %s"
++msgid "Epoch : %s"
++msgstr "Date : %s"
+
+-#: ../output.py:542
++#: ../output.py:583
+ #, python-format
+-msgid "Version : %s"
+-msgstr "Version : %s"
++msgid "Version : %s"
++msgstr "Version : %s"
+
+-#: ../output.py:543
++#: ../output.py:584
+ #, python-format
+-msgid "Release : %s"
+-msgstr "Révision : %s"
++msgid "Release : %s"
++msgstr "Révision : %s"
+
+-#: ../output.py:544
++#: ../output.py:585
+ #, python-format
+-msgid "Size : %s"
+-msgstr "Taille : %s"
++msgid "Size : %s"
++msgstr "Taille : %s"
+
+-#: ../output.py:545
++#: ../output.py:586 ../output.py:890
+ #, python-format
+-msgid "Repo : %s"
++msgid "Repo : %s"
+ msgstr "Dépôt : %s"
+
+-#: ../output.py:547
++#: ../output.py:588
+ #, python-format
+-msgid "From repo : %s"
+-msgstr "Depuis le dépôt : %s"
++msgid "From repo : %s"
++msgstr "Depuis le dépôt : %s"
+
+-#: ../output.py:549
++#: ../output.py:590
+ #, python-format
+-msgid "Committer : %s"
+-msgstr "Auteur : %s"
++msgid "Committer : %s"
++msgstr "Auteur : %s"
+
+-#: ../output.py:550
++#: ../output.py:591
+ #, python-format
+-msgid "Committime : %s"
+-msgstr "Date de validation : %s"
++msgid "Committime : %s"
++msgstr "Date de validation : %s"
+
+-#: ../output.py:551
++#: ../output.py:592
+ #, python-format
+-msgid "Buildtime : %s"
+-msgstr "Date de compilation : %s"
++msgid "Buildtime : %s"
++msgstr "Date de compilation : %s"
+
+-#: ../output.py:553
++#: ../output.py:594
+ #, python-format
+-msgid "Installtime: %s"
++msgid "Install time: %s"
+ msgstr "Date d'installation : %s"
+
+-#: ../output.py:554
+-msgid "Summary : "
+-msgstr "Résumé : "
++#: ../output.py:602
++#, python-format
++msgid "Installed by: %s"
++msgstr "Installés par : %s"
+
+-#: ../output.py:556
++#: ../output.py:609
+ #, python-format
+-msgid "URL : %s"
+-msgstr "URL : %s"
++msgid "Changed by : %s"
++msgstr "Modifié par : %s"
+
+-#: ../output.py:557
++#: ../output.py:610
++msgid "Summary : "
++msgstr "Résumé : "
++
++#: ../output.py:612 ../output.py:903
+ #, python-format
+-msgid "License : %s"
+-msgstr "Licence : %s"
++msgid "URL : %s"
++msgstr "URL : %s"
+
+-#: ../output.py:558
+-msgid "Description: "
+-msgstr "Description :"
++#: ../output.py:613
++msgid "License : "
++msgstr "Licence : "
++
++#: ../output.py:614 ../output.py:900
++msgid "Description : "
++msgstr "Description : "
+
+-#: ../output.py:626
++#: ../output.py:682
+ msgid "y"
+ msgstr "o"
+
+-#: ../output.py:626
++#: ../output.py:682
+ msgid "yes"
+ msgstr "oui"
+
+-#: ../output.py:627
++#: ../output.py:683
+ msgid "n"
+ msgstr "n"
+
+-#: ../output.py:627
++#: ../output.py:683
+ msgid "no"
+ msgstr "non"
+
+-#: ../output.py:631
++#: ../output.py:687
+ msgid "Is this ok [y/N]: "
+ msgstr "Est-ce correct [o/N] : "
+
+-#: ../output.py:722
++#: ../output.py:775
+ #, python-format
+ msgid ""
+ "\n"
+@@ -662,152 +709,144 @@ msgstr ""
+ "\n"
+ "Groupe : %s"
+
+-#: ../output.py:726
++#: ../output.py:779
+ #, python-format
+ msgid " Group-Id: %s"
+ msgstr "Id du g : %s"
+
+-#: ../output.py:731
++#: ../output.py:784
+ #, python-format
+ msgid " Description: %s"
+ msgstr " Description : %s"
+
+-#: ../output.py:733
++#: ../output.py:786
+ msgid " Mandatory Packages:"
+ msgstr " Paquets mandataires :"
+
+-#: ../output.py:734
++#: ../output.py:787
+ msgid " Default Packages:"
+ msgstr " Paquets par défaut :"
+
+-#: ../output.py:735
++#: ../output.py:788
+ msgid " Optional Packages:"
+ msgstr " Paquets optionnels :"
+
+-#: ../output.py:736
++#: ../output.py:789
+ msgid " Conditional Packages:"
+ msgstr " Paquets conditionnels :"
+
+-#: ../output.py:756
++#: ../output.py:809
+ #, python-format
+ msgid "package: %s"
+ msgstr "paquet : %s"
+
+-#: ../output.py:758
++#: ../output.py:811
+ msgid " No dependencies for this package"
+ msgstr " Pas de dépendances pour ce paquet"
+
+-#: ../output.py:763
++#: ../output.py:816
+ #, python-format
+ msgid " dependency: %s"
+ msgstr " dépendance : %s"
+
+-#: ../output.py:765
++#: ../output.py:818
+ msgid " Unsatisfied dependency"
+ msgstr " Dépendance non satisfaite"
+
+-#: ../output.py:837
+-#, python-format
+-msgid "Repo : %s"
+-msgstr "Dépôt : %s"
+-
+-#: ../output.py:838
++#: ../output.py:891
+ msgid "Matched from:"
+ msgstr "Correspondance depuis :"
+
+-#: ../output.py:847
+-msgid "Description : "
+-msgstr "Description : "
+-
+-#: ../output.py:850
+-#, python-format
+-msgid "URL : %s"
+-msgstr "URL : %s"
+-
+-#: ../output.py:853
++#: ../output.py:906
+ #, python-format
+ msgid "License : %s"
+ msgstr "Licence : %s"
+
+-#: ../output.py:856
++#: ../output.py:909
+ #, python-format
+ msgid "Filename : %s"
+ msgstr "Nom de fichier : %s"
+
+-#: ../output.py:860
++#: ../output.py:913
+ msgid "Other : "
+ msgstr "Autre :"
+
+-#: ../output.py:893
++#: ../output.py:956
+ msgid "There was an error calculating total download size"
+ msgstr ""
+ "Une erreur est survenue pendant le calcul de la taille totale des "
+ "téléchargements"
+
+-#: ../output.py:898
++#: ../output.py:961
+ #, python-format
+ msgid "Total size: %s"
+ msgstr "Taille totale : %s"
+
+-#: ../output.py:901
++#: ../output.py:964
+ #, python-format
+ msgid "Total download size: %s"
+ msgstr "Taille totale des téléchargement : %s"
+
+-#: ../output.py:942
++#: ../output.py:968 ../output.py:988
++#, python-format
++msgid "Installed size: %s"
++msgstr "Taille d'installation : %s"
++
++#: ../output.py:984
++msgid "There was an error calculating installed size"
++msgstr ""
++"Une erreur est survenue pendant le calcul de la taille des données installées"
++
++#: ../output.py:1029
+ msgid "Reinstalling"
+ msgstr "Réinstallation"
+
+-#: ../output.py:943
++#: ../output.py:1030
+ msgid "Downgrading"
+ msgstr "Retour à la version précédente."
+
+-#: ../output.py:944
++#: ../output.py:1031
+ msgid "Installing for dependencies"
+ msgstr "Installation pour dépendance"
+
+-#: ../output.py:945
++#: ../output.py:1032
+ msgid "Updating for dependencies"
+ msgstr "Mise à jour pour dépendance"
+
+-#: ../output.py:946
++#: ../output.py:1033
+ msgid "Removing for dependencies"
+ msgstr "Suppression pour dépendance"
+
+-#: ../output.py:953 ../output.py:1065
++#: ../output.py:1040 ../output.py:1159
+ msgid "Skipped (dependency problems)"
+ msgstr "Omis (problèmes de dépendances)"
+
+-#: ../output.py:976
++#: ../output.py:1063
+ msgid "Package"
+ msgstr "Paquet"
+
+-#: ../output.py:976
++#: ../output.py:1063
+ msgid "Arch"
+ msgstr "Architecture"
+
+-#: ../output.py:977
++#: ../output.py:1064
+ msgid "Version"
+ msgstr "Version"
+
+-#: ../output.py:977
++#: ../output.py:1064
+ msgid "Repository"
+ msgstr "Dépôt"
+
+-#: ../output.py:978
++#: ../output.py:1065
+ msgid "Size"
+ msgstr "Taille"
+
+-#: ../output.py:990
++#: ../output.py:1077
+ #, python-format
+-msgid ""
+-" replacing %s%s%s.%s %s\n"
+-"\n"
+-msgstr ""
+-" remplace %s%s%s.%s %s\n"
+-"\n"
++msgid " replacing %s%s%s.%s %s\n"
++msgstr " remplacement de %s%s%s.%s %s\n"
+
+-#: ../output.py:999
++#: ../output.py:1086
+ #, python-format
+ msgid ""
+ "\n"
+@@ -818,52 +857,57 @@ msgstr ""
+ "Résumé de la transaction\n"
+ "%s\n"
+
+-#: ../output.py:1006
++#: ../output.py:1097
+ #, python-format
+-msgid ""
+-"Install %5.5s Package(s)\n"
+-"Upgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Installer %5.5s paquet(s)\n"
+-"Mettre à jour %5.5s paquet(s)\n"
++msgid "Install %5.5s Package(s)\n"
++msgstr "Installation de %5.5s paquet(s)\n"
+
+-#: ../output.py:1015
++#: ../output.py:1101
+ #, python-format
+-msgid ""
+-"Remove %5.5s Package(s)\n"
+-"Reinstall %5.5s Package(s)\n"
+-"Downgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Supprimer %5.5s paquet(s)\n"
+-"Réinstaller %5.5s paquet(s)\n"
+-"Déclasser %5.5s paquet(s)\n"
++msgid "Upgrade %5.5s Package(s)\n"
++msgstr "Mise à jour de %5.5s paquet(s)\n"
+
+-#: ../output.py:1059
++#: ../output.py:1105
++#, python-format
++msgid "Remove %5.5s Package(s)\n"
++msgstr "Suppression de %5.5s paquet(s)\n"
++
++#: ../output.py:1109
++#, python-format
++msgid "Reinstall %5.5s Package(s)\n"
++msgstr "Réinstallation de %5.5s paquet(s)\n"
++
++#: ../output.py:1113
++#, python-format
++msgid "Downgrade %5.5s Package(s)\n"
++msgstr "Rétrogradage de %5.5s paquet(s)\n"
++
++#: ../output.py:1153
+ msgid "Removed"
+ msgstr "Supprimé"
+
+-#: ../output.py:1060
++#: ../output.py:1154
+ msgid "Dependency Removed"
+ msgstr "Dépendance supprimée"
+
+-#: ../output.py:1062
++#: ../output.py:1156
+ msgid "Dependency Installed"
+-msgstr "Dépendance installée"
++msgstr "Dépendance(s) installée(s) "
+
+-#: ../output.py:1064
++#: ../output.py:1158
+ msgid "Dependency Updated"
+ msgstr "Dépendance mise à jour"
+
+-#: ../output.py:1066
++#: ../output.py:1160
+ msgid "Replaced"
+ msgstr "Remplacé"
+
+-#: ../output.py:1067
++#: ../output.py:1161
+ msgid "Failed"
+ msgstr "Échec"
+
+ #. Delta between C-c's so we treat as exit
+-#: ../output.py:1133
++#: ../output.py:1245
+ msgid "two"
+ msgstr "deux"
+
+@@ -871,7 +915,7 @@ msgstr "deux"
+ #. Current download cancelled, interrupt (ctrl-c) again within two seconds
+ #. to exit.
+ #. Where "interupt (ctrl-c) again" and "two" are highlighted.
+-#: ../output.py:1144
++#: ../output.py:1256
+ #, python-format
+ msgid ""
+ "\n"
+@@ -884,212 +928,446 @@ msgstr ""
+ "s%s%s secondes\n"
+ "pour quitter.\n"
+
+-#: ../output.py:1155
++#: ../output.py:1267
+ msgid "user interrupt"
+ msgstr "interruption par l'utilisateur"
+
+-#: ../output.py:1173
++#: ../output.py:1285
+ msgid "Total"
+ msgstr "Total"
+
+-#: ../output.py:1203
++#: ../output.py:1307
++msgid "I"
++msgstr "I"
++
++#: ../output.py:1308
++msgid "O"
++msgstr "O"
++
++#: ../output.py:1309
++msgid "E"
++msgstr "E"
++
++#: ../output.py:1310
++msgid "R"
++msgstr "R"
++
++#: ../output.py:1311
++msgid "D"
++msgstr "D"
++
++#: ../output.py:1312
++msgid "U"
++msgstr "U"
++
++#: ../output.py:1323
+ msgid "<unset>"
+ msgstr "<indéfini>"
+
+-#: ../output.py:1204
++#: ../output.py:1324
+ msgid "System"
+ msgstr "Système"
+
+-#: ../output.py:1240
++#: ../output.py:1368
+ msgid "Bad transaction IDs, or package(s), given"
+ msgstr "Le paquet ou l'identifiant de transaction fourni sont erronés"
+
+-#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+-msgid "Warning: RPMDB has been altered since the last yum transaction."
+-msgstr ""
+-"Avertissement : RPMDB a été modifiée depuis la dernière transaction de yum."
++#: ../output.py:1380
++msgid "ID"
++msgstr "Identifiant"
++
++#: ../output.py:1381 ../output.py:1699
++msgid "Login user"
++msgstr "Identifiant utilisateur"
++
++#: ../output.py:1382
++msgid "Date and time"
++msgstr "Date et heure"
+
+-#: ../output.py:1289
++#: ../output.py:1383 ../output.py:1701
++msgid "Action(s)"
++msgstr "Action(s)"
++
++#: ../output.py:1384 ../output.py:1702
++msgid "Altered"
++msgstr "Modifié"
++
++#: ../output.py:1431 ../output.py:1760
+ msgid "No transaction ID given"
+ msgstr "Aucun identifiant de transaction n'a été fourni"
+
+-#: ../output.py:1297
++#: ../output.py:1457
+ msgid "Bad transaction ID given"
+ msgstr "L'identifiant de transaction fourni est erroné"
+
+-#: ../output.py:1302
++#: ../output.py:1462
+ msgid "Not found given transaction ID"
+ msgstr "L'identifiant de transaction fourni est introuvable"
+
+-#: ../output.py:1310
++#: ../output.py:1470
+ msgid "Found more than one transaction ID!"
+ msgstr "Plus d'un identifiant de transaction a été trouvé !"
+
+-#: ../output.py:1331
++#: ../output.py:1491 ../output.py:1770
+ msgid "No transaction ID, or package, given"
+ msgstr "Le paquet ou l'identifiant de transaction fourni sont absents"
+
+-#: ../output.py:1357
++#: ../output.py:1518 ../output.py:1645
++msgid "Downgraded"
++msgstr "Rétrogradé"
++
++#: ../output.py:1519
++msgid "Not installed"
++msgstr "Non installé"
++
++#: ../output.py:1520
++msgid "Older"
++msgstr "Plus ancien"
++
++#: ../output.py:1520
++msgid "Newer"
++msgstr "Plus récent"
++
++#: ../output.py:1552
+ msgid "Transaction ID :"
+ msgstr "Identifiant de transaction :"
+
+-#: ../output.py:1359
++#: ../output.py:1554
+ msgid "Begin time :"
+ msgstr "Temps de début :"
+
+-#: ../output.py:1362 ../output.py:1364
++#: ../output.py:1557 ../output.py:1559
+ msgid "Begin rpmdb :"
+-msgstr "Début de rpmdb :"
++msgstr "Début de RPMDB :"
+
+-#: ../output.py:1378
++#: ../output.py:1573
+ #, python-format
+ msgid "(%s seconds)"
+ msgstr "(%s secondes)"
+
+-#: ../output.py:1379
++#: ../output.py:1574
+ msgid "End time :"
+ msgstr "Temps de fin :"
+
+-#: ../output.py:1382 ../output.py:1384
++#: ../output.py:1577 ../output.py:1579
+ msgid "End rpmdb :"
+-msgstr "Fin de rpmdb :"
++msgstr "Fin de RPMDB :"
+
+-#: ../output.py:1385
++#: ../output.py:1580
+ msgid "User :"
+ msgstr "Utilisateur :"
+
+-#: ../output.py:1387 ../output.py:1389 ../output.py:1391
++#: ../output.py:1582 ../output.py:1584 ../output.py:1586
+ msgid "Return-Code :"
+ msgstr "Code retour :"
+
+-#: ../output.py:1387
++#: ../output.py:1582
+ msgid "Aborted"
+ msgstr "Avorté"
+
+-#: ../output.py:1389
++#: ../output.py:1584
+ msgid "Failure:"
+ msgstr "Échec :"
+
+-#: ../output.py:1391
++#: ../output.py:1586
+ msgid "Success"
+ msgstr "Réussi"
+
+-#: ../output.py:1392
+-msgid "Transaction performed with:"
+-msgstr "Transaction effectuée avec :"
++#: ../output.py:1589
++msgid "Command Line :"
++msgstr "Ligne de commande :"
+
+-#: ../output.py:1405
+-msgid "Downgraded"
+-msgstr "Rétrogradé"
++#: ../output.py:1597
++#, python-format
++msgid "Additional non-default information stored: %d"
++msgstr "Informations supplémentaires stockées : %d"
+
+-#. multiple versions installed, both older and newer
+-#: ../output.py:1407
+-msgid "Weird"
+-msgstr "Bizarre"
++#: ../output.py:1600
++msgid "Transaction performed with:"
++msgstr "Transaction effectuée avec :"
+
+-#: ../output.py:1409
++#: ../output.py:1603
+ msgid "Packages Altered:"
+ msgstr "Paquets modifiés :"
+
+-#: ../output.py:1412
++#: ../output.py:1607
++msgid "Packages Skipped:"
++msgstr "Paquets ignorés :"
++
++#: ../output.py:1612
++msgid "Rpmdb Problems:"
++msgstr "Problèmes RPMDB :"
++
++#: ../output.py:1620
+ msgid "Scriptlet output:"
+ msgstr "Sortie du scriplet :"
+
+-#: ../output.py:1418
++#: ../output.py:1626
+ msgid "Errors:"
+ msgstr "Erreurs :"
+
+-#: ../output.py:1489
++#. Note that these don't use _simple_pkg() because we are showing what
++#. happened to them in the transaction ... not the difference between the
++#. version in the transaction and now.
++#: ../output.py:1637 ../output.py:1638
++msgid "Install"
++msgstr "Installation"
++
++#: ../output.py:1639
++msgid "Dep-Install"
++msgstr "Dep-Installées"
++
++#: ../output.py:1641
++msgid "Obsoleting"
++msgstr "Obsolète"
++
++#: ../output.py:1642
++msgid "Erase"
++msgstr "Supprimé"
++
++#: ../output.py:1643
++msgid "Reinstall"
++msgstr "Réinstallation"
++
++#: ../output.py:1644
++msgid "Downgrade"
++msgstr "Rétrogradé"
++
++#: ../output.py:1646
++msgid "Update"
++msgstr "Mise à jour"
++
++#: ../output.py:1700
++msgid "Time"
++msgstr "Heure"
++
++#: ../output.py:1726
+ msgid "Last day"
+ msgstr "Dernier jour"
+
+-#: ../output.py:1490
++#: ../output.py:1727
+ msgid "Last week"
+ msgstr "Dernière semaine"
+
+-#: ../output.py:1491
++#: ../output.py:1728
+ msgid "Last 2 weeks"
+ msgstr "Deux dernières semaines"
+
+ #. US default :p
+-#: ../output.py:1492
++#: ../output.py:1729
+ msgid "Last 3 months"
+ msgstr "Trois derniers mois"
+
+-#: ../output.py:1493
++#: ../output.py:1730
+ msgid "Last 6 months"
+ msgstr "Six derniers mois"
+
+-#: ../output.py:1494
++#: ../output.py:1731
+ msgid "Last year"
+ msgstr "L'année dernière"
+
+-#: ../output.py:1495
++#: ../output.py:1732
+ msgid "Over a year ago"
+ msgstr "Il y a plus d'un an"
+
+-#: ../output.py:1524
++#: ../output.py:1774
++#, python-format
++msgid "No Transaction %s found"
++msgstr "Aucune transaction %s n'a été trouvée"
++
++#: ../output.py:1780
++msgid "Transaction ID:"
++msgstr "Identifiant de transaction :"
++
++#: ../output.py:1781
++msgid "Available additional history information:"
++msgstr "Informations additionnelles disponibles dans l'historique :"
++
++#: ../output.py:1793
++#, python-format
++msgid "%s: No additional data found by this name"
++msgstr "%s : Aucune donnée supplémentaire trouvée grâce à ce nom"
++
++#: ../output.py:1809
+ msgid "installed"
+ msgstr "installé"
+
+-#: ../output.py:1525
++#: ../output.py:1810
+ msgid "updated"
+ msgstr "mis à jour"
+
+-#: ../output.py:1526
++#: ../output.py:1811
+ msgid "obsoleted"
+ msgstr "obsolète"
+
+-#: ../output.py:1527
++#: ../output.py:1812
+ msgid "erased"
+ msgstr "effacé"
+
+-#: ../output.py:1531
++#: ../output.py:1813
++msgid "reinstalled"
++msgstr "réinstallé"
++
++#: ../output.py:1814
++msgid "downgraded"
++msgstr "rétrogradé"
++
++#: ../output.py:1818
+ #, python-format
+ msgid "---> Package %s.%s %s:%s-%s set to be %s"
+ msgstr "---> Paquet %s.%s %s:%s-%s marqué pour être %s "
+
+-#: ../output.py:1538
++#: ../output.py:1825
+ msgid "--> Running transaction check"
+ msgstr "--> Lancement de la transaction de test"
+
+-#: ../output.py:1543
++#: ../output.py:1830
+ msgid "--> Restarting Dependency Resolution with new changes."
+ msgstr ""
+ "--> Redémarrage de la résolution des dépendances avec les nouveaux "
+ "changements."
+
+-#: ../output.py:1548
++#: ../output.py:1835
+ msgid "--> Finished Dependency Resolution"
+ msgstr "--> Résolution des dépendances terminée"
+
+-#: ../output.py:1553 ../output.py:1558
++#: ../output.py:1840 ../output.py:1845
+ #, python-format
+ msgid "--> Processing Dependency: %s for package: %s"
+ msgstr "--> Traitement de la dépendance : %s pour le paquet : %s"
+
+-#: ../output.py:1562
++#: ../output.py:1850
++#, python-format
++msgid "---> Keeping package: %s"
++msgstr "---> Conservation du paquet : %s"
++
++#: ../output.py:1853
+ #, python-format
+ msgid "--> Unresolved Dependency: %s"
+ msgstr "--> Dépendance non résolue : %s"
+
+-#: ../output.py:1568 ../output.py:1573
++#: ../output.py:1864
++#, python-format
++msgid "Package: %s"
++msgstr "Paquet : %s"
++
++#: ../output.py:1866
++#, python-format
++msgid ""
++"\n"
++" Requires: %s"
++msgstr ""
++"\n"
++" Requiert : %s"
++
++#: ../output.py:1875
++#, python-format
++msgid ""
++"\n"
++" %s: %s (%s)"
++msgstr ""
++"\n"
++" %s : %s (%s)"
++
++#: ../output.py:1880
++#, python-format
++msgid ""
++"\n"
++" %s"
++msgstr ""
++"\n"
++" %s"
++
++#: ../output.py:1882
++msgid ""
++"\n"
++" Not found"
++msgstr ""
++"\n"
++" Non trouvé"
++
++#. These should be the only three things we care about:
++#: ../output.py:1897
++msgid "Updated By"
++msgstr "Mis à jour par"
++
++#: ../output.py:1898
++msgid "Downgraded By"
++msgstr "Rétrogradé par"
++
++#: ../output.py:1899
++msgid "Obsoleted By"
++msgstr "Rendu obsolète par"
++
++#: ../output.py:1917
++msgid "Available"
++msgstr "Disponible"
++
++#: ../output.py:1944 ../output.py:1949
+ #, python-format
+ msgid "--> Processing Conflict: %s conflicts %s"
+ msgstr "--> Traitement du conflit : %s entre en conflit avec %s"
+
+-#: ../output.py:1577
++#: ../output.py:1953
+ msgid "--> Populating transaction set with selected packages. Please wait."
+ msgstr ""
+ "--> Peuplement du jeu de transaction avec les paquets sélectionnés. Merci de "
+ "patienter."
+
+-#: ../output.py:1581
++#: ../output.py:1957
+ #, python-format
+ msgid "---> Downloading header for %s to pack into transaction set."
+ msgstr "--> Téléchargement de l'en-tête de %s pour l'ajouter à la transaction."
+
+-#: ../utils.py:137 ../yummain.py:42
++#: ../utils.py:94
++msgid "Running"
++msgstr "Exécution"
++
++#: ../utils.py:95
++msgid "Sleeping"
++msgstr "Mise en attente"
++
++#: ../utils.py:96
++msgid "Uninterruptible"
++msgstr "Impossible d'interrompre"
++
++#: ../utils.py:97
++msgid "Zombie"
++msgstr "Zombie"
++
++#: ../utils.py:98
++msgid "Traced/Stopped"
++msgstr "Tracé/Stoppé"
++
++#: ../utils.py:99 ../yumcommands.py:972
++msgid "Unknown"
++msgstr "Inconnu"
++
++#: ../utils.py:110
++msgid " The other application is: PackageKit"
++msgstr " L'autre application est : PackageKit"
++
++#: ../utils.py:112
++#, python-format
++msgid " The other application is: %s"
++msgstr " L'autre application est : %s"
++
++#: ../utils.py:115
++#, python-format
++msgid " Memory : %5s RSS (%5sB VSZ)"
++msgstr " Mémoire : %5s RSS (%5sB VSZ)"
++
++#: ../utils.py:120
++#, python-format
++msgid " Started: %s - %s ago"
++msgstr " Débuté : il y a %s - %s"
++
++#: ../utils.py:122
++#, python-format
++msgid " State : %s, pid: %d"
++msgstr " État : %s, pid : %d"
++
++#: ../utils.py:143 ../yummain.py:42
+ msgid ""
+ "\n"
+ "\n"
+@@ -1099,7 +1377,7 @@ msgstr ""
+ "\n"
+ "Sortie sur annulation par l'utilisateur"
+
+-#: ../utils.py:143 ../yummain.py:48
++#: ../utils.py:149 ../yummain.py:48
+ msgid ""
+ "\n"
+ "\n"
+@@ -1109,7 +1387,7 @@ msgstr ""
+ "\n"
+ "Sortie suite à une redirection cassée"
+
+-#: ../utils.py:145 ../yummain.py:50
++#: ../utils.py:151 ../yummain.py:50
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1120,15 +1398,60 @@ msgstr ""
+ "\n"
+ "%s"
+
+-#: ../utils.py:184 ../yummain.py:273
++#: ../utils.py:201 ../yummain.py:107
++msgid ""
++"Another app is currently holding the yum lock; exiting as configured by "
++"exit_on_lock"
++msgstr ""
++"Une autre application verrouille actuellement l'utilisation de yum ; "
++"fermeture en cours conformément à la configuration de exit_on_lock"
++
++#: ../utils.py:260
++#, python-format
++msgid "PluginExit Error: %s"
++msgstr "Erreur de PluginExit : %s"
++
++#: ../utils.py:263
++#, python-format
++msgid "Yum Error: %s"
++msgstr "Erreur de yum : %s"
++
++#: ../utils.py:315 ../yummain.py:134 ../yummain.py:173
++#, python-format
++msgid "Error: %s"
++msgstr "Erreur : %s"
++
++#: ../utils.py:319 ../yummain.py:177
++msgid " You could try using --skip-broken to work around the problem"
++msgstr ""
++" Vous pouvez essayer d'utiliser --skip-broken pour contourner le problème"
++
++#: ../utils.py:321 ../yummain.py:179 ../yummain.py:212
++msgid " You could try running: rpm -Va --nofiles --nodigest"
++msgstr " Vous pouvez essayer d'exécuter : rpm -Va --nofiles --nodigest"
++
++#: ../utils.py:328 ../yummain.py:144 ../yummain.py:186
++#, python-format
++msgid "Unknown Error(s): Exit Code: %d:"
++msgstr "Erreur(s) inconnue(s) : Code de sortie : %d :"
++
++#: ../utils.py:334 ../yummain.py:192
++msgid ""
++"\n"
++"Dependencies Resolved"
++msgstr ""
++"\n"
++"Dépendances résolues"
++
++#: ../utils.py:349 ../yummain.py:215
+ msgid "Complete!"
+ msgstr "Terminé !"
+
+-#: ../yumcommands.py:42
++#: ../yumcommands.py:43
+ msgid "You need to be root to perform this command."
+ msgstr "Vous devez être super-utilisateur pour lancer cette commande."
+
+-#: ../yumcommands.py:49
++#: ../yumcommands.py:50
+ msgid ""
+ "\n"
+ "You have enabled checking of packages via GPG keys. This is a good thing. \n"
+@@ -1163,335 +1486,356 @@ msgstr ""
+ "Pour plus de renseignements, contactez le fournisseur de paquets de votre "
+ "distribution.\n"
+
+-#: ../yumcommands.py:69
++#: ../yumcommands.py:70
+ #, python-format
+ msgid "Error: Need to pass a list of pkgs to %s"
+ msgstr "Erreur : il faut passer une liste de paquets à %s"
+
+-#: ../yumcommands.py:75
++#: ../yumcommands.py:76
+ msgid "Error: Need an item to match"
+ msgstr "Erreur : un élément de correspondance est requis"
+
+-#: ../yumcommands.py:81
++#: ../yumcommands.py:82
+ msgid "Error: Need a group or list of groups"
+ msgstr "Erreur : un groupe ou une liste de groupes est requise"
+
+-#: ../yumcommands.py:90
++#: ../yumcommands.py:91
+ #, python-format
+ msgid "Error: clean requires an option: %s"
+ msgstr "Erreur : clean requiert une option : %s"
+
+-#: ../yumcommands.py:95
++#: ../yumcommands.py:96
+ #, python-format
+ msgid "Error: invalid clean argument: %r"
+ msgstr "Erreur : argument invalide pour clean : %r"
+
+-#: ../yumcommands.py:108
++#: ../yumcommands.py:109
+ msgid "No argument to shell"
+ msgstr "Pas d'options à passer au terminal"
+
+-#: ../yumcommands.py:110
++#: ../yumcommands.py:111
+ #, python-format
+ msgid "Filename passed to shell: %s"
+ msgstr "Nom de fichier passé au terminal : %s"
+
+-#: ../yumcommands.py:114
++#: ../yumcommands.py:115
+ #, python-format
+ msgid "File %s given as argument to shell does not exist."
+ msgstr "Le fichier %s passé en argument au shell n'existe pas."
+
+-#: ../yumcommands.py:120
++#: ../yumcommands.py:121
+ msgid "Error: more than one file given as argument to shell."
+ msgstr "Erreur : plus d'un fichier passé en argument au shell."
+
+-#: ../yumcommands.py:169
++#: ../yumcommands.py:138
++msgid ""
++"There are no enabled repos.\n"
++" Run \"yum repolist all\" to see the repos you have.\n"
++" You can enable repos with yum-config-manager --enable <repo>"
++msgstr ""
++"Aucun dépôt n'est activé.\n"
++" Exécutez \"yum repolist all\" pour consulter la liste des dépôts installés."
++"\n"
++" Vous pouvez activer des dépôts avec la commande yum-config-manager --enable "
++"<repo>"
++
++#: ../yumcommands.py:189
+ msgid "PACKAGE..."
+ msgstr "PAQUETAGE..."
+
+-#: ../yumcommands.py:172
++#: ../yumcommands.py:192
+ msgid "Install a package or packages on your system"
+ msgstr "Installe un ou plusieurs paquets sur votre système"
+
+-#: ../yumcommands.py:180
++#: ../yumcommands.py:201
+ msgid "Setting up Install Process"
+ msgstr "Configuration du processus d'installation"
+
+-#: ../yumcommands.py:191
++#: ../yumcommands.py:212 ../yumcommands.py:234
+ msgid "[PACKAGE...]"
+ msgstr "[PAQUETAGE...]"
+
+-#: ../yumcommands.py:194
++#: ../yumcommands.py:215
+ msgid "Update a package or packages on your system"
+ msgstr "Met à jour un ou plusieurs paquets sur votre système"
+
+-#: ../yumcommands.py:201
++#: ../yumcommands.py:223
+ msgid "Setting up Update Process"
+ msgstr "Configuration du processus de mise à jour"
+
+-#: ../yumcommands.py:246
++#: ../yumcommands.py:237
++msgid "Synchronize installed packages to the latest available versions"
++msgstr ""
++"Synchronisation des paquets installés vers leurs versions les plus précentes"
++
++#: ../yumcommands.py:245
++msgid "Setting up Distribution Synchronization Process"
++msgstr "Configuration du processus de synchronisation de la distribution"
++
++#: ../yumcommands.py:288
+ msgid "Display details about a package or group of packages"
+ msgstr "Affiche les détails d'un paquet ou d'un groupe de paquets"
+
+-#: ../yumcommands.py:295
++#: ../yumcommands.py:337
+ msgid "Installed Packages"
+ msgstr "Paquets installés"
+
+-#: ../yumcommands.py:303
++#: ../yumcommands.py:345
+ msgid "Available Packages"
+ msgstr "Paquets disponibles"
+
+-#: ../yumcommands.py:307
++#: ../yumcommands.py:349
+ msgid "Extra Packages"
+ msgstr "Paquets supplémentaires"
+
+-#: ../yumcommands.py:311
++#: ../yumcommands.py:353
+ msgid "Updated Packages"
+ msgstr "Paquets mis à jour"
+
+ #. This only happens in verbose mode
+-#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
++#: ../yumcommands.py:361 ../yumcommands.py:368 ../yumcommands.py:655
+ msgid "Obsoleting Packages"
+ msgstr "Obsolescence des paquets"
+
+-#: ../yumcommands.py:328
++#: ../yumcommands.py:370
+ msgid "Recently Added Packages"
+ msgstr "Paquets récemment ajoutés"
+
+-#: ../yumcommands.py:335
++#: ../yumcommands.py:377
+ msgid "No matching Packages to list"
+ msgstr "Aucun paquet correspondant à lister"
+
+-#: ../yumcommands.py:349
++#: ../yumcommands.py:391
+ msgid "List a package or groups of packages"
+ msgstr "Liste un paquet ou un groupe de paquets"
+
+-#: ../yumcommands.py:361
++#: ../yumcommands.py:403
+ msgid "Remove a package or packages from your system"
+ msgstr "Supprime un ou plusieurs paquets de votre système"
+
+-#: ../yumcommands.py:368
++#: ../yumcommands.py:410
+ msgid "Setting up Remove Process"
+ msgstr "Configuration du processus de suppression"
+
+-#: ../yumcommands.py:382
++#: ../yumcommands.py:424
+ msgid "Setting up Group Process"
+ msgstr "Configuration du processus de groupe"
+
+-#: ../yumcommands.py:388
++#: ../yumcommands.py:430
+ msgid "No Groups on which to run command"
+ msgstr "Aucun groupe sur lequel lancer la commande"
+
+-#: ../yumcommands.py:401
++#: ../yumcommands.py:443
+ msgid "List available package groups"
+ msgstr "Liste les groupes de paquets disponibles"
+
+-#: ../yumcommands.py:418
++#: ../yumcommands.py:463
+ msgid "Install the packages in a group on your system"
+ msgstr "Installe les paquets d'un groupe sur votre système"
+
+-#: ../yumcommands.py:440
++#: ../yumcommands.py:486
+ msgid "Remove the packages in a group from your system"
+ msgstr "Supprime les paquets d'un groupe de votre système"
+
+-#: ../yumcommands.py:467
++#: ../yumcommands.py:514
+ msgid "Display details about a package group"
+ msgstr "Affiche des détails sur un groupe de paquets"
+
+-#: ../yumcommands.py:491
++#: ../yumcommands.py:539
+ msgid "Generate the metadata cache"
+ msgstr "Génère le cache des méta données"
+
+-#: ../yumcommands.py:497
++#: ../yumcommands.py:545
+ msgid "Making cache files for all metadata files."
+ msgstr "Création des fichiers de cache pour tous les fichiers de méta données."
+
+-#: ../yumcommands.py:498
++#: ../yumcommands.py:546
+ msgid "This may take a while depending on the speed of this computer"
+ msgstr "Cela peut prendre du temps en fonction de la vitesse de cet ordinateur"
+
+-#: ../yumcommands.py:519
++#: ../yumcommands.py:567
+ msgid "Metadata Cache Created"
+ msgstr "Cache des méta données créé"
+
+-#: ../yumcommands.py:533
++#: ../yumcommands.py:581
+ msgid "Remove cached data"
+ msgstr "Supprime les données en cache"
+
+-#: ../yumcommands.py:553
++#: ../yumcommands.py:602
+ msgid "Find what package provides the given value"
+ msgstr "Cherche à quel paquet correspond la valeur donnée"
+
+-#: ../yumcommands.py:573
++#: ../yumcommands.py:622
+ msgid "Check for available package updates"
+ msgstr "Cherche les mises à jour de paquets disponibles"
+
+-#: ../yumcommands.py:623
++#: ../yumcommands.py:675
+ msgid "Search package details for the given string"
+ msgstr "Cherche les détails du paquet en fonction de la chaîne entrée"
+
+-#: ../yumcommands.py:629
++#: ../yumcommands.py:681
+ msgid "Searching Packages: "
+ msgstr "Recherche dans les paquets :"
+
+-#: ../yumcommands.py:646
++#: ../yumcommands.py:698
+ msgid "Update packages taking obsoletes into account"
+ msgstr "Mises à jour en tenant compte des paquets obsolètes"
+
+-#: ../yumcommands.py:654
++#: ../yumcommands.py:707
+ msgid "Setting up Upgrade Process"
+ msgstr "Configuration du processus de mise à jour"
+
+-#: ../yumcommands.py:668
++#: ../yumcommands.py:721
+ msgid "Install a local RPM"
+ msgstr "Installe un RPM local"
+
+-#: ../yumcommands.py:676
++#: ../yumcommands.py:729
+ msgid "Setting up Local Package Process"
+ msgstr "Configuration du processus de paquets locaux"
+
+-#: ../yumcommands.py:695
++#: ../yumcommands.py:748
+ msgid "Determine which package provides the given dependency"
+ msgstr "Détermine quel paquet fournit une dépendance donnée"
+
+-#: ../yumcommands.py:698
++#: ../yumcommands.py:751
+ msgid "Searching Packages for Dependency:"
+ msgstr "Recherche dans les paquets pour la dépendance :"
+
+-#: ../yumcommands.py:712
++#: ../yumcommands.py:765
+ msgid "Run an interactive yum shell"
+ msgstr "Lance un shell yum interactif"
+
+-#: ../yumcommands.py:718
++#: ../yumcommands.py:771
+ msgid "Setting up Yum Shell"
+ msgstr "Configuration du shell Yum"
+
+-#: ../yumcommands.py:736
++#: ../yumcommands.py:789
+ msgid "List a package's dependencies"
+ msgstr "Liste les dépendances d'un paquet"
+
+-#: ../yumcommands.py:742
++#: ../yumcommands.py:795
+ msgid "Finding dependencies: "
+ msgstr "Recherche de dépendances :"
+
+-#: ../yumcommands.py:758
++#: ../yumcommands.py:811
+ msgid "Display the configured software repositories"
+ msgstr "Affiche les dépôts logiciels configurés"
+
+-#: ../yumcommands.py:810 ../yumcommands.py:811
++#: ../yumcommands.py:877 ../yumcommands.py:878
+ msgid "enabled"
+ msgstr "activé"
+
+-#: ../yumcommands.py:819 ../yumcommands.py:820
++#: ../yumcommands.py:904 ../yumcommands.py:905
+ msgid "disabled"
+ msgstr "désactivé"
+
+-#: ../yumcommands.py:834
++#: ../yumcommands.py:921
+ msgid "Repo-id : "
+ msgstr "Id du dépôt : "
+
+-#: ../yumcommands.py:835
++#: ../yumcommands.py:922
+ msgid "Repo-name : "
+ msgstr "Nom du dépôt : "
+
+-#: ../yumcommands.py:836
++#: ../yumcommands.py:925
+ msgid "Repo-status : "
+ msgstr "État du dépôt : "
+
+-#: ../yumcommands.py:838
++#: ../yumcommands.py:928
+ msgid "Repo-revision: "
+ msgstr "Révision du dépôt :"
+
+-#: ../yumcommands.py:842
++#: ../yumcommands.py:932
+ msgid "Repo-tags : "
+ msgstr "Tags du dépôt :"
+
+-#: ../yumcommands.py:848
++#: ../yumcommands.py:938
+ msgid "Repo-distro-tags: "
+ msgstr "Repo-distro-tags : "
+
+-#: ../yumcommands.py:853
++#: ../yumcommands.py:943
+ msgid "Repo-updated : "
+ msgstr "Mise à jour du dépôt :"
+
+-#: ../yumcommands.py:855
++#: ../yumcommands.py:945
+ msgid "Repo-pkgs : "
+ msgstr "Paquets du dépôt : "
+
+-#: ../yumcommands.py:856
++#: ../yumcommands.py:946
+ msgid "Repo-size : "
+ msgstr "Taille du dépôt : "
+
+-#: ../yumcommands.py:863
++#: ../yumcommands.py:953
+ msgid "Repo-baseurl : "
+ msgstr "Baseurl du dépôt : "
+
+-#: ../yumcommands.py:871
++#: ../yumcommands.py:961
+ msgid "Repo-metalink: "
+ msgstr "Méta-lien du dépôt :"
+
+-#: ../yumcommands.py:875
++#: ../yumcommands.py:965
+ msgid " Updated : "
+ msgstr " Mis à jour : "
+
+-#: ../yumcommands.py:878
++#: ../yumcommands.py:968
+ msgid "Repo-mirrors : "
+ msgstr "Miroirs du dépôt :"
+
+-#: ../yumcommands.py:882 ../yummain.py:133
+-msgid "Unknown"
+-msgstr "Inconnu"
+-
+-#: ../yumcommands.py:888
++#: ../yumcommands.py:978
+ #, python-format
+ msgid "Never (last: %s)"
+ msgstr "Jamais (dernier : %s)"
+
+-#: ../yumcommands.py:890
++#: ../yumcommands.py:980
+ #, python-format
+ msgid "Instant (last: %s)"
+ msgstr "Instant (dernier : %s)"
+
+-#: ../yumcommands.py:893
++#: ../yumcommands.py:983
+ #, python-format
+ msgid "%s second(s) (last: %s)"
+ msgstr "%s seconde(s) (dernier : %s)"
+
+-#: ../yumcommands.py:895
++#: ../yumcommands.py:985
+ msgid "Repo-expire : "
+ msgstr "Expiration du dépôt : "
+
+-#: ../yumcommands.py:898
++#: ../yumcommands.py:988
+ msgid "Repo-exclude : "
+ msgstr "Exclus du dépôt :"
+
+-#: ../yumcommands.py:902
++#: ../yumcommands.py:992
+ msgid "Repo-include : "
+ msgstr "Inclus au dépôt :"
+
++#: ../yumcommands.py:996
++msgid "Repo-excluded: "
++msgstr "Exclus du dépôt : "
++
+ #. Work out the first (id) and last (enabled/disalbed/count),
+ #. then chop the middle (name)...
+-#: ../yumcommands.py:912 ../yumcommands.py:938
++#: ../yumcommands.py:1006 ../yumcommands.py:1035
+ msgid "repo id"
+ msgstr "id du dépôt"
+
+-#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
++#: ../yumcommands.py:1023 ../yumcommands.py:1024 ../yumcommands.py:1042
+ msgid "status"
+ msgstr "statut"
+
+-#: ../yumcommands.py:939
++#: ../yumcommands.py:1036
+ msgid "repo name"
+ msgstr "nom du dépôt"
+
+-#: ../yumcommands.py:965
++#: ../yumcommands.py:1073
+ msgid "Display a helpful usage message"
+ msgstr "Affiche un message d'aide à l'utilisation"
+
+-#: ../yumcommands.py:999
++#: ../yumcommands.py:1107
+ #, python-format
+ msgid "No help available for %s"
+ msgstr "Aucune aide disponible pour %s"
+
+-#: ../yumcommands.py:1004
++#: ../yumcommands.py:1112
+ msgid ""
+ "\n"
+ "\n"
+@@ -1501,7 +1845,7 @@ msgstr ""
+ "\n"
+ "alias : "
+
+-#: ../yumcommands.py:1006
++#: ../yumcommands.py:1114
+ msgid ""
+ "\n"
+ "\n"
+@@ -1511,153 +1855,84 @@ msgstr ""
+ "\n"
+ "alias : "
+
+-#: ../yumcommands.py:1034
++#: ../yumcommands.py:1143
+ msgid "Setting up Reinstall Process"
+ msgstr "Configuration du processus de ré-installation"
+
+-#: ../yumcommands.py:1042
++#: ../yumcommands.py:1151
+ msgid "reinstall a package"
+ msgstr "ré-installer un paquet"
+
+-#: ../yumcommands.py:1060
++#: ../yumcommands.py:1170
+ msgid "Setting up Downgrade Process"
+ msgstr "Configuration du processus de rétrogradation"
+
+-#: ../yumcommands.py:1067
++#: ../yumcommands.py:1177
+ msgid "downgrade a package"
+ msgstr "rétrograder un paquet"
+
+-#: ../yumcommands.py:1081
++#: ../yumcommands.py:1191
+ msgid "Display a version for the machine and/or available repos."
+ msgstr "Afficher une version de la machine et/ou des dépôts disponibles."
+
+-#: ../yumcommands.py:1111
++#: ../yumcommands.py:1230
+ msgid " Yum version groups:"
+ msgstr "Groupes de version de yum :"
+
+-#: ../yumcommands.py:1121
++#: ../yumcommands.py:1240
+ msgid " Group :"
+ msgstr "Groupe :"
+
+-#: ../yumcommands.py:1122
++#: ../yumcommands.py:1241
+ msgid " Packages:"
+ msgstr "Paquets :"
+
+-#: ../yumcommands.py:1152
++#: ../yumcommands.py:1270
+ msgid "Installed:"
+-msgstr "Installé :"
++msgstr "Installés :"
+
+-#: ../yumcommands.py:1157
++#: ../yumcommands.py:1278
+ msgid "Group-Installed:"
+ msgstr "Groupe installé :"
+
+-#: ../yumcommands.py:1166
++#: ../yumcommands.py:1287
+ msgid "Available:"
+ msgstr "Disponible :"
+
+-#: ../yumcommands.py:1172
++#: ../yumcommands.py:1296
+ msgid "Group-Available:"
+ msgstr "Groupes disponibles :"
+
+-#: ../yumcommands.py:1211
++#: ../yumcommands.py:1335
+ msgid "Display, or use, the transaction history"
+ msgstr "Afficher ou utiliser l'historique de transaction"
+
+-#: ../yumcommands.py:1239
++#: ../yumcommands.py:1363
+ #, python-format
+ msgid "Invalid history sub-command, use: %s."
+ msgstr "Sous-commande de l'historique invalide, utilisez : %s."
+
+-#: ../yummain.py:128
+-msgid "Running"
+-msgstr "Exécution"
+-
+-#: ../yummain.py:129
+-msgid "Sleeping"
+-msgstr "Mise en attente"
+-
+-#: ../yummain.py:130
+-msgid "Uninteruptable"
+-msgstr "Impossible d'interrompre"
+-
+-#: ../yummain.py:131
+-msgid "Zombie"
+-msgstr "Zombie"
+-
+-#: ../yummain.py:132
+-msgid "Traced/Stopped"
+-msgstr "Tracé/Stoppé"
+-
+-#: ../yummain.py:137
+-msgid " The other application is: PackageKit"
+-msgstr " L'autre application est : PackageKit"
+-
+-#: ../yummain.py:139
+-#, python-format
+-msgid " The other application is: %s"
+-msgstr " L'autre application est : %s"
+-
+-#: ../yummain.py:142
+-#, python-format
+-msgid " Memory : %5s RSS (%5sB VSZ)"
+-msgstr " Mémoire : %5s RSS (%5sB VSZ)"
++#: ../yumcommands.py:1370
++msgid "You don't have access to the history DB."
++msgstr "Vous n'avez pas accès à la base de données de l'historique."
+
+-#: ../yummain.py:146
+-#, python-format
+-msgid " Started: %s - %s ago"
+-msgstr " Débuté : il y a %s - %s"
+-
+-#: ../yummain.py:148
+-#, python-format
+-msgid " State : %s, pid: %d"
+-msgstr " État : %s, pid : %d"
++#: ../yumcommands.py:1413
++msgid "Check for problems in the rpmdb"
++msgstr "Recherche des problèmes dans RPMDB"
+
+-#: ../yummain.py:173
++#: ../yummain.py:103
+ msgid ""
+ "Another app is currently holding the yum lock; waiting for it to exit..."
+ msgstr ""
+ "Une autre application verrouille actuellement l'utilisation de yum ; attente "
+ "de déverrouillage..."
+
+-#: ../yummain.py:201 ../yummain.py:240
+-#, python-format
+-msgid "Error: %s"
+-msgstr "Erreur : %s"
+-
+-#: ../yummain.py:211 ../yummain.py:253
+-#, python-format
+-msgid "Unknown Error(s): Exit Code: %d:"
+-msgstr "Erreur(s) inconnue(s) : Code de sortie : %d :"
+-
+ #. Depsolve stage
+-#: ../yummain.py:218
++#: ../yummain.py:151
+ msgid "Resolving Dependencies"
+ msgstr "Résolution des dépendances"
+
+-#: ../yummain.py:242
+-msgid " You could try using --skip-broken to work around the problem"
+-msgstr ""
+-" Vous pouvez essayer d'utiliser --skip-broken pour contourner le problème"
+-
+-#: ../yummain.py:243
+-msgid ""
+-" You could try running: package-cleanup --problems\n"
+-" package-cleanup --dupes\n"
+-" rpm -Va --nofiles --nodigest"
+-msgstr ""
+-" Vous pouvez essayer d'exécuter : package-cleanup --problems\n"
+-" package-cleanup --dupes\n"
+-" rpm -Va --nofiles --nodigest"
+-
+-#: ../yummain.py:259
+-msgid ""
+-"\n"
+-"Dependencies Resolved"
+-msgstr ""
+-"\n"
+-"Dépendances résolues"
+-
+-#: ../yummain.py:326
++#: ../yummain.py:269
+ msgid ""
+ "\n"
+ "\n"
+@@ -1675,193 +1950,178 @@ msgstr "doTsSetup() sera supprimé dans une future version de Yum.\n"
+ msgid "Setting up TransactionSets before config class is up"
+ msgstr "Mise en place de l'ensemble des transactions avant configuration"
+
+-#: ../yum/depsolve.py:148
++#: ../yum/depsolve.py:151
+ #, python-format
+ msgid "Invalid tsflag in config file: %s"
+ msgstr "tsflag invalide dans le fichier de configuration : %s"
+
+-#: ../yum/depsolve.py:159
++#: ../yum/depsolve.py:162
+ #, python-format
+ msgid "Searching pkgSack for dep: %s"
+ msgstr "Recherche dans le regroupement pour la dépendance : %s"
+
+-#: ../yum/depsolve.py:175
+-#, python-format
+-msgid "Potential match for %s from %s"
+-msgstr "Correspondance potentielle pour %s depuis %s"
+-
+-#: ../yum/depsolve.py:183
+-#, python-format
+-msgid "Matched %s to require for %s"
+-msgstr "Correspondance %s trouvée pour %s "
+-
+-#: ../yum/depsolve.py:224
++#: ../yum/depsolve.py:205
+ #, python-format
+ msgid "Member: %s"
+ msgstr "Membre : %s"
+
+-#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
++#: ../yum/depsolve.py:219 ../yum/depsolve.py:754
+ #, python-format
+ msgid "%s converted to install"
+ msgstr "%s converti pour installation"
+
+-#: ../yum/depsolve.py:245
++#: ../yum/depsolve.py:226
+ #, python-format
+ msgid "Adding Package %s in mode %s"
+ msgstr "Ajout du paquet %s en mode %s"
+
+-#: ../yum/depsolve.py:255
++#: ../yum/depsolve.py:242
+ #, python-format
+ msgid "Removing Package %s"
+ msgstr "Suppression du paquet %s"
+
+-#: ../yum/depsolve.py:277
++#: ../yum/depsolve.py:264
+ #, python-format
+ msgid "%s requires: %s"
+ msgstr "%s requiert : %s"
+
+-#: ../yum/depsolve.py:335
++#: ../yum/depsolve.py:305
++#, python-format
++msgid "%s requires %s"
++msgstr "%s requiert %s"
++
++#: ../yum/depsolve.py:332
+ msgid "Needed Require has already been looked up, cheating"
+ msgstr "Le prérequis a déjà été trouvé, on triche"
+
+-#: ../yum/depsolve.py:345
++#: ../yum/depsolve.py:342
+ #, python-format
+ msgid "Needed Require is not a package name. Looking up: %s"
+ msgstr "Le prérequis n'est pas un nom de paquet. Recherche de : %s "
+
+-#: ../yum/depsolve.py:352
++#: ../yum/depsolve.py:349
+ #, python-format
+ msgid "Potential Provider: %s"
+ msgstr "Fournisseur potentiel : %s"
+
+-#: ../yum/depsolve.py:375
++#: ../yum/depsolve.py:372
+ #, python-format
+ msgid "Mode is %s for provider of %s: %s"
+ msgstr "Le mode est %s pour le fournisseur de %s : %s"
+
+-#: ../yum/depsolve.py:379
++#: ../yum/depsolve.py:376
+ #, python-format
+ msgid "Mode for pkg providing %s: %s"
+ msgstr "Mode pour le paquet qui fournit %s : %s"
+
+-#: ../yum/depsolve.py:383
++#: ../yum/depsolve.py:380
+ #, python-format
+ msgid "TSINFO: %s package requiring %s marked as erase"
+ msgstr "TSINFO : le paquet %s requiert la suppression de %s"
+
+-#: ../yum/depsolve.py:396
++#: ../yum/depsolve.py:393
+ #, python-format
+ msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+ msgstr "TSINFO : Obsolescence de %s avec %s pour résoudre les dépendances."
+
+-#: ../yum/depsolve.py:399
++#: ../yum/depsolve.py:396
+ #, python-format
+ msgid "TSINFO: Updating %s to resolve dep."
+ msgstr "TSINFO : Mise à jour de %s pour la résolution des dépendances."
+
+-#: ../yum/depsolve.py:407
++#: ../yum/depsolve.py:404
+ #, python-format
+ msgid "Cannot find an update path for dep for: %s"
+ msgstr ""
+ "Impossible de trouver un chemin de mise à jour pour la dépendance de : %s"
+
+-#: ../yum/depsolve.py:417
+-#, python-format
+-msgid "Unresolvable requirement %s for %s"
+-msgstr "Impossible de résoudre le prérequis %s pour %s"
+-
+-#: ../yum/depsolve.py:440
++#: ../yum/depsolve.py:435
+ #, python-format
+ msgid "Quick matched %s to require for %s"
+ msgstr "Correspondance %s trouvée pour %s "
+
+ #. is it already installed?
+-#: ../yum/depsolve.py:482
++#: ../yum/depsolve.py:477
+ #, python-format
+ msgid "%s is in providing packages but it is already installed, removing."
+ msgstr "%s est dans les paquets fournis mais est déjà installé, suppression."
+
+-#: ../yum/depsolve.py:498
++#: ../yum/depsolve.py:493
+ #, python-format
+ msgid "Potential resolving package %s has newer instance in ts."
+ msgstr ""
+ "ts contient une version plus récente du paquet %s susceptible de résoudre la "
+ "dépendance."
+
+-#: ../yum/depsolve.py:509
++#: ../yum/depsolve.py:504
+ #, python-format
+ msgid "Potential resolving package %s has newer instance installed."
+ msgstr ""
+ "Le paquet susceptible de résoudre la dépedence %s est déjà installé dans une "
+ "version plus récente."
+
+-#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
+-#, python-format
+-msgid "Missing Dependency: %s is needed by package %s"
+-msgstr "Dépendance manquante : %s est requis par le paquet %s"
+-
+-#: ../yum/depsolve.py:530
++#: ../yum/depsolve.py:522
+ #, python-format
+ msgid "%s already in ts, skipping this one"
+ msgstr "%s déjà dans ts, omission de celui-ci"
+
+-#: ../yum/depsolve.py:573
++#: ../yum/depsolve.py:571
+ #, python-format
+ msgid "TSINFO: Marking %s as update for %s"
+ msgstr "TSINFO : Sélection de %s pour mise à jour de %s"
+
+-#: ../yum/depsolve.py:581
++#: ../yum/depsolve.py:580
+ #, python-format
+ msgid "TSINFO: Marking %s as install for %s"
+ msgstr "TSINFO : Sélection de %s pour installation de %s"
+
+-#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
++#: ../yum/depsolve.py:690 ../yum/depsolve.py:780
+ msgid "Success - empty transaction"
+ msgstr "Succès - transaction vide"
+
+-#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
++#: ../yum/depsolve.py:729 ../yum/depsolve.py:744
+ msgid "Restarting Loop"
+ msgstr "Re-démarrage de la boucle"
+
+-#: ../yum/depsolve.py:755
++#: ../yum/depsolve.py:760
+ msgid "Dependency Process ending"
+ msgstr "Finalisation du processus de dépendance"
+
+-#: ../yum/depsolve.py:761
++#: ../yum/depsolve.py:774
+ #, python-format
+ msgid "%s from %s has depsolving problems"
+ msgstr "%s de %s a des problèmes de dépendances"
+
+-#: ../yum/depsolve.py:768
++#: ../yum/depsolve.py:781
+ msgid "Success - deps resolved"
+ msgstr "Succès - dépendances résolues"
+
+-#: ../yum/depsolve.py:782
++#: ../yum/depsolve.py:802
+ #, python-format
+ msgid "Checking deps for %s"
+ msgstr "Recherche des dépendances pour %s"
+
+-#: ../yum/depsolve.py:865
++#: ../yum/depsolve.py:888
+ #, python-format
+ msgid "looking for %s as a requirement of %s"
+ msgstr "recherche de %s comme prérequis de %s"
+
+-#: ../yum/depsolve.py:1007
++#: ../yum/depsolve.py:1119
+ #, python-format
+ msgid "Running compare_providers() for %s"
+ msgstr "Lancement de compare_providers() pour %s"
+
+-#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
++#: ../yum/depsolve.py:1146 ../yum/depsolve.py:1152
+ #, python-format
+ msgid "better arch in po %s"
+ msgstr "meilleure architecture dans l'objet paquet %s"
+
+-#: ../yum/depsolve.py:1142
++#: ../yum/depsolve.py:1244
+ #, python-format
+ msgid "%s obsoletes %s"
+ msgstr "%s rend obsolète %s"
+
+-#: ../yum/depsolve.py:1154
++#: ../yum/depsolve.py:1256
+ #, python-format
+ msgid ""
+ "archdist compared %s to %s on %s\n"
+@@ -1870,105 +2130,144 @@ msgstr ""
+ "architecture %s comparée à %s sur %s\n"
+ " Gagnant : %s"
+
+-#: ../yum/depsolve.py:1161
++#: ../yum/depsolve.py:1264
+ #, python-format
+ msgid "common sourcerpm %s and %s"
+ msgstr "rpm source commun pour %s et %s"
+
+-#: ../yum/depsolve.py:1167
++#: ../yum/depsolve.py:1268
++#, python-format
++msgid "base package %s is installed for %s"
++msgstr "le paquet de base %s est installé pour %s"
++
++#: ../yum/depsolve.py:1274
+ #, python-format
+ msgid "common prefix of %s between %s and %s"
+ msgstr "préfix commun %s entre %s et %s"
+
+-#: ../yum/depsolve.py:1175
++#: ../yum/depsolve.py:1305
++#, python-format
++msgid "requires minimal: %d"
++msgstr "requiert au minimum : %d"
++
++#: ../yum/depsolve.py:1309
++#, python-format
++msgid " Winner: %s"
++msgstr " Vainqueur : %s"
++
++#: ../yum/depsolve.py:1314
++#, python-format
++msgid " Loser(with %d): %s"
++msgstr " Perdant (avec %d) : %s"
++
++#: ../yum/depsolve.py:1330
+ #, python-format
+ msgid "Best Order: %s"
+ msgstr "Meilleur ordre : %s"
+
+-#: ../yum/__init__.py:187
++#: ../yum/__init__.py:214
+ msgid "doConfigSetup() will go away in a future version of Yum.\n"
+ msgstr "doConfigSetup() sera supprimé dans une future version de Yum.\n"
+
+-#: ../yum/__init__.py:412
++#: ../yum/__init__.py:453
++#, python-format
++msgid "Repository %r: Error parsing config: %s"
++msgstr "Dépôt %r : erreur lors de l'analyse de la configuration : %s"
++
++#: ../yum/__init__.py:459
+ #, python-format
+ msgid "Repository %r is missing name in configuration, using id"
+ msgstr ""
+ "Il manque le nom du dépôt %r dans la configuration, utilisation de "
+ "l'identifiant"
+
+-#: ../yum/__init__.py:450
++#: ../yum/__init__.py:497
+ msgid "plugins already initialised"
+ msgstr "modules complémentaires déjà initialisés"
+
+-#: ../yum/__init__.py:457
++#: ../yum/__init__.py:504
+ msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+ msgstr "doRpmDBSetup() sera supprimé dans une future version de Yum.\n"
+
+-#: ../yum/__init__.py:468
++#: ../yum/__init__.py:515
+ msgid "Reading Local RPMDB"
+ msgstr "Lecture de la base de données RPM locale"
+
+-#: ../yum/__init__.py:489
++#: ../yum/__init__.py:538
+ msgid "doRepoSetup() will go away in a future version of Yum.\n"
+ msgstr "doRepoSetup() sera supprimé dans une future version de Yum.\n"
+
+-#: ../yum/__init__.py:509
++#: ../yum/__init__.py:577
+ msgid "doSackSetup() will go away in a future version of Yum.\n"
+ msgstr "doSackSetup() sera supprimé dans une future version de Yum.\n"
+
+-#: ../yum/__init__.py:539
++#: ../yum/__init__.py:607
+ msgid "Setting up Package Sacks"
+ msgstr "Configuration du groupe de paquets"
+
+-#: ../yum/__init__.py:584
++#: ../yum/__init__.py:652
+ #, python-format
+ msgid "repo object for repo %s lacks a _resetSack method\n"
+ msgstr "une méthode _resetSack est manquante pour l'objet dépôt du dépôt %s\n"
+
+-#: ../yum/__init__.py:585
++#: ../yum/__init__.py:653
+ msgid "therefore this repo cannot be reset.\n"
+ msgstr "en conséquence ce dépôt ne peut être ré-initialisé.\n"
+
+-#: ../yum/__init__.py:590
++#: ../yum/__init__.py:658
+ msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+ msgstr "doUpdateSetup() sera supprimé dans une future version de Yum.\n"
+
+-#: ../yum/__init__.py:602
++#: ../yum/__init__.py:670
+ msgid "Building updates object"
+ msgstr "Construction de l'objet de mises à jour"
+
+-#: ../yum/__init__.py:637
++#: ../yum/__init__.py:709
+ msgid "doGroupSetup() will go away in a future version of Yum.\n"
+ msgstr "doGroupSetup() sera supprimé dans une future version de Yum.\n"
+
+-#: ../yum/__init__.py:662
++#: ../yum/__init__.py:734
+ msgid "Getting group metadata"
+ msgstr "Obtention des méta données du groupe"
+
+-#: ../yum/__init__.py:688
++#: ../yum/__init__.py:760
+ #, python-format
+ msgid "Adding group file from repository: %s"
+ msgstr "Ajout du ficher de groupes depuis le dépôt : %s"
+
+-#: ../yum/__init__.py:697
++#: ../yum/__init__.py:769
+ #, python-format
+ msgid "Failed to add groups file for repository: %s - %s"
+ msgstr "Échec d'ajout du fichier de groupes pour le dépôt : %s - %s"
+
+-#: ../yum/__init__.py:703
++#: ../yum/__init__.py:775
+ msgid "No Groups Available in any repository"
+ msgstr "Aucun groupe disponible dans les dépôts"
+
+-#: ../yum/__init__.py:763
++#: ../yum/__init__.py:787
++msgid "Getting pkgtags metadata"
++msgstr "Obtention des méta-données de pkgtags"
++
++#: ../yum/__init__.py:797
++#, python-format
++msgid "Adding tags from repository: %s"
++msgstr "Ajout des tags depuis le dépôt : %s"
++
++#: ../yum/__init__.py:806
++#, python-format
++msgid "Failed to add Pkg Tags for repository: %s - %s"
++msgstr "Échec d'ajout des tags du paquet pour le dépôt : %s - %s"
++
++#: ../yum/__init__.py:884
+ msgid "Importing additional filelist information"
+ msgstr "Import d'informations additionnelles sur la liste de fichiers"
+
+-#: ../yum/__init__.py:777
++#: ../yum/__init__.py:898
+ #, python-format
+ msgid "The program %s%s%s is found in the yum-utils package."
+ msgstr "Le programme %s%s%s est présent dans le paquet yum-utils."
+
+-#: ../yum/__init__.py:785
++#: ../yum/__init__.py:906
+ msgid ""
+ "There are unfinished transactions remaining. You might consider running yum-"
+ "complete-transaction first to finish them."
+@@ -1976,17 +2275,23 @@ msgstr ""
+ "Il reste des transactions non terminées. Vous devriez envisager de lancer de "
+ "yum-complete-transaction pour les terminer."
+
+-#: ../yum/__init__.py:853
++#: ../yum/__init__.py:985
++#, python-format
++msgid "Trying to remove \"%s\", which is protected"
++msgstr "Tentative de retrait de « %s », qui est protégé"
++
++#. Kind of hacky
++#: ../yum/__init__.py:1044
+ #, python-format
+ msgid "Skip-broken round %i"
+ msgstr "Cycle %i d'évitement des dépendances cassées"
+
+-#: ../yum/__init__.py:906
++#: ../yum/__init__.py:1101
+ #, python-format
+ msgid "Skip-broken took %i rounds "
+ msgstr "L'évitement des dépendances cassées a pris %i cycles"
+
+-#: ../yum/__init__.py:907
++#: ../yum/__init__.py:1102
+ msgid ""
+ "\n"
+ "Packages skipped because of dependency problems:"
+@@ -1994,79 +2299,119 @@ msgstr ""
+ "\n"
+ "Paquets omis en raison de problèmes de dépendances :"
+
+-#: ../yum/__init__.py:911
++#: ../yum/__init__.py:1106
+ #, python-format
+ msgid " %s from %s"
+ msgstr " %s depuis %s"
+
+-#: ../yum/__init__.py:1083
++#. FIXME: _N()
++#: ../yum/__init__.py:1251
++#, python-format
++msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:"
++msgstr ""
++"** %d problèmes RPMDB pré-existants trouvés, la sortie de « yum check » est "
++"la suivante :"
++
++#: ../yum/__init__.py:1255
++msgid "Warning: RPMDB altered outside of yum."
++msgstr ""
++"Avertissement : RPMDB a été modifiée par une autre application que yum."
++
++#: ../yum/__init__.py:1267
++msgid "missing requires"
++msgstr "dépendances manquantes"
++
++#: ../yum/__init__.py:1268
++msgid "installed conflict"
++msgstr "conflit installé"
++
++#: ../yum/__init__.py:1366
+ msgid ""
+ "Warning: scriptlet or other non-fatal errors occurred during transaction."
+ msgstr ""
+ "Attention : scriptlet ou autres erreurs non fatales pendant la transaction."
+
+-#: ../yum/__init__.py:1101
++#: ../yum/__init__.py:1376
++msgid "Transaction couldn't start:"
++msgstr "La transaction n'a pas pu démarrer :"
++
++#. should this be 'to_unicoded'?
++#: ../yum/__init__.py:1379
++msgid "Could not run transaction."
++msgstr "Impossible d'exécuter la transaction."
++
++#: ../yum/__init__.py:1392
+ #, python-format
+ msgid "Failed to remove transaction file %s"
+ msgstr "Échec de la suppression du fichier de transaction %s"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1130
++#: ../yum/__init__.py:1424
+ #, python-format
+ msgid "%s was supposed to be installed but is not!"
+ msgstr "%s est censé être installé, mais ne l'est pas !"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1169
++#: ../yum/__init__.py:1486
+ #, python-format
+ msgid "%s was supposed to be removed but is not!"
+ msgstr "%s est censé être supprimé, mais ne l'est pas !"
+
++#: ../yum/__init__.py:1597
++#, python-format
++msgid "Could not open lock %s: %s"
++msgstr "Impossible de libérer le verrou %s : %s"
++
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1289
++#: ../yum/__init__.py:1614
+ #, python-format
+ msgid "Unable to check if PID %s is active"
+ msgstr "Impossible de vérifier si le PID %s est actif"
+
+ #. Another copy seems to be running.
+-#: ../yum/__init__.py:1293
++#: ../yum/__init__.py:1618
+ #, python-format
+ msgid "Existing lock %s: another copy is running as pid %s."
+ msgstr "Verrou %s existant : une autre copie est lancée avec le pid %s."
+
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1328
++#: ../yum/__init__.py:1653
+ #, python-format
+ msgid "Could not create lock at %s: %s "
+ msgstr "Impossible de créer le verrou sur %s : %s"
+
+-#: ../yum/__init__.py:1373
+-msgid "Package does not match intended download"
+-msgstr "Le paquet ne correspond pas au téléchargement attendu"
++#: ../yum/__init__.py:1698
++#, python-format
++msgid ""
++"Package does not match intended download. Suggestion: run yum --enablerepo=%"
++"s clean metadata"
++msgstr ""
++"Le paquet ne correspond pas au téléchargement attendu. Suggestion : exécutez "
++"yum --enablerepo=%s clean metadata"
+
+-#: ../yum/__init__.py:1388
++#: ../yum/__init__.py:1714
+ msgid "Could not perform checksum"
+ msgstr "Ne peut procéder à la vérification des sommes de contrôle"
+
+-#: ../yum/__init__.py:1391
++#: ../yum/__init__.py:1717
+ msgid "Package does not match checksum"
+ msgstr "Le paquet ne correspond pas à sa somme de contrôle"
+
+-#: ../yum/__init__.py:1433
++#: ../yum/__init__.py:1769
+ #, python-format
+ msgid "package fails checksum but caching is enabled for %s"
+ msgstr ""
+ "Le paquet ne correspond pas à la somme de contrôle mais le cache est activé "
+ "pour %s"
+
+-#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
++#: ../yum/__init__.py:1772 ../yum/__init__.py:1801
+ #, python-format
+ msgid "using local copy of %s"
+ msgstr "utilisation de la copie locale de %s"
+
+-#: ../yum/__init__.py:1477
++#: ../yum/__init__.py:1813
+ #, python-format
+ msgid ""
+ "Insufficient space in download directory %s\n"
+@@ -2077,11 +2422,11 @@ msgstr ""
+ " * libre %s\n"
+ " * nécessaire %s"
+
+-#: ../yum/__init__.py:1526
++#: ../yum/__init__.py:1862
+ msgid "Header is not complete."
+ msgstr "L'en-tête est incomplet."
+
+-#: ../yum/__init__.py:1563
++#: ../yum/__init__.py:1899
+ #, python-format
+ msgid ""
+ "Header not in local cache and caching-only mode enabled. Cannot download %s"
+@@ -2089,62 +2434,62 @@ msgstr ""
+ "L'en-tête n'est pas dans le cache et le mode cache uniquement est activé. "
+ "Impossible de télécharger %s"
+
+-#: ../yum/__init__.py:1618
++#: ../yum/__init__.py:1954
+ #, python-format
+ msgid "Public key for %s is not installed"
+ msgstr "La clé publique pour %s n'est pas installée"
+
+-#: ../yum/__init__.py:1622
++#: ../yum/__init__.py:1958
+ #, python-format
+ msgid "Problem opening package %s"
+ msgstr "Problème à l'ouverture du paquet %s"
+
+-#: ../yum/__init__.py:1630
++#: ../yum/__init__.py:1966
+ #, python-format
+ msgid "Public key for %s is not trusted"
+ msgstr "La clé publique pour %s n'est pas de confiance"
+
+-#: ../yum/__init__.py:1634
++#: ../yum/__init__.py:1970
+ #, python-format
+ msgid "Package %s is not signed"
+ msgstr "Le paquet %s n'est pas signé"
+
+-#: ../yum/__init__.py:1672
++#: ../yum/__init__.py:2008
+ #, python-format
+ msgid "Cannot remove %s"
+ msgstr "Impossible de supprimer %s"
+
+-#: ../yum/__init__.py:1676
++#: ../yum/__init__.py:2012
+ #, python-format
+ msgid "%s removed"
+ msgstr "%s supprimé"
+
+-#: ../yum/__init__.py:1712
++#: ../yum/__init__.py:2058
+ #, python-format
+ msgid "Cannot remove %s file %s"
+ msgstr "Impossible de supprimer depuis %s le fichier %s"
+
+-#: ../yum/__init__.py:1716
++#: ../yum/__init__.py:2062
+ #, python-format
+ msgid "%s file %s removed"
+ msgstr "fichier de %s : %s supprimé"
+
+-#: ../yum/__init__.py:1718
++#: ../yum/__init__.py:2064
+ #, python-format
+ msgid "%d %s files removed"
+ msgstr "%d fichiers de %s supprimés"
+
+-#: ../yum/__init__.py:1787
++#: ../yum/__init__.py:2133
+ #, python-format
+ msgid "More than one identical match in sack for %s"
+ msgstr "Plus d'une correspondance identique dans le regroupement pour %s"
+
+-#: ../yum/__init__.py:1793
++#: ../yum/__init__.py:2139
+ #, python-format
+ msgid "Nothing matches %s.%s %s:%s-%s from update"
+ msgstr "Rien ne correspond à %s.%s %s:%s-%s dans la mise à jour"
+
+-#: ../yum/__init__.py:2026
++#: ../yum/__init__.py:2433
+ msgid ""
+ "searchPackages() will go away in a future version of "
+ "Yum. Use searchGenerator() instead. \n"
+@@ -2152,188 +2497,221 @@ msgstr ""
+ "searchPackages() sera supprimé dans une future version de "
+ "Yum. Utilisez searchGenerator() à la place. \n"
+
+-#: ../yum/__init__.py:2065
++#: ../yum/__init__.py:2472
+ #, python-format
+ msgid "Searching %d packages"
+ msgstr "Recherche de %d paquets"
+
+-#: ../yum/__init__.py:2069
++#: ../yum/__init__.py:2476
+ #, python-format
+ msgid "searching package %s"
+ msgstr "recherche du paquet %s"
+
+-#: ../yum/__init__.py:2081
++#: ../yum/__init__.py:2488
+ msgid "searching in file entries"
+ msgstr "recherche dans les entrées de fichiers"
+
+-#: ../yum/__init__.py:2088
++#: ../yum/__init__.py:2495
+ msgid "searching in provides entries"
+ msgstr "recherche dans les entrées de correspondance"
+
+-#: ../yum/__init__.py:2121
++#: ../yum/__init__.py:2528
+ #, python-format
+ msgid "Provides-match: %s"
+ msgstr "Correspondance fournie : %s"
+
+-#: ../yum/__init__.py:2170
++#: ../yum/__init__.py:2577
+ msgid "No group data available for configured repositories"
+ msgstr "Aucune donnée sur les groupes disponible pour les dépôts configurés"
+
+-#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+-#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+-#: ../yum/__init__.py:2655
++#: ../yum/__init__.py:2608 ../yum/__init__.py:2627 ../yum/__init__.py:2658
++#: ../yum/__init__.py:2664 ../yum/__init__.py:2746 ../yum/__init__.py:2750
++#: ../yum/__init__.py:3095
+ #, python-format
+ msgid "No Group named %s exists"
+ msgstr "Aucun groupe nommé %s n'existe"
+
+-#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
++#: ../yum/__init__.py:2639 ../yum/__init__.py:2766
+ #, python-format
+ msgid "package %s was not marked in group %s"
+ msgstr "le paquet %s n'a pas été marqué dans le groupe %s"
+
+-#: ../yum/__init__.py:2279
++#: ../yum/__init__.py:2686
+ #, python-format
+ msgid "Adding package %s from group %s"
+ msgstr "Ajout du paquet %s pour le groupe %s"
+
+-#: ../yum/__init__.py:2283
++#: ../yum/__init__.py:2690
+ #, python-format
+ msgid "No package named %s available to be installed"
+ msgstr "Aucun paquet nommé %s n'est disponible pour installation"
+
+-#: ../yum/__init__.py:2380
++#. This can happen due to excludes after .up has
++#. happened.
++#: ../yum/__init__.py:2794
+ #, python-format
+ msgid "Package tuple %s could not be found in packagesack"
+ msgstr "Impossible de trouver le tuple de paquet %s dans le regroupement"
+
+-#: ../yum/__init__.py:2399
++#: ../yum/__init__.py:2813
+ #, python-format
+ msgid "Package tuple %s could not be found in rpmdb"
+-msgstr "Impossible de trouver le tuple de paquet %s dans rpmdb"
+-
+-#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
+-msgid "Invalid version flag"
+-msgstr "Drapeau de version invalide"
++msgstr "Impossible de trouver le tuple de paquet %s dans RPMDB"
+
+-#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
++#: ../yum/__init__.py:2868 ../yum/__init__.py:2873
+ #, python-format
+ msgid "No Package found for %s"
+ msgstr "Aucun paquet trouvé pour %s"
+
+-#: ../yum/__init__.py:2696
++#: ../yum/__init__.py:2901
++msgid "Invalid version flag"
++msgstr "Drapeau de version invalide"
++
++#: ../yum/__init__.py:3145
+ msgid "Package Object was not a package object instance"
+ msgstr "L'objet paquet n'était pas une instance correcte d'objet paquet"
+
+-#: ../yum/__init__.py:2700
++#: ../yum/__init__.py:3149
+ msgid "Nothing specified to install"
+ msgstr "Rien de spécifié pour installation"
+
+ # Aucune idée
+-#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
++#: ../yum/__init__.py:3168 ../yum/__init__.py:3992
+ #, python-format
+ msgid "Checking for virtual provide or file-provide for %s"
+ msgstr ""
+ "Recherche de correspondance virtuelle ou de correspondance fichier pour %s"
+
+-#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+-#: ../yum/__init__.py:3495
++#: ../yum/__init__.py:3174 ../yum/__init__.py:3504 ../yum/__init__.py:3684
++#: ../yum/__init__.py:3998
+ #, python-format
+ msgid "No Match for argument: %s"
+ msgstr "Aucune correspondance pour l'argument : %s"
+
+-#: ../yum/__init__.py:2798
++#: ../yum/__init__.py:3250
+ #, python-format
+ msgid "Package %s installed and not available"
+ msgstr "Le paquet %s est installé et n'est pas disponible"
+
+-#: ../yum/__init__.py:2801
++#: ../yum/__init__.py:3253
+ msgid "No package(s) available to install"
+ msgstr "Aucun paquet disponible pour installation"
+
+-#: ../yum/__init__.py:2813
++#: ../yum/__init__.py:3265
+ #, python-format
+ msgid "Package: %s - already in transaction set"
+ msgstr "Paquet : %s - déjà dans le jeu de transaction"
+
+-#: ../yum/__init__.py:2839
++#: ../yum/__init__.py:3291
+ #, python-format
+ msgid "Package %s is obsoleted by %s which is already installed"
+ msgstr "Le paquet %s est rendu obsolète par %s qui est déjà installé"
+
+-#: ../yum/__init__.py:2842
++#: ../yum/__init__.py:3296
++#, python-format
++msgid ""
++"Package %s is obsoleted by %s, but obsoleting package does not provide for "
++"requirements"
++msgstr ""
++"Le paquet %s est rendu obsolète par %s, mais l'obsolescence n'affecte pas "
++"les dépendances"
++
++#: ../yum/__init__.py:3299
+ #, python-format
+ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+ msgstr ""
+ "Le paquet %s est rendu obsolète par %s, tentative d'installation de %s à la "
+ "place"
+
+-#: ../yum/__init__.py:2850
++#: ../yum/__init__.py:3307
+ #, python-format
+ msgid "Package %s already installed and latest version"
+ msgstr "Le paquet %s est déjà installé dans sa dernière version"
+
+-#: ../yum/__init__.py:2864
++#: ../yum/__init__.py:3321
+ #, python-format
+ msgid "Package matching %s already installed. Checking for update."
+ msgstr ""
+ "Le paquet qui correspond à %s est déjà installé. Recherche d'une mise à jour."
+
+ #. update everything (the easy case)
+-#: ../yum/__init__.py:2966
++#: ../yum/__init__.py:3424
+ msgid "Updating Everything"
+ msgstr "Mise à jour complète"
+
+-#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+-#: ../yum/__init__.py:3155
++#: ../yum/__init__.py:3448 ../yum/__init__.py:3577 ../yum/__init__.py:3604
++#: ../yum/__init__.py:3630
+ #, python-format
+ msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+ msgstr ""
+ "Pas de mise à jour des paquets qui ont déjà été rendus obsolètes : %s.%s %s:%"
+ "s-%s"
+
+-#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
++#: ../yum/__init__.py:3489 ../yum/__init__.py:3680
+ #, python-format
+ msgid "%s"
+ msgstr "%s"
+
+-#: ../yum/__init__.py:3093
++#: ../yum/__init__.py:3566
+ #, python-format
+ msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+ msgstr "Paquet déjà rendu obsolète : %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3124
++#: ../yum/__init__.py:3599
+ #, python-format
+ msgid "Not Updating Package that is obsoleted: %s"
+ msgstr "Pas de mise à jour du paquet qui est obsolète : %s"
+
+-#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
++#: ../yum/__init__.py:3608 ../yum/__init__.py:3634
+ #, python-format
+ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+ msgstr ""
+ "Pas de mise à jour des paquets qui ont déjà été mis à jour : %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3218
++#: ../yum/__init__.py:3697
+ msgid "No package matched to remove"
+ msgstr "Aucun paquet sélectionné pour suppression"
+
+-#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
++#: ../yum/__init__.py:3703
+ #, python-format
+-msgid "Cannot open file: %s. Skipping."
+-msgstr "Impossible d'ouvrir le fichier : %s. Omission."
++msgid "Skipping the running kernel: %s"
++msgstr "Omission du noyau en cours d'exécution : %s"
++
++#: ../yum/__init__.py:3709
++#, python-format
++msgid "Removing %s from the transaction"
++msgstr "Suppression de %s de la transaction"
+
+-#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
++#: ../yum/__init__.py:3744
++#, python-format
++msgid "Cannot open: %s. Skipping."
++msgstr "Impossible d'ouvrir : %s. Omission."
++
++#: ../yum/__init__.py:3747 ../yum/__init__.py:3859 ../yum/__init__.py:3935
+ #, python-format
+ msgid "Examining %s: %s"
+ msgstr "Examen de %s : %s"
+
+-#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
++#: ../yum/__init__.py:3751
++#, python-format
++msgid "Cannot localinstall deltarpm: %s. Skipping."
++msgstr "Impossible d'exécuter localinstall sur le deltarpm : %s. Omission."
++
++#: ../yum/__init__.py:3760 ../yum/__init__.py:3862 ../yum/__init__.py:3938
+ #, python-format
+ msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+ msgstr ""
+ "Impossible d'ajouter le paquet %s à la transaction. Architecture "
+ "incompatible : %s"
+
+-#: ../yum/__init__.py:3270
++#: ../yum/__init__.py:3766
++#, python-format
++msgid "Cannot install package %s. It is obsoleted by installed package %s"
++msgstr ""
++"Impossible d'installer le paquet %s. Il est rendu obsolète par le paquet "
++"%s installé"
++
++#: ../yum/__init__.py:3774
+ #, python-format
+ msgid ""
+ "Package %s not installed, cannot update it. Run yum install to install it "
+@@ -2342,101 +2720,129 @@ msgstr ""
+ "Le paquet %s n'est pas installé, il est impossible de le mettre à jour. "
+ "Lancez plutôt yum install pour l'installer."
+
+-#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
++#: ../yum/__init__.py:3803 ../yum/__init__.py:3867 ../yum/__init__.py:3943
+ #, python-format
+ msgid "Excluding %s"
+ msgstr "Exclusion de %s"
+
+-#: ../yum/__init__.py:3304
++#: ../yum/__init__.py:3808
+ #, python-format
+ msgid "Marking %s to be installed"
+ msgstr "Sélection de %s pour installation "
+
+-#: ../yum/__init__.py:3310
++#: ../yum/__init__.py:3814
+ #, python-format
+ msgid "Marking %s as an update to %s"
+ msgstr "Sélection de %s pour mise à jour de %s"
+
+-#: ../yum/__init__.py:3317
++#: ../yum/__init__.py:3821
+ #, python-format
+ msgid "%s: does not update installed package."
+ msgstr "%s : ne met pas à jour le paquet installé."
+
+-#: ../yum/__init__.py:3379
++#: ../yum/__init__.py:3856 ../yum/__init__.py:3932
++#, python-format
++msgid "Cannot open file: %s. Skipping."
++msgstr "Impossible d'ouvrir le fichier : %s. Omission."
++
++#: ../yum/__init__.py:3886
+ msgid "Problem in reinstall: no package matched to remove"
+ msgstr ""
+ "Problème dans la ré-installation : aucun paquet correspondant à supprimer"
+
+-# Je suis pas sûr d'avoir bien compris la chaîne originale
+-#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
+-#, python-format
+-msgid "Package %s is allowed multiple installs, skipping"
+-msgstr "Le paquet %s autorise des installations multiples, omission"
+-
+-#: ../yum/__init__.py:3413
++#: ../yum/__init__.py:3912
+ #, python-format
+ msgid "Problem in reinstall: no package %s matched to install"
+ msgstr ""
+ "Problème dans la ré-installation : aucun paquet %s correspondant à installer"
+
+-#: ../yum/__init__.py:3515
++#: ../yum/__init__.py:4018
+ msgid "No package(s) available to downgrade"
+ msgstr "Aucun paquet disponible pour rétrogradation"
+
+-#: ../yum/__init__.py:3559
++# Je suis pas sûr d'avoir bien compris la chaîne originale
++#: ../yum/__init__.py:4026
++#, python-format
++msgid "Package %s is allowed multiple installs, skipping"
++msgstr "Le paquet %s autorise des installations multiples, omission"
++
++#: ../yum/__init__.py:4072
+ #, python-format
+ msgid "No Match for available package: %s"
+ msgstr "Aucune correspondance pour le paquet disponible : %s"
+
+-#: ../yum/__init__.py:3565
++#: ../yum/__init__.py:4079
+ #, python-format
+ msgid "Only Upgrade available on package: %s"
+-msgstr "Mise à niveau uniquement disponible pour le paquet : %s"
++msgstr "Mise à jour uniquement disponible pour le paquet : %s"
+
+-#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
++#: ../yum/__init__.py:4149 ../yum/__init__.py:4186
+ #, python-format
+ msgid "Failed to downgrade: %s"
+ msgstr "Échec lors du lors du retour à la version précédente : %s"
+
+-#: ../yum/__init__.py:3704
++#: ../yum/__init__.py:4218
+ #, python-format
+ msgid "Retrieving GPG key from %s"
+ msgstr "Récupération de la clé GPG depuis %s"
+
+-#: ../yum/__init__.py:3724
++#: ../yum/__init__.py:4238
+ msgid "GPG key retrieval failed: "
+ msgstr "Échec de la récupération de la clé GPG : "
+
+-#: ../yum/__init__.py:3735
++#: ../yum/__init__.py:4244
++#, python-format
++msgid "Invalid GPG Key from %s: %s"
++msgstr "Clé GPG invalide depuis %s :%s"
++
++#: ../yum/__init__.py:4253
+ #, python-format
+ msgid "GPG key parsing failed: key does not have value %s"
+ msgstr "Échec d'analyse de la clé GPG : la clé n'a pas de valeur %s"
+
+-#: ../yum/__init__.py:3767
++#: ../yum/__init__.py:4267
+ #, python-format
+-msgid "GPG key at %s (0x%s) is already installed"
+-msgstr "La clé GPG %s (0x%s) est déjà installée"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid : %s\n"
++" Package: %s (%s)\n"
++" From : %s"
++msgstr ""
++"Import de la clé GPG 0x%s :\n"
++" ID utilisateur : %s\n"
++" Paquet : %s (%s)\n"
++" Depuis : %s"
++
++#: ../yum/__init__.py:4275
++#, python-format
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid: \"%s\"\n"
++" From : %s"
++msgstr ""
++"Import de la clé GPG 0x%s :\n"
++" ID utilisateur : %s\n"
++" Depuis : %s"
+
+-#. Try installing/updating GPG key
+-#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
++#: ../yum/__init__.py:4307
+ #, python-format
+-msgid "Importing GPG key 0x%s \"%s\" from %s"
+-msgstr "Import de la clé GPG 0x%s « %s » depuis %s"
++msgid "GPG key at %s (0x%s) is already installed"
++msgstr "La clé GPG %s (0x%s) est déjà installée"
+
+-#: ../yum/__init__.py:3789
++#: ../yum/__init__.py:4326
+ msgid "Not installing key"
+ msgstr "N'installe pas la clé"
+
+-#: ../yum/__init__.py:3795
++#: ../yum/__init__.py:4332
+ #, python-format
+ msgid "Key import failed (code %d)"
+ msgstr "L'import de la clé à échoué (code %d)"
+
+-#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
++#: ../yum/__init__.py:4333 ../yum/__init__.py:4389
+ msgid "Key imported successfully"
+ msgstr "La clé a été importée avec succès"
+
+-#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
++#: ../yum/__init__.py:4338
+ #, python-format
+ msgid ""
+ "The GPG keys listed for the \"%s\" repository are already installed but they "
+@@ -2447,81 +2853,97 @@ msgstr ""
+ "incorrectes pour ce paquet.\n"
+ "Vérifiez que les URL des clés pour ce dépôt soient correctes."
+
+-#: ../yum/__init__.py:3810
++#: ../yum/__init__.py:4347
+ msgid "Import of key(s) didn't help, wrong key(s)?"
+ msgstr ""
+ "L'import de la (des) clé(s) n'a pas résolu le problème, mauvaise(s) clé(s) ?"
+
+-#: ../yum/__init__.py:3829
++#: ../yum/__init__.py:4366
+ #, python-format
+ msgid "GPG key at %s (0x%s) is already imported"
+ msgstr "La clé GPG %s (0x%s) est déjà importée"
+
+-#: ../yum/__init__.py:3849
++#: ../yum/__init__.py:4383
+ #, python-format
+ msgid "Not installing key for repo %s"
+ msgstr "N'installe pas la clé pour le dépôt %s"
+
+-#: ../yum/__init__.py:3854
++#: ../yum/__init__.py:4388
+ msgid "Key import failed"
+ msgstr "L'import de la clé à échoué"
+
+-#: ../yum/__init__.py:3976
++#: ../yum/__init__.py:4394
++#, python-format
++msgid ""
++"The GPG keys listed for the \"%s\" repository are already installed but they "
++"are not correct.\n"
++"Check that the correct key URLs are configured for this repository."
++msgstr ""
++"Les clés GPG listées pour le dépôt « %s » sont déjà installées mais sont "
++"incorrectes.\n"
++"Vérifiez que les URL des clés pour ce dépôt soient correctes."
++
++#: ../yum/__init__.py:4521
+ msgid "Unable to find a suitable mirror."
+ msgstr "Impossible de trouver un miroir adapté."
+
+-#: ../yum/__init__.py:3978
++#: ../yum/__init__.py:4523
+ msgid "Errors were encountered while downloading packages."
+ msgstr "Des erreurs ont été rencontrée durant le téléchargement des paquets."
+
+-#: ../yum/__init__.py:4028
++#: ../yum/__init__.py:4573
+ #, python-format
+ msgid "Please report this error at %s"
+ msgstr "Veuillez reporter cette erreur dans %s"
+
+-#: ../yum/__init__.py:4052
++#: ../yum/__init__.py:4597
+ msgid "Test Transaction Errors: "
+ msgstr "Erreurs de la transaction de test : "
+
++#: ../yum/__init__.py:4700
++#, python-format
++msgid "Could not set cachedir: %s"
++msgstr "Impossible de configurer cachedir : %s"
++
+ #. Mostly copied from YumOutput._outKeyValFill()
+-#: ../yum/plugins.py:202
++#: ../yum/plugins.py:208
+ msgid "Loaded plugins: "
+ msgstr "Modules complémentaires chargés : "
+
+-#: ../yum/plugins.py:216 ../yum/plugins.py:222
++#: ../yum/plugins.py:222 ../yum/plugins.py:228
+ #, python-format
+ msgid "No plugin match for: %s"
+ msgstr "Aucun plugin correspondant pour : %s"
+
+-#: ../yum/plugins.py:252
++#: ../yum/plugins.py:258
+ #, python-format
+ msgid "Not loading \"%s\" plugin, as it is disabled"
+ msgstr "Le module complémentaire « %s » est désactivé, il ne sera pas chargé"
+
+ #. Give full backtrace:
+-#: ../yum/plugins.py:264
++#: ../yum/plugins.py:270
+ #, python-format
+ msgid "Plugin \"%s\" can't be imported"
+ msgstr "L'extension « %s » ne peut pas être importé"
+
+-#: ../yum/plugins.py:271
++#: ../yum/plugins.py:277
+ #, python-format
+ msgid "Plugin \"%s\" doesn't specify required API version"
+ msgstr ""
+ "Le module complémentaire « %s » ne spécifie pas la version de l'API requise"
+
+-#: ../yum/plugins.py:276
++#: ../yum/plugins.py:282
+ #, python-format
+ msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+ msgstr ""
+ "Le module complémentaire « %s » requiert l'API %s. L'API supportée est %s."
+
+-#: ../yum/plugins.py:309
++#: ../yum/plugins.py:315
+ #, python-format
+ msgid "Loading \"%s\" plugin"
+ msgstr "Chargement du module complémentaire « %s »"
+
+-#: ../yum/plugins.py:316
++#: ../yum/plugins.py:322
+ #, python-format
+ msgid ""
+ "Two or more plugins with the name \"%s\" exist in the plugin search path"
+@@ -2529,25 +2951,48 @@ msgstr ""
+ "Au moins deux modules complémentaires avec le même nom « %s » existent dans "
+ "le chemin de recherche des modules complémentaires"
+
+-#: ../yum/plugins.py:336
++#: ../yum/plugins.py:342
+ #, python-format
+ msgid "Configuration file %s not found"
+ msgstr "Fichier de configuration %s non trouvé"
+
+ #. for
+ #. Configuration files for the plugin not found
+-#: ../yum/plugins.py:339
++#: ../yum/plugins.py:345
+ #, python-format
+ msgid "Unable to find configuration file for plugin %s"
+ msgstr ""
+ "Impossible de trouver le fichier de configuration pour le module "
+ "complémentaire %s"
+
+-#: ../yum/plugins.py:501
++#: ../yum/plugins.py:507
+ msgid "registration of commands not supported"
+ msgstr "enregistrement de commandes non supporté"
+
+-#: ../yum/rpmtrans.py:78
++#: ../yum/rpmsack.py:102
++msgid "has missing requires of"
++msgstr "a des dépendances manquantes de"
++
++#: ../yum/rpmsack.py:105
++msgid "has installed conflicts"
++msgstr "des conflits sont installés"
++
++#: ../yum/rpmsack.py:114
++#, python-format
++msgid "%s is a duplicate with %s"
++msgstr "%s est un doublon de %s"
++
++#: ../yum/rpmsack.py:122
++#, python-format
++msgid "%s is obsoleted by %s"
++msgstr "%s est rendu obsolète par %s"
++
++#: ../yum/rpmsack.py:130
++#, python-format
++msgid "%s provides %s but it cannot be found"
++msgstr "%s fournit %s mais est introuvable"
++
++#: ../yum/rpmtrans.py:79
+ msgid "Repackaging"
+ msgstr "Ré-empaquetage"
+
+@@ -2581,6 +3026,54 @@ msgstr "En-tête endommagé %s"
+ msgid "Error opening rpm %s - error %s"
+ msgstr "Erreur d'ouverture du rpm %s - erreur %s"
+
++#~ msgid "Finished Transaction Test"
++#~ msgstr "Transaction de test terminée"
++
++#~ msgid "Repo : %s"
++#~ msgstr "Dépôt : %s"
++
++#~ msgid "URL : %s"
++#~ msgstr "URL : %s"
++
++#~ msgid "License : %s"
++#~ msgstr "Licence : %s"
++
++#~ msgid "Description: "
++#~ msgstr "Description :"
++
++#~ msgid ""
++#~ "Remove %5.5s Package(s)\n"
++#~ "Reinstall %5.5s Package(s)\n"
++#~ "Downgrade %5.5s Package(s)\n"
++#~ msgstr ""
++#~ "Supprimer %5.5s paquet(s)\n"
++#~ "Réinstaller %5.5s paquet(s)\n"
++#~ "Déclasser %5.5s paquet(s)\n"
++
++#~ msgid "Weird"
++#~ msgstr "Bizarre"
++
++#~ msgid ""
++#~ " You could try running: package-cleanup --problems\n"
++#~ " package-cleanup --dupes\n"
++#~ " rpm -Va --nofiles --nodigest"
++#~ msgstr ""
++#~ " Vous pouvez essayer d'exécuter : package-cleanup --problems\n"
++#~ " package-cleanup --dupes\n"
++#~ " rpm -Va --nofiles --nodigest"
++
++#~ msgid "Potential match for %s from %s"
++#~ msgstr "Correspondance potentielle pour %s depuis %s"
++
++#~ msgid "Matched %s to require for %s"
++#~ msgstr "Correspondance %s trouvée pour %s "
++
++#~ msgid "Unresolvable requirement %s for %s"
++#~ msgstr "Impossible de résoudre le prérequis %s pour %s"
++
++#~ msgid "Missing Dependency: %s is needed by package %s"
++#~ msgstr "Dépendance manquante : %s est requis par le paquet %s"
++
+ #~ msgid "Matching packages for package list to user args"
+ #~ msgstr "Liste des paquets correspondant à la demande de l'utilisateur"
+
+@@ -2611,9 +3104,6 @@ msgstr "Erreur d'ouverture du rpm %s - erreur %s"
+ #~ msgid "Reducing %s to included packages only"
+ #~ msgstr "Réduction de %s aux paquets inclus uniquement"
+
+-#~ msgid "Keeping included package %s"
+-#~ msgstr "Conservation du paquet inclus %s"
+-
+ #~ msgid "Removing unmatched package %s"
+ #~ msgstr "Suppression du paquet non concordant %s"
+
+diff --git a/po/it.po b/po/it.po
+index 7d8e38d..0b37a29 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -12,7 +12,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: yum-it 3.2.8\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-02-11 10:54-0500\n"
++"POT-Creation-Date: 2010-08-17 10:15-0400\n"
+ "PO-Revision-Date: 2001-02-17 02:12+0100\n"
+ "Last-Translator: Guido Grazioli <guido.grazioli at gmail.com>\n"
+ "Language-Team: Italian <fedora-trans-it at redhat.com>\n"
+@@ -22,7 +22,7 @@ msgstr ""
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+ "X-Generator: Lokalize 0.3\n"
+
+-#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72
++#: ../callback.py:48 ../output.py:1027 ../yum/rpmtrans.py:72
+ msgid "Updating"
+ msgstr "Aggiornamento"
+
+@@ -30,26 +30,26 @@ msgstr "Aggiornamento"
+ msgid "Erasing"
+ msgstr "Eliminazione"
+
+-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946
+-#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1026
++#: ../output.py:1919 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
+ #: ../yum/rpmtrans.py:77
+ msgid "Installing"
+ msgstr "Installazione"
+
+-#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76
++#: ../callback.py:52 ../callback.py:58 ../output.py:1640 ../yum/rpmtrans.py:76
+ msgid "Obsoleted"
+ msgstr "Reso obsoleto"
+
+-#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491
++#: ../callback.py:54 ../output.py:1157 ../output.py:1518 ../output.py:1647
+ msgid "Updated"
+ msgstr "Aggiornato"
+
+-#: ../callback.py:55 ../output.py:1438
++#: ../callback.py:55 ../output.py:1517
+ msgid "Erased"
+ msgstr "Eliminato"
+
+-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068
+-#: ../output.py:1434 ../output.py:1646
++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1155
++#: ../output.py:1517 ../output.py:1519 ../output.py:1891
+ msgid "Installed"
+ msgstr "Installato"
+
+@@ -71,7 +71,7 @@ msgstr "Errore: stato di output non valido: %s per %s"
+ msgid "Erased: %s"
+ msgstr "Eliminato: %s"
+
+-#: ../callback.py:217 ../output.py:948 ../output.py:1648
++#: ../callback.py:217 ../output.py:1028 ../output.py:1894
+ msgid "Removing"
+ msgstr "Rimozione in corso"
+
+@@ -79,65 +79,65 @@ msgstr "Rimozione in corso"
+ msgid "Cleanup"
+ msgstr "Pulizia"
+
+-#: ../cli.py:107
++#: ../cli.py:108
+ #, python-format
+ msgid "Command \"%s\" already defined"
+ msgstr "Comando \"%s\" già definito"
+
+-#: ../cli.py:119
++#: ../cli.py:120
+ msgid "Setting up repositories"
+ msgstr "Settaggio repository"
+
+-#: ../cli.py:130
++#: ../cli.py:131
+ msgid "Reading repository metadata in from local files"
+ msgstr "Lettura dei metadati dei repository dai file locali"
+
+-#: ../cli.py:194 ../utils.py:193
++#: ../cli.py:234 ../utils.py:254
+ #, python-format
+ msgid "Config Error: %s"
+ msgstr "Errore di configurazione: %s"
+
+-#: ../cli.py:197 ../cli.py:1272 ../utils.py:196
++#: ../cli.py:237 ../cli.py:1403 ../utils.py:257
+ #, python-format
+ msgid "Options Error: %s"
+ msgstr "Errore opzioni: %s"
+
+-#: ../cli.py:227
++#: ../cli.py:267
+ #, python-format
+ msgid " Installed: %s-%s at %s"
+ msgstr " Installato: %s-%s da %s"
+
+-#: ../cli.py:229
++#: ../cli.py:269
+ #, python-format
+ msgid " Built : %s at %s"
+ msgstr " Build : %s su %s"
+
+-#: ../cli.py:231
++#: ../cli.py:271
+ #, python-format
+ msgid " Committed: %s at %s"
+ msgstr " Committed: %s su %s"
+
+-#: ../cli.py:270
++#: ../cli.py:310
+ msgid "You need to give some command"
+ msgstr "È necessario specificare un comando"
+
+-#: ../cli.py:284
++#: ../cli.py:324
+ #, python-format
+ msgid "No such command: %s. Please use %s --help"
+ msgstr "Comando sconosciuto: %s. Eseguire %s --help"
+
+-#: ../cli.py:314
++#: ../cli.py:354
+ msgid "Disk Requirements:\n"
+ msgstr "Requisiti disco:\n"
+
+-#: ../cli.py:316
++#: ../cli.py:356
+ #, python-format
+ msgid " At least %dMB more space needed on the %s filesystem.\n"
+ msgstr " Servono almeno altri %dMB sul filesystem %s.\n"
+
+ #. TODO: simplify the dependency errors?
+ #. Fixup the summary
+-#: ../cli.py:321
++#: ../cli.py:361
+ msgid ""
+ "Error Summary\n"
+ "-------------\n"
+@@ -145,60 +145,60 @@ msgstr ""
+ "Riepilogo errori\n"
+ "----------------\n"
+
+-#: ../cli.py:364
++#: ../cli.py:404
+ msgid "Trying to run the transaction but nothing to do. Exiting."
+ msgstr "La transazione non contiene alcuna operazione da eseguire."
+
+-#: ../cli.py:403
++#: ../cli.py:451
+ msgid "Exiting on user Command"
+ msgstr "Uscita richiesta dall'utente"
+
+-#: ../cli.py:407
++#: ../cli.py:455
+ msgid "Downloading Packages:"
+ msgstr "Download dei pacchetti:"
+
+-#: ../cli.py:412
++#: ../cli.py:460
+ msgid "Error Downloading Packages:\n"
+ msgstr "Errore nel download dei pacchetti:\n"
+
+-#: ../cli.py:426 ../yum/__init__.py:4195
++#: ../cli.py:474 ../yum/__init__.py:4559
+ msgid "Running rpm_check_debug"
+ msgstr "Esecuzione rpm_check_debug"
+
+-#: ../cli.py:435 ../yum/__init__.py:4204
++#: ../cli.py:483 ../yum/__init__.py:4568
+ msgid "ERROR You need to update rpm to handle:"
+ msgstr "ERRORE Occorre aggiornare rpm per gestire:"
+
+-#: ../cli.py:437 ../yum/__init__.py:4207
++#: ../cli.py:485 ../yum/__init__.py:4571
+ msgid "ERROR with rpm_check_debug vs depsolve:"
+ msgstr "ERRORE tra rpm_check_debug e depsolve:"
+
+-#: ../cli.py:443
++#: ../cli.py:491
+ msgid "RPM needs to be updated"
+ msgstr "RPM deve essere aggiornato"
+
+-#: ../cli.py:444
++#: ../cli.py:492
+ #, python-format
+ msgid "Please report this error in %s"
+ msgstr "Riportare questo errore su %s"
+
+-#: ../cli.py:450
++#: ../cli.py:498
+ msgid "Running Transaction Test"
+ msgstr "Test di transazione in corso"
+
+-#: ../cli.py:466
++#: ../cli.py:514
+ msgid "Transaction Check Error:\n"
+ msgstr "Errore nel controllo transazione:\n"
+
+-#: ../cli.py:473
++#: ../cli.py:521
+ msgid "Transaction Test Succeeded"
+ msgstr "Test di transazione eseguito con successo"
+
+-#: ../cli.py:495
++#: ../cli.py:543
+ msgid "Running Transaction"
+ msgstr "Transazione in corso"
+
+-#: ../cli.py:525
++#: ../cli.py:573
+ msgid ""
+ "Refusing to automatically import keys when running unattended.\n"
+ "Use \"-y\" to override."
+@@ -206,84 +206,92 @@ msgstr ""
+ "L'importazione automatica delle chiavi è disabilitata in modalità non interattiva.\n"
+ "Usare \"-y\" per abilitarla."
+
+-#: ../cli.py:544 ../cli.py:578
++#: ../cli.py:592 ../cli.py:626
+ msgid " * Maybe you meant: "
+ msgstr " * Forse si intendeva: "
+
+-#: ../cli.py:561 ../cli.py:569
++#: ../cli.py:609 ../cli.py:617
+ #, python-format
+ msgid "Package(s) %s%s%s available, but not installed."
+ msgstr "Pacchetto %s%s%s disponibile, ma non installato."
+
+-#: ../cli.py:575 ../cli.py:607 ../cli.py:687
++#: ../cli.py:623 ../cli.py:656 ../cli.py:810
+ #, python-format
+ msgid "No package %s%s%s available."
+ msgstr "Nessun pacchetto %s%s%s disponibile."
+
+-#: ../cli.py:612 ../cli.py:748
++#: ../cli.py:663 ../cli.py:875
+ msgid "Package(s) to install"
+ msgstr "Pacchetto(i) da installare"
+
+-#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749
+-#: ../yumcommands.py:160
++#: ../cli.py:666 ../cli.py:667 ../cli.py:816 ../cli.py:850 ../cli.py:876
++#: ../yumcommands.py:179
+ msgid "Nothing to do"
+ msgstr "Niente da fare"
+
+-#: ../cli.py:647
++#: ../cli.py:701
+ #, python-format
+ msgid "%d packages marked for Update"
+ msgstr "%d pacchetti marcati per l'aggiornamento"
+
+-#: ../cli.py:650
++#: ../cli.py:704
+ msgid "No Packages marked for Update"
+ msgstr "Nessun pacchetto marcato per l'aggiornamento"
+
+-#: ../cli.py:664
++#: ../cli.py:770
++msgid "%d packages marked for Distribution Synchronization"
++msgstr "%d pacchetti marcati per la Distribution Synchronization"
++
++#: ../cli.py:773
++msgid "No Packages marked for Distribution Synchronization"
++msgstr "Nessun pacchetto marcato per la Distribution Synchronization"
++
++#: ../cli.py:787
+ #, python-format
+ msgid "%d packages marked for removal"
+ msgstr "%d pacchetti marcati per la rimozione"
+
+-#: ../cli.py:667
++#: ../cli.py:790
+ msgid "No Packages marked for removal"
+ msgstr "Nessun pacchetto marcato per la rimozione"
+
+-#: ../cli.py:692
++#: ../cli.py:815
+ msgid "Package(s) to downgrade"
+ msgstr "Downgrade dei pacchetti"
+
+-#: ../cli.py:717
++#: ../cli.py:840
+ #, python-format
+ msgid " (from %s)"
+ msgstr " (da %s)"
+
+-#: ../cli.py:719
++#: ../cli.py:841
+ #, python-format
+ msgid "Installed package %s%s%s%s not available."
+ msgstr "Pacchetto installato %s%s%s%s non disponibile."
+
+-#: ../cli.py:726
++#: ../cli.py:849
+ msgid "Package(s) to reinstall"
+ msgstr "Pacchetto(i) da reinstallare"
+
+-#: ../cli.py:739
++#: ../cli.py:862
+ msgid "No Packages Provided"
+ msgstr "Nessun pacchetto specificato"
+
+-#: ../cli.py:818
++#: ../cli.py:945
+ #, python-format
+ msgid "Matched: %s"
+ msgstr "Trovato: %s"
+
+-#: ../cli.py:825
++#: ../cli.py:952
+ #, python-format
+ msgid "Warning: No matches found for: %s"
+ msgstr "Attenzione: Nessun pacchetto trovato per: %s"
+
+-#: ../cli.py:828
++#: ../cli.py:955
+ msgid "No Matches found"
+ msgstr "Nessuna corrispondenza trovata"
+
+-#: ../cli.py:868
++#: ../cli.py:995
+ #, python-format
+ msgid ""
+ "Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+@@ -292,109 +300,113 @@ msgstr ""
+ "Attenzione: la versione 3.0.x di yum non fa match correttamente sui filename.\n"
+ " Si può usare \"%s*/%s%s\" e/o \"%s*bin/%s%s\" per avere questo comportamento"
+
+-#: ../cli.py:884
++#: ../cli.py:1011
+ #, python-format
+ msgid "No Package Found for %s"
+ msgstr "Nessun pacchetto trovato per %s"
+
+-#: ../cli.py:896
++#: ../cli.py:1021
++msgid "Cleaning repos: "
++msgstr "Pulizia dei repository:"
++
++#: ../cli.py:1026
+ msgid "Cleaning up Everything"
+ msgstr "Pulizia completa"
+
+-#: ../cli.py:912
++#: ../cli.py:1042
+ msgid "Cleaning up Headers"
+ msgstr "Pulizia header"
+
+-#: ../cli.py:915
++#: ../cli.py:1045
+ msgid "Cleaning up Packages"
+ msgstr "Pulizia pacchetti"
+
+-#: ../cli.py:918
++#: ../cli.py:1048
+ msgid "Cleaning up xml metadata"
+ msgstr "Pulizia metadati xml"
+
+-#: ../cli.py:921
++#: ../cli.py:1051
+ msgid "Cleaning up database cache"
+ msgstr "Pulizia cache database"
+
+-#: ../cli.py:924
++#: ../cli.py:1054
+ msgid "Cleaning up expire-cache metadata"
+ msgstr "Pulizia metadati expire-cache"
+
+-#: ../cli.py:927
++#: ../cli.py:1057
+ msgid "Cleaning up cached rpmdb data"
+ msgstr "Pulizia cache di rpmdb"
+
+-#: ../cli.py:930
++#: ../cli.py:1060
+ msgid "Cleaning up plugins"
+ msgstr "Pulizia plugin"
+
+-#: ../cli.py:955
++#: ../cli.py:1085
+ msgid "Installed Groups:"
+ msgstr "Gruppi installati:"
+
+-#: ../cli.py:967
++#: ../cli.py:1097
+ msgid "Available Groups:"
+ msgstr "Gruppi disponibili:"
+
+-#: ../cli.py:977
++#: ../cli.py:1107
+ msgid "Done"
+ msgstr "Fatto"
+
+-#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788
++#: ../cli.py:1118 ../cli.py:1136 ../cli.py:1142 ../yum/__init__.py:3069
+ #, python-format
+ msgid "Warning: Group %s does not exist."
+ msgstr "Attenzione: Il gruppo %s non esiste."
+
+-#: ../cli.py:1016
++#: ../cli.py:1146
+ msgid "No packages in any requested group available to install or update"
+ msgstr "Nessun pacchetto in alcun gruppo richiesto è disponibile per l'installazione o l'aggiornamento"
+
+-#: ../cli.py:1018
++#: ../cli.py:1148
+ #, python-format
+ msgid "%d Package(s) to Install"
+ msgstr "%d pacchetto(i) da installare"
+
+-#: ../cli.py:1028 ../yum/__init__.py:2800
++#: ../cli.py:1158 ../yum/__init__.py:3081
+ #, python-format
+ msgid "No group named %s exists"
+ msgstr "Non esiste nessun gruppo con nome %s"
+
+-#: ../cli.py:1034
++#: ../cli.py:1164
+ msgid "No packages to remove from groups"
+ msgstr "Nessun pacchetto da rimuovere dai gruppi"
+
+-#: ../cli.py:1036
++#: ../cli.py:1166
+ #, python-format
+ msgid "%d Package(s) to remove"
+ msgstr "%d pacchetto(i) da eliminare"
+
+-#: ../cli.py:1078
++#: ../cli.py:1208
+ #, python-format
+ msgid "Package %s is already installed, skipping"
+ msgstr "Il pacchetto %s è già installato, verrà ignorato"
+
+-#: ../cli.py:1089
++#: ../cli.py:1219
+ #, python-format
+ msgid "Discarding non-comparable pkg %s.%s"
+ msgstr "Esclusione del pacchetto non comparabile %s.%s"
+
+ #. we've not got any installed that match n or n+a
+-#: ../cli.py:1115
++#: ../cli.py:1245
+ #, python-format
+ msgid "No other %s installed, adding to list for potential install"
+ msgstr "Nessun altro %s installato, inserimento in lista per potenziale installazione"
+
+-#: ../cli.py:1135
++#: ../cli.py:1265
+ msgid "Plugin Options"
+ msgstr "Opzioni plugin"
+
+-#: ../cli.py:1143
++#: ../cli.py:1273
+ #, python-format
+ msgid "Command line error: %s"
+ msgstr "Errore di linea di comando: %s"
+
+-#: ../cli.py:1156
++#: ../cli.py:1287
+ #, python-format
+ msgid ""
+ "\n"
+@@ -405,114 +417,117 @@ msgstr ""
+ "\n"
+ "%s: l'opzione %s richiede un argomento"
+
+-#: ../cli.py:1209
++#: ../cli.py:1340
+ msgid "--color takes one of: auto, always, never"
+ msgstr "--color deve specificare uno tra: auto, always, never"
+
+-#: ../cli.py:1319
++#: ../cli.py:1450
+ msgid "show this help message and exit"
+ msgstr "mostra questo messaggio di aiuto ed esce"
+
+-#: ../cli.py:1323
++#: ../cli.py:1454
+ msgid "be tolerant of errors"
+ msgstr "tollera gli errori"
+
+-#: ../cli.py:1326
++#: ../cli.py:1457
+ msgid "run entirely from system cache, don't update cache"
+ msgstr "esegui esclusivamente in cache, senza aggiornarla"
+
+-#: ../cli.py:1329
++#: ../cli.py:1460
+ msgid "config file location"
+ msgstr "percorso del file di configurazione"
+
+-#: ../cli.py:1332
++#: ../cli.py:1463
+ msgid "maximum command wait time"
+ msgstr "tempo massimo di attesa comando"
+
+-#: ../cli.py:1334
++#: ../cli.py:1465
+ msgid "debugging output level"
+ msgstr "livello output di debug"
+
+-#: ../cli.py:1338
++#: ../cli.py:1469
+ msgid "show duplicates, in repos, in list/search commands"
+ msgstr "mostra i duplicati nei repo, per i comandi list/search"
+
+-#: ../cli.py:1340
++#: ../cli.py:1471
+ msgid "error output level"
+ msgstr "livello output per gli errori"
+
+-#: ../cli.py:1343
++#: ../cli.py:1474
+ msgid "debugging output level for rpm"
+ msgstr "livello output di debug per rpm"
+
+-#: ../cli.py:1346
++#: ../cli.py:1477
+ msgid "quiet operation"
+ msgstr "modalità silenziosa"
+
+-#: ../cli.py:1348
++#: ../cli.py:1479
+ msgid "verbose operation"
+ msgstr "mostra più messaggi di log"
+
+-#: ../cli.py:1350
++#: ../cli.py:1481
+ msgid "answer yes for all questions"
+ msgstr "risponde si a tutte le domande"
+
+-#: ../cli.py:1352
++#: ../cli.py:1483
+ msgid "show Yum version and exit"
+ msgstr "mostra la versione di yum ed esce"
+
+-#: ../cli.py:1353
++#: ../cli.py:1484
+ msgid "set install root"
+ msgstr "imposta la root d'installazione"
+
+-#: ../cli.py:1357
++#: ../cli.py:1488
+ msgid "enable one or more repositories (wildcards allowed)"
+ msgstr "abilita uno o più repository (wildcard consentite)"
+
+-#: ../cli.py:1361
++#: ../cli.py:1492
+ msgid "disable one or more repositories (wildcards allowed)"
+ msgstr "disabilita uno o più repository (wildcard consentite)"
+
+-#: ../cli.py:1364
++#: ../cli.py:1495
+ msgid "exclude package(s) by name or glob"
+ msgstr "esclude pacchetti per nome o glob"
+
+-#: ../cli.py:1366
++#: ../cli.py:1497
+ msgid "disable exclude from main, for a repo or for everything"
+ msgstr "disabilita l'esclusione dal main, per un repo o per tutto"
+
+-#: ../cli.py:1369
++#: ../cli.py:1500
+ msgid "enable obsoletes processing during updates"
+ msgstr "abilita l'elaborazione degli obsoleti durante l'aggiornamento"
+
+-#: ../cli.py:1371
++#: ../cli.py:1502
+ msgid "disable Yum plugins"
+ msgstr "disabilita i plugin di Yum"
+
+-#: ../cli.py:1373
++#: ../cli.py:1504
+ msgid "disable gpg signature checking"
+ msgstr "disabilita il controllo della firma gpg"
+
+-#: ../cli.py:1375
++#: ../cli.py:1506
+ msgid "disable plugins by name"
+ msgstr "disabilita i plugin per nome"
+
+-#: ../cli.py:1378
++#: ../cli.py:1509
+ msgid "enable plugins by name"
+ msgstr "abilita i plugin per nome"
+
+-#: ../cli.py:1381
++#: ../cli.py:1512
+ msgid "skip packages with depsolving problems"
+ msgstr "ignora pacchetti con problemi di risoluzione dipendenze"
+
+-#: ../cli.py:1383
++#: ../cli.py:1514
+ msgid "control whether color is used"
+ msgstr "controlla se il colore è usato"
+
+-#: ../cli.py:1385
++#: ../cli.py:1516
+ msgid "set value of $releasever in yum config and repo files"
+-msgstr ""
+-"imposta $releasever nella configurazione di yum e nei file dei repo"
++msgstr "imposta $releasever nella configurazione di yum e nei file dei repo"
++
++#: ../cli.py:1518
++msgid "set arbitrary config and repo options"
++msgstr "imposta configurazioni arbitrarie e opzioni dei repository"
+
+ #: ../output.py:305
+ msgid "Jan"
+@@ -566,104 +581,114 @@ msgstr "Dic"
+ msgid "Trying other mirror."
+ msgstr "Connessione ad un altro mirror in corso."
+
+-#: ../output.py:534
++#: ../output.py:579
+ #, python-format
+-msgid "Name : %s%s%s"
+-msgstr "Nome : %s%s%s"
++msgid "Name : %s%s%s"
++msgstr "Nome : %s%s%s"
+
+-#: ../output.py:535
++#: ../output.py:580
+ #, python-format
+-msgid "Arch : %s"
+-msgstr "Arch : %s"
++msgid "Arch : %s"
++msgstr "Arch : %s"
+
+-#: ../output.py:537
++#: ../output.py:582
+ #, python-format
+-msgid "Epoch : %s"
+-msgstr "Epoch : %s"
++msgid "Epoch : %s"
++msgstr "Epoch : %s"
+
+-#: ../output.py:538
++#: ../output.py:583
+ #, python-format
+-msgid "Version : %s"
+-msgstr "Versione : %s"
++msgid "Version : %s"
++msgstr "Versione : %s"
+
+-#: ../output.py:539
++#: ../output.py:584
+ #, python-format
+-msgid "Release : %s"
+-msgstr "Rilascio : %s"
++msgid "Release : %s"
++msgstr "Rilascio : %s"
+
+-#: ../output.py:540
++#: ../output.py:585
+ #, python-format
+-msgid "Size : %s"
++msgid "Size : %s"
+ msgstr "Dimensione : %s"
+
+-#: ../output.py:541
++#: ../output.py:586 ../output.py:890
+ #, python-format
+-msgid "Repo : %s"
+-msgstr "Repo : %s"
++msgid "Repo : %s"
++msgstr "Repo : %s"
+
+-#: ../output.py:543
++#: ../output.py:588
+ #, python-format
+-msgid "From repo : %s"
+-msgstr "Dal repo : %s"
++msgid "From repo : %s"
++msgstr "Dal repo : %s"
+
+-#: ../output.py:545
++#: ../output.py:590
+ #, python-format
+-msgid "Committer : %s"
++msgid "Committer : %s"
+ msgstr "Committer : %s"
+
+-#: ../output.py:546
++#: ../output.py:591
+ #, python-format
+-msgid "Committime : %s"
+-msgstr "Data commit: %s"
++msgid "Committime : %s"
++msgstr "Data commit : %s"
+
+-#: ../output.py:547
++#: ../output.py:592
+ #, python-format
+-msgid "Buildtime : %s"
++msgid "Buildtime : %s"
+ msgstr "Data build : %s"
+
+-#: ../output.py:549
++#: ../output.py:594
++#, python-format
++msgid "Install time: %s"
++msgstr "Data inst.: %s"
++
++#: ../output.py:602
+ #, python-format
+-msgid "Installtime: %s"
+-msgstr "Data inst. : %s"
++msgid "Installed by: %s"
++msgstr "Installato da: %s"
+
+-#: ../output.py:550
+-msgid "Summary : "
+-msgstr "Sommario : "
++#: ../output.py:609
++#, python-format
++msgid "Changed by : %s"
++msgstr "Modificato da : %s"
++
++#: ../output.py:610
++msgid "Summary : "
++msgstr "Sommario: "
+
+-#: ../output.py:552
++#: ../output.py:612 ../output.py:903
+ #, python-format
+-msgid "URL : %s"
+-msgstr "URL : %s"
++msgid "URL : %s"
++msgstr "URL : %s"
+
+-#: ../output.py:553
+-msgid "License : "
+-msgstr "Licenza : "
++#: ../output.py:613
++msgid "License : "
++msgstr "Licenza: "
+
+-#: ../output.py:554
+-msgid "Description: "
+-msgstr "Descrizione: "
++#: ../output.py:614 ../output.py:900
++msgid "Description : "
++msgstr "Descrizione : "
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "y"
+ msgstr "s"
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "yes"
+ msgstr "si"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "n"
+ msgstr "n"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "no"
+ msgstr "no"
+
+-#: ../output.py:627
++#: ../output.py:687
+ msgid "Is this ok [y/N]: "
+ msgstr "Procedere [s/N]: "
+
+-#: ../output.py:715
++#: ../output.py:775
+ #, python-format
+ msgid ""
+ "\n"
+@@ -672,152 +697,142 @@ msgstr ""
+ "\n"
+ "Gruppo: %s"
+
+-#: ../output.py:719
++#: ../output.py:779
+ #, python-format
+ msgid " Group-Id: %s"
+ msgstr " Id-Gruppo: %s"
+
+-#: ../output.py:724
++#: ../output.py:784
+ #, python-format
+ msgid " Description: %s"
+ msgstr " Descrizione: %s"
+
+-#: ../output.py:726
++#: ../output.py:786
+ msgid " Mandatory Packages:"
+ msgstr " Pacchetti necessari:"
+
+-#: ../output.py:727
++#: ../output.py:787
+ msgid " Default Packages:"
+ msgstr " Pacchetti di default:"
+
+-#: ../output.py:728
++#: ../output.py:788
+ msgid " Optional Packages:"
+ msgstr "Pacchetti opzionali:"
+
+-#: ../output.py:729
++#: ../output.py:789
+ msgid " Conditional Packages:"
+ msgstr " Pacchetti condizionali:"
+
+-#: ../output.py:749
++#: ../output.py:809
+ #, python-format
+ msgid "package: %s"
+ msgstr "pacchetto: %s"
+
+-#: ../output.py:751
++#: ../output.py:811
+ msgid " No dependencies for this package"
+ msgstr " Nessuna dipendenza per questo pacchetto"
+
+-#: ../output.py:756
++#: ../output.py:816
+ #, python-format
+ msgid " dependency: %s"
+ msgstr " dipendenze: %s"
+
+-#: ../output.py:758
++#: ../output.py:818
+ msgid " Unsatisfied dependency"
+ msgstr " Dipendenza non soddisfatte"
+
+-#: ../output.py:830
+-#, python-format
+-msgid "Repo : %s"
+-msgstr "Repo : %s"
+-
+-#: ../output.py:831
++#: ../output.py:891
+ msgid "Matched from:"
+ msgstr "Corrispondenza trovata in:"
+
+-#: ../output.py:840
+-msgid "Description : "
+-msgstr "Descrizione : "
+-
+-#: ../output.py:843
+-#, python-format
+-msgid "URL : %s"
+-msgstr "URL : %s"
+-
+-#: ../output.py:846
++#: ../output.py:906
+ #, python-format
+ msgid "License : %s"
+ msgstr "Licenza : %s"
+
+-#: ../output.py:849
++#: ../output.py:909
+ #, python-format
+ msgid "Filename : %s"
+ msgstr "Nome file : %s"
+
+-#: ../output.py:853
++#: ../output.py:913
+ msgid "Other : "
+ msgstr "Altro : "
+
+-#: ../output.py:896
++#: ../output.py:956
+ msgid "There was an error calculating total download size"
+ msgstr "Si è verificato un errore nel calcolo della dimensione totale di download"
+
+-#: ../output.py:901
++#: ../output.py:961
+ #, python-format
+ msgid "Total size: %s"
+ msgstr "Dimensione totale: %s"
+
+-#: ../output.py:904
++#: ../output.py:964
+ #, python-format
+ msgid "Total download size: %s"
+ msgstr "Dimensione totale del download: %s"
+
+-#: ../output.py:908
++#: ../output.py:968 ../output.py:988
+ #, python-format
+ msgid "Installed size: %s"
+ msgstr "Dimensione installata: %s"
+
+-#: ../output.py:949
++#: ../output.py:984
++msgid "There was an error calculating installed size"
++msgstr "Si è verificato un errore nel calcolo della dimensione del pacchetto installato"
++
++#: ../output.py:1029
+ msgid "Reinstalling"
+ msgstr "Reinstallazione"
+
+-#: ../output.py:950
++#: ../output.py:1030
+ msgid "Downgrading"
+ msgstr "Downgrade"
+
+-#: ../output.py:951
++#: ../output.py:1031
+ msgid "Installing for dependencies"
+ msgstr "Installazioni per dipendenze"
+
+-#: ../output.py:952
++#: ../output.py:1032
+ msgid "Updating for dependencies"
+ msgstr "Aggiornamenti per dipendenze"
+
+-#: ../output.py:953
++#: ../output.py:1033
+ msgid "Removing for dependencies"
+ msgstr "Rimozioni per dipendenze"
+
+-#: ../output.py:960 ../output.py:1072
++#: ../output.py:1040 ../output.py:1159
+ msgid "Skipped (dependency problems)"
+ msgstr "Saltato (problemi di dipendenze)"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Package"
+ msgstr "Pacchetto"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Arch"
+ msgstr "Arch"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Version"
+ msgstr "Versione"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Repository"
+ msgstr "Repository"
+
+ # poco spazio, va come intestazione nella tabella di riepilogo
+-#: ../output.py:985
++#: ../output.py:1065
+ msgid "Size"
+ msgstr "Dim."
+
+-#: ../output.py:997
++#: ../output.py:1077
+ #, python-format
+ msgid " replacing %s%s%s.%s %s\n"
+ msgstr " in sostituzione di %s%s%s.%s %s\n"
+
+-#: ../output.py:1006
++#: ../output.py:1086
+ #, python-format
+ msgid ""
+ "\n"
+@@ -828,52 +843,57 @@ msgstr ""
+ "Riepilogo della transazione\n"
+ "%s\n"
+
+-#: ../output.py:1013
++#: ../output.py:1097
+ #, python-format
+-msgid ""
+-"Install %5.5s Package(s)\n"
+-"Upgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Installa %5.5s pacchetto/i\n"
+-"Aggiorna %5.5s pacchetto/i\n"
++msgid "Install %5.5s Package(s)\n"
++msgstr "Installa %5.5s pacchetti\n"
+
+-#: ../output.py:1022
++#: ../output.py:1101
+ #, python-format
+-msgid ""
+-"Remove %5.5s Package(s)\n"
+-"Reinstall %5.5s Package(s)\n"
+-"Downgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Elimina %5.5s pacchetto/i\n"
+-"Reinstalla %5.5s pacchetto/i\n"
+-"Downgrade %5.5s pacchetto/i\n"
++msgid "Upgrade %5.5s Package(s)\n"
++msgstr "Aggiorna %5.5s pacchetti\n"
+
+-#: ../output.py:1066
++#: ../output.py:1105
++#, python-format
++msgid "Remove %5.5s Package(s)\n"
++msgstr "Elimina %5.5s pacchetti\n"
++
++#: ../output.py:1109
++#, python-format
++msgid "Reinstall %5.5s Package(s)\n"
++msgstr "Reinstalla %5.5s pacchetti\n"
++
++#: ../output.py:1113
++#, python-format
++msgid "Downgrade %5.5s Package(s)\n"
++msgstr "Downgrade %5.5s pacchetti\n"
++
++#: ../output.py:1153
+ msgid "Removed"
+ msgstr "Eliminato"
+
+-#: ../output.py:1067
++#: ../output.py:1154
+ msgid "Dependency Removed"
+ msgstr "Dipendenza rimossa"
+
+-#: ../output.py:1069
++#: ../output.py:1156
+ msgid "Dependency Installed"
+ msgstr "Dipendenza installata"
+
+-#: ../output.py:1071
++#: ../output.py:1158
+ msgid "Dependency Updated"
+ msgstr "Dipendenza aggiornata"
+
+-#: ../output.py:1073
++#: ../output.py:1160
+ msgid "Replaced"
+ msgstr "Sostituito"
+
+-#: ../output.py:1074
++#: ../output.py:1161
+ msgid "Failed"
+ msgstr "Fallito"
+
+ #. Delta between C-c's so we treat as exit
+-#: ../output.py:1140
++#: ../output.py:1245
+ msgid "two"
+ msgstr "due"
+
+@@ -881,7 +901,7 @@ msgstr "due"
+ #. Current download cancelled, interrupt (ctrl-c) again within two seconds
+ #. to exit.
+ #. Where "interupt (ctrl-c) again" and "two" are highlighted.
+-#: ../output.py:1151
++#: ../output.py:1256
+ #, python-format
+ msgid ""
+ "\n"
+@@ -889,282 +909,339 @@ msgid ""
+ "to exit.\n"
+ msgstr ""
+ "\n"
+-" Download interrotto, %spremi nuovamente (ctrl-c)%s entro %s%s%s secondi per "
+-"uscire.\n"
++" Download interrotto, %spremi nuovamente (ctrl-c)%s entro %s%s%s secondi per uscire.\n"
+
+-#: ../output.py:1162
++#: ../output.py:1267
+ msgid "user interrupt"
+ msgstr "interruzione utente"
+
+-#: ../output.py:1180
++#: ../output.py:1285
+ msgid "Total"
+ msgstr "Totale"
+
+ # abbreviazione di Install
+-#: ../output.py:1202
++#: ../output.py:1307
+ msgid "I"
+ msgstr "I"
+
+ # abbreviazione di Obsolete
+-#: ../output.py:1203
++#: ../output.py:1308
+ msgid "O"
+ msgstr "O"
+
+ # Erase
+-#: ../output.py:1204
++#: ../output.py:1309
+ msgid "E"
+ msgstr "E"
+
+ # Remove
+-#: ../output.py:1205
++#: ../output.py:1310
+ msgid "R"
+ msgstr "R"
+
+ # Downgrade
+-#: ../output.py:1206
++#: ../output.py:1311
+ msgid "D"
+ msgstr "D"
+
+ # Update
+-#: ../output.py:1207
++#: ../output.py:1312
+ msgid "U"
+ msgstr "U"
+
+-#: ../output.py:1217
++#: ../output.py:1323
+ msgid "<unset>"
+ msgstr "<non impostato>"
+
+-#: ../output.py:1218
++#: ../output.py:1324
+ msgid "System"
+ msgstr "Sistema"
+
+-#: ../output.py:1254
++#: ../output.py:1368
+ msgid "Bad transaction IDs, or package(s), given"
+ msgstr "L'ID transazione, o il pacchetto specificato, non è corretto"
+
+-#: ../output.py:1266
++#: ../output.py:1380
+ msgid "ID"
+ msgstr "ID"
+
+-#: ../output.py:1267 ../output.py:1520
++#: ../output.py:1381 ../output.py:1699
+ msgid "Login user"
+ msgstr "Utente loggato"
+
+-#: ../output.py:1268
++#: ../output.py:1382
+ msgid "Date and time"
+ msgstr "Data e ora"
+
+-#: ../output.py:1269 ../output.py:1522
++#: ../output.py:1383 ../output.py:1701
+ msgid "Action(s)"
+ msgstr "Azione/i"
+
+ # intestazione nel senso di "numero di pacchetti lavorati"
+-#: ../output.py:1270 ../output.py:1523
++#: ../output.py:1384 ../output.py:1702
+ msgid "Altered"
+ msgstr "Modifiche"
+
+-#: ../output.py:1310
++#: ../output.py:1431 ../output.py:1760
+ msgid "No transaction ID given"
+ msgstr "ID transazione non specificato"
+
+-#: ../output.py:1336
++#: ../output.py:1457
+ msgid "Bad transaction ID given"
+ msgstr "L'ID transazione specificato non è corretto"
+
+-#: ../output.py:1341
++#: ../output.py:1462
+ msgid "Not found given transaction ID"
+ msgstr "L'ID transazione specificato non è stato trovato"
+
+-#: ../output.py:1349
++#: ../output.py:1470
+ msgid "Found more than one transaction ID!"
+ msgstr "Sono stati trovati ID transazione multipli!"
+
+-#: ../output.py:1370
++#: ../output.py:1491 ../output.py:1770
+ msgid "No transaction ID, or package, given"
+ msgstr "ID transazione o pacchetto non specificato"
+
+-#: ../output.py:1396
++#: ../output.py:1518 ../output.py:1645
++msgid "Downgraded"
++msgstr "Downgraded"
++
++#: ../output.py:1519
++msgid "Not installed"
++msgstr "Non installato"
++
++#: ../output.py:1520
++msgid "Older"
++msgstr "Meno recente"
++
++#: ../output.py:1520
++msgid "Newer"
++msgstr "Più recente"
++
++#: ../output.py:1552
+ msgid "Transaction ID :"
+ msgstr "ID transazione :"
+
+-#: ../output.py:1398
++#: ../output.py:1554
+ msgid "Begin time :"
+ msgstr "Ora inizio :"
+
+-#: ../output.py:1401 ../output.py:1403
++#: ../output.py:1557 ../output.py:1559
+ msgid "Begin rpmdb :"
+ msgstr "rpmdb iniziale :"
+
+-#: ../output.py:1417
++#: ../output.py:1573
+ #, python-format
+ msgid "(%s seconds)"
+ msgstr "(%s secondi)"
+
+-#: ../output.py:1418
++#: ../output.py:1574
+ msgid "End time :"
+ msgstr "Ora termine :"
+
+-#: ../output.py:1421 ../output.py:1423
++#: ../output.py:1577 ../output.py:1579
+ msgid "End rpmdb :"
+ msgstr "rpmdb finale :"
+
+-#: ../output.py:1424
++#: ../output.py:1580
+ msgid "User :"
+ msgstr "Utente :"
+
+-#: ../output.py:1426 ../output.py:1428 ../output.py:1430
++#: ../output.py:1582 ../output.py:1584 ../output.py:1586
+ msgid "Return-Code :"
+ msgstr "Return-Code : "
+
+-#: ../output.py:1426
++#: ../output.py:1582
+ msgid "Aborted"
+ msgstr "Interrotto"
+
+-#: ../output.py:1428
++#: ../output.py:1584
+ msgid "Failure:"
+ msgstr "Errore:"
+
+-#: ../output.py:1430
++#: ../output.py:1586
+ msgid "Success"
+ msgstr "Completato"
+
+-#: ../output.py:1431
+-msgid "Transaction performed with:"
+-msgstr "Transazione eseguita con:"
++#: ../output.py:1589
++msgid "Command Line :"
++msgstr "Linea di comando :"
+
+-#: ../output.py:1444 ../output.py:1489
+-msgid "Downgraded"
+-msgstr "Downgraded"
++#: ../output.py:1597
++#, python-format
++msgid "Additional non-default information stored: %d"
++msgstr "Informazioni non predefinite addizionali salvate: %d"
+
+-#. multiple versions installed, both older and newer
+-#: ../output.py:1446
+-msgid "Weird"
+-msgstr "Weird"
++#: ../output.py:1600
++msgid "Transaction performed with:"
++msgstr "Transazione eseguita con:"
+
+-#: ../output.py:1448
++#: ../output.py:1603
+ msgid "Packages Altered:"
+ msgstr "Pacchetti modificati:"
+
+-#: ../output.py:1451
++#: ../output.py:1607
++msgid "Packages Skipped:"
++msgstr "Pacchetti ignorati:"
++
++#: ../output.py:1612
++msgid "Rpmdb Problems:"
++msgstr "Problemi di rpmdb:"
++
++#: ../output.py:1620
+ msgid "Scriptlet output:"
+ msgstr "Output della scriptlet:"
+
+-#: ../output.py:1457
++#: ../output.py:1626
+ msgid "Errors:"
+ msgstr "Errori:"
+
++#. Note that these don't use _simple_pkg() because we are showing what
++#. happened to them in the transaction ... not the difference between the
++#. version in the transaction and now.
+ # queste sotto sono etichette a fianco della lista di pacchetti
+ # per lo storico delle transazioni
+-#: ../output.py:1481 ../output.py:1482
++#: ../output.py:1637 ../output.py:1638
+ msgid "Install"
+ msgstr "Install"
+
+-#: ../output.py:1483
++#: ../output.py:1639
+ msgid "Dep-Install"
+ msgstr "Dep-Install"
+
+-#: ../output.py:1485
++#: ../output.py:1641
+ msgid "Obsoleting"
+ msgstr "Obsoleto"
+
+-#: ../output.py:1486
++#: ../output.py:1642
+ msgid "Erase"
+ msgstr "Eliminato"
+
+-#: ../output.py:1487
++#: ../output.py:1643
+ msgid "Reinstall"
+ msgstr "Reinstall"
+
+-#: ../output.py:1488
++#: ../output.py:1644
+ msgid "Downgrade"
+ msgstr "Downgrade"
+
+-#: ../output.py:1490
++#: ../output.py:1646
+ msgid "Update"
+ msgstr "Update"
+
+-#: ../output.py:1521
++#: ../output.py:1700
+ msgid "Time"
+ msgstr "Data"
+
+-#: ../output.py:1547
++#: ../output.py:1726
+ msgid "Last day"
+ msgstr "Ultime 24 ore"
+
+-#: ../output.py:1548
++#: ../output.py:1727
+ msgid "Last week"
+ msgstr "Ultima settimana"
+
+-#: ../output.py:1549
++#: ../output.py:1728
+ msgid "Last 2 weeks"
+ msgstr "Ultime 2 settimane"
+
+ #. US default :p
+-#: ../output.py:1550
++#: ../output.py:1729
+ msgid "Last 3 months"
+ msgstr "Ultimi 3 mesi"
+
+-#: ../output.py:1551
++#: ../output.py:1730
+ msgid "Last 6 months"
+ msgstr "Ultimi 6 mesi"
+
+-#: ../output.py:1552
++#: ../output.py:1731
+ msgid "Last year"
+ msgstr "Ultimi 12 mesi"
+
+-#: ../output.py:1553
++#: ../output.py:1732
+ msgid "Over a year ago"
+ msgstr "Più di un anno"
+
+-#: ../output.py:1585
++#: ../output.py:1774
++#, python-format
++msgid "No Transaction %s found"
++msgstr "Transazione %s non trovata"
++
++#: ../output.py:1780
++msgid "Transaction ID:"
++msgstr "ID transazione:"
++
++#: ../output.py:1781
++msgid "Available additional history information:"
++msgstr "Informazioni addizionali sulla cronologia:"
++
++#: ../output.py:1793
++#, python-format
++msgid "%s: No additional data found by this name"
++msgstr "%s: nessuna informazione addizionale trovata con questo nome"
++
++#: ../output.py:1809
+ msgid "installed"
+ msgstr "installato"
+
+-#: ../output.py:1586
++#: ../output.py:1810
+ msgid "updated"
+ msgstr "aggiornato"
+
+-#: ../output.py:1587
++#: ../output.py:1811
+ msgid "obsoleted"
+ msgstr "reso obsoleto"
+
+-#: ../output.py:1588
++#: ../output.py:1812
+ msgid "erased"
+ msgstr "eliminato"
+
+-#: ../output.py:1592
++#: ../output.py:1813
++msgid "reinstalled"
++msgstr "reinstallato"
++
++#: ../output.py:1814
++msgid "downgraded"
++msgstr "downgraded"
++
++#: ../output.py:1818
+ #, python-format
+ msgid "---> Package %s.%s %s:%s-%s set to be %s"
+ msgstr "---> Pacchetto %s.%s %s:%s-%s settato per essere %s"
+
+-#: ../output.py:1599
++#: ../output.py:1825
+ msgid "--> Running transaction check"
+ msgstr "--> Esecuzione del controllo di transazione"
+
+-#: ../output.py:1604
++#: ../output.py:1830
+ msgid "--> Restarting Dependency Resolution with new changes."
+ msgstr "--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti."
+
+-#: ../output.py:1609
++#: ../output.py:1835
+ msgid "--> Finished Dependency Resolution"
+ msgstr "--> Risoluzione delle dipendenze completata"
+
+-#: ../output.py:1614 ../output.py:1619
++#: ../output.py:1840 ../output.py:1845
+ #, python-format
+ msgid "--> Processing Dependency: %s for package: %s"
+ msgstr "--> Elaborazione dipendenza: %s per il pacchetto: %s"
+
+-#: ../output.py:1623
++#: ../output.py:1850
++#, python-format
++msgid "---> Keeping package: %s"
++msgstr "---> Pacchetto mantenuto: %s"
++
++#: ../output.py:1853
+ #, python-format
+ msgid "--> Unresolved Dependency: %s"
+ msgstr "--> Dipendenza non risolta: %s"
+
+-#: ../output.py:1634
++#: ../output.py:1864
+ #, python-format
+ msgid "Package: %s"
+ msgstr "Pacchetto: %s"
+
+-#: ../output.py:1636
++#: ../output.py:1866
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1173,7 +1250,7 @@ msgstr ""
+ "\n"
+ " richiede: %s"
+
+-#: ../output.py:1649 ../output.py:1660
++#: ../output.py:1875
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1182,83 +1259,103 @@ msgstr ""
+ "\n"
+ " %s: %s (%s)"
+
+-#: ../output.py:1657
++#: ../output.py:1880
++#, python-format
++msgid ""
++"\n"
++" %s"
++msgstr ""
++"\n"
++" %s"
++
++#: ../output.py:1882
++msgid ""
++"\n"
++" Not found"
++msgstr ""
++"\n"
++" Non trovato"
++
++#. These should be the only three things we care about:
++#: ../output.py:1897
++msgid "Updated By"
++msgstr "Aggiornato da"
++
++#: ../output.py:1898
++msgid "Downgraded By"
++msgstr "Downgraded da"
++
++#: ../output.py:1899
++msgid "Obsoleted By"
++msgstr "Reso obsoleto da"
++
++#: ../output.py:1917
+ msgid "Available"
+ msgstr "Disponibile"
+
+-#: ../output.py:1665 ../output.py:1670
++#: ../output.py:1944 ../output.py:1949
+ #, python-format
+ msgid "--> Processing Conflict: %s conflicts %s"
+ msgstr "--> Controllo conflitto: %s va in conflitto con %s"
+
+-#: ../output.py:1674
++#: ../output.py:1953
+ msgid "--> Populating transaction set with selected packages. Please wait."
+ msgstr "--> Inizializzazione della transazione con i pacchetti selezionati. Attendere prego."
+
+-#: ../output.py:1678
++#: ../output.py:1957
+ #, python-format
+ msgid "---> Downloading header for %s to pack into transaction set."
+ msgstr "---> Download degli header per %s per impacchettarli nel set di transazione."
+
+-#: ../utils.py:93
++#: ../utils.py:94
+ msgid "Running"
+ msgstr "In esecuzione"
+
+-#: ../utils.py:94
++#: ../utils.py:95
+ msgid "Sleeping"
+ msgstr "In attesa"
+
+-#: ../utils.py:95
++#: ../utils.py:96
+ msgid "Uninterruptible"
+ msgstr "Non interrompibile"
+
+-#: ../utils.py:96
++#: ../utils.py:97
+ msgid "Zombie"
+ msgstr "Zombie"
+
+-#: ../utils.py:97
++#: ../utils.py:98
+ msgid "Traced/Stopped"
+ msgstr "Tracciato/Arrestato"
+
+-#: ../utils.py:98 ../yumcommands.py:917
++#: ../utils.py:99 ../yumcommands.py:972
+ msgid "Unknown"
+ msgstr "Sconosciuto"
+
+-#: ../utils.py:109
++#: ../utils.py:110
+ msgid " The other application is: PackageKit"
+ msgstr " L'altra applicazione è: PackageKit"
+
+-#: ../utils.py:111
++#: ../utils.py:112
+ #, python-format
+ msgid " The other application is: %s"
+ msgstr " L'altra applicazione è: %s"
+
+-#: ../utils.py:114
++#: ../utils.py:115
+ #, python-format
+ msgid " Memory : %5s RSS (%5sB VSZ)"
+ msgstr " Memoria : %5s RSS (%5sB VSZ)"
+
+-#: ../utils.py:119
++#: ../utils.py:120
+ #, python-format
+ msgid " Started: %s - %s ago"
+ msgstr " Avviato: %s - %s fa"
+
+-#: ../utils.py:121
++#: ../utils.py:122
+ #, python-format
+ msgid " State : %s, pid: %d"
+ msgstr " Stato : %s, pid: %d"
+
+-#: ../utils.py:199
+-#, python-format
+-msgid "PluginExit Error: %s"
+-msgstr "Errore ritorno del plugin: %s"
+-
+-#: ../utils.py:202
+-#, python-format
+-msgid "Yum Error: %s"
+-msgstr "Errore di yum: %s"
+-
+-#: ../utils.py:235 ../yummain.py:42
++#: ../utils.py:143 ../yummain.py:42
+ msgid ""
+ "\n"
+ "\n"
+@@ -1268,7 +1365,7 @@ msgstr ""
+ "\n"
+ "Uscita forzata da utente"
+
+-#: ../utils.py:241 ../yummain.py:48
++#: ../utils.py:149 ../yummain.py:48
+ msgid ""
+ "\n"
+ "\n"
+@@ -1278,7 +1375,7 @@ msgstr ""
+ "\n"
+ "Uscita per broken pipe"
+
+-#: ../utils.py:243 ../yummain.py:50
++#: ../utils.py:151 ../yummain.py:50
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1289,7 +1386,47 @@ msgstr ""
+ "\n"
+ "%s"
+
+-#: ../utils.py:282 ../yummain.py:211
++#: ../utils.py:201 ../yummain.py:107
++msgid "Another app is currently holding the yum lock; exiting as configured by exit_on_lock"
++msgstr "Un'altra applicazione sta bloccando l'esecuzione di yum; arresto come configurato da exit_on_lock"
++
++#: ../utils.py:260
++#, python-format
++msgid "PluginExit Error: %s"
++msgstr "Errore ritorno del plugin: %s"
++
++#: ../utils.py:263
++#, python-format
++msgid "Yum Error: %s"
++msgstr "Errore di yum: %s"
++
++#: ../utils.py:315 ../yummain.py:134 ../yummain.py:173
++#, python-format
++msgid "Error: %s"
++msgstr "Errore: %s"
++
++#: ../utils.py:319 ../yummain.py:177
++msgid " You could try using --skip-broken to work around the problem"
++msgstr " Si può provare ad usare --skip-broken per aggirare il problema"
++
++#: ../utils.py:321 ../yummain.py:179 ../yummain.py:212
++msgid " You could try running: rpm -Va --nofiles --nodigest"
++msgstr " Provare ad eseguire: rpm -Va --nofiles --nodigest"
++
++#: ../utils.py:328 ../yummain.py:144 ../yummain.py:186
++#, python-format
++msgid "Unknown Error(s): Exit Code: %d:"
++msgstr "Errore sconosciuto: Codice di uscita: %d:"
++
++#: ../utils.py:334 ../yummain.py:192
++msgid ""
++"\n"
++"Dependencies Resolved"
++msgstr ""
++"\n"
++"Dipendenze risolte"
++
++#: ../utils.py:349 ../yummain.py:215
+ msgid "Complete!"
+ msgstr "Completo!"
+
+@@ -1368,296 +1505,313 @@ msgstr "Il file %s dato come argomento per la shell non esiste."
+ msgid "Error: more than one file given as argument to shell."
+ msgstr "Errore: più di un file passato come argomento alla shell."
+
+-#: ../yumcommands.py:170
++#: ../yumcommands.py:138
++msgid ""
++"There are no enabled repos.\n"
++" Run \"yum repolist all\" to see the repos you have.\n"
++" You can enable repos with yum-config-manager --enable <repo>"
++msgstr ""
++"Non ci sono repository abilitati.\n"
++" Esegui \"yum repolist all\" per vedere la lista dei repository.\n"
++" E' possibile abilitare i repository desiderati con yum-config-manager --enable <repo>"
++
++#: ../yumcommands.py:189
+ msgid "PACKAGE..."
+ msgstr "PACCHETTO..."
+
+-#: ../yumcommands.py:173
++#: ../yumcommands.py:192
+ msgid "Install a package or packages on your system"
+ msgstr "Installa uno o più pacchetti nel sistema"
+
+-#: ../yumcommands.py:181
++#: ../yumcommands.py:201
+ msgid "Setting up Install Process"
+ msgstr "Impostazione processo di installazione"
+
+-#: ../yumcommands.py:192
++#: ../yumcommands.py:212 ../yumcommands.py:234
+ msgid "[PACKAGE...]"
+ msgstr "[PACCHETTO...]"
+
+-#: ../yumcommands.py:195
++#: ../yumcommands.py:215
+ msgid "Update a package or packages on your system"
+ msgstr "Aggiorna uno o più pacchetti nel sistema"
+
+-#: ../yumcommands.py:202
++#: ../yumcommands.py:223
+ msgid "Setting up Update Process"
+ msgstr "Impostazione processo di aggiornamento"
+
+-#: ../yumcommands.py:244
++#: ../yumcommands.py:237
++msgid "Synchronize installed packages to the latest available versions"
++msgstr "Sincronizza i pacchetti installati con le ultime versioni disponibili"
++
++#: ../yumcommands.py:245
++msgid "Setting up Distribution Synchronization Process"
++msgstr "Impostazione processo di DIstribution Synchronization"
++
++#: ../yumcommands.py:288
+ msgid "Display details about a package or group of packages"
+ msgstr "Visualizza dettagli su un pacchetto o un gruppo di pacchetti"
+
+-#: ../yumcommands.py:293
++#: ../yumcommands.py:337
+ msgid "Installed Packages"
+ msgstr "Pacchetti installati"
+
+-#: ../yumcommands.py:301
++#: ../yumcommands.py:345
+ msgid "Available Packages"
+ msgstr "Pacchetti disponibili"
+
+-#: ../yumcommands.py:305
++#: ../yumcommands.py:349
+ msgid "Extra Packages"
+ msgstr "Pacchetti extra"
+
+-#: ../yumcommands.py:309
++#: ../yumcommands.py:353
+ msgid "Updated Packages"
+ msgstr "Aggiornamenti disponibili"
+
+ #. This only happens in verbose mode
+-#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601
++#: ../yumcommands.py:361 ../yumcommands.py:368 ../yumcommands.py:655
+ msgid "Obsoleting Packages"
+ msgstr "Pacchetti resi obsoleti"
+
+-#: ../yumcommands.py:326
++#: ../yumcommands.py:370
+ msgid "Recently Added Packages"
+ msgstr "Pacchetti aggiunti di recente"
+
+-#: ../yumcommands.py:333
++#: ../yumcommands.py:377
+ msgid "No matching Packages to list"
+ msgstr "Nessun pacchetto presente in lista"
+
+-#: ../yumcommands.py:347
++#: ../yumcommands.py:391
+ msgid "List a package or groups of packages"
+ msgstr "Elenca un pacchetto o un gruppo di pacchetti"
+
+-
+ # queste sotto sono le descrizioni dei comandi: yum --help
+-#: ../yumcommands.py:359
++#: ../yumcommands.py:403
+ msgid "Remove a package or packages from your system"
+ msgstr "Elimina uno o più pacchetti dal sistema"
+
+-#: ../yumcommands.py:366
++#: ../yumcommands.py:410
+ msgid "Setting up Remove Process"
+ msgstr "Impostazione processo di eliminazione"
+
+-#: ../yumcommands.py:380
++#: ../yumcommands.py:424
+ msgid "Setting up Group Process"
+ msgstr "Impostazione processo di gruppo"
+
+-#: ../yumcommands.py:386
++#: ../yumcommands.py:430
+ msgid "No Groups on which to run command"
+ msgstr "Nessun gruppo sul quale eseguire il comando"
+
+-#: ../yumcommands.py:399
++#: ../yumcommands.py:443
+ msgid "List available package groups"
+ msgstr "Elenca i gruppi di pacchetti disponibili"
+
+-#: ../yumcommands.py:416
++#: ../yumcommands.py:463
+ msgid "Install the packages in a group on your system"
+ msgstr "Installa nel sistema i pacchetti di un gruppo"
+
+-#: ../yumcommands.py:438
++#: ../yumcommands.py:486
+ msgid "Remove the packages in a group from your system"
+ msgstr "Elimina dal sistema i pacchetti di un gruppo"
+
+-#: ../yumcommands.py:465
++#: ../yumcommands.py:514
+ msgid "Display details about a package group"
+ msgstr "Visualizza i dettagli di un gruppo di pacchetti"
+
+-#: ../yumcommands.py:489
++#: ../yumcommands.py:539
+ msgid "Generate the metadata cache"
+ msgstr "Genera la cache dei metadati"
+
+-#: ../yumcommands.py:495
++#: ../yumcommands.py:545
+ msgid "Making cache files for all metadata files."
+ msgstr "Creazione dei file di cache per i metadati."
+
+-#: ../yumcommands.py:496
++#: ../yumcommands.py:546
+ msgid "This may take a while depending on the speed of this computer"
+ msgstr "L'operazione impiegherà del tempo che dipende dalla velocità del computer"
+
+-#: ../yumcommands.py:517
++#: ../yumcommands.py:567
+ msgid "Metadata Cache Created"
+ msgstr "Cache dei metadata creata"
+
+-#: ../yumcommands.py:531
++#: ../yumcommands.py:581
+ msgid "Remove cached data"
+ msgstr "Elimina i dati nella cache"
+
+-#: ../yumcommands.py:551
++#: ../yumcommands.py:602
+ msgid "Find what package provides the given value"
+ msgstr "Determina il pacchetto che fornisce il valore dato"
+
+-#: ../yumcommands.py:571
++#: ../yumcommands.py:622
+ msgid "Check for available package updates"
+ msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti"
+
+-#: ../yumcommands.py:621
++#: ../yumcommands.py:675
+ msgid "Search package details for the given string"
+ msgstr "Cerca il termine passato nei dettagli dei pacchetti"
+
+-#: ../yumcommands.py:627
++#: ../yumcommands.py:681
+ msgid "Searching Packages: "
+ msgstr "Ricerca dei pacchetti: "
+
+-#: ../yumcommands.py:644
++#: ../yumcommands.py:698
+ msgid "Update packages taking obsoletes into account"
+ msgstr "Aggiorna i pacchetti tenendo conto degli obsoleti"
+
+-#: ../yumcommands.py:652
++#: ../yumcommands.py:707
+ msgid "Setting up Upgrade Process"
+ msgstr "Impostazione processo di upgrade"
+
+-#: ../yumcommands.py:666
++#: ../yumcommands.py:721
+ msgid "Install a local RPM"
+ msgstr "Installa un RPM in locale"
+
+-#: ../yumcommands.py:674
++#: ../yumcommands.py:729
+ msgid "Setting up Local Package Process"
+ msgstr "Impostazione processo per pacchetti in locale"
+
+-#: ../yumcommands.py:693
++#: ../yumcommands.py:748
+ msgid "Determine which package provides the given dependency"
+ msgstr "Determina quale pacchetto soddisfa la dipendenza specificata"
+
+-#: ../yumcommands.py:696
++#: ../yumcommands.py:751
+ msgid "Searching Packages for Dependency:"
+ msgstr "Ricerca dei pacchetti per dipendenze:"
+
+-#: ../yumcommands.py:710
++#: ../yumcommands.py:765
+ msgid "Run an interactive yum shell"
+ msgstr "Esegue una shell di yum interattiva"
+
+-#: ../yumcommands.py:716
++#: ../yumcommands.py:771
+ msgid "Setting up Yum Shell"
+ msgstr "Impostazione della shell di yum"
+
+-#: ../yumcommands.py:734
++#: ../yumcommands.py:789
+ msgid "List a package's dependencies"
+ msgstr "Elenca le dipendenze di un pacchetto"
+
+-#: ../yumcommands.py:740
++#: ../yumcommands.py:795
+ msgid "Finding dependencies: "
+ msgstr "Ricerca delle dipendenze: "
+
+-#: ../yumcommands.py:756
++#: ../yumcommands.py:811
+ msgid "Display the configured software repositories"
+ msgstr "Mostra i repository di software configurati"
+
+-#: ../yumcommands.py:822 ../yumcommands.py:823
++#: ../yumcommands.py:877 ../yumcommands.py:878
+ msgid "enabled"
+ msgstr "abilitato"
+
+-#: ../yumcommands.py:849 ../yumcommands.py:850
++#: ../yumcommands.py:904 ../yumcommands.py:905
+ msgid "disabled"
+ msgstr "disabilitato"
+
+-#: ../yumcommands.py:866
++#: ../yumcommands.py:921
+ msgid "Repo-id : "
+ msgstr "Id-Repo : "
+
+-#: ../yumcommands.py:867
++#: ../yumcommands.py:922
+ msgid "Repo-name : "
+ msgstr "Nome-Repo : "
+
+-#: ../yumcommands.py:870
++#: ../yumcommands.py:925
+ msgid "Repo-status : "
+ msgstr "Stato-Repo : "
+
+-#: ../yumcommands.py:873
++#: ../yumcommands.py:928
+ msgid "Repo-revision: "
+ msgstr "Revisione-Repo: "
+
+-#: ../yumcommands.py:877
++#: ../yumcommands.py:932
+ msgid "Repo-tags : "
+ msgstr "Repo-tags : "
+
+-#: ../yumcommands.py:883
++#: ../yumcommands.py:938
+ msgid "Repo-distro-tags: "
+ msgstr "Repo-distro-tags: "
+
+-#: ../yumcommands.py:888
++#: ../yumcommands.py:943
+ msgid "Repo-updated : "
+ msgstr "Repo-updated : "
+
+-#: ../yumcommands.py:890
++#: ../yumcommands.py:945
+ msgid "Repo-pkgs : "
+ msgstr "Repo-pkgs : "
+
+-#: ../yumcommands.py:891
++#: ../yumcommands.py:946
+ msgid "Repo-size : "
+ msgstr "Dim.-Repo : "
+
+-#: ../yumcommands.py:898
++#: ../yumcommands.py:953
+ msgid "Repo-baseurl : "
+ msgstr "Repo-baseurl : "
+
+-#: ../yumcommands.py:906
++#: ../yumcommands.py:961
+ msgid "Repo-metalink: "
+ msgstr "Repo-metalink: "
+
+-#: ../yumcommands.py:910
++#: ../yumcommands.py:965
+ msgid " Updated : "
+ msgstr " Aggiornato :"
+
+-#: ../yumcommands.py:913
++#: ../yumcommands.py:968
+ msgid "Repo-mirrors : "
+ msgstr "Repo-mirrors : "
+
+-#: ../yumcommands.py:923
++#: ../yumcommands.py:978
+ #, python-format
+ msgid "Never (last: %s)"
+ msgstr "Mai (ultimo: %s)"
+
+-#: ../yumcommands.py:925
++#: ../yumcommands.py:980
+ #, python-format
+ msgid "Instant (last: %s)"
+ msgstr "Istantaneo (ultimo: %s)"
+
+-#: ../yumcommands.py:928
++#: ../yumcommands.py:983
+ #, python-format
+ msgid "%s second(s) (last: %s)"
+ msgstr "%s secondi (ultimo: %s)"
+
+-#: ../yumcommands.py:930
++#: ../yumcommands.py:985
+ msgid "Repo-expire : "
+ msgstr "Repo-expire : "
+
+-#: ../yumcommands.py:933
++#: ../yumcommands.py:988
+ msgid "Repo-exclude : "
+ msgstr "Repo-exclude : "
+
+-#: ../yumcommands.py:937
++#: ../yumcommands.py:992
+ msgid "Repo-include : "
+ msgstr "Repo-include :"
+
+-#: ../yumcommands.py:941
++#: ../yumcommands.py:996
+ msgid "Repo-excluded: "
+ msgstr "Repo-excluded: "
+
+ #. Work out the first (id) and last (enabled/disalbed/count),
+ #. then chop the middle (name)...
+-#: ../yumcommands.py:951 ../yumcommands.py:980
++#: ../yumcommands.py:1006 ../yumcommands.py:1035
+ msgid "repo id"
+ msgstr "id repo"
+
+-#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987
++#: ../yumcommands.py:1023 ../yumcommands.py:1024 ../yumcommands.py:1042
+ msgid "status"
+ msgstr "stato"
+
+-#: ../yumcommands.py:981
++#: ../yumcommands.py:1036
+ msgid "repo name"
+ msgstr "nome repo"
+
+-#: ../yumcommands.py:1018
++#: ../yumcommands.py:1073
+ msgid "Display a helpful usage message"
+ msgstr "Mostra un'utile guida all'uso"
+
+-#: ../yumcommands.py:1052
++#: ../yumcommands.py:1107
+ #, python-format
+ msgid "No help available for %s"
+ msgstr "Nessun aiuto disponibile per %s"
+
+-#: ../yumcommands.py:1057
++#: ../yumcommands.py:1112
+ msgid ""
+ "\n"
+ "\n"
+@@ -1667,7 +1821,7 @@ msgstr ""
+ "\n"
+ "alias: "
+
+-#: ../yumcommands.py:1059
++#: ../yumcommands.py:1114
+ msgid ""
+ "\n"
+ "\n"
+@@ -1677,104 +1831,82 @@ msgstr ""
+ "\n"
+ "alias: "
+
+-#: ../yumcommands.py:1087
++#: ../yumcommands.py:1143
+ msgid "Setting up Reinstall Process"
+ msgstr "Impostazione processo di reinstallazione"
+
+-#: ../yumcommands.py:1095
++#: ../yumcommands.py:1151
+ msgid "reinstall a package"
+ msgstr "Reinstalla un pacchetto"
+
+-#: ../yumcommands.py:1113
++#: ../yumcommands.py:1170
+ msgid "Setting up Downgrade Process"
+ msgstr "Impostazione processo di downgrade"
+
+-#: ../yumcommands.py:1120
++#: ../yumcommands.py:1177
+ msgid "downgrade a package"
+ msgstr "Esegue il downgrade di un pacchetto"
+
+-#: ../yumcommands.py:1134
++#: ../yumcommands.py:1191
+ msgid "Display a version for the machine and/or available repos."
+ msgstr "Mostra una versione del sistema e/o dei repo disponibili."
+
+-#: ../yumcommands.py:1173
++#: ../yumcommands.py:1230
+ msgid " Yum version groups:"
+ msgstr " Gruppi della versione di yum:"
+
+-#: ../yumcommands.py:1183
++#: ../yumcommands.py:1240
+ msgid " Group :"
+ msgstr " Gruppo :"
+
+-#: ../yumcommands.py:1184
++#: ../yumcommands.py:1241
+ msgid " Packages:"
+ msgstr " Pacchetti:"
+
+-#: ../yumcommands.py:1213
++#: ../yumcommands.py:1270
+ msgid "Installed:"
+ msgstr "Installato:"
+
+-#: ../yumcommands.py:1218
++#: ../yumcommands.py:1278
+ msgid "Group-Installed:"
+ msgstr "Group-Installed:"
+
+-#: ../yumcommands.py:1227
++#: ../yumcommands.py:1287
+ msgid "Available:"
+ msgstr "Disponibile:"
+
+-#: ../yumcommands.py:1233
++#: ../yumcommands.py:1296
+ msgid "Group-Available:"
+ msgstr "Group-Available:"
+
+-#: ../yumcommands.py:1272
++#: ../yumcommands.py:1335
+ msgid "Display, or use, the transaction history"
+ msgstr "Visualizza e gestisci la cronologia delle transazioni"
+
+-# qui history rimane cosi' perchè intende il comando
+-#: ../yumcommands.py:1300
++# qui history rimane cosi' perchè intende il comando
++#: ../yumcommands.py:1363
+ #, python-format
+ msgid "Invalid history sub-command, use: %s."
+ msgstr "Sotto comando per history non valido, usare: %s."
+
+-#: ../yumcommands.py:1345
++#: ../yumcommands.py:1370
++msgid "You don't have access to the history DB."
++msgstr "Non si dispone dell'accesso alla cronologia."
++
++#: ../yumcommands.py:1413
+ msgid "Check for problems in the rpmdb"
+ msgstr "Identifica gli errori nell'rpmdb"
+
+-#: ../yummain.py:102
++#: ../yummain.py:103
+ msgid "Another app is currently holding the yum lock; waiting for it to exit..."
+ msgstr "Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che esca..."
+
+-#: ../yummain.py:130 ../yummain.py:169
+-#, python-format
+-msgid "Error: %s"
+-msgstr "Errore: %s"
+-
+-#: ../yummain.py:140 ../yummain.py:182
+-#, python-format
+-msgid "Unknown Error(s): Exit Code: %d:"
+-msgstr "Errore sconosciuto: Codice di uscita: %d:"
+-
+ #. Depsolve stage
+-#: ../yummain.py:147
++#: ../yummain.py:151
+ msgid "Resolving Dependencies"
+ msgstr "Risoluzione dipendenze"
+
+-#: ../yummain.py:173
+-msgid " You could try using --skip-broken to work around the problem"
+-msgstr " Si può provare ad usare --skip-broken per aggirare il problema"
+-
+-#: ../yummain.py:175 ../yummain.py:208
+-msgid " You could try running: rpm -Va --nofiles --nodigest"
+-msgstr " Provare ad eseguire: rpm -Va --nofiles --nodigest"
+-
+-#: ../yummain.py:188
+-msgid ""
+-"\n"
+-"Dependencies Resolved"
+-msgstr ""
+-"\n"
+-"Dipendenze risolte"
+-
+-#: ../yummain.py:265
++#: ../yummain.py:269
+ msgid ""
+ "\n"
+ "\n"
+@@ -1792,137 +1924,127 @@ msgstr "doTsSetup() verrà eliminato in una futura versione di yum.\n"
+ msgid "Setting up TransactionSets before config class is up"
+ msgstr "Impostazione del TransactionSets prima che sia attivo config class"
+
+-#: ../yum/depsolve.py:148
++#: ../yum/depsolve.py:151
+ #, python-format
+ msgid "Invalid tsflag in config file: %s"
+ msgstr "tsflag non valido nel file di configurazione: %s"
+
+-#: ../yum/depsolve.py:159
++#: ../yum/depsolve.py:162
+ #, python-format
+ msgid "Searching pkgSack for dep: %s"
+ msgstr "Ricerca di pkgSack per dip: %s"
+
+-#: ../yum/depsolve.py:175
+-#, python-format
+-msgid "Potential match for %s from %s"
+-msgstr "Corrispondenza potenziale per %s da %s"
+-
+-#: ../yum/depsolve.py:183
+-#, python-format
+-msgid "Matched %s to require for %s"
+-msgstr "Individuato %s come dipendenza per %s"
+-
+-#: ../yum/depsolve.py:225
++#: ../yum/depsolve.py:205
+ #, python-format
+ msgid "Member: %s"
+ msgstr "Membro: %s"
+
+-#: ../yum/depsolve.py:239 ../yum/depsolve.py:754
++#: ../yum/depsolve.py:219 ../yum/depsolve.py:754
+ #, python-format
+ msgid "%s converted to install"
+ msgstr "%s convertito in installazione"
+
+-#: ../yum/depsolve.py:246
++#: ../yum/depsolve.py:226
+ #, python-format
+ msgid "Adding Package %s in mode %s"
+ msgstr "Aggiunto il pacchetto %s in modo %s"
+
+-#: ../yum/depsolve.py:256
++#: ../yum/depsolve.py:242
+ #, python-format
+ msgid "Removing Package %s"
+ msgstr "Rimozione pacchetto %s"
+
+-#: ../yum/depsolve.py:278
++#: ../yum/depsolve.py:264
+ #, python-format
+ msgid "%s requires: %s"
+ msgstr "%s richiede: %s"
+
+-#: ../yum/depsolve.py:319
++#: ../yum/depsolve.py:305
+ #, python-format
+ msgid "%s requires %s"
+ msgstr "%s richiede %s"
+
+-#: ../yum/depsolve.py:346
++#: ../yum/depsolve.py:332
+ msgid "Needed Require has already been looked up, cheating"
+ msgstr "Il requisito necessario è già stato controllato, imbroglio"
+
+-#: ../yum/depsolve.py:356
++#: ../yum/depsolve.py:342
+ #, python-format
+ msgid "Needed Require is not a package name. Looking up: %s"
+ msgstr "Il requisito necessario non è il nome di un pacchetto. Ricerca di: %s"
+
+-#: ../yum/depsolve.py:363
++#: ../yum/depsolve.py:349
+ #, python-format
+ msgid "Potential Provider: %s"
+ msgstr "Provider potenziale: %s"
+
+-#: ../yum/depsolve.py:386
++#: ../yum/depsolve.py:372
+ #, python-format
+ msgid "Mode is %s for provider of %s: %s"
+ msgstr "La modalità è %s per il provider di %s: %s"
+
+-#: ../yum/depsolve.py:390
++#: ../yum/depsolve.py:376
+ #, python-format
+ msgid "Mode for pkg providing %s: %s"
+ msgstr "Modalità per il pacchetto che fornisce %s: %s"
+
+-#: ../yum/depsolve.py:394
++#: ../yum/depsolve.py:380
+ #, python-format
+ msgid "TSINFO: %s package requiring %s marked as erase"
+ msgstr "TSINFO: il pacchetto %s richiede che %s sia marcato per la rimozione"
+
+-#: ../yum/depsolve.py:407
++#: ../yum/depsolve.py:393
+ #, python-format
+ msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+ msgstr "TSINFO: Verrà reso obsoleto %s sostituendolo con %s per risolvere una dipendenza."
+
+-#: ../yum/depsolve.py:410
++#: ../yum/depsolve.py:396
+ #, python-format
+ msgid "TSINFO: Updating %s to resolve dep."
+ msgstr "TSINFO: Aggiornamento di %s per risolvere dip."
+
+-#: ../yum/depsolve.py:418
++#: ../yum/depsolve.py:404
+ #, python-format
+ msgid "Cannot find an update path for dep for: %s"
+ msgstr "Impossibile trovare un percorso di aggiornamento per dipendenze per: %s"
+
+-#: ../yum/depsolve.py:449
++#: ../yum/depsolve.py:435
+ #, python-format
+ msgid "Quick matched %s to require for %s"
+ msgstr "Individuato %s come requisito per %s"
+
+ #. is it already installed?
+-#: ../yum/depsolve.py:491
++#: ../yum/depsolve.py:477
+ #, python-format
+ msgid "%s is in providing packages but it is already installed, removing."
+ msgstr "%s è nei pacchetti fornitori ma è già installato, viene rimosso."
+
+-#: ../yum/depsolve.py:507
++#: ../yum/depsolve.py:493
+ #, python-format
+ msgid "Potential resolving package %s has newer instance in ts."
+ msgstr "Potenziale risoluzione del pacchetto %s ha una instanza più nuova in ts."
+
+-#: ../yum/depsolve.py:518
++#: ../yum/depsolve.py:504
+ #, python-format
+ msgid "Potential resolving package %s has newer instance installed."
+ msgstr "Potenziale risoluzione del pacchetto %s ha una istanza più recente installata."
+
+-#: ../yum/depsolve.py:536
++#: ../yum/depsolve.py:522
+ #, python-format
+ msgid "%s already in ts, skipping this one"
+ msgstr "%s è gia nel set delle transazioni (ts), verrà saltato"
+
+-#: ../yum/depsolve.py:578
++#: ../yum/depsolve.py:571
+ #, python-format
+ msgid "TSINFO: Marking %s as update for %s"
+ msgstr "TSINFO: %s marcato come update per %s"
+
+-#: ../yum/depsolve.py:586
++#: ../yum/depsolve.py:580
+ #, python-format
+ msgid "TSINFO: Marking %s as install for %s"
+ msgstr "TSINFO: %s marcato come installa per %s"
+
+-#: ../yum/depsolve.py:690 ../yum/depsolve.py:781
++#: ../yum/depsolve.py:690 ../yum/depsolve.py:780
+ msgid "Success - empty transaction"
+ msgstr "Successo - transazione vuota"
+
+@@ -1939,36 +2061,36 @@ msgstr "Processo delle dipendenze terminato"
+ msgid "%s from %s has depsolving problems"
+ msgstr "%s appartenente a %s ha problemi di dipendenze"
+
+-#: ../yum/depsolve.py:782
++#: ../yum/depsolve.py:781
+ msgid "Success - deps resolved"
+ msgstr "Successo - dipendenze risolte"
+
+-#: ../yum/depsolve.py:796
++#: ../yum/depsolve.py:802
+ #, python-format
+ msgid "Checking deps for %s"
+ msgstr "Controllo delle dipendenze per %s"
+
+-#: ../yum/depsolve.py:874
++#: ../yum/depsolve.py:888
+ #, python-format
+ msgid "looking for %s as a requirement of %s"
+ msgstr "ricerca di %s come un requisito di %s"
+
+-#: ../yum/depsolve.py:1090
++#: ../yum/depsolve.py:1119
+ #, python-format
+ msgid "Running compare_providers() for %s"
+ msgstr "Esecuzione di compare_providers() per %s"
+
+-#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123
++#: ../yum/depsolve.py:1146 ../yum/depsolve.py:1152
+ #, python-format
+ msgid "better arch in po %s"
+ msgstr "migliore architettura in po %s"
+
+-#: ../yum/depsolve.py:1218
++#: ../yum/depsolve.py:1244
+ #, python-format
+ msgid "%s obsoletes %s"
+ msgstr "%s rende obsoleto %s"
+
+-#: ../yum/depsolve.py:1230
++#: ../yum/depsolve.py:1256
+ #, python-format
+ msgid ""
+ "archdist compared %s to %s on %s\n"
+@@ -1977,138 +2099,162 @@ msgstr ""
+ "archdist ha comparato %s a %s su %s\n"
+ " Vincitore: %s"
+
+-#: ../yum/depsolve.py:1237
++#: ../yum/depsolve.py:1264
+ #, python-format
+ msgid "common sourcerpm %s and %s"
+ msgstr "sourcerpm comune %s e %s"
+
+-#: ../yum/depsolve.py:1241
++#: ../yum/depsolve.py:1268
+ #, python-format
+ msgid "base package %s is installed for %s"
+ msgstr "il pacchetto base %s è installato per %s"
+
+-#: ../yum/depsolve.py:1247
++#: ../yum/depsolve.py:1274
+ #, python-format
+ msgid "common prefix of %s between %s and %s"
+ msgstr "prefisso comune di %s tra %s e %s"
+
+-#: ../yum/depsolve.py:1256
++#: ../yum/depsolve.py:1305
++#, python-format
++msgid "requires minimal: %d"
++msgstr " richiede almeno: %d"
++
++#: ../yum/depsolve.py:1309
++#, python-format
++msgid " Winner: %s"
++msgstr " Vincitore: %s"
++
++#: ../yum/depsolve.py:1314
++#, python-format
++msgid " Loser(with %d): %s"
++msgstr " Perdente (con %d): %s"
++
++#: ../yum/depsolve.py:1330
+ #, python-format
+ msgid "Best Order: %s"
+ msgstr "Ordine migliore: %s"
+
+-#: ../yum/__init__.py:192
++#: ../yum/__init__.py:214
+ msgid "doConfigSetup() will go away in a future version of Yum.\n"
+ msgstr "doConfigSetup() verrà eliminato in una futura versione di yum.\n"
+
+-#: ../yum/__init__.py:424
++#: ../yum/__init__.py:453
++#, python-format
++msgid "Repository %r: Error parsing config: %s"
++msgstr "Repository %r: errore nella lettura dela configurazione: %s"
++
++#: ../yum/__init__.py:459
+ #, python-format
+ msgid "Repository %r is missing name in configuration, using id"
+-msgstr ""
+-"Nella configurazione non è presente il nome nel repo %r, uso dell'id"
++msgstr "Nella configurazione non è presente il nome nel repo %r, uso dell'id"
+
+-#: ../yum/__init__.py:462
++#: ../yum/__init__.py:497
+ msgid "plugins already initialised"
+ msgstr "plugin già inizializzato"
+
+-#: ../yum/__init__.py:469
++#: ../yum/__init__.py:504
+ msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+ msgstr "doRpmDBSetup() verrà eliminato in una futura versione di yum.\n"
+
+-#: ../yum/__init__.py:480
++#: ../yum/__init__.py:515
+ msgid "Reading Local RPMDB"
+ msgstr "Lettura del RPMDB locale"
+
+-#: ../yum/__init__.py:504
++#: ../yum/__init__.py:538
+ msgid "doRepoSetup() will go away in a future version of Yum.\n"
+ msgstr "doRepoSetup() verrà eliminato in una futura versione di yum.\n"
+
+-#: ../yum/__init__.py:524
++#: ../yum/__init__.py:577
+ msgid "doSackSetup() will go away in a future version of Yum.\n"
+ msgstr "doSackSetup() verrà eliminato in una futura versione di yum.\n"
+
+-#: ../yum/__init__.py:554
++#: ../yum/__init__.py:607
+ msgid "Setting up Package Sacks"
+ msgstr "Settaggio pacchetti sack"
+
+-#: ../yum/__init__.py:599
++#: ../yum/__init__.py:652
+ #, python-format
+ msgid "repo object for repo %s lacks a _resetSack method\n"
+ msgstr "l'oggetto repo per il repository %s manca del metodo _resetSack\n"
+
+-#: ../yum/__init__.py:600
++#: ../yum/__init__.py:653
+ msgid "therefore this repo cannot be reset.\n"
+ msgstr "quindi questo repository non può essere resettato.\n"
+
+-#: ../yum/__init__.py:605
++#: ../yum/__init__.py:658
+ msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+ msgstr "doUpdateSetup() verrà eliminato in una futura versione di yum.\n"
+
+-#: ../yum/__init__.py:617
++#: ../yum/__init__.py:670
+ msgid "Building updates object"
+ msgstr "Costruzione oggetto aggiornamenti"
+
+-#: ../yum/__init__.py:652
++#: ../yum/__init__.py:709
+ msgid "doGroupSetup() will go away in a future version of Yum.\n"
+ msgstr "doGroupSetup() verrà eliminato in una futura versione di Yum.\n"
+
+-#: ../yum/__init__.py:677
++#: ../yum/__init__.py:734
+ msgid "Getting group metadata"
+ msgstr "Scaricamento metadati del gruppo"
+
+-#: ../yum/__init__.py:703
++#: ../yum/__init__.py:760
+ #, python-format
+ msgid "Adding group file from repository: %s"
+ msgstr "Aggiunta file di gruppo dal repository: %s"
+
+-#: ../yum/__init__.py:712
++#: ../yum/__init__.py:769
+ #, python-format
+ msgid "Failed to add groups file for repository: %s - %s"
+ msgstr "Fallita l'aggiunta di file di gruppi per repository: %s - %s"
+
+-#: ../yum/__init__.py:718
++#: ../yum/__init__.py:775
+ msgid "No Groups Available in any repository"
+ msgstr "Nessun gruppo disponibile in alcun repository"
+
+-#: ../yum/__init__.py:730
++#: ../yum/__init__.py:787
+ msgid "Getting pkgtags metadata"
+ msgstr "Scaricamento metadati pkgtags"
+
+-#: ../yum/__init__.py:740
+-#,, python-format
++#: ../yum/__init__.py:797
++#, python-format
+ msgid "Adding tags from repository: %s"
+ msgstr "Aggiunta tag dal repository: %s"
+
+-#: ../yum/__init__.py:749
++#: ../yum/__init__.py:806
+ #, python-format
+ msgid "Failed to add Pkg Tags for repository: %s - %s"
+ msgstr "Errore aggiungendo i Pgg Tags per il repository: %s - %s"
+
+-#: ../yum/__init__.py:827
++#: ../yum/__init__.py:884
+ msgid "Importing additional filelist information"
+ msgstr "Import di informazioni addizionali sulla lista di file"
+
+-#: ../yum/__init__.py:841
++#: ../yum/__init__.py:898
+ #, python-format
+ msgid "The program %s%s%s is found in the yum-utils package."
+ msgstr "Il programma %s%s%s si trova nel pacchetto yum-utils."
+
+-#: ../yum/__init__.py:849
++#: ../yum/__init__.py:906
+ msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them."
+ msgstr "Ci sono transazioni non completate. Considerare di lanciare prima yum-complete-transaction per portarle a termine."
+
++#: ../yum/__init__.py:985
++#, python-format
++msgid "Trying to remove \"%s\", which is protected"
++msgstr "Tentativo di reimozione di \"%s\", che è protetto"
++
+ #. Kind of hacky
+-#: ../yum/__init__.py:922
++#: ../yum/__init__.py:1044
+ #, python-format
+ msgid "Skip-broken round %i"
+ msgstr "Ciclo skip-broken %i"
+
+-#: ../yum/__init__.py:975
++#: ../yum/__init__.py:1101
+ #, python-format
+ msgid "Skip-broken took %i rounds "
+ msgstr "Raggiunti %i cicli skip-broken"
+
+-#: ../yum/__init__.py:976
++#: ../yum/__init__.py:1102
+ msgid ""
+ "\n"
+ "Packages skipped because of dependency problems:"
+@@ -2116,87 +2262,108 @@ msgstr ""
+ "\n"
+ "Pacchetti ignorati a causa di problemi di dipendenza:"
+
+-#: ../yum/__init__.py:980
++#: ../yum/__init__.py:1106
+ #, python-format
+ msgid " %s from %s"
+ msgstr " %s da %s"
+
+-#: ../yum/__init__.py:1121
++#. FIXME: _N()
++#: ../yum/__init__.py:1251
++#, python-format
++msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:"
++msgstr "** Trovati %d problemi pre-esistenti nel rpmdb, l'output di 'yum check' è:"
++
++#: ../yum/__init__.py:1255
+ msgid "Warning: RPMDB altered outside of yum."
+ msgstr "Attenione: RPMDB modificato al di fuori di yum."
+
+-#: ../yum/__init__.py:1126
++#: ../yum/__init__.py:1267
+ msgid "missing requires"
+ msgstr "dipendenze mancanti"
+
+-#: ../yum/__init__.py:1127
++#: ../yum/__init__.py:1268
+ msgid "installed conflict"
+ msgstr "conflitto installato"
+
+-#: ../yum/__init__.py:1180
++#: ../yum/__init__.py:1366
+ msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
+ msgstr "Attenzione: errori in scriptlet o altri errori non fatali sono avvenuti durante la transazione."
+
+-#: ../yum/__init__.py:1198
++#: ../yum/__init__.py:1376
++msgid "Transaction couldn't start:"
++msgstr "Non è stato possibile iniziare la transazione:"
++
++#. should this be 'to_unicoded'?
++#: ../yum/__init__.py:1379
++msgid "Could not run transaction."
++msgstr "Impossibile eseguire la transazione."
++
++#: ../yum/__init__.py:1392
+ #, python-format
+ msgid "Failed to remove transaction file %s"
+ msgstr "Eliminazione del file di transazione %s fallita"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1227
++#: ../yum/__init__.py:1424
+ #, python-format
+ msgid "%s was supposed to be installed but is not!"
+ msgstr "%s doveva essere installato, ma non sembra esserlo!"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1266
++#: ../yum/__init__.py:1486
+ #, python-format
+ msgid "%s was supposed to be removed but is not!"
+ msgstr "%s doveva essere eliminato, ma non lo è stato!"
+
++#: ../yum/__init__.py:1597
++#, python-format
++msgid "Could not open lock %s: %s"
++msgstr "Impossibile creare il lock su %s: %s"
++
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1386
++#: ../yum/__init__.py:1614
+ #, python-format
+ msgid "Unable to check if PID %s is active"
+ msgstr "Non è possibile controllare se il PID %s è attivo"
+
+ #. Another copy seems to be running.
+-#: ../yum/__init__.py:1390
++#: ../yum/__init__.py:1618
+ #, python-format
+ msgid "Existing lock %s: another copy is running as pid %s."
+ msgstr "Lock %s attivo: altro processo in esecuzione con pid %s."
+
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1425
++#: ../yum/__init__.py:1653
+ #, python-format
+ msgid "Could not create lock at %s: %s "
+ msgstr "Impossibile creare il lock su %s: %s"
+
+-#: ../yum/__init__.py:1470
+-msgid "Package does not match intended download. Suggestion: run yum clean metadata"
+-msgstr "Il pacchetto non corrisponde al download desiderato. Suggerimento: eseguire yum clean metadata"
++#: ../yum/__init__.py:1698
++#, python-format
++msgid "Package does not match intended download. Suggestion: run yum --enablerepo=%s clean metadata"
++msgstr "Il pacchetto non corrisponde al download desiderato. Suggerimento: eseguire yum --enablerepo=%s clean metadata"
+
+-#: ../yum/__init__.py:1486
++#: ../yum/__init__.py:1714
+ msgid "Could not perform checksum"
+ msgstr "Non è possibile calcolare il checksum"
+
+-#: ../yum/__init__.py:1489
++#: ../yum/__init__.py:1717
+ msgid "Package does not match checksum"
+ msgstr "Il pacchetto non corrisponde al checksum"
+
+-#: ../yum/__init__.py:1531
++#: ../yum/__init__.py:1769
+ #, python-format
+ msgid "package fails checksum but caching is enabled for %s"
+ msgstr "il pacchetto ha fallito il checksum ma la cache è abilitata per %s"
+
+-#: ../yum/__init__.py:1534 ../yum/__init__.py:1563
++#: ../yum/__init__.py:1772 ../yum/__init__.py:1801
+ #, python-format
+ msgid "using local copy of %s"
+ msgstr "utilizzo di una copia locale di %s"
+
+-#: ../yum/__init__.py:1575
++#: ../yum/__init__.py:1813
+ #, python-format
+ msgid ""
+ "Insufficient space in download directory %s\n"
+@@ -2207,352 +2374,397 @@ msgstr ""
+ " * libero %s\n"
+ " * necessario %s"
+
+-#: ../yum/__init__.py:1624
++#: ../yum/__init__.py:1862
+ msgid "Header is not complete."
+ msgstr "L'header non è completo."
+
+-#: ../yum/__init__.py:1661
++#: ../yum/__init__.py:1899
+ #, python-format
+ msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
+ msgstr "Header non presente in cache locale e modalità solo-cache abilitata. Impossibile scaricare %s"
+
+-#: ../yum/__init__.py:1716
++#: ../yum/__init__.py:1954
+ #, python-format
+ msgid "Public key for %s is not installed"
+ msgstr "La chiave pubblica per %s non è installata"
+
+-#: ../yum/__init__.py:1720
++#: ../yum/__init__.py:1958
+ #, python-format
+ msgid "Problem opening package %s"
+ msgstr "Problemi nell'apertura di %s"
+
+-#: ../yum/__init__.py:1728
++#: ../yum/__init__.py:1966
+ #, python-format
+ msgid "Public key for %s is not trusted"
+ msgstr "La chiave pubblica per %s non è trusted"
+
+-#: ../yum/__init__.py:1732
++#: ../yum/__init__.py:1970
+ #, python-format
+ msgid "Package %s is not signed"
+ msgstr "Il pacchetto %s non è firmato"
+
+-#: ../yum/__init__.py:1770
++#: ../yum/__init__.py:2008
+ #, python-format
+ msgid "Cannot remove %s"
+ msgstr "Non posso rimuovere %s"
+
+-#: ../yum/__init__.py:1774
++#: ../yum/__init__.py:2012
+ #, python-format
+ msgid "%s removed"
+ msgstr "%s eliminato"
+
+-#: ../yum/__init__.py:1820
++#: ../yum/__init__.py:2058
+ #, python-format
+ msgid "Cannot remove %s file %s"
+ msgstr "Impossibile rimuovere %s file %s"
+
+-#: ../yum/__init__.py:1824
++#: ../yum/__init__.py:2062
+ #, python-format
+ msgid "%s file %s removed"
+ msgstr "%s file %s rimosso"
+
+-#: ../yum/__init__.py:1826
++#: ../yum/__init__.py:2064
+ #, python-format
+ msgid "%d %s files removed"
+ msgstr "%d %s file rimossi"
+
+-#: ../yum/__init__.py:1895
++#: ../yum/__init__.py:2133
+ #, python-format
+ msgid "More than one identical match in sack for %s"
+ msgstr "Più di una corrispondenza identica nel sack per %s"
+
+-#: ../yum/__init__.py:1901
++#: ../yum/__init__.py:2139
+ #, python-format
+ msgid "Nothing matches %s.%s %s:%s-%s from update"
+ msgstr "Nessuna corrispondenza %s.%s %s:%s-%s dall'aggiornamento"
+
+-#: ../yum/__init__.py:2180
++#: ../yum/__init__.py:2433
+ msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
+ msgstr "searchPackages() verrà eliminato in una futura versione di yum. In sostituzione usare searchGenerator(). \n"
+
+-#: ../yum/__init__.py:2219
++#: ../yum/__init__.py:2472
+ #, python-format
+ msgid "Searching %d packages"
+ msgstr "Ricerca dei pacchetti %d"
+
+-#: ../yum/__init__.py:2223
++#: ../yum/__init__.py:2476
+ #, python-format
+ msgid "searching package %s"
+ msgstr "Ricerca del pacchetto %s"
+
+-#: ../yum/__init__.py:2235
++#: ../yum/__init__.py:2488
+ msgid "searching in file entries"
+ msgstr "ricerca nelle file entries"
+
+-#: ../yum/__init__.py:2242
++#: ../yum/__init__.py:2495
+ msgid "searching in provides entries"
+ msgstr "ricerca nelle provides entries"
+
+-#: ../yum/__init__.py:2275
++#: ../yum/__init__.py:2528
+ #, python-format
+ msgid "Provides-match: %s"
+ msgstr "Provides-match: %s"
+
+-#: ../yum/__init__.py:2324
++#: ../yum/__init__.py:2577
+ msgid "No group data available for configured repositories"
+ msgstr "Non ci sono informazioni sui gruppi per i repository configurati"
+
+-#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405
+-#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497
+-#: ../yum/__init__.py:2814
++#: ../yum/__init__.py:2608 ../yum/__init__.py:2627 ../yum/__init__.py:2658
++#: ../yum/__init__.py:2664 ../yum/__init__.py:2746 ../yum/__init__.py:2750
++#: ../yum/__init__.py:3095
+ #, python-format
+ msgid "No Group named %s exists"
+ msgstr "Il gruppo %s non esiste"
+
+-#: ../yum/__init__.py:2386 ../yum/__init__.py:2513
++#: ../yum/__init__.py:2639 ../yum/__init__.py:2766
+ #, python-format
+ msgid "package %s was not marked in group %s"
+ msgstr "Il pacchetto %s non è stato marcato nel gruppo %s"
+
+-#: ../yum/__init__.py:2433
++#: ../yum/__init__.py:2686
+ #, python-format
+ msgid "Adding package %s from group %s"
+ msgstr "Aggiunta del pacchetto %s dal gruppo %s"
+
+-#: ../yum/__init__.py:2437
++#: ../yum/__init__.py:2690
+ #, python-format
+ msgid "No package named %s available to be installed"
+ msgstr "Nessun pacchetto con nome %s disponibile per l'installazione"
+
+-#: ../yum/__init__.py:2539
++#. This can happen due to excludes after .up has
++#. happened.
++#: ../yum/__init__.py:2794
+ #, python-format
+ msgid "Package tuple %s could not be found in packagesack"
+ msgstr "Il pacchetto con tupla %s non è stato trovato nel packagesack"
+
+-#: ../yum/__init__.py:2558
++#: ../yum/__init__.py:2813
+ #, python-format
+ msgid "Package tuple %s could not be found in rpmdb"
+ msgstr "Il pacchetto con tupla %s non è stato trovato nel rpmdb"
+
+-#: ../yum/__init__.py:2614 ../yum/__init__.py:2664
+-msgid "Invalid version flag"
+-msgstr "Flag di versione non valido"
+-
+-#: ../yum/__init__.py:2634 ../yum/__init__.py:2639
++#: ../yum/__init__.py:2868 ../yum/__init__.py:2873
+ #, python-format
+ msgid "No Package found for %s"
+ msgstr "Nessun pacchetto trovato per %s"
+
+-#: ../yum/__init__.py:2855
++#: ../yum/__init__.py:2901
++msgid "Invalid version flag"
++msgstr "Flag di versione non valido"
++
++#: ../yum/__init__.py:3145
+ msgid "Package Object was not a package object instance"
+ msgstr "L'oggetto Package non era un'istanza dell'oggetto pacchetto"
+
+-#: ../yum/__init__.py:2859
++#: ../yum/__init__.py:3149
+ msgid "Nothing specified to install"
+ msgstr "Non è specificato niente da installare"
+
+-#: ../yum/__init__.py:2875 ../yum/__init__.py:3652
++#: ../yum/__init__.py:3168 ../yum/__init__.py:3992
+ #, python-format
+ msgid "Checking for virtual provide or file-provide for %s"
+-msgstr "Controllo dei virtual provice o file-provide per %s"
++msgstr "Controllo dei virtual provide o file-provide per %s"
+
+-#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365
+-#: ../yum/__init__.py:3658
++#: ../yum/__init__.py:3174 ../yum/__init__.py:3504 ../yum/__init__.py:3684
++#: ../yum/__init__.py:3998
+ #, python-format
+ msgid "No Match for argument: %s"
+ msgstr "Nessuna corrispondenza per l'argomento: %s"
+
+-#: ../yum/__init__.py:2957
++#: ../yum/__init__.py:3250
+ #, python-format
+ msgid "Package %s installed and not available"
+ msgstr "Il pacchetto %s è installato e non disponibile"
+
+-#: ../yum/__init__.py:2960
++#: ../yum/__init__.py:3253
+ msgid "No package(s) available to install"
+ msgstr "Nessun pacchetto disponibile per l'installazione"
+
+-#: ../yum/__init__.py:2972
++#: ../yum/__init__.py:3265
+ #, python-format
+ msgid "Package: %s - already in transaction set"
+ msgstr "Pacchetto: %s - già nel set di transazione"
+
+-#: ../yum/__init__.py:2998
++#: ../yum/__init__.py:3291
+ #, python-format
+ msgid "Package %s is obsoleted by %s which is already installed"
+ msgstr "Il pacchetto %s è reso obsoleto da %s, che è già installato"
+
+-#: ../yum/__init__.py:3001
++#: ../yum/__init__.py:3296
++#, python-format
++msgid "Package %s is obsoleted by %s, but obsoleting package does not provide for requirements"
++msgstr "Il pacchetto %s è reso obsoleto da %s, ma quest'ultimo non fornisce i provide richiesti"
++
++#: ../yum/__init__.py:3299
+ #, python-format
+ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+ msgstr "Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo posto"
+
+-#: ../yum/__init__.py:3009
++#: ../yum/__init__.py:3307
+ #, python-format
+ msgid "Package %s already installed and latest version"
+ msgstr "Il pacchetto %s è già aggiornato all'ultima versione"
+
+-#: ../yum/__init__.py:3023
++#: ../yum/__init__.py:3321
+ #, python-format
+ msgid "Package matching %s already installed. Checking for update."
+ msgstr "Il pacchetto corrispondente a %s è già installato. Controllo aggiornamenti."
+
+ #. update everything (the easy case)
+-#: ../yum/__init__.py:3126
++#: ../yum/__init__.py:3424
+ msgid "Updating Everything"
+ msgstr "Aggiornamento sistema"
+
+-#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289
+-#: ../yum/__init__.py:3315
++#: ../yum/__init__.py:3448 ../yum/__init__.py:3577 ../yum/__init__.py:3604
++#: ../yum/__init__.py:3630
+ #, python-format
+ msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+ msgstr "Il pacchetto obsoleto non verrà aggiornato: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3182 ../yum/__init__.py:3362
++#: ../yum/__init__.py:3489 ../yum/__init__.py:3680
+ #, python-format
+ msgid "%s"
+ msgstr "%s"
+
+-#: ../yum/__init__.py:3253
++#: ../yum/__init__.py:3566
+ #, python-format
+ msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+ msgstr "Il pacchetto era già obsoleto: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3284
++#: ../yum/__init__.py:3599
+ #, python-format
+ msgid "Not Updating Package that is obsoleted: %s"
+ msgstr "Il pacchetto obsoleto non verrà aggiornato: %s"
+
+-#: ../yum/__init__.py:3293 ../yum/__init__.py:3319
++#: ../yum/__init__.py:3608 ../yum/__init__.py:3634
+ #, python-format
+ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+ msgstr "Il pacchetto è già aggiornato: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3378
++#: ../yum/__init__.py:3697
+ msgid "No package matched to remove"
+ msgstr "Nessun pacchetto selezionato per l'eliminazione"
+
+-#: ../yum/__init__.py:3412
++#: ../yum/__init__.py:3703
++#, python-format
++msgid "Skipping the running kernel: %s"
++msgstr "Ignoro il kernel in esecuzione: %s"
++
++#: ../yum/__init__.py:3709
++#, python-format
++msgid "Removing %s from the transaction"
++msgstr "Rimozione di %s dalla transazione"
++
++#: ../yum/__init__.py:3744
+ #, python-format
+ msgid "Cannot open: %s. Skipping."
+ msgstr "Impossibile aprire: %s. Verrà ignorato."
+
+-#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598
++#: ../yum/__init__.py:3747 ../yum/__init__.py:3859 ../yum/__init__.py:3935
+ #, python-format
+ msgid "Examining %s: %s"
+ msgstr "Analisi di %s: %s"
+
+-#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601
++#: ../yum/__init__.py:3751
++#, python-format
++msgid "Cannot localinstall deltarpm: %s. Skipping."
++msgstr "localinstall del deltarpm fallito: %s. Verrà ignorato."
++
++#: ../yum/__init__.py:3760 ../yum/__init__.py:3862 ../yum/__init__.py:3938
+ #, python-format
+ msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+ msgstr "Impossibile aggiungere il pacchetto %s alla transazione. Architettura non compatibile: %s"
+
+-#: ../yum/__init__.py:3431
++#: ../yum/__init__.py:3766
++#, python-format
++msgid "Cannot install package %s. It is obsoleted by installed package %s"
++msgstr "Impossibile installare il pacchetto %s. E' reso obsoleto dal pacchetto installato %s"
++
++#: ../yum/__init__.py:3774
+ #, python-format
+ msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
+ msgstr "Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire yum install per installarlo."
+
+-#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606
++#: ../yum/__init__.py:3803 ../yum/__init__.py:3867 ../yum/__init__.py:3943
+ #, python-format
+ msgid "Excluding %s"
+ msgstr "Esclusione di %s"
+
+-#: ../yum/__init__.py:3465
++#: ../yum/__init__.py:3808
+ #, python-format
+ msgid "Marking %s to be installed"
+-msgstr "Contrassegno %s per l'installazione"
++msgstr "%s contrassegnato per l'installazione"
+
+-#: ../yum/__init__.py:3471
++#: ../yum/__init__.py:3814
+ #, python-format
+ msgid "Marking %s as an update to %s"
+ msgstr "%s contrassegnato come aggiornamento di %s"
+
+-#: ../yum/__init__.py:3478
++#: ../yum/__init__.py:3821
+ #, python-format
+ msgid "%s: does not update installed package."
+ msgstr "%s: non aggiorna il pacchetto installato."
+
+-#: ../yum/__init__.py:3511 ../yum/__init__.py:3595
++#: ../yum/__init__.py:3856 ../yum/__init__.py:3932
+ #, python-format
+ msgid "Cannot open file: %s. Skipping."
+ msgstr "Impossibile aprire il file: %s. Verrà ignorato."
+
+-#: ../yum/__init__.py:3541
++#: ../yum/__init__.py:3886
+ msgid "Problem in reinstall: no package matched to remove"
+ msgstr "Problema nella reinstallazione: nessun pacchetto corrispondente per la rimozione"
+
+-#: ../yum/__init__.py:3554 ../yum/__init__.py:3686
+-#, python-format
+-msgid "Package %s is allowed multiple installs, skipping"
+-msgstr "Il pacchetto %s permette installazioni multiple, lo salto"
+-
+-#: ../yum/__init__.py:3575
++#: ../yum/__init__.py:3912
+ #, python-format
+ msgid "Problem in reinstall: no package %s matched to install"
+ msgstr "Problema nella reinstallazione: nessun pacchetto corrispondente a %s per l'installazione"
+
+-#: ../yum/__init__.py:3678
++#: ../yum/__init__.py:4018
+ msgid "No package(s) available to downgrade"
+ msgstr "Nessun pacchetto disponibile per il downgrade"
+
+-#: ../yum/__init__.py:3731
++#: ../yum/__init__.py:4026
++#, python-format
++msgid "Package %s is allowed multiple installs, skipping"
++msgstr "Il pacchetto %s permette installazioni multiple, lo salto"
++
++#: ../yum/__init__.py:4072
+ #, python-format
+ msgid "No Match for available package: %s"
+ msgstr "Nessuna corrispondenza per il pacchetto disponibile: %s"
+
+-#: ../yum/__init__.py:3738
++#: ../yum/__init__.py:4079
+ #, python-format
+ msgid "Only Upgrade available on package: %s"
+ msgstr "Solo l'upgrade è disponibile per il pacchetto: %s"
+
+-#: ../yum/__init__.py:3808 ../yum/__init__.py:3845
++#: ../yum/__init__.py:4149 ../yum/__init__.py:4186
+ #, python-format
+ msgid "Failed to downgrade: %s"
+ msgstr "Downgrade fallito: %s"
+
+-#: ../yum/__init__.py:3877
++#: ../yum/__init__.py:4218
+ #, python-format
+ msgid "Retrieving GPG key from %s"
+ msgstr "Recupero chiavi GPG da %s"
+
+-#: ../yum/__init__.py:3897
++#: ../yum/__init__.py:4238
+ msgid "GPG key retrieval failed: "
+ msgstr "Recupero chiavi GPG fallito: "
+
+-#: ../yum/__init__.py:3903
++#: ../yum/__init__.py:4244
+ #, python-format
+ msgid "Invalid GPG Key from %s: %s"
+ msgstr "Chiave GPG non valida da %s: %s"
+
+-#: ../yum/__init__.py:3912
++#: ../yum/__init__.py:4253
+ #, python-format
+ msgid "GPG key parsing failed: key does not have value %s"
+ msgstr "Analisi chiave GPG fallita: la chiave non ha valore %s"
+
+-#: ../yum/__init__.py:3944
++#: ../yum/__init__.py:4267
+ #, python-format
+-msgid "GPG key at %s (0x%s) is already installed"
+-msgstr "Chiave GPG in %s (0x%s) già installata"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid : %s\n"
++" Package: %s (%s)\n"
++" From : %s"
++msgstr ""
++"Importazione chiave GPG 0x%s:\n"
++" Id utente : %s\n"
++"Pacchetto: %s (%s)\n"
++" Da : %s"
+
+-#. Try installing/updating GPG key
+-#: ../yum/__init__.py:3949 ../yum/__init__.py:4011
++#: ../yum/__init__.py:4275
+ #, python-format
+-msgid "Importing GPG key 0x%s \"%s\" from %s"
+-msgstr "Importazione chiave GPG 0x%s \"%s\" da %s"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid: \"%s\"\n"
++" From : %s"
++msgstr ""
++"Importazione chiave GPG 0x%s:\n"
++" Id utente: \"%s\"\n"
++" Da : %s"
+
+-#: ../yum/__init__.py:3966
++#: ../yum/__init__.py:4307
++#, python-format
++msgid "GPG key at %s (0x%s) is already installed"
++msgstr "Chiave GPG in %s (0x%s) già installata"
++
++#: ../yum/__init__.py:4326
+ msgid "Not installing key"
+ msgstr "Non installo le chiavi"
+
+-#: ../yum/__init__.py:3972
++#: ../yum/__init__.py:4332
+ #, python-format
+ msgid "Key import failed (code %d)"
+ msgstr "Importazione chiave fallita (codice %d)"
+
+-#: ../yum/__init__.py:3973 ../yum/__init__.py:4032
++#: ../yum/__init__.py:4333 ../yum/__init__.py:4389
+ msgid "Key imported successfully"
+ msgstr "Chiave importata correttamente"
+
+-#: ../yum/__init__.py:3978 ../yum/__init__.py:4037
++#: ../yum/__init__.py:4338
+ #, python-format
+ msgid ""
+ "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
+@@ -2561,101 +2773,109 @@ msgstr ""
+ "Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette per questo pacchetto.\n"
+ "Controllare che le URL delle chiavi di questo repository siano configurate correttamente."
+
+-#: ../yum/__init__.py:3987
++#: ../yum/__init__.py:4347
+ msgid "Import of key(s) didn't help, wrong key(s)?"
+ msgstr "Importazione delle chiavi non sufficiente, chiave sbagliata?"
+
+-#: ../yum/__init__.py:4006
++#: ../yum/__init__.py:4366
+ #, python-format
+ msgid "GPG key at %s (0x%s) is already imported"
+ msgstr "Chiave GPG in %s (0x%s) è già stata importata"
+
+-#: ../yum/__init__.py:4026
++#: ../yum/__init__.py:4383
+ #, python-format
+ msgid "Not installing key for repo %s"
+ msgstr "La chiave per il repo %s non verrà installata"
+
+-#: ../yum/__init__.py:4031
++#: ../yum/__init__.py:4388
+ msgid "Key import failed"
+ msgstr "Importazione chiave fallita"
+
+-#: ../yum/__init__.py:4157
++#: ../yum/__init__.py:4394
++#, python-format
++msgid ""
++"The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n"
++"Check that the correct key URLs are configured for this repository."
++msgstr ""
++"Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette.\n"
++"Controllare che le URL delle chiavi di questo repository siano configurate correttamente."
++
++#: ../yum/__init__.py:4521
+ msgid "Unable to find a suitable mirror."
+ msgstr "Impossibile trovare un mirror adatto."
+
+-#: ../yum/__init__.py:4159
++#: ../yum/__init__.py:4523
+ msgid "Errors were encountered while downloading packages."
+ msgstr "Sono stati riscontrati degli errori durante il download dei pacchetti."
+
+-#: ../yum/__init__.py:4209
++#: ../yum/__init__.py:4573
+ #, python-format
+ msgid "Please report this error at %s"
+ msgstr "Riportare questo errore su %s"
+
+-#: ../yum/__init__.py:4233
++#: ../yum/__init__.py:4597
+ msgid "Test Transaction Errors: "
+ msgstr "Errori nel test di transazione: "
+
+-#: ../yum/__init__.py:4334
++#: ../yum/__init__.py:4700
+ #, python-format
+ msgid "Could not set cachedir: %s"
+ msgstr "Impossibile impostare la cachedir: %s"
+
+ #. Mostly copied from YumOutput._outKeyValFill()
+-#: ../yum/plugins.py:202
++#: ../yum/plugins.py:208
+ msgid "Loaded plugins: "
+ msgstr "Plugin abilitati:"
+
+-#: ../yum/plugins.py:216 ../yum/plugins.py:222
++#: ../yum/plugins.py:222 ../yum/plugins.py:228
+ #, python-format
+ msgid "No plugin match for: %s"
+ msgstr "Nessun plugin corrisponde a: %s"
+
+-#: ../yum/plugins.py:252
++#: ../yum/plugins.py:258
+ #, python-format
+ msgid "Not loading \"%s\" plugin, as it is disabled"
+ msgstr "Plugin \"%s\" non caricato, perchè è disabilitato"
+
+ #. Give full backtrace:
+-#: ../yum/plugins.py:264
++#: ../yum/plugins.py:270
+ #, python-format
+ msgid "Plugin \"%s\" can't be imported"
+ msgstr "Il plugin \"%s\" non può essere importato"
+
+-#: ../yum/plugins.py:271
++#: ../yum/plugins.py:277
+ #, python-format
+ msgid "Plugin \"%s\" doesn't specify required API version"
+ msgstr "Il plugin \"%s\" non specifica la versione API richiesta"
+
+-#: ../yum/plugins.py:276
++#: ../yum/plugins.py:282
+ #, python-format
+ msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+ msgstr "Il plugin \"%s\" richiede l'API %s. L'API supportata è %s."
+
+-#: ../yum/plugins.py:309
++#: ../yum/plugins.py:315
+ #, python-format
+ msgid "Loading \"%s\" plugin"
+ msgstr "Caricamento del plugin \"%s\""
+
+-#: ../yum/plugins.py:316
++#: ../yum/plugins.py:322
+ #, python-format
+ msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
+-msgstr ""
+-"Esistono due o più plugin con nome \"%s\" nel percorso di ricerca dei plugin"
++msgstr "Esistono due o più plugin con nome \"%s\" nel percorso di ricerca dei plugin"
+
+-#: ../yum/plugins.py:336
++#: ../yum/plugins.py:342
+ #, python-format
+ msgid "Configuration file %s not found"
+ msgstr "File di configurazione %s non trovato"
+
+ #. for
+ #. Configuration files for the plugin not found
+-#: ../yum/plugins.py:339
++#: ../yum/plugins.py:345
+ #, python-format
+ msgid "Unable to find configuration file for plugin %s"
+ msgstr "Non posso trovare il file di configurazione per il plugin %s"
+
+-#: ../yum/plugins.py:501
++#: ../yum/plugins.py:507
+ msgid "registration of commands not supported"
+ msgstr "registrazione dei comandi non supportata"
+
+@@ -2672,6 +2892,16 @@ msgstr "ha conflitti con pacchetti installati"
+ msgid "%s is a duplicate with %s"
+ msgstr "%s è un duplicato di %s"
+
++#: ../yum/rpmsack.py:122
++#, python-format
++msgid "%s is obsoleted by %s"
++msgstr "%s è reso obsoleto da %s"
++
++#: ../yum/rpmsack.py:130
++#, python-format
++msgid "%s provides %s but it cannot be found"
++msgstr "%s fornisce %s, ma non è stato possibile trovarlo"
++
+ #: ../yum/rpmtrans.py:79
+ msgid "Repackaging"
+ msgstr "Reimpacchettamento"
+@@ -2688,8 +2918,7 @@ msgstr "Controllo md5 dell'RPM %s fallito"
+
+ #: ../rpmUtils/oldUtils.py:151
+ msgid "Could not open RPM database for reading. Perhaps it is already in use?"
+-msgstr ""
+-"Non è stato possibile aprire in lettura il database RPM. Forse è gia in uso?"
++msgstr "Non è stato possibile aprire in lettura il database RPM. Forse è gia in uso?"
+
+ #: ../rpmUtils/oldUtils.py:183
+ msgid "Got an empty Header, something has gone wrong"
+@@ -2706,6 +2935,33 @@ msgstr "Header %s danneggiato"
+ msgid "Error opening rpm %s - error %s"
+ msgstr "Errore nell'apertura dell'rpm %s - errore %s"
+
++#~ msgid "Repo : %s"
++#~ msgstr "Repo : %s"
++
++#~ msgid "URL : %s"
++#~ msgstr "URL : %s"
++
++#~ msgid "Description: "
++#~ msgstr "Descrizione: "
++
++#~ msgid ""
++#~ "Remove %5.5s Package(s)\n"
++#~ "Reinstall %5.5s Package(s)\n"
++#~ "Downgrade %5.5s Package(s)\n"
++#~ msgstr ""
++#~ "Elimina %5.5s pacchetto/i\n"
++#~ "Reinstalla %5.5s pacchetto/i\n"
++#~ "Downgrade %5.5s pacchetto/i\n"
++
++#~ msgid "Weird"
++#~ msgstr "Weird"
++
++#~ msgid "Potential match for %s from %s"
++#~ msgstr "Corrispondenza potenziale per %s da %s"
++
++#~ msgid "Matched %s to require for %s"
++#~ msgstr "Individuato %s come dipendenza per %s"
++
+ #~ msgid "Finished Transaction Test"
+ #~ msgstr "Test di transazione terminato"
+
+@@ -2753,9 +3009,6 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s"
+ #~ msgid "Reducing %s to included packages only"
+ #~ msgstr "Riduzione %s ai soli pacchetti inclusi"
+
+-#~ msgid "Keeping included package %s"
+-#~ msgstr "Il pacchetto incluso %s verrà mantenuto"
+-
+ #~ msgid "Removing unmatched package %s"
+ #~ msgstr "Rimozione pacchetto non corrispondente %s"
+
+diff --git a/po/ja.po b/po/ja.po
+index 9753642..c8dc5ae 100644
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -6,15 +6,15 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: yum-3_2_X\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-02-22 03:34+0900\n"
+-"PO-Revision-Date: 2010-02-22 02:53+0900\n"
++"POT-Creation-Date: 2010-08-11 10:31+0900\n"
++"PO-Revision-Date: 2010-08-16 05:19+0900\n"
+ "Last-Translator: Tadashi Jokagi <elf at elf.no-ip.org>\n"
+ "Language-Team: Japanese <elf at elf.no-ip.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:947 ../yum/rpmtrans.py:72
++#: ../callback.py:48 ../output.py:1027 ../yum/rpmtrans.py:72
+ msgid "Updating"
+ msgstr "更新"
+
+@@ -22,28 +22,28 @@ msgstr "更新"
+ msgid "Erasing"
+ msgstr "削除中"
+
+-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946
+-#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1026
++#: ../output.py:1917 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
+ #: ../yum/rpmtrans.py:77
+ msgid "Installing"
+ msgstr "インストールしています"
+
+-#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76
++#: ../callback.py:52 ../callback.py:58 ../output.py:1640 ../yum/rpmtrans.py:76
+ msgid "Obsoleted"
+-msgstr "不要でした"
++msgstr "不要"
+
+-#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491
++#: ../callback.py:54 ../output.py:1157 ../output.py:1518 ../output.py:1647
+ msgid "Updated"
+-msgstr "更新しました"
++msgstr "更新"
+
+-#: ../callback.py:55 ../output.py:1438
++#: ../callback.py:55 ../output.py:1517
+ msgid "Erased"
+-msgstr "削除しました"
++msgstr "削除"
+
+-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068
+-#: ../output.py:1434 ../output.py:1646
++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1155
++#: ../output.py:1517 ../output.py:1519 ../output.py:1889
+ msgid "Installed"
+-msgstr "インストールしました"
++msgstr "インストール"
+
+ #: ../callback.py:130
+ msgid "No header - huh?"
+@@ -63,7 +63,7 @@ msgstr "エラー: 不正な出力状態: %s for %s"
+ msgid "Erased: %s"
+ msgstr "削除しました: %s"
+
+-#: ../callback.py:217 ../output.py:948 ../output.py:1648
++#: ../callback.py:217 ../output.py:1028 ../output.py:1892
+ msgid "Removing"
+ msgstr "削除"
+
+@@ -71,65 +71,65 @@ msgstr "削除"
+ msgid "Cleanup"
+ msgstr "整理中"
+
+-#: ../cli.py:107
++#: ../cli.py:108
+ #, python-format
+ msgid "Command \"%s\" already defined"
+ msgstr "コマンド「%s」はすでに定義済みです"
+
+-#: ../cli.py:119
++#: ../cli.py:120
+ msgid "Setting up repositories"
+ msgstr "リポジトリーの設定"
+
+-#: ../cli.py:130
++#: ../cli.py:131
+ msgid "Reading repository metadata in from local files"
+ msgstr "ローカルファイルからリポジトリーのメタデータを読み込んでいます"
+
+-#: ../cli.py:194 ../utils.py:193
++#: ../cli.py:234 ../utils.py:254
+ #, python-format
+ msgid "Config Error: %s"
+ msgstr "設定エラー: %s"
+
+-#: ../cli.py:197 ../cli.py:1272 ../utils.py:196
++#: ../cli.py:237 ../cli.py:1403 ../utils.py:257
+ #, python-format
+ msgid "Options Error: %s"
+ msgstr "オプションエラー: %s"
+
+-#: ../cli.py:227
++#: ../cli.py:267
+ #, python-format
+ msgid " Installed: %s-%s at %s"
+ msgstr "インストール: %s-%s (日時: %s)"
+
+-#: ../cli.py:229
++#: ../cli.py:269
+ #, python-format
+ msgid " Built : %s at %s"
+ msgstr " 構築 : %s (日時: %s)"
+
+-#: ../cli.py:231
++#: ../cli.py:271
+ #, python-format
+ msgid " Committed: %s at %s"
+ msgstr " コミット : %s (日時: %s)"
+
+-#: ../cli.py:270
++#: ../cli.py:310
+ msgid "You need to give some command"
+ msgstr "いくつかのコマンドを指定する必要があります"
+
+-#: ../cli.py:284
++#: ../cli.py:324
+ #, python-format
+ msgid "No such command: %s. Please use %s --help"
+ msgstr "コマンド「%s」が見つかりません。「%s --help」を実行してください。"
+
+-#: ../cli.py:314
++#: ../cli.py:354
+ msgid "Disk Requirements:\n"
+ msgstr "ディスク要求:\n"
+
+-#: ../cli.py:316
++#: ../cli.py:356
+ #, python-format
+ msgid " At least %dMB more space needed on the %s filesystem.\n"
+ msgstr " 少なくとも %dMB の空き容量がファイルシステム %s で必要です。\n"
+
+ #. TODO: simplify the dependency errors?
+ #. Fixup the summary
+-#: ../cli.py:321
++#: ../cli.py:361
+ msgid ""
+ "Error Summary\n"
+ "-------------\n"
+@@ -137,255 +137,270 @@ msgstr ""
+ "エラーの要約\n"
+ "-------------\n"
+
+-#: ../cli.py:364
++#: ../cli.py:404
+ msgid "Trying to run the transaction but nothing to do. Exiting."
+ msgstr ""
+ "トランザクションの実行を試みましたが、何もありませんでした。終了します。"
+
+-#: ../cli.py:403
++#: ../cli.py:451
+ msgid "Exiting on user Command"
+ msgstr "ユーザーコマンドを終了しています"
+
+-#: ../cli.py:407
++#: ../cli.py:455
+ msgid "Downloading Packages:"
+ msgstr "パッケージをダウンロードしています:"
+
+-#: ../cli.py:412
++#: ../cli.py:460
+ msgid "Error Downloading Packages:\n"
+ msgstr "パッケージのダウンロードでエラー:\n"
+
+-#: ../cli.py:426 ../yum/__init__.py:4182
++#: ../cli.py:474 ../yum/__init__.py:4551
+ msgid "Running rpm_check_debug"
+ msgstr "rpm_check_debug を実行しています"
+
+-#: ../cli.py:435 ../yum/__init__.py:4191
++#: ../cli.py:483 ../yum/__init__.py:4560
+ msgid "ERROR You need to update rpm to handle:"
+-msgstr ""
++msgstr "エラー: RPM の更新のためのハンドルを更新する必要があります"
+
+-#: ../cli.py:437 ../yum/__init__.py:4194
++#: ../cli.py:485 ../yum/__init__.py:4563
+ msgid "ERROR with rpm_check_debug vs depsolve:"
+-msgstr ""
++msgstr "エラー: rpm_check_debug と depsolve の勝負:"
+
+-#: ../cli.py:443
++#: ../cli.py:491
+ msgid "RPM needs to be updated"
+ msgstr "更新には RPM が必要です"
+
+-#: ../cli.py:444
++#: ../cli.py:492
+ #, python-format
+ msgid "Please report this error in %s"
+ msgstr "%s にこのエラーを報告してください"
+
+-#: ../cli.py:450
++#: ../cli.py:498
+ msgid "Running Transaction Test"
+ msgstr "トランザクションのテストを実行しています"
+
+-#: ../cli.py:466
++#: ../cli.py:514
+ msgid "Transaction Check Error:\n"
+ msgstr "トランザクションの確認エラー\n"
+
+-#: ../cli.py:473
++#: ../cli.py:521
+ msgid "Transaction Test Succeeded"
+ msgstr "トランザクションのテストを成功しました"
+
+-#: ../cli.py:495
++#: ../cli.py:543
+ msgid "Running Transaction"
+ msgstr "トランザクションを実行しています"
+
+-#: ../cli.py:525
++#: ../cli.py:573
+ msgid ""
+ "Refusing to automatically import keys when running unattended.\n"
+ "Use \"-y\" to override."
+ msgstr ""
+
+-#: ../cli.py:544 ../cli.py:578
++#: ../cli.py:592 ../cli.py:626
+ msgid " * Maybe you meant: "
+-msgstr ""
++msgstr " * おそらくの意味: "
+
+-#: ../cli.py:561 ../cli.py:569
++#: ../cli.py:609 ../cli.py:617
+ #, python-format
+ msgid "Package(s) %s%s%s available, but not installed."
+ msgstr "パッケージ %s%s%s は利用できますが、インストールしませんでした。"
+
+-#: ../cli.py:575 ../cli.py:607 ../cli.py:687
++#: ../cli.py:623 ../cli.py:656 ../cli.py:810
+ #, python-format
+ msgid "No package %s%s%s available."
+ msgstr "パッケージ %s%s%s は利用できません。"
+
+-#: ../cli.py:612 ../cli.py:748
++#: ../cli.py:663 ../cli.py:875
+ msgid "Package(s) to install"
+ msgstr "インストールするパッケージ"
+
+-#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749
+-#: ../yumcommands.py:160
++#: ../cli.py:666 ../cli.py:667 ../cli.py:816 ../cli.py:850 ../cli.py:876
++#: ../yumcommands.py:179
+ msgid "Nothing to do"
+ msgstr "何もしません"
+
+-#: ../cli.py:647
++#: ../cli.py:701
+ #, python-format
+ msgid "%d packages marked for Update"
+-msgstr "%d 個のパッケージが更新の設定しました"
++msgstr "%d 個のパッケージが更新の設定しました。"
+
+-#: ../cli.py:650
++#: ../cli.py:704
+ msgid "No Packages marked for Update"
+-msgstr "更新と設定されたパッケージがありません"
++msgstr "更新と設定されたパッケージがありません。"
++
++#: ../cli.py:770
++#, python-format
++msgid "%d packages marked for Distribution Synchronization"
++msgstr "%d 個のパッケージを同期配信に設定しました。"
++
++#: ../cli.py:773
++msgid "No Packages marked for Distribution Synchronization"
++msgstr "パッケージが同期配信に設定したパッケージはありません。"
+
+-#: ../cli.py:664
++#: ../cli.py:787
+ #, python-format
+ msgid "%d packages marked for removal"
+-msgstr "%d 個のパッケージが削除の設定しました"
++msgstr "%d 個のパッケージを削除に設定しました。"
+
+-#: ../cli.py:667
++#: ../cli.py:790
+ msgid "No Packages marked for removal"
+-msgstr "削除と設定されたパッケージがありません"
++msgstr "削除と設定したパッケージはありません。"
+
+-#: ../cli.py:692
++#: ../cli.py:815
+ msgid "Package(s) to downgrade"
+ msgstr "ダウングレードするパッケージ"
+
+-#: ../cli.py:717
++#: ../cli.py:840
+ #, python-format
+ msgid " (from %s)"
+ msgstr " (%s から)"
+
+-#: ../cli.py:719
++#: ../cli.py:841
+ #, python-format
+ msgid "Installed package %s%s%s%s not available."
+ msgstr "インストール済みパッケージ %s%s%s%s は利用できません。"
+
+-#: ../cli.py:726
++#: ../cli.py:849
+ msgid "Package(s) to reinstall"
+ msgstr "再インストールするパッケージ"
+
+-#: ../cli.py:739
++#: ../cli.py:862
+ msgid "No Packages Provided"
+-msgstr "パッケージが提供されていません"
++msgstr "パッケージが提供されていません。"
+
+-#: ../cli.py:818
++#: ../cli.py:945
+ #, python-format
+ msgid "Matched: %s"
+ msgstr "一致: %s"
+
+-#: ../cli.py:825
++#: ../cli.py:952
+ #, python-format
+ msgid "Warning: No matches found for: %s"
+ msgstr "警告: 一致するものが見つかりません: %s"
+
+-#: ../cli.py:828
++#: ../cli.py:955
+ msgid "No Matches found"
+ msgstr "見つかりませんでした"
+
+-#: ../cli.py:868
++#: ../cli.py:995
+ #, 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 ""
++"警告: yum のバージョン 3.0.x は、誤ってファイル名に対して一致するでしょう。\n"
++"その振る舞いをするには「%s*/%s%s」もしくは「%s*bin/%s%s」が使用できます。"
+
+-#: ../cli.py:884
++#: ../cli.py:1011
+ #, python-format
+ msgid "No Package Found for %s"
+ msgstr "%s のパッケージが見つかりません"
+
+-#: ../cli.py:896
++#: ../cli.py:1021
++msgid "Cleaning repos: "
++msgstr "リポジトリーを清掃しています: "
++
++#: ../cli.py:1026
+ msgid "Cleaning up Everything"
+ msgstr "すべて掃除しています"
+
+-#: ../cli.py:912
++#: ../cli.py:1042
+ msgid "Cleaning up Headers"
+ msgstr "ヘッダーを掃除しています"
+
+-#: ../cli.py:915
++#: ../cli.py:1045
+ msgid "Cleaning up Packages"
+ msgstr "パッケージを掃除しています"
+
+-#: ../cli.py:918
++#: ../cli.py:1048
+ msgid "Cleaning up xml metadata"
+ msgstr "XML メタデータを掃除しています"
+
+-#: ../cli.py:921
++#: ../cli.py:1051
+ msgid "Cleaning up database cache"
+ msgstr "データベースキャッシュを掃除しています"
+
+-#: ../cli.py:924
++#: ../cli.py:1054
+ msgid "Cleaning up expire-cache metadata"
+ msgstr "期限切れのメタデータキャッシュを掃除しています"
+
+-#: ../cli.py:927
++#: ../cli.py:1057
+ msgid "Cleaning up cached rpmdb data"
+ msgstr "キャッシュ済み rpmdb データを掃除しています"
+
+-#: ../cli.py:930
++#: ../cli.py:1060
+ msgid "Cleaning up plugins"
+ msgstr "プラグインを掃除しています"
+
+-#: ../cli.py:955
++#: ../cli.py:1085
+ msgid "Installed Groups:"
+ msgstr "インストール済みグループ:"
+
+-#: ../cli.py:967
++#: ../cli.py:1097
+ msgid "Available Groups:"
+ msgstr "利用可能なグループ"
+
+-#: ../cli.py:977
++#: ../cli.py:1107
+ msgid "Done"
+ msgstr "完了"
+
+-#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2775
++#: ../cli.py:1118 ../cli.py:1136 ../cli.py:1142 ../yum/__init__.py:3069
+ #, python-format
+ msgid "Warning: Group %s does not exist."
+ msgstr "警告: グループ %s が存在しません。"
+
+-#: ../cli.py:1016
++#: ../cli.py:1146
+ msgid "No packages in any requested group available to install or update"
+ msgstr ""
+ "インストールまたは更新に利用できるいくつかの要求されたグループにパッケージが"
+ "ありません"
+
+-#: ../cli.py:1018
++#: ../cli.py:1148
+ #, python-format
+ msgid "%d Package(s) to Install"
+ msgstr "%d 個のパッケージをインストールします"
+
+-#: ../cli.py:1028 ../yum/__init__.py:2787
++#: ../cli.py:1158 ../yum/__init__.py:3081
+ #, python-format
+ msgid "No group named %s exists"
+ msgstr "グループ名 %s が存在しません"
+
+-#: ../cli.py:1034
++#: ../cli.py:1164
+ msgid "No packages to remove from groups"
+ msgstr "グループから削除するパッケージがありません"
+
+-#: ../cli.py:1036
++#: ../cli.py:1166
+ #, python-format
+ msgid "%d Package(s) to remove"
+ msgstr "%d 個のパッケージを削除します"
+
+-#: ../cli.py:1078
++#: ../cli.py:1208
+ #, python-format
+ msgid "Package %s is already installed, skipping"
+ msgstr "パッケージ %s は既にインストールされているので飛ばします"
+
+-#: ../cli.py:1089
++#: ../cli.py:1219
+ #, 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:1115
++#: ../cli.py:1245
+ #, python-format
+ msgid "No other %s installed, adding to list for potential install"
+ msgstr ""
+
+-#: ../cli.py:1135
++#: ../cli.py:1265
+ msgid "Plugin Options"
+ msgstr "プラグインのオプション"
+
+-#: ../cli.py:1143
++#: ../cli.py:1273
+ #, python-format
+ msgid "Command line error: %s"
+ msgstr "コマンドライン エラー: %s"
+
+-#: ../cli.py:1156
++#: ../cli.py:1287
+ #, python-format
+ msgid ""
+ "\n"
+@@ -396,114 +411,118 @@ msgstr ""
+ "\n"
+ "%s: オプション %s は引数が必要です "
+
+-#: ../cli.py:1209
++#: ../cli.py:1340
+ msgid "--color takes one of: auto, always, never"
+ msgstr "--color がとることができる値な次のうちひとつです: auto、always、never"
+
+-#: ../cli.py:1319
++#: ../cli.py:1450
+ msgid "show this help message and exit"
+ msgstr "このヘルプ メッセージを表示して終了する"
+
+-#: ../cli.py:1323
++#: ../cli.py:1454
+ msgid "be tolerant of errors"
+ msgstr "エラーを黙認する"
+
+-#: ../cli.py:1326
++#: ../cli.py:1457
+ msgid "run entirely from system cache, don't update cache"
+ msgstr "キャッシュから完全に実行し、キャッシュを更新しません"
+
+-#: ../cli.py:1329
++#: ../cli.py:1460
+ msgid "config file location"
+ msgstr "構成ファイルの場所"
+
+-#: ../cli.py:1332
++#: ../cli.py:1463
+ msgid "maximum command wait time"
+ msgstr "コマンドの最大待ち時間"
+
+-#: ../cli.py:1334
++#: ../cli.py:1465
+ msgid "debugging output level"
+ msgstr "デバッグ情報の出力レベル"
+
+-#: ../cli.py:1338
++#: ../cli.py:1469
+ msgid "show duplicates, in repos, in list/search commands"
+ msgstr "一覧/検索コマンドのリポジトリーの重複の表示"
+
+-#: ../cli.py:1340
++#: ../cli.py:1471
+ msgid "error output level"
+ msgstr "エラー出力レベル"
+
+-#: ../cli.py:1343
++#: ../cli.py:1474
+ msgid "debugging output level for rpm"
+ msgstr "rpm のデバッグ情報の出力レベル"
+
+-#: ../cli.py:1346
++#: ../cli.py:1477
+ msgid "quiet operation"
+ msgstr "静かに処理をする"
+
+-#: ../cli.py:1348
++#: ../cli.py:1479
+ msgid "verbose operation"
+ msgstr "冗長に処理をする"
+
+-#: ../cli.py:1350
++#: ../cli.py:1481
+ msgid "answer yes for all questions"
+ msgstr "すべての問い合わせに「yes」で答える"
+
+-#: ../cli.py:1352
++#: ../cli.py:1483
+ msgid "show Yum version and exit"
+ msgstr "Yum のバージョンを表示して終了する"
+
+-#: ../cli.py:1353
++#: ../cli.py:1484
+ msgid "set install root"
+ msgstr "インストールのベース ディレクトリーを設定する"
+
+-#: ../cli.py:1357
++#: ../cli.py:1488
+ msgid "enable one or more repositories (wildcards allowed)"
+ msgstr "ひとつ以上のリポジトリーを有効にする (ワイルドカード許可)"
+
+-#: ../cli.py:1361
++#: ../cli.py:1492
+ msgid "disable one or more repositories (wildcards allowed)"
+ msgstr "ひとつ以上のリポジトリーを無効にする (ワイルドカード許可)"
+
+-#: ../cli.py:1364
++#: ../cli.py:1495
+ msgid "exclude package(s) by name or glob"
+ msgstr "名前かワイルドカードでパッケージを除外する"
+
+-#: ../cli.py:1366
++#: ../cli.py:1497
+ msgid "disable exclude from main, for a repo or for everything"
+-msgstr ""
++msgstr "main、あるリポジトリー、またはすべてからの除外を無効にします。"
+
+-#: ../cli.py:1369
++#: ../cli.py:1500
+ msgid "enable obsoletes processing during updates"
+ msgstr "更新中に不要な処理を有効にします"
+
+-#: ../cli.py:1371
++#: ../cli.py:1502
+ msgid "disable Yum plugins"
+ msgstr "Yum プラグインを無効にする"
+
+-#: ../cli.py:1373
++#: ../cli.py:1504
+ msgid "disable gpg signature checking"
+ msgstr "GPG 署名の確認を無効にする"
+
+-#: ../cli.py:1375
++#: ../cli.py:1506
+ msgid "disable plugins by name"
+ msgstr "名前でプラグインを無効にする"
+
+-#: ../cli.py:1378
++#: ../cli.py:1509
+ msgid "enable plugins by name"
+ msgstr "名前でプラグインを有効にする"
+
+-#: ../cli.py:1381
++#: ../cli.py:1512
+ msgid "skip packages with depsolving problems"
+ msgstr "依存性に問題があるパッケージを飛ばす"
+
+-#: ../cli.py:1383
++#: ../cli.py:1514
+ msgid "control whether color is used"
+ msgstr "色を使うかどうか制御する"
+
+-#: ../cli.py:1385
++#: ../cli.py:1516
+ msgid "set value of $releasever in yum config and repo files"
+ msgstr "yum 設定と repo ファイルに $releasever の値を設定する"
+
++#: ../cli.py:1518
++msgid "set arbitrary config and repo options"
++msgstr "全体設定とリポジトリー オプションの任意に設定する"
++
+ #: ../output.py:305
+ msgid "Jan"
+ msgstr "1 月"
+@@ -556,105 +575,115 @@ msgstr "12 月"
+ msgid "Trying other mirror."
+ msgstr "他のミラーを試します。"
+
+-#: ../output.py:534
++#: ../output.py:579
+ #, python-format
+-msgid "Name : %s%s%s"
+-msgstr "名前 : %s%s%s"
++msgid "Name : %s%s%s"
++msgstr "名前 : %s%s%s"
+
+-#: ../output.py:535
++#: ../output.py:580
+ #, python-format
+-msgid "Arch : %s"
+-msgstr "アーキテクチャ: %s"
++msgid "Arch : %s"
++msgstr "アーキテクチャ : %s"
+
+-#: ../output.py:537
++#: ../output.py:582
+ #, python-format
+-msgid "Epoch : %s"
+-msgstr "エポック : %s"
++msgid "Epoch : %s"
++msgstr "エポック : %s"
+
+-#: ../output.py:538
++#: ../output.py:583
+ #, python-format
+-msgid "Version : %s"
+-msgstr "バージョン : %s"
++msgid "Version : %s"
++msgstr "バージョン : %s"
+
+-#: ../output.py:539
++#: ../output.py:584
+ #, python-format
+-msgid "Release : %s"
+-msgstr "リリース : %s"
++msgid "Release : %s"
++msgstr "リリース : %s"
+
+-#: ../output.py:540
++#: ../output.py:585
+ #, python-format
+-msgid "Size : %s"
+-msgstr "容量 : %s"
++msgid "Size : %s"
++msgstr "容量 : %s"
+
+-#: ../output.py:541
++#: ../output.py:586 ../output.py:890
+ #, python-format
+-msgid "Repo : %s"
+-msgstr "リポジトリー : %s"
++msgid "Repo : %s"
++msgstr "リポジトリー : %s"
+
+-#: ../output.py:543
++#: ../output.py:588
+ #, python-format
+-msgid "From repo : %s"
+-msgstr ""
++msgid "From repo : %s"
++msgstr "提供元リポジトリー : %s"
+
+-#: ../output.py:545
++#: ../output.py:590
+ #, python-format
+-msgid "Committer : %s"
+-msgstr "コミット者 : %s"
++msgid "Committer : %s"
++msgstr "コミット者 : %s"
+
+-#: ../output.py:546
++#: ../output.py:591
+ #, python-format
+-msgid "Committime : %s"
+-msgstr "コミット日時 : %s"
++msgid "Committime : %s"
++msgstr "コミット日時 : %s"
+
+-#: ../output.py:547
++#: ../output.py:592
+ #, python-format
+-msgid "Buildtime : %s"
+-msgstr "ビルド日時 : %s"
++msgid "Buildtime : %s"
++msgstr "ビルド日時 : %s"
+
+-#: ../output.py:549
++#: ../output.py:594
+ #, python-format
+-msgid "Installtime: %s"
+-msgstr "インストール日時 : %s "
++msgid "Install time: %s"
++msgstr "インストール日時 : %s "
+
+-#: ../output.py:550
+-msgid "Summary : "
+-msgstr "要約 : "
++#: ../output.py:602
++#, python-format
++msgid "Installed by: %s"
++msgstr "インストール済み容量: %s"
+
+-#: ../output.py:552
++#: ../output.py:609
+ #, python-format
+-msgid "URL : %s"
+-msgstr "URL : %s"
++msgid "Changed by : %s"
++msgstr "変更者 : %s"
+
+-#: ../output.py:553
+-msgid "License : "
+-msgstr "ライセンス : "
++#: ../output.py:610
++msgid "Summary : "
++msgstr "要約 : "
+
+-#: ../output.py:554
+-msgid "Description: "
+-msgstr "説明 : "
++#: ../output.py:612 ../output.py:903
++#, python-format
++msgid "URL : %s"
++msgstr "URL : %s"
++
++#: ../output.py:613
++msgid "License : "
++msgstr "ライセンス : "
++
++#: ../output.py:614 ../output.py:900
++msgid "Description : "
++msgstr "説明 : "
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "y"
+ msgstr "y"
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "yes"
+ msgstr "はい"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "n"
+ msgstr "n"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "no"
+ msgstr "いいえ"
+
+ # REMEMBER to Translate [Y/N] to the current locale
+-#: ../output.py:627
++#: ../output.py:687
+ msgid "Is this ok [y/N]: "
+ msgstr "これでいいですか? [y/N]"
+
+-#: ../output.py:715
++#: ../output.py:775
+ #, python-format
+ msgid ""
+ "\n"
+@@ -663,151 +692,141 @@ msgstr ""
+ "\n"
+ "グループ: %s"
+
+-#: ../output.py:719
++#: ../output.py:779
+ #, python-format
+ msgid " Group-Id: %s"
+ msgstr " グループ ID: %s"
+
+-#: ../output.py:724
++#: ../output.py:784
+ #, python-format
+ msgid " Description: %s"
+ msgstr " 説明: %s"
+
+-#: ../output.py:726
++#: ../output.py:786
+ msgid " Mandatory Packages:"
+ msgstr " 強制的なパッケージ:"
+
+-#: ../output.py:727
++#: ../output.py:787
+ msgid " Default Packages:"
+ msgstr " 標準パッケージ:"
+
+-#: ../output.py:728
++#: ../output.py:788
+ msgid " Optional Packages:"
+ msgstr " オプション パッケージ:"
+
+-#: ../output.py:729
++#: ../output.py:789
+ msgid " Conditional Packages:"
+ msgstr " 条件付パッケージ:"
+
+-#: ../output.py:749
++#: ../output.py:809
+ #, python-format
+ msgid "package: %s"
+ msgstr "パッケージ : %s"
+
+-#: ../output.py:751
++#: ../output.py:811
+ msgid " No dependencies for this package"
+ msgstr " このパッケージの依存はありません"
+
+-#: ../output.py:756
++#: ../output.py:816
+ #, python-format
+ msgid " dependency: %s"
+ msgstr " 依存性 : %s"
+
+-#: ../output.py:758
++#: ../output.py:818
+ msgid " Unsatisfied dependency"
+ msgstr " 満たされていない依存性"
+
+-#: ../output.py:830
+-#, python-format
+-msgid "Repo : %s"
+-msgstr "リポジトリー : %s"
+-
+-#: ../output.py:831
++#: ../output.py:891
+ msgid "Matched from:"
+-msgstr ""
++msgstr "一致 :"
+
+-#: ../output.py:840
+-msgid "Description : "
+-msgstr "説明 : "
+-
+-#: ../output.py:843
+-#, python-format
+-msgid "URL : %s"
+-msgstr "URL : %s"
+-
+-#: ../output.py:846
++#: ../output.py:906
+ #, python-format
+ msgid "License : %s"
+ msgstr "ライセンス : %s"
+
+-#: ../output.py:849
++#: ../output.py:909
+ #, python-format
+ msgid "Filename : %s"
+ msgstr "ファイル名 : %s"
+
+-#: ../output.py:853
++#: ../output.py:913
+ msgid "Other : "
+ msgstr "その他 : "
+
+-#: ../output.py:896
++#: ../output.py:956
+ msgid "There was an error calculating total download size"
+-msgstr "総ダウンロード容量の計算中にエラーです"
++msgstr "総ダウンロード容量の計算中にエラーです。"
+
+-#: ../output.py:901
++#: ../output.py:961
+ #, python-format
+ msgid "Total size: %s"
+ msgstr "合計容量: %s"
+
+-#: ../output.py:904
++#: ../output.py:964
+ #, python-format
+ msgid "Total download size: %s"
+ msgstr "総ダウンロード容量: %s"
+
+-#: ../output.py:908
++#: ../output.py:968 ../output.py:988
+ #, python-format
+ msgid "Installed size: %s"
+ msgstr "インストール済み容量: %s"
+
+-#: ../output.py:949
++#: ../output.py:984
++msgid "There was an error calculating installed size"
++msgstr "インストール容量の計算中にエラーです。"
++
++#: ../output.py:1029
+ msgid "Reinstalling"
+ msgstr "再インストール中"
+
+-#: ../output.py:950
++#: ../output.py:1030
+ msgid "Downgrading"
+ msgstr "ダウングレード中"
+
+-#: ../output.py:951
++#: ../output.py:1031
+ msgid "Installing for dependencies"
+-msgstr "依存性関連でのインストールをします"
++msgstr "依存性関連でのインストールをします。"
+
+-#: ../output.py:952
++#: ../output.py:1032
+ msgid "Updating for dependencies"
+-msgstr "依存性関連での更新をします"
++msgstr "依存性関連での更新をします。"
+
+-#: ../output.py:953
++#: ../output.py:1033
+ msgid "Removing for dependencies"
+-msgstr "依存性関連での削除をします"
++msgstr "依存性関連での削除をします。"
+
+-#: ../output.py:960 ../output.py:1072
++#: ../output.py:1040 ../output.py:1159
+ msgid "Skipped (dependency problems)"
+ msgstr "飛ばしました (依存性の問題)"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Package"
+ msgstr "パッケージ"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Arch"
+ msgstr "アーキテクチャ"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Version"
+ msgstr "バージョン"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Repository"
+ msgstr "リポジトリー"
+
+-#: ../output.py:985
++#: ../output.py:1065
+ msgid "Size"
+ msgstr "容量"
+
+-#: ../output.py:997
++#: ../output.py:1077
+ #, python-format
+ msgid " replacing %s%s%s.%s %s\n"
+ msgstr " 置き換えています %s%s%s.%s %s\n"
+
+-#: ../output.py:1006
++#: ../output.py:1086
+ #, python-format
+ msgid ""
+ "\n"
+@@ -818,52 +837,57 @@ msgstr ""
+ "トランザクションの要約\n"
+ "%s\n"
+
+-#: ../output.py:1013
++#: ../output.py:1097
+ #, python-format
+-msgid ""
+-"Install %5.5s Package(s)\n"
+-"Upgrade %5.5s Package(s)\n"
+-msgstr ""
+-"インストール %5.5s パッケージ\n"
+-"アップグレード %5.5s パッケージ\n"
++msgid "Install %5.5s Package(s)\n"
++msgstr "インストール %5.5s パッケージ\n"
+
+-#: ../output.py:1022
++#: ../output.py:1101
+ #, python-format
+-msgid ""
+-"Remove %5.5s Package(s)\n"
+-"Reinstall %5.5s Package(s)\n"
+-"Downgrade %5.5s Package(s)\n"
+-msgstr ""
+-"削除 %5.5s パッケージ\n"
+-"再インストール %5.5s パッケージ\n"
+-"ダウングレード %5.5s パッケージ\n"
++msgid "Upgrade %5.5s Package(s)\n"
++msgstr "アップグレード %5.5s パッケージ\n"
+
+-#: ../output.py:1066
++#: ../output.py:1105
++#, python-format
++msgid "Remove %5.5s Package(s)\n"
++msgstr "削除 %5.5s パッケージ\n"
++
++#: ../output.py:1109
++#, python-format
++msgid "Reinstall %5.5s Package(s)\n"
++msgstr "再インストール %5.5s パッケージ\n"
++
++#: ../output.py:1113
++#, python-format
++msgid "Downgrade %5.5s Package(s)\n"
++msgstr "ダウングレード %5.5s パッケージ\n"
++
++#: ../output.py:1153
+ msgid "Removed"
+ msgstr "削除しました"
+
+-#: ../output.py:1067
++#: ../output.py:1154
+ msgid "Dependency Removed"
+ msgstr "依存性の削除をしました"
+
+-#: ../output.py:1069
++#: ../output.py:1156
+ msgid "Dependency Installed"
+ msgstr "依存性関連をインストールしました"
+
+-#: ../output.py:1071
++#: ../output.py:1158
+ msgid "Dependency Updated"
+ msgstr "依存性を更新しました"
+
+-#: ../output.py:1073
++#: ../output.py:1160
+ msgid "Replaced"
+-msgstr "置換しました"
++msgstr "置換"
+
+-#: ../output.py:1074
++#: ../output.py:1161
+ msgid "Failed"
+-msgstr "失敗しました"
++msgstr "失敗"
+
+ #. Delta between C-c's so we treat as exit
+-#: ../output.py:1140
++#: ../output.py:1245
+ msgid "two"
+ msgstr "2"
+
+@@ -871,282 +895,337 @@ msgstr "2"
+ #. Current download cancelled, interrupt (ctrl-c) again within two seconds
+ #. to exit.
+ #. Where "interupt (ctrl-c) again" and "two" are highlighted.
+-#: ../output.py:1151
++#: ../output.py:1256
+ #, python-format
+ msgid ""
+ "\n"
+ " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
+ "seconds\n"
+ "to exit.\n"
+-msgstr ""
+-"\n"
+-"現在のダウンロードを取り消しました。終了するには %s再度割り込み ([Ctrl][C]"
+-"キー)%s を %s%s%s 秒以内に押してください。\n"
++msgstr "\n現在のダウンロードをキャンセルしました。終了するには %s再度割り込み ([Ctrl][C]キー)%s を %s%s%s 秒以内に押してください。\n"
+
+-#: ../output.py:1162
++#: ../output.py:1267
+ msgid "user interrupt"
+ msgstr "ユーザーの割り込み"
+
+-#: ../output.py:1180
++#: ../output.py:1285
+ msgid "Total"
+ msgstr "合計"
+
+-#: ../output.py:1202
++#: ../output.py:1307
+ msgid "I"
+ msgstr "I"
+
+-#: ../output.py:1203
++#: ../output.py:1308
+ msgid "O"
+ msgstr "O"
+
+-#: ../output.py:1204
++#: ../output.py:1309
+ msgid "E"
+ msgstr "E"
+
+-#: ../output.py:1205
++#: ../output.py:1310
+ msgid "R"
+ msgstr "R"
+
+-#: ../output.py:1206
++#: ../output.py:1311
+ msgid "D"
+ msgstr "D"
+
+-#: ../output.py:1207
++#: ../output.py:1312
+ msgid "U"
+ msgstr "U"
+
+-#: ../output.py:1217
++#: ../output.py:1323
+ msgid "<unset>"
+ msgstr "<未設定>"
+
+-#: ../output.py:1218
++#: ../output.py:1324
+ msgid "System"
+ msgstr "システム"
+
+-#: ../output.py:1254
++#: ../output.py:1368
+ msgid "Bad transaction IDs, or package(s), given"
+ msgstr "指定されたトランザクション ID、またはパッケージがおかしいです"
+
+-#: ../output.py:1266
++#: ../output.py:1380
+ msgid "ID"
+ msgstr "ID"
+
+-#: ../output.py:1267 ../output.py:1520
++#: ../output.py:1381 ../output.py:1699
+ msgid "Login user"
+ msgstr "ログイン ユーザー"
+
+-#: ../output.py:1268
++#: ../output.py:1382
+ msgid "Date and time"
+ msgstr "日時"
+
+-#: ../output.py:1269 ../output.py:1522
++#: ../output.py:1383 ../output.py:1701
+ msgid "Action(s)"
+ msgstr "操作"
+
+-#: ../output.py:1270 ../output.py:1523
++#: ../output.py:1384 ../output.py:1702
+ msgid "Altered"
+-msgstr ""
++msgstr "変更"
+
+-#: ../output.py:1310
++#: ../output.py:1431 ../output.py:1760
+ msgid "No transaction ID given"
+-msgstr "指定されたトランザクション ID がありません"
++msgstr "指定されたトランザクション ID がありません。"
+
+-#: ../output.py:1336
++#: ../output.py:1457
+ msgid "Bad transaction ID given"
+ msgstr "指定されたトランザクション ID がおかしいです"
+
+-#: ../output.py:1341
++#: ../output.py:1462
+ msgid "Not found given transaction ID"
+ msgstr "指定されたトランザクション ID が見つかりません"
+
+-#: ../output.py:1349
++#: ../output.py:1470
+ msgid "Found more than one transaction ID!"
+ msgstr "ひとつ以上のトランザクション ID が見つかりません!"
+
+-#: ../output.py:1370
++#: ../output.py:1491 ../output.py:1770
+ msgid "No transaction ID, or package, given"
+-msgstr "指定されたトランザクション ID、またはパッケージが見つかりません"
++msgstr "指定されたトランザクション ID、またはパッケージが見つかりません。"
++
++#: ../output.py:1518 ../output.py:1645
++msgid "Downgraded"
++msgstr "ダウングレード済み"
++
++#: ../output.py:1519
++msgid "Not installed"
++msgstr "未インストール"
++
++#: ../output.py:1520
++msgid "Older"
++msgstr "より古い"
++
++#: ../output.py:1520
++msgid "Newer"
++msgstr "より新しい"
+
+-#: ../output.py:1396
++#: ../output.py:1552
+ msgid "Transaction ID :"
+ msgstr "トランザクション ID :"
+
+-#: ../output.py:1398
++#: ../output.py:1554
+ msgid "Begin time :"
+ msgstr "開始時間 :"
+
+-#: ../output.py:1401 ../output.py:1403
++#: ../output.py:1557 ../output.py:1559
+ msgid "Begin rpmdb :"
+ msgstr "開始 rpmdb :"
+
+-#: ../output.py:1417
++#: ../output.py:1573
+ #, python-format
+ msgid "(%s seconds)"
+ msgstr "(%s 秒)"
+
+-#: ../output.py:1418
++#: ../output.py:1574
+ msgid "End time :"
+-msgstr "終了時間 : "
++msgstr "終了時間 :"
+
+-#: ../output.py:1421 ../output.py:1423
++#: ../output.py:1577 ../output.py:1579
+ msgid "End rpmdb :"
+-msgstr "終了 rpmdb : "
++msgstr "終了 rpmdb :"
+
+-#: ../output.py:1424
++#: ../output.py:1580
+ msgid "User :"
+ msgstr "ユーザー :"
+
+-#: ../output.py:1426 ../output.py:1428 ../output.py:1430
++#: ../output.py:1582 ../output.py:1584 ../output.py:1586
+ msgid "Return-Code :"
+ msgstr "終了コード :"
+
+-#: ../output.py:1426
++#: ../output.py:1582
+ msgid "Aborted"
+ msgstr "中断しました"
+
+-#: ../output.py:1428
++#: ../output.py:1584
+ msgid "Failure:"
+ msgstr "失敗しました:"
+
+-#: ../output.py:1430
++#: ../output.py:1586
+ msgid "Success"
+ msgstr "成功"
+
+-#: ../output.py:1431
+-msgid "Transaction performed with:"
+-msgstr "トランザクションの実行:"
++#: ../output.py:1589
++msgid "Command Line :"
++msgstr "コマンドライン :"
+
+-#: ../output.py:1444 ../output.py:1489
+-msgid "Downgraded"
+-msgstr "ダウングレードしました"
++#: ../output.py:1597
++#, python-format
++msgid "Additional non-default information stored: %d"
++msgstr "保存済みの追加の非標準な情報: %d"
+
+-#. multiple versions installed, both older and newer
+-#: ../output.py:1446
+-msgid "Weird"
+-msgstr "異様"
++#: ../output.py:1600
++msgid "Transaction performed with:"
++msgstr "トランザクションの実行:"
+
+-#: ../output.py:1448
++#: ../output.py:1603
+ msgid "Packages Altered:"
+ msgstr "切り替えたパッケージ:"
+
+-#: ../output.py:1451
++#: ../output.py:1607
++msgid "Packages Skipped:"
++msgstr "パッケージを飛ばします:"
++
++#: ../output.py:1612
++msgid "Rpmdb Problems:"
++msgstr "Rpmdb の問題:"
++
++#: ../output.py:1620
+ msgid "Scriptlet output:"
+ msgstr "スクリプトの出力:"
+
+-#: ../output.py:1457
++#: ../output.py:1626
+ msgid "Errors:"
+ msgstr "エラー:"
+
+-#: ../output.py:1481 ../output.py:1482
++#. Note that these don't use _simple_pkg() because we are showing what
++#. happened to them in the transaction ... not the difference between the
++#. version in the transaction and now.
++#: ../output.py:1637 ../output.py:1638
+ msgid "Install"
+ msgstr "インストール"
+
+-#: ../output.py:1483
++#: ../output.py:1639
+ msgid "Dep-Install"
+ msgstr "依存インストール"
+
+-#: ../output.py:1485
++#: ../output.py:1641
+ msgid "Obsoleting"
+ msgstr "不要削除"
+
+-#: ../output.py:1486
++#: ../output.py:1642
+ msgid "Erase"
+ msgstr "削除"
+
+-#: ../output.py:1487
++#: ../output.py:1643
+ msgid "Reinstall"
+ msgstr "再インストール"
+
+-#: ../output.py:1488
++#: ../output.py:1644
+ msgid "Downgrade"
+ msgstr "ダウングレード"
+
+-#: ../output.py:1490
++#: ../output.py:1646
+ msgid "Update"
+ msgstr "更新"
+
+-#: ../output.py:1521
++#: ../output.py:1700
+ msgid "Time"
+ msgstr "時間"
+
+-#: ../output.py:1547
++#: ../output.py:1726
+ msgid "Last day"
+ msgstr "昨日"
+
+-#: ../output.py:1548
++#: ../output.py:1727
+ msgid "Last week"
+ msgstr "先週"
+
+-#: ../output.py:1549
++#: ../output.py:1728
+ msgid "Last 2 weeks"
+-msgstr "最終 2 週"
++msgstr "最近の 2 週間"
+
+ #. US default :p
+-#: ../output.py:1550
++#: ../output.py:1729
+ msgid "Last 3 months"
+-msgstr "最終 3 ヶ月"
++msgstr "最近の 3 ヶ月間"
+
+-#: ../output.py:1551
++#: ../output.py:1730
+ msgid "Last 6 months"
+-msgstr "最終 6 ヶ月"
++msgstr "最近の 6 ヶ月間"
+
+-#: ../output.py:1552
++#: ../output.py:1731
+ msgid "Last year"
+ msgstr "昨年"
+
+-#: ../output.py:1553
++#: ../output.py:1732
+ msgid "Over a year ago"
+ msgstr "1 年以上前"
+
+-#: ../output.py:1585
++#: ../output.py:1774
++#, python-format
++msgid "No Transaction %s found"
++msgstr "トランザクション %s が見つかりません。"
++
++#: ../output.py:1780
++msgid "Transaction ID:"
++msgstr "トランザクション ID:"
++
++#: ../output.py:1781
++msgid "Available additional history information:"
++msgstr "追加の履歴情報が利用できます:"
++
++#: ../output.py:1793
++#, python-format
++msgid "%s: No additional data found by this name"
++msgstr "%s: この名前から追加のデータが見つかりません。"
++
++#: ../output.py:1809
+ msgid "installed"
+ msgstr "インストール"
+
+-#: ../output.py:1586
++#: ../output.py:1810
+ msgid "updated"
+ msgstr "更新"
+
+-#: ../output.py:1587
++#: ../output.py:1811
+ msgid "obsoleted"
+ msgstr "不要"
+
+-#: ../output.py:1588
++#: ../output.py:1812
+ msgid "erased"
+ msgstr "削除"
+
+-#: ../output.py:1592
++#: ../output.py:1813
++msgid "reinstalled"
++msgstr "再インストール"
++
++#: ../output.py:1814
++msgid "downgraded"
++msgstr "ダウングレード"
++
++#: ../output.py:1818
+ #, python-format
+ msgid "---> Package %s.%s %s:%s-%s set to be %s"
+-msgstr "---> パッケージ %s.%s %s:%s-%s を%sに設定しました"
++msgstr "---> パッケージ %s.%s %s:%s-%s を%sに設定しました。"
+
+-#: ../output.py:1599
++#: ../output.py:1825
+ msgid "--> Running transaction check"
+-msgstr "--> トランザクションの確認を実行しています"
++msgstr "--> トランザクションの確認を実行しています。"
+
+-#: ../output.py:1604
++#: ../output.py:1830
+ msgid "--> Restarting Dependency Resolution with new changes."
+ msgstr "--> 新しい変更と依存性の解決を再開しています。"
+
+-#: ../output.py:1609
++#: ../output.py:1835
+ msgid "--> Finished Dependency Resolution"
+-msgstr "--> 依存性解決を終了しました"
++msgstr "--> 依存性解決を終了しました。"
+
+-#: ../output.py:1614 ../output.py:1619
++#: ../output.py:1840 ../output.py:1845
+ #, python-format
+ msgid "--> Processing Dependency: %s for package: %s"
+ msgstr "--> 依存性の処理をしています: %s のパッケージ: %s"
+
+-#: ../output.py:1623
++#: ../output.py:1850
++#, python-format
++msgid "---> Keeping package: %s"
++msgstr "---> 維持しています: %s"
++
++#: ../output.py:1853
+ #, python-format
+ msgid "--> Unresolved Dependency: %s"
+ msgstr "--> 未解決の依存性: %s"
+
+-#: ../output.py:1634
++#: ../output.py:1864
+ #, python-format
+ msgid "Package: %s"
+ msgstr "パッケージ: %s"
+
+-#: ../output.py:1636
++#: ../output.py:1866
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1155,7 +1234,7 @@ msgstr ""
+ "\n"
+ " 要求: %s"
+
+-#: ../output.py:1649 ../output.py:1660
++#: ../output.py:1875
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1164,95 +1243,108 @@ msgstr ""
+ "\n"
+ " %s: %s (%s)"
+
+-#: ../output.py:1657
++#: ../output.py:1880
++#, python-format
++msgid ""
++"\n"
++" %s"
++msgstr "\n %s"
++
++#: ../output.py:1882
++msgid ""
++"\n"
++" Not found"
++msgstr "\n 見つかりません"
++
++#. These should be the only three things we care about:
++#: ../output.py:1895
++msgid "Updated By"
++msgstr "次のものにより更新された: "
++
++#: ../output.py:1896
++msgid "Downgraded By"
++msgstr "次のものによりダウングレードされた: "
++
++#: ../output.py:1897
++msgid "Obsoleted By"
++msgstr "次のものにより不要にされた: "
++
++#: ../output.py:1915
+ msgid "Available"
+ msgstr "利用可能"
+
+-#: ../output.py:1665 ../output.py:1670
++#: ../output.py:1923 ../output.py:1928
+ #, python-format
+ msgid "--> Processing Conflict: %s conflicts %s"
+ msgstr "--> 衝突を処理しています: %s は %s と衝突しています"
+
+-#: ../output.py:1674
++#: ../output.py:1932
+ msgid "--> Populating transaction set with selected packages. Please wait."
+ msgstr ""
+
+-#: ../output.py:1678
++#: ../output.py:1936
+ #, python-format
+ msgid "---> Downloading header for %s to pack into transaction set."
+ msgstr ""
+ "---> トランザクションセットに束ねるために %s のヘッダーをダウンロードしていま"
+ "す"
+
+-#: ../utils.py:93
++#: ../utils.py:94
+ msgid "Running"
+ msgstr "実行中"
+
+-#: ../utils.py:94
++#: ../utils.py:95
+ msgid "Sleeping"
+ msgstr "スリープ中"
+
+-#: ../utils.py:95
++#: ../utils.py:96
+ msgid "Uninterruptible"
+ msgstr "割り込み不可"
+
+-#: ../utils.py:96
++#: ../utils.py:97
+ msgid "Zombie"
+ msgstr "ゾンビ"
+
+-#: ../utils.py:97
++#: ../utils.py:98
+ msgid "Traced/Stopped"
+-msgstr ""
++msgstr "トレース/停止"
+
+-#: ../utils.py:98 ../yumcommands.py:917
++#: ../utils.py:99 ../yumcommands.py:972
+ msgid "Unknown"
+ msgstr "不明"
+
+-#: ../utils.py:109
++#: ../utils.py:110
+ msgid " The other application is: PackageKit"
+ msgstr " 他のアプリケーション: PackageKit"
+
+-#: ../utils.py:111
++#: ../utils.py:112
+ #, python-format
+ msgid " The other application is: %s"
+ msgstr " 他のアプリケーション: %s"
+
+-#: ../utils.py:114
++#: ../utils.py:115
+ #, python-format
+ msgid " Memory : %5s RSS (%5sB VSZ)"
+ msgstr " メモリー: %5s RSS (%5sB VSZ)"
+
+-#: ../utils.py:119
++#: ../utils.py:120
+ #, python-format
+ msgid " Started: %s - %s ago"
+ msgstr " 開始 : %s - %s 秒経過"
+
+-#: ../utils.py:121
++#: ../utils.py:122
+ #, python-format
+ msgid " State : %s, pid: %d"
+ msgstr " 状態 : %s、PID: %d"
+
+-#: ../utils.py:199
+-#, python-format
+-msgid "PluginExit Error: %s"
+-msgstr "プラグインのエラー終了: %s"
+-
+-#: ../utils.py:202
+-#, python-format
+-msgid "Yum Error: %s"
+-msgstr "Yum エラー: %s"
+-
+-#: ../utils.py:235 ../yummain.py:42
++#: ../utils.py:143 ../yummain.py:42
+ msgid ""
+ "\n"
+ "\n"
+ "Exiting on user cancel"
+-msgstr ""
+-"\n"
+-"\n"
+-"ユーザーの取り消しで終了しています"
++msgstr "\n\nユーザーのキャンセルで終了しています"
+
+-#: ../utils.py:241 ../yummain.py:48
++#: ../utils.py:149 ../yummain.py:48
+ msgid ""
+ "\n"
+ "\n"
+@@ -1262,7 +1354,7 @@ msgstr ""
+ "\n"
+ "パイプが壊れたため終了しています"
+
+-#: ../utils.py:243 ../yummain.py:50
++#: ../utils.py:151 ../yummain.py:50
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1273,7 +1365,49 @@ msgstr ""
+ "\n"
+ "%s"
+
+-#: ../utils.py:282 ../yummain.py:211
++#: ../utils.py:201 ../yummain.py:107
++msgid ""
++"Another app is currently holding the yum lock; exiting as configured by "
++"exit_on_lock"
++msgstr "別のアプリケーションが現在 yum のロックを持っています。exit_on_lock による設定が存在します"
++
++#: ../utils.py:260
++#, python-format
++msgid "PluginExit Error: %s"
++msgstr "プラグインのエラー終了: %s"
++
++#: ../utils.py:263
++#, python-format
++msgid "Yum Error: %s"
++msgstr "Yum エラー: %s"
++
++#: ../utils.py:315 ../yummain.py:134 ../yummain.py:173
++#, python-format
++msgid "Error: %s"
++msgstr "エラー: %s"
++
++#: ../utils.py:319 ../yummain.py:177
++msgid " You could try using --skip-broken to work around the problem"
++msgstr " 問題を回避するために --skip-broken を用いることができません"
++
++#: ../utils.py:321 ../yummain.py:179 ../yummain.py:212
++msgid " You could try running: rpm -Va --nofiles --nodigest"
++msgstr " これらを試行できます: rpm -Va --nofiles --nodigest"
++
++#: ../utils.py:328 ../yummain.py:144 ../yummain.py:186
++#, python-format
++msgid "Unknown Error(s): Exit Code: %d:"
++msgstr "不明なエラー: 終了コード: %d:"
++
++#: ../utils.py:334 ../yummain.py:192
++msgid ""
++"\n"
++"Dependencies Resolved"
++msgstr ""
++"\n"
++"依存性を解決しました"
++
++#: ../utils.py:349 ../yummain.py:215
+ msgid "Complete!"
+ msgstr "完了しました!"
+
+@@ -1340,294 +1474,312 @@ msgstr "シェルへの引数として渡したファイル %s は存在しま
+ msgid "Error: more than one file given as argument to shell."
+ msgstr "エラー: シェルへの引数としてひとつ以上のファイルを渡しました。"
+
+-#: ../yumcommands.py:170
++#: ../yumcommands.py:138
++msgid ""
++"There are no enabled repos.\n"
++" Run \"yum repolist all\" to see the repos you have.\n"
++" You can enable repos with yum-config-manager --enable <repo>"
++msgstr ""
++"有効なリポジトリーがありません。\n"
++" 「yum repolist all」を実行し、所持するリポジトリーを参照してください。\n"
++" 「yum-config-manager --enable <repo>」でリポジトリーを有効にできます。"
++
++#: ../yumcommands.py:189
+ msgid "PACKAGE..."
+ msgstr "パッケージ..."
+
+-#: ../yumcommands.py:173
++#: ../yumcommands.py:192
+ msgid "Install a package or packages on your system"
+ msgstr "システムにパッケージをインストールする"
+
+-#: ../yumcommands.py:181
++#: ../yumcommands.py:201
+ msgid "Setting up Install Process"
+ msgstr "インストール処理の設定をしています"
+
+-#: ../yumcommands.py:192
++#: ../yumcommands.py:212 ../yumcommands.py:234
+ msgid "[PACKAGE...]"
+ msgstr "[パッケージ...]"
+
+-#: ../yumcommands.py:195
++#: ../yumcommands.py:215
+ msgid "Update a package or packages on your system"
+ msgstr "システムのパッケージを更新する"
+
+-#: ../yumcommands.py:202
++#: ../yumcommands.py:223
+ msgid "Setting up Update Process"
+ msgstr "更新処理の設定をしています"
+
+-#: ../yumcommands.py:244
++#: ../yumcommands.py:237
++msgid "Synchronize installed packages to the latest available versions"
++msgstr "最新の利用可能なバージョンへインストール済みパッケージを同期する"
++
++#: ../yumcommands.py:245
++msgid "Setting up Distribution Synchronization Process"
++msgstr "同期配信処理の準備をしています"
++
++#: ../yumcommands.py:288
+ msgid "Display details about a package or group of packages"
+ msgstr "パッケージもしくはパッケージのグループについての詳細を表示する"
+
+-#: ../yumcommands.py:293
++#: ../yumcommands.py:337
+ msgid "Installed Packages"
+ msgstr "インストール済みパッケージ"
+
+-#: ../yumcommands.py:301
++#: ../yumcommands.py:345
+ msgid "Available Packages"
+ msgstr "利用可能なパッケージ"
+
+-#: ../yumcommands.py:305
++#: ../yumcommands.py:349
+ msgid "Extra Packages"
+ msgstr "外部パッケージ"
+
+-#: ../yumcommands.py:309
++#: ../yumcommands.py:353
+ msgid "Updated Packages"
+ msgstr "更新したパッケージ"
+
+ #. This only happens in verbose mode
+-#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601
++#: ../yumcommands.py:361 ../yumcommands.py:368 ../yumcommands.py:655
+ msgid "Obsoleting Packages"
+ msgstr "パッケージを不要にしています"
+
+-#: ../yumcommands.py:326
++#: ../yumcommands.py:370
+ msgid "Recently Added Packages"
+ msgstr "最近追加したパッケージ"
+
+-#: ../yumcommands.py:333
++#: ../yumcommands.py:377
+ msgid "No matching Packages to list"
+ msgstr "表示するパッケージはありません"
+
+-#: ../yumcommands.py:347
++#: ../yumcommands.py:391
+ msgid "List a package or groups of packages"
+ msgstr "パッケージグループの一覧を表示する"
+
+-#: ../yumcommands.py:359
++#: ../yumcommands.py:403
+ msgid "Remove a package or packages from your system"
+ msgstr "システムから削除するパッケージ"
+
+-#: ../yumcommands.py:366
++#: ../yumcommands.py:410
+ msgid "Setting up Remove Process"
+ msgstr "削除処理の設定をしています"
+
+-#: ../yumcommands.py:380
++#: ../yumcommands.py:424
+ msgid "Setting up Group Process"
+ msgstr "グループ処理の設定をしています"
+
+-#: ../yumcommands.py:386
++#: ../yumcommands.py:430
+ msgid "No Groups on which to run command"
+ msgstr "コマンドを実行するグループがありません"
+
+-#: ../yumcommands.py:399
++#: ../yumcommands.py:443
+ msgid "List available package groups"
+ msgstr "利用できるパッケージグループの一覧"
+
+-#: ../yumcommands.py:416
++#: ../yumcommands.py:463
+ msgid "Install the packages in a group on your system"
+ msgstr "システムのグループのパッケージをインストールする"
+
+-#: ../yumcommands.py:438
++#: ../yumcommands.py:486
+ msgid "Remove the packages in a group from your system"
+ msgstr "システムからグループのパッケージを削除する"
+
+-#: ../yumcommands.py:465
++#: ../yumcommands.py:514
+ msgid "Display details about a package group"
+ msgstr "パッケージグループについての詳細を表示する"
+
+-#: ../yumcommands.py:489
++#: ../yumcommands.py:539
+ msgid "Generate the metadata cache"
+ msgstr "メタデータキャッシュを生成する"
+
+-#: ../yumcommands.py:495
++#: ../yumcommands.py:545
+ msgid "Making cache files for all metadata files."
+ msgstr "すべて飲めたデータファイルのキャッシュを作成します。"
+
+-#: ../yumcommands.py:496
++#: ../yumcommands.py:546
+ msgid "This may take a while depending on the speed of this computer"
+ msgstr "これは、このコンピューターの速度に依存する時間をとるかもしれません"
+
+-#: ../yumcommands.py:517
++#: ../yumcommands.py:567
+ msgid "Metadata Cache Created"
+ msgstr "メタデータのキャッシュを作成しました"
+
+-#: ../yumcommands.py:531
++#: ../yumcommands.py:581
+ msgid "Remove cached data"
+ msgstr "キャッシュデータを削除する"
+
+-#: ../yumcommands.py:551
++#: ../yumcommands.py:602
+ msgid "Find what package provides the given value"
+ msgstr "指定値を提供するパッケージを検索する"
+
+-#: ../yumcommands.py:571
++#: ../yumcommands.py:622
+ msgid "Check for available package updates"
+ msgstr "更新に利用できるパッケージを確認する"
+
+-#: ../yumcommands.py:621
++#: ../yumcommands.py:675
+ msgid "Search package details for the given string"
+ msgstr "指定した文字列でパッケージの詳細を検索する"
+
+-#: ../yumcommands.py:627
++#: ../yumcommands.py:681
+ msgid "Searching Packages: "
+ msgstr "パッケージの検索中: "
+
+-#: ../yumcommands.py:644
++#: ../yumcommands.py:698
+ msgid "Update packages taking obsoletes into account"
+ msgstr "不要になったパッケージを考慮しながらパッケージを更新する"
+
+-#: ../yumcommands.py:652
++#: ../yumcommands.py:707
+ msgid "Setting up Upgrade Process"
+ msgstr "更新処理の設定をしています"
+
+-#: ../yumcommands.py:666
++#: ../yumcommands.py:721
+ msgid "Install a local RPM"
+ msgstr "ローカル RPM のインストール"
+
+-#: ../yumcommands.py:674
++#: ../yumcommands.py:729
+ msgid "Setting up Local Package Process"
+ msgstr "ローカルパッケージ処理の設定をしています"
+
+-#: ../yumcommands.py:693
++#: ../yumcommands.py:748
+ msgid "Determine which package provides the given dependency"
+-msgstr ""
++msgstr "指定の依存性を提供するパッケージがどれか特定する"
+
+-#: ../yumcommands.py:696
++#: ../yumcommands.py:751
+ msgid "Searching Packages for Dependency:"
+ msgstr "依存性のパッケージ検索:"
+
+-#: ../yumcommands.py:710
++#: ../yumcommands.py:765
+ msgid "Run an interactive yum shell"
+ msgstr "対話型の yum シェルを実行する"
+
+-#: ../yumcommands.py:716
++#: ../yumcommands.py:771
+ msgid "Setting up Yum Shell"
+ msgstr "Yum シェルの設定をしています"
+
+-#: ../yumcommands.py:734
++#: ../yumcommands.py:789
+ msgid "List a package's dependencies"
+ msgstr "パッケージの依存性の一覧を表示する"
+
+-#: ../yumcommands.py:740
++#: ../yumcommands.py:795
+ msgid "Finding dependencies: "
+ msgstr "依存性の検索中: "
+
+-#: ../yumcommands.py:756
++#: ../yumcommands.py:811
+ msgid "Display the configured software repositories"
+ msgstr "ソフトウェアリポジトリーの構成を表示する"
+
+-#: ../yumcommands.py:822 ../yumcommands.py:823
++#: ../yumcommands.py:877 ../yumcommands.py:878
+ msgid "enabled"
+ msgstr "有効"
+
+-#: ../yumcommands.py:849 ../yumcommands.py:850
++#: ../yumcommands.py:904 ../yumcommands.py:905
+ msgid "disabled"
+ msgstr "無効"
+
+-#: ../yumcommands.py:866
++#: ../yumcommands.py:921
+ msgid "Repo-id : "
+-msgstr "リポジトリー ID : "
++msgstr "リポジトリー ID : "
+
+-#: ../yumcommands.py:867
++#: ../yumcommands.py:922
+ msgid "Repo-name : "
+-msgstr "リポジトリー名 : "
++msgstr "リポジトリーの名前 : "
+
+-#: ../yumcommands.py:870
++#: ../yumcommands.py:925
+ msgid "Repo-status : "
+-msgstr "リポジトリーの状態 : "
++msgstr "リポジトリーの状態 : "
+
+-#: ../yumcommands.py:873
++#: ../yumcommands.py:928
+ msgid "Repo-revision: "
+-msgstr "リポジトリーのリビジョン: "
++msgstr "リポジトリーのリビジョン : "
+
+-#: ../yumcommands.py:877
++#: ../yumcommands.py:932
+ msgid "Repo-tags : "
+-msgstr "リポジトリータグ : "
++msgstr "リポジトリーのタグ : "
+
+-#: ../yumcommands.py:883
++#: ../yumcommands.py:938
+ msgid "Repo-distro-tags: "
+ msgstr ""
+
+-#: ../yumcommands.py:888
++#: ../yumcommands.py:943
+ msgid "Repo-updated : "
+-msgstr "リポジトリー更新日 : "
++msgstr "リポジトリー更新日 : "
+
+-#: ../yumcommands.py:890
++#: ../yumcommands.py:945
+ msgid "Repo-pkgs : "
+-msgstr ""
++msgstr "リポジトリー内パッケージ数 : "
+
+-#: ../yumcommands.py:891
++#: ../yumcommands.py:946
+ msgid "Repo-size : "
+-msgstr "リポジトリー容量 : "
++msgstr "リポジトリー容量 : "
+
+-#: ../yumcommands.py:898
++#: ../yumcommands.py:953
+ msgid "Repo-baseurl : "
+-msgstr "リポジトリー基準 URL : "
++msgstr "リポジトリー基準 URL : "
+
+-#: ../yumcommands.py:906
++#: ../yumcommands.py:961
+ msgid "Repo-metalink: "
+-msgstr "リポジトリーメタリンク: "
++msgstr "リポジトリーメタリンク : "
+
+-#: ../yumcommands.py:910
++#: ../yumcommands.py:965
+ msgid " Updated : "
+-msgstr " 更新日 : "
++msgstr " 更新日 : "
+
+-#: ../yumcommands.py:913
++#: ../yumcommands.py:968
+ msgid "Repo-mirrors : "
+-msgstr "リポジトリーミラー : "
++msgstr "リポジトリーのミラー : "
+
+-#: ../yumcommands.py:923
++#: ../yumcommands.py:978
+ #, python-format
+ msgid "Never (last: %s)"
+ msgstr "ずっと (最終: %s)"
+
+-#: ../yumcommands.py:925
++#: ../yumcommands.py:980
+ #, python-format
+ msgid "Instant (last: %s)"
+ msgstr "インスタント (最終: %s)"
+
+-#: ../yumcommands.py:928
++#: ../yumcommands.py:983
+ #, python-format
+ msgid "%s second(s) (last: %s)"
+ msgstr "%s 秒 (最終: %s)"
+
+-#: ../yumcommands.py:930
++#: ../yumcommands.py:985
+ msgid "Repo-expire : "
+-msgstr ""
++msgstr "リポジトリーの期限 : "
+
+-#: ../yumcommands.py:933
++#: ../yumcommands.py:988
+ msgid "Repo-exclude : "
+-msgstr ""
++msgstr "リポジトリーの除外 : "
+
+-#: ../yumcommands.py:937
++#: ../yumcommands.py:992
+ msgid "Repo-include : "
+-msgstr ""
++msgstr "リポジトリーの内包 : "
+
+-#: ../yumcommands.py:941
++#: ../yumcommands.py:996
+ msgid "Repo-excluded: "
+-msgstr ""
++msgstr "リポジトリーの除外数 : "
+
+ #. Work out the first (id) and last (enabled/disalbed/count),
+ #. then chop the middle (name)...
+-#: ../yumcommands.py:951 ../yumcommands.py:980
++#: ../yumcommands.py:1006 ../yumcommands.py:1035
+ msgid "repo id"
+ msgstr "リポジトリー ID"
+
+-#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987
++#: ../yumcommands.py:1023 ../yumcommands.py:1024 ../yumcommands.py:1042
+ msgid "status"
+ msgstr "状態"
+
+-#: ../yumcommands.py:981
++#: ../yumcommands.py:1036
+ msgid "repo name"
+ msgstr "リポジトリー名"
+
+-#: ../yumcommands.py:1018
++#: ../yumcommands.py:1073
+ msgid "Display a helpful usage message"
+ msgstr "役立つ使い方のメッセージを表示する"
+
+-#: ../yumcommands.py:1052
++#: ../yumcommands.py:1107
+ #, python-format
+ msgid "No help available for %s"
+ msgstr "%s のヘルプは利用できません"
+
+-#: ../yumcommands.py:1057
++#: ../yumcommands.py:1112
+ msgid ""
+ "\n"
+ "\n"
+@@ -1637,7 +1789,7 @@ msgstr ""
+ "\n"
+ "別名: "
+
+-#: ../yumcommands.py:1059
++#: ../yumcommands.py:1114
+ msgid ""
+ "\n"
+ "\n"
+@@ -1647,115 +1799,89 @@ msgstr ""
+ "\n"
+ "別名: "
+
+-#: ../yumcommands.py:1087
++#: ../yumcommands.py:1143
+ msgid "Setting up Reinstall Process"
+ msgstr "再インストール処理の設定をしています"
+
+-#: ../yumcommands.py:1095
++#: ../yumcommands.py:1151
+ msgid "reinstall a package"
+ msgstr "パッケージの再インストール"
+
+-#: ../yumcommands.py:1113
++#: ../yumcommands.py:1170
+ msgid "Setting up Downgrade Process"
+ msgstr "ダウングレード処理の設定をしています"
+
+-#: ../yumcommands.py:1120
++#: ../yumcommands.py:1177
+ msgid "downgrade a package"
+ msgstr "パッケージのダウングレード"
+
+-#: ../yumcommands.py:1134
++#: ../yumcommands.py:1191
+ msgid "Display a version for the machine and/or available repos."
+-msgstr ""
++msgstr "ホストの利用できるリポジトリーのバージョンを表示する"
+
+-#: ../yumcommands.py:1173
++#: ../yumcommands.py:1230
+ msgid " Yum version groups:"
+ msgstr " Yum バージョン グループ"
+
+-#: ../yumcommands.py:1183
++#: ../yumcommands.py:1240
+ msgid " Group :"
+-msgstr " グループ :"
++msgstr " グループ :"
+
+-#: ../yumcommands.py:1184
++#: ../yumcommands.py:1241
+ msgid " Packages:"
+-msgstr "パッケージ :"
++msgstr "パッケージ :"
+
+-#: ../yumcommands.py:1213
++#: ../yumcommands.py:1270
+ msgid "Installed:"
+-msgstr "インストール済み:"
++msgstr "インストール済み :"
+
+-#: ../yumcommands.py:1218
++#: ../yumcommands.py:1278
+ msgid "Group-Installed:"
+-msgstr "グループインストール済み:"
++msgstr "グループ インストール済み:"
+
+-#: ../yumcommands.py:1227
++#: ../yumcommands.py:1287
+ msgid "Available:"
+-msgstr "利用可能 :"
++msgstr "利用可能 :"
+
+-#: ../yumcommands.py:1233
++#: ../yumcommands.py:1296
+ msgid "Group-Available:"
+-msgstr "利用可能なグループ:"
++msgstr "利用可能なグループ :"
+
+-#: ../yumcommands.py:1272
++#: ../yumcommands.py:1335
+ msgid "Display, or use, the transaction history"
+-msgstr ""
++msgstr "トランザクション履歴を表示、使用する"
+
+-#: ../yumcommands.py:1300
++#: ../yumcommands.py:1363
+ #, python-format
+ msgid "Invalid history sub-command, use: %s."
+-msgstr ""
++msgstr "使用した history のサブコマンドが正しくありません: %s"
+
+-#: ../yumcommands.py:1345
++#: ../yumcommands.py:1370
++msgid "You don't have access to the history DB."
++msgstr "履歴 DB にアクセスできません。"
++
++#: ../yumcommands.py:1413
+ msgid "Check for problems in the rpmdb"
+-msgstr ""
++msgstr "rpmdb の問題を確認する"
+
+-#: ../yummain.py:102
++#: ../yummain.py:103
+ msgid ""
+ "Another app is currently holding the yum lock; waiting for it to exit..."
+ msgstr ""
+ "別のアプリケーションが現在 yum のロックを持っています。終了するまで待っていま"
+ "す..."
+
+-#: ../yummain.py:130 ../yummain.py:169
+-#, python-format
+-msgid "Error: %s"
+-msgstr "エラー: %s"
+-
+-#: ../yummain.py:140 ../yummain.py:182
+-#, python-format
+-msgid "Unknown Error(s): Exit Code: %d:"
+-msgstr "不明なエラー: 終了コード: %d:"
+-
+ #. Depsolve stage
+-#: ../yummain.py:147
++#: ../yummain.py:151
+ msgid "Resolving Dependencies"
+ msgstr "依存性の解決をしています"
+
+-#: ../yummain.py:173
+-msgid " You could try using --skip-broken to work around the problem"
+-msgstr " 問題を回避するために --skip-broken を用いることができません"
+-
+-#: ../yummain.py:175 ../yummain.py:208
+-msgid " You could try running: rpm -Va --nofiles --nodigest"
+-msgstr " これらを試行できます: rpm -Va --nofiles --nodigest"
+-
+-#: ../yummain.py:188
+-msgid ""
+-"\n"
+-"Dependencies Resolved"
+-msgstr ""
+-"\n"
+-"依存性を解決しました"
+-
+-#: ../yummain.py:265
++#: ../yummain.py:269
+ msgid ""
+ "\n"
+ "\n"
+ "Exiting on user cancel."
+-msgstr ""
+-"\n"
+-"\n"
+-"\n"
+-"ユーザーによる取り消しで終了しています。"
++msgstr "\n\n\nユーザーによるキャンセルで終了しています。"
+
+ #: ../yum/depsolve.py:82
+ msgid "doTsSetup() will go away in a future version of Yum.\n"
+@@ -1765,296 +1891,316 @@ msgstr "doTsSetup() は Yum の将来のバージョンでなくなります。\
+ msgid "Setting up TransactionSets before config class is up"
+ msgstr "構成クラスが終わる前にトランザクションセットを設定しています"
+
+-#: ../yum/depsolve.py:148
++#: ../yum/depsolve.py:151
+ #, python-format
+ msgid "Invalid tsflag in config file: %s"
+ msgstr "構成ファイルの tsflag が不正です: %s"
+
+-#: ../yum/depsolve.py:159
++#: ../yum/depsolve.py:162
+ #, python-format
+ msgid "Searching pkgSack for dep: %s"
+ msgstr "依存性の pkgSack を検索しています: %s"
+
+-#: ../yum/depsolve.py:202
++#: ../yum/depsolve.py:205
+ #, python-format
+ msgid "Member: %s"
+ msgstr "メンバー: %s"
+
+-#: ../yum/depsolve.py:216 ../yum/depsolve.py:731
++#: ../yum/depsolve.py:219 ../yum/depsolve.py:754
+ #, python-format
+ msgid "%s converted to install"
+ msgstr "%s をインストールに変更しました"
+
+-#: ../yum/depsolve.py:223
++#: ../yum/depsolve.py:226
+ #, python-format
+ msgid "Adding Package %s in mode %s"
+ msgstr "モード %s にパッケージ %s を追加しています"
+
+-#: ../yum/depsolve.py:233
++#: ../yum/depsolve.py:242
+ #, python-format
+ msgid "Removing Package %s"
+ msgstr "パッケージ %s の削除をしています"
+
+-#: ../yum/depsolve.py:255
++#: ../yum/depsolve.py:264
+ #, python-format
+ msgid "%s requires: %s"
+ msgstr "%s の要求: %s"
+
+-#: ../yum/depsolve.py:296
++#: ../yum/depsolve.py:305
+ #, python-format
+ msgid "%s requires %s"
+-msgstr ""
++msgstr "%s は %s を要求します"
+
+-#: ../yum/depsolve.py:323
++#: ../yum/depsolve.py:332
+ msgid "Needed Require has already been looked up, cheating"
+ msgstr "必要な要求は既に調べましたが不正をしています"
+
+-#: ../yum/depsolve.py:333
++#: ../yum/depsolve.py:342
+ #, python-format
+ msgid "Needed Require is not a package name. Looking up: %s"
+ msgstr "必要な要求はパッケージ名ではありません。調べています: %s"
+
+-#: ../yum/depsolve.py:340
++#: ../yum/depsolve.py:349
+ #, python-format
+ msgid "Potential Provider: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:363
++#: ../yum/depsolve.py:372
+ #, python-format
+ msgid "Mode is %s for provider of %s: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:367
++#: ../yum/depsolve.py:376
+ #, python-format
+ msgid "Mode for pkg providing %s: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:371
++#: ../yum/depsolve.py:380
+ #, python-format
+ msgid "TSINFO: %s package requiring %s marked as erase"
+ msgstr ""
+
+-#: ../yum/depsolve.py:384
++#: ../yum/depsolve.py:393
+ #, python-format
+ msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+ msgstr ""
+
+-#: ../yum/depsolve.py:387
++#: ../yum/depsolve.py:396
+ #, python-format
+ msgid "TSINFO: Updating %s to resolve dep."
+ msgstr ""
+
+-#: ../yum/depsolve.py:395
++#: ../yum/depsolve.py:404
+ #, python-format
+ msgid "Cannot find an update path for dep for: %s"
+ msgstr "依存する更新パスを見つけられません: %s"
+
+-#: ../yum/depsolve.py:426
++#: ../yum/depsolve.py:435
+ #, python-format
+ msgid "Quick matched %s to require for %s"
+ msgstr ""
+
+ #. is it already installed?
+-#: ../yum/depsolve.py:468
++#: ../yum/depsolve.py:477
+ #, python-format
+ msgid "%s is in providing packages but it is already installed, removing."
+ msgstr ""
+ "%s を提供するパッケージはすでにインストールされています。削除しています。"
+
+-#: ../yum/depsolve.py:484
++#: ../yum/depsolve.py:493
+ #, python-format
+ msgid "Potential resolving package %s has newer instance in ts."
+ msgstr ""
+
+-#: ../yum/depsolve.py:495
++#: ../yum/depsolve.py:504
+ #, python-format
+ msgid "Potential resolving package %s has newer instance installed."
+ msgstr ""
+
+-#: ../yum/depsolve.py:513
++#: ../yum/depsolve.py:522
+ #, python-format
+ msgid "%s already in ts, skipping this one"
+ msgstr "%s はすでに ts にあります。これを飛ばします"
+
+-#: ../yum/depsolve.py:555
++#: ../yum/depsolve.py:571
+ #, python-format
+ msgid "TSINFO: Marking %s as update for %s"
+ msgstr "TSINFO: %s を更新として %s で設定しています"
+
+-#: ../yum/depsolve.py:563
++#: ../yum/depsolve.py:580
+ #, python-format
+ msgid "TSINFO: Marking %s as install for %s"
+ msgstr "TSINFO: %s をインストールとして %s で設定しています"
+
+-#: ../yum/depsolve.py:667 ../yum/depsolve.py:758
++#: ../yum/depsolve.py:690 ../yum/depsolve.py:780
+ msgid "Success - empty transaction"
+ msgstr "成功 - 空のトランザクション"
+
+-#: ../yum/depsolve.py:706 ../yum/depsolve.py:721
++#: ../yum/depsolve.py:729 ../yum/depsolve.py:744
+ msgid "Restarting Loop"
+ msgstr "ループを再開しています"
+
+-#: ../yum/depsolve.py:737
++#: ../yum/depsolve.py:760
+ msgid "Dependency Process ending"
+ msgstr "依存性の処理を終了しています"
+
+-#: ../yum/depsolve.py:751
++#: ../yum/depsolve.py:774
+ #, python-format
+ msgid "%s from %s has depsolving problems"
+ msgstr "%s(%s) は依存性に問題があります"
+
+-#: ../yum/depsolve.py:759
++#: ../yum/depsolve.py:781
+ msgid "Success - deps resolved"
+ msgstr "成功 - 依存性を解決しました"
+
+-#: ../yum/depsolve.py:773
++#: ../yum/depsolve.py:802
+ #, python-format
+ msgid "Checking deps for %s"
+ msgstr "%s の依存性を確認しています"
+
+-#: ../yum/depsolve.py:851
++#: ../yum/depsolve.py:888
+ #, python-format
+ msgid "looking for %s as a requirement of %s"
+ msgstr "%s の要求として %s を検索しています"
+
+-#: ../yum/depsolve.py:1067
++#: ../yum/depsolve.py:1119
+ #, python-format
+ msgid "Running compare_providers() for %s"
+ msgstr "%s の compare_providers() を実行しています"
+
+-#: ../yum/depsolve.py:1094 ../yum/depsolve.py:1100
++#: ../yum/depsolve.py:1146 ../yum/depsolve.py:1152
+ #, python-format
+ msgid "better arch in po %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1195
++#: ../yum/depsolve.py:1244
+ #, python-format
+ msgid "%s obsoletes %s"
+-msgstr ""
++msgstr "%s は %s で不要です"
+
+-#: ../yum/depsolve.py:1207
++#: ../yum/depsolve.py:1256
+ #, python-format
+ msgid ""
+ "archdist compared %s to %s on %s\n"
+ " Winner: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1214
++#: ../yum/depsolve.py:1264
+ #, python-format
+ msgid "common sourcerpm %s and %s"
+ msgstr "%s と %s の共通ソース RPM(SRPM)"
+
+-#: ../yum/depsolve.py:1218
++#: ../yum/depsolve.py:1268
+ #, python-format
+ msgid "base package %s is installed for %s"
+ msgstr "ベースパッケージ %s は %s のためにインストールしています"
+
+-#: ../yum/depsolve.py:1224
++#: ../yum/depsolve.py:1274
+ #, python-format
+ msgid "common prefix of %s between %s and %s"
+ msgstr "%s から %s と %s の共通接頭辞"
+
+-#: ../yum/depsolve.py:1233
++#: ../yum/depsolve.py:1305
++#, python-format
++msgid "requires minimal: %d"
++msgstr "最低限の要求: %d"
++
++#: ../yum/depsolve.py:1309
++#, python-format
++msgid " Winner: %s"
++msgstr " 勝者: %s"
++
++#: ../yum/depsolve.py:1314
++#, python-format
++msgid " Loser(with %d): %s"
++msgstr " 敗者(%d): %s"
++
++#: ../yum/depsolve.py:1330
+ #, python-format
+ msgid "Best Order: %s"
+ msgstr "最適の順序: %s"
+
+-#: ../yum/__init__.py:192
++#: ../yum/__init__.py:214
+ msgid "doConfigSetup() will go away in a future version of Yum.\n"
+ msgstr "doConfigSetup() は Yum の将来のバージョンでなくなります。\n"
+
+-#: ../yum/__init__.py:424
++#: ../yum/__init__.py:453
++#, python-format
++msgid "Repository %r: Error parsing config: %s"
++msgstr "リポジトリー %r: 設定の解析中にエラー: %s"
++
++#: ../yum/__init__.py:459
+ #, python-format
+ msgid "Repository %r is missing name in configuration, using id"
+ msgstr "リポジトリー %r は構成中に名前がありませんので ID を使います"
+
+-#: ../yum/__init__.py:462
++#: ../yum/__init__.py:497
+ msgid "plugins already initialised"
+ msgstr "プラグインは既に初期化されています"
+
+-#: ../yum/__init__.py:469
++#: ../yum/__init__.py:504
+ msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+ msgstr "dbRpmDBSetup() は Yum の将来のバージョンでなくなります。\n"
+
+-#: ../yum/__init__.py:480
++#: ../yum/__init__.py:515
+ msgid "Reading Local RPMDB"
+ msgstr "ローカルの RPMDB を読み込んでいます"
+
+-#: ../yum/__init__.py:504
++#: ../yum/__init__.py:538
+ msgid "doRepoSetup() will go away in a future version of Yum.\n"
+ msgstr "doRepoSetup() は Yum の将来のバージョンでなくなります。\n"
+
+-#: ../yum/__init__.py:524
++#: ../yum/__init__.py:577
+ msgid "doSackSetup() will go away in a future version of Yum.\n"
+ msgstr "doSackSetup() は Yum の将来のバージョンでなくなります。\n"
+
+-#: ../yum/__init__.py:554
++#: ../yum/__init__.py:607
+ msgid "Setting up Package Sacks"
+ msgstr ""
+
+-#: ../yum/__init__.py:599
++#: ../yum/__init__.py:652
+ #, python-format
+ msgid "repo object for repo %s lacks a _resetSack method\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:600
++#: ../yum/__init__.py:653
+ msgid "therefore this repo cannot be reset.\n"
+ msgstr "したがって、このリポジトリーはリセットできません。\n"
+
+-#: ../yum/__init__.py:605
++#: ../yum/__init__.py:658
+ msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+ msgstr "doUpdateSetup() は Yum の将来のバージョンでなくなります。\n"
+
+-#: ../yum/__init__.py:617
++#: ../yum/__init__.py:670
+ msgid "Building updates object"
+ msgstr "オブジェクトの更新を構築しています"
+
+-#: ../yum/__init__.py:652
++#: ../yum/__init__.py:709
+ msgid "doGroupSetup() will go away in a future version of Yum.\n"
+ msgstr "doGroupSetup() は Yum の将来のバージョンでなくなります。\n"
+
+-#: ../yum/__init__.py:677
++#: ../yum/__init__.py:734
+ msgid "Getting group metadata"
+ msgstr "グループメタデータを取得しています"
+
+-#: ../yum/__init__.py:703
++#: ../yum/__init__.py:760
+ #, python-format
+ msgid "Adding group file from repository: %s"
+ msgstr "リポジトリーからグループファイルを追加しています: %s"
+
+-#: ../yum/__init__.py:712
++#: ../yum/__init__.py:769
+ #, python-format
+ msgid "Failed to add groups file for repository: %s - %s"
+ msgstr "リポジトリーのグループファイルに追加できませんでした: %s - %s"
+
+-#: ../yum/__init__.py:718
++#: ../yum/__init__.py:775
+ msgid "No Groups Available in any repository"
+ msgstr "いずれかのリポジトリーに利用できるグループはありません"
+
+-#: ../yum/__init__.py:730
++#: ../yum/__init__.py:787
+ msgid "Getting pkgtags metadata"
+ msgstr "メタデータ pkgtags を取得しています"
+
+-#: ../yum/__init__.py:740
++#: ../yum/__init__.py:797
+ #, python-format
+ msgid "Adding tags from repository: %s"
+ msgstr "リポジトリーからタグを追加しています: %s"
+
+-#: ../yum/__init__.py:749
++#: ../yum/__init__.py:806
+ #, python-format
+ msgid "Failed to add Pkg Tags for repository: %s - %s"
+ msgstr "リポジトリーからパッケージタグの追加に失敗しました: %s - %s"
+
+-#: ../yum/__init__.py:827
++#: ../yum/__init__.py:884
+ msgid "Importing additional filelist information"
+ msgstr "追加のファイル一覧情報にインポートしています"
+
+-#: ../yum/__init__.py:841
++#: ../yum/__init__.py:898
+ #, python-format
+ msgid "The program %s%s%s is found in the yum-utils package."
+ msgstr "プログラム %s%s%s は yum-utils パッケージ内で見つかりました。"
+
+-#: ../yum/__init__.py:849
++#: ../yum/__init__.py:906
+ msgid ""
+ "There are unfinished transactions remaining. You might consider running yum-"
+ "complete-transaction first to finish them."
+@@ -2062,18 +2208,23 @@ msgstr ""
+ "終了していない残作業があります。それらを終了するために、まず yum-complete-"
+ "transaction の実行を検討すべきかもしれません。"
+
++#: ../yum/__init__.py:985
++#, python-format
++msgid "Trying to remove \"%s\", which is protected"
++msgstr ""
++
+ #. Kind of hacky
+-#: ../yum/__init__.py:922
++#: ../yum/__init__.py:1044
+ #, python-format
+ msgid "Skip-broken round %i"
+ msgstr ""
+
+-#: ../yum/__init__.py:975
++#: ../yum/__init__.py:1101
+ #, python-format
+ msgid "Skip-broken took %i rounds "
+ msgstr ""
+
+-#: ../yum/__init__.py:976
++#: ../yum/__init__.py:1102
+ msgid ""
+ "\n"
+ "Packages skipped because of dependency problems:"
+@@ -2081,95 +2232,115 @@ msgstr ""
+ "\n"
+ "パッケージは依存関係に問題があるため、飛ばします:"
+
+-#: ../yum/__init__.py:980
++#: ../yum/__init__.py:1106
+ #, python-format
+ msgid " %s from %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1121
++#. FIXME: _N()
++#: ../yum/__init__.py:1251
++#, python-format
++msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:"
++msgstr ""
++
++#: ../yum/__init__.py:1255
+ msgid "Warning: RPMDB altered outside of yum."
+ msgstr "警告: RPMDB は yum 以外で変更されました。"
+
+-#: ../yum/__init__.py:1126
++#: ../yum/__init__.py:1267
+ msgid "missing requires"
+ msgstr "要求されたもの不足"
+
+-#: ../yum/__init__.py:1127
++#: ../yum/__init__.py:1268
+ msgid "installed conflict"
+ msgstr "インストール済みとの衝突"
+
+-#: ../yum/__init__.py:1180
++#: ../yum/__init__.py:1366
+ msgid ""
+ "Warning: scriptlet or other non-fatal errors occurred during transaction."
+ msgstr ""
+ "警告: スクリプト、もしくはその他で処理の間に致命的ではないエラーが発生しまし"
+ "た。"
+
+-#: ../yum/__init__.py:1198
++#: ../yum/__init__.py:1376
++msgid "Transaction couldn't start:"
++msgstr "トランザクションを解しできません:"
++
++#. should this be 'to_unicoded'?
++#: ../yum/__init__.py:1379
++msgid "Could not run transaction."
++msgstr "トランザクションを実行できません。"
++
++#: ../yum/__init__.py:1392
+ #, python-format
+ msgid "Failed to remove transaction file %s"
+ msgstr "トランザクションファイル %s の削除に失敗しました"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1227
++#: ../yum/__init__.py:1424
+ #, python-format
+ msgid "%s was supposed to be installed but is not!"
+ msgstr "%s のインストールを想定したがそうではなかった!"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1266
++#: ../yum/__init__.py:1486
+ #, python-format
+ msgid "%s was supposed to be removed but is not!"
+ msgstr "%s の削除を想定したがそうではなかった!"
+
++#: ../yum/__init__.py:1597
++#, python-format
++msgid "Could not open lock %s: %s"
++msgstr "%s のロックを開けません: %s"
++
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1386
++#: ../yum/__init__.py:1614
+ #, python-format
+ msgid "Unable to check if PID %s is active"
+ msgstr "PID %s がアクティブかどうかの確認に失敗しました"
+
+ #. Another copy seems to be running.
+-#: ../yum/__init__.py:1390
++#: ../yum/__init__.py:1618
+ #, python-format
+ msgid "Existing lock %s: another copy is running as pid %s."
+ msgstr "ロックファイル %s が存在します: PID %s として別に実行されています。"
+
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1425
++#: ../yum/__init__.py:1653
+ #, python-format
+ msgid "Could not create lock at %s: %s "
+ msgstr "%s でロックを作成できません: %s"
+
+-#: ../yum/__init__.py:1470
++#: ../yum/__init__.py:1698
++#, python-format
+ msgid ""
+-"Package does not match intended download. Suggestion: run yum clean metadata"
+-msgstr ""
+-"パッケージは予定したダウンロードと一致しません。 提案: 「yum clean metadata」"
+-"の実行"
++"Package does not match intended download. Suggestion: run yum --enablerepo=%"
++"s clean metadata"
++msgstr "パッケージは予定したダウンロードと一致しません。 提案: 「yum --enablerepo=%s clean metadata」の実行"
+
+-#: ../yum/__init__.py:1486
++#: ../yum/__init__.py:1714
+ msgid "Could not perform checksum"
+ msgstr "チェックサムの実行ができません"
+
+-#: ../yum/__init__.py:1489
++#: ../yum/__init__.py:1717
+ msgid "Package does not match checksum"
+ msgstr "パッケージのチェックサムが一致しません"
+
+-#: ../yum/__init__.py:1541
++#: ../yum/__init__.py:1769
+ #, python-format
+ msgid "package fails checksum but caching is enabled for %s"
+ msgstr ""
+ "%s のためにキャッシュを有効にしていますが、パッケージのチェックサム演算に失敗"
+ "します。"
+
+-#: ../yum/__init__.py:1544 ../yum/__init__.py:1573
++#: ../yum/__init__.py:1772 ../yum/__init__.py:1801
+ #, python-format
+ msgid "using local copy of %s"
+ msgstr "%s のローカルコピーを使う"
+
+-#: ../yum/__init__.py:1585
++#: ../yum/__init__.py:1813
+ #, python-format
+ msgid ""
+ "Insufficient space in download directory %s\n"
+@@ -2180,11 +2351,11 @@ msgstr ""
+ " * 空き容量 %s\n"
+ " * 必要容量 %s"
+
+-#: ../yum/__init__.py:1634
++#: ../yum/__init__.py:1862
+ msgid "Header is not complete."
+ msgstr "ヘッダーが完了していません。"
+
+-#: ../yum/__init__.py:1671
++#: ../yum/__init__.py:1899
+ #, python-format
+ msgid ""
+ "Header not in local cache and caching-only mode enabled. Cannot download %s"
+@@ -2192,62 +2363,62 @@ msgstr ""
+ "ヘッダーはキャッシュのみのモードが有効で、ローカルにありません。%s のダウン"
+ "ロードができません"
+
+-#: ../yum/__init__.py:1726
++#: ../yum/__init__.py:1954
+ #, python-format
+ msgid "Public key for %s is not installed"
+ msgstr "%s の公開鍵がインストールされていません"
+
+-#: ../yum/__init__.py:1730
++#: ../yum/__init__.py:1958
+ #, python-format
+ msgid "Problem opening package %s"
+ msgstr "パッケージ %s を開いている最中に問題です"
+
+-#: ../yum/__init__.py:1738
++#: ../yum/__init__.py:1966
+ #, python-format
+ msgid "Public key for %s is not trusted"
+ msgstr "%s の公開鍵が信頼されません"
+
+-#: ../yum/__init__.py:1742
++#: ../yum/__init__.py:1970
+ #, python-format
+ msgid "Package %s is not signed"
+ msgstr "パッケージ %s は署名されていません"
+
+-#: ../yum/__init__.py:1780
++#: ../yum/__init__.py:2008
+ #, python-format
+ msgid "Cannot remove %s"
+ msgstr "%s を削除できません"
+
+-#: ../yum/__init__.py:1784
++#: ../yum/__init__.py:2012
+ #, python-format
+ msgid "%s removed"
+ msgstr "%s を削除しました"
+
+-#: ../yum/__init__.py:1830
++#: ../yum/__init__.py:2058
+ #, python-format
+ msgid "Cannot remove %s file %s"
+ msgstr "%s のファイル %s を削除できませんでした"
+
+-#: ../yum/__init__.py:1834
++#: ../yum/__init__.py:2062
+ #, python-format
+ msgid "%s file %s removed"
+ msgstr "%s のファイル %s を削除しました"
+
+-#: ../yum/__init__.py:1836
++#: ../yum/__init__.py:2064
+ #, python-format
+ msgid "%d %s files removed"
+ msgstr "%d %sファイルを削除しました"
+
+-#: ../yum/__init__.py:1905
++#: ../yum/__init__.py:2133
+ #, python-format
+ msgid "More than one identical match in sack for %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1911
++#: ../yum/__init__.py:2139
+ #, python-format
+ msgid "Nothing matches %s.%s %s:%s-%s from update"
+ msgstr "更新から %s.%s %s:%s-%s に一致しません"
+
+-#: ../yum/__init__.py:2190
++#: ../yum/__init__.py:2433
+ msgid ""
+ "searchPackages() will go away in a future version of "
+ "Yum. Use searchGenerator() instead. \n"
+@@ -2255,126 +2426,133 @@ msgstr ""
+ "searchPackages() は Yum の将来のバージョンでなくなりま"
+ "す。 代わりに searchGenerator() を使います。\n"
+
+-#: ../yum/__init__.py:2229
++#: ../yum/__init__.py:2472
+ #, python-format
+ msgid "Searching %d packages"
+ msgstr "%d 個のパッケージを検索しています"
+
+-#: ../yum/__init__.py:2233
++#: ../yum/__init__.py:2476
+ #, python-format
+ msgid "searching package %s"
+ msgstr "パッケージ %s を検索しています"
+
+-#: ../yum/__init__.py:2245
++#: ../yum/__init__.py:2488
+ msgid "searching in file entries"
+ msgstr "ファイルのエントリーから検索しています"
+
+-#: ../yum/__init__.py:2252
++#: ../yum/__init__.py:2495
+ msgid "searching in provides entries"
+ msgstr "提供されたエントリーを検索しています"
+
+-#: ../yum/__init__.py:2285
++#: ../yum/__init__.py:2528
+ #, python-format
+ msgid "Provides-match: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2334
++#: ../yum/__init__.py:2577
+ msgid "No group data available for configured repositories"
+ msgstr "構成されたリポジトリーに利用できるグループはありません"
+
+-#: ../yum/__init__.py:2365 ../yum/__init__.py:2384 ../yum/__init__.py:2415
+-#: ../yum/__init__.py:2421 ../yum/__init__.py:2503 ../yum/__init__.py:2507
+-#: ../yum/__init__.py:2801
++#: ../yum/__init__.py:2608 ../yum/__init__.py:2627 ../yum/__init__.py:2658
++#: ../yum/__init__.py:2664 ../yum/__init__.py:2746 ../yum/__init__.py:2750
++#: ../yum/__init__.py:3095
+ #, python-format
+ msgid "No Group named %s exists"
+ msgstr "グループ名 %s が存在しません"
+
+-#: ../yum/__init__.py:2396 ../yum/__init__.py:2523
++#: ../yum/__init__.py:2639 ../yum/__init__.py:2766
+ #, python-format
+ msgid "package %s was not marked in group %s"
+ msgstr "パッケージ%s はグループ %s で設定されていません"
+
+-#: ../yum/__init__.py:2443
++#: ../yum/__init__.py:2686
+ #, python-format
+ msgid "Adding package %s from group %s"
+ msgstr "パッケージ %s をグループ %s から追加しています"
+
+-#: ../yum/__init__.py:2447
++#: ../yum/__init__.py:2690
+ #, python-format
+ msgid "No package named %s available to be installed"
+ msgstr "インストールに利用できるパッケージ名 %s がありません"
+
+-#: ../yum/__init__.py:2549
++#. This can happen due to excludes after .up has
++#. happened.
++#: ../yum/__init__.py:2794
+ #, python-format
+ msgid "Package tuple %s could not be found in packagesack"
+ msgstr ""
+
+-#: ../yum/__init__.py:2568
++#: ../yum/__init__.py:2813
+ #, python-format
+ msgid "Package tuple %s could not be found in rpmdb"
+ msgstr ""
+
+-#: ../yum/__init__.py:2621 ../yum/__init__.py:2626
++#: ../yum/__init__.py:2868 ../yum/__init__.py:2873
+ #, python-format
+ msgid "No Package found for %s"
+ msgstr "%s のパッケージが見つかりません"
+
+-#: ../yum/__init__.py:2651
++#: ../yum/__init__.py:2901
+ msgid "Invalid version flag"
+ msgstr "不正なバージョンフラグ"
+
+-#: ../yum/__init__.py:2842
++#: ../yum/__init__.py:3145
+ msgid "Package Object was not a package object instance"
+ msgstr ""
+ "パッケージ オブジェクトはパッケージ オブジェクト インスタンスではありません"
+
+-#: ../yum/__init__.py:2846
++#: ../yum/__init__.py:3149
+ msgid "Nothing specified to install"
+ msgstr "インストールへの指定がありません"
+
+-#: ../yum/__init__.py:2862 ../yum/__init__.py:3639
++#: ../yum/__init__.py:3168 ../yum/__init__.py:3984
+ #, python-format
+ msgid "Checking for virtual provide or file-provide for %s"
+ msgstr "%s の仮想提供かファイル提供を確認しています"
+
+-#: ../yum/__init__.py:2868 ../yum/__init__.py:3184 ../yum/__init__.py:3352
+-#: ../yum/__init__.py:3645
++#: ../yum/__init__.py:3174 ../yum/__init__.py:3504 ../yum/__init__.py:3684
++#: ../yum/__init__.py:3990
+ #, python-format
+ msgid "No Match for argument: %s"
+ msgstr "引数に一致しません: %s"
+
+-#: ../yum/__init__.py:2944
++#: ../yum/__init__.py:3250
+ #, python-format
+ msgid "Package %s installed and not available"
+ msgstr "パッケージ %s はインストール済みか利用できません"
+
+-#: ../yum/__init__.py:2947
++#: ../yum/__init__.py:3253
+ msgid "No package(s) available to install"
+ msgstr "インストールに利用できるパッケージはありません"
+
+-#: ../yum/__init__.py:2959
++#: ../yum/__init__.py:3265
+ #, python-format
+ msgid "Package: %s - already in transaction set"
+-msgstr "パッケージ: %s - すでにトランザクション設定をしています"
++msgstr "パッケージ: %s - すでにトランザクション設定をしています。"
+
+-#: ../yum/__init__.py:2985
++#: ../yum/__init__.py:3291
+ #, python-format
+ msgid "Package %s is obsoleted by %s which is already installed"
+-msgstr "パッケージ %s は既にインストール済みの %s によって不要です"
++msgstr "パッケージ %s は既にインストール済みの %s によって不要扱いになりました。"
+
+-#: ../yum/__init__.py:2988
++#: ../yum/__init__.py:3296
++#, python-format
++msgid ""
++"Package %s is obsoleted by %s, but obsoleting package does not provide for "
++"requirements"
++msgstr "パッケージ %s は %s によって不要になりました。しかし、不要のパッケージは要求を提供していません。"
++
++#: ../yum/__init__.py:3299
+ #, python-format
+ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+-msgstr ""
+-"パッケージ %s は %s によって不要です。代わりに %s のインストールを試みていま"
+-"す"
++msgstr "パッケージ %s は %s によって不要になりました。代わりに %s のインストールを試みています。"
+
+-#: ../yum/__init__.py:2996
++#: ../yum/__init__.py:3307
+ #, python-format
+ msgid "Package %s already installed and latest version"
+ msgstr "パッケージ %s はインストール済みか最新バージョンです"
+
+-#: ../yum/__init__.py:3010
++#: ../yum/__init__.py:3321
+ #, python-format
+ msgid "Package matching %s already installed. Checking for update."
+ msgstr ""
+@@ -2382,60 +2560,75 @@ msgstr ""
+ "す。"
+
+ #. update everything (the easy case)
+-#: ../yum/__init__.py:3113
++#: ../yum/__init__.py:3424
+ msgid "Updating Everything"
+ msgstr "すべて更新しています"
+
+-#: ../yum/__init__.py:3134 ../yum/__init__.py:3249 ../yum/__init__.py:3276
+-#: ../yum/__init__.py:3302
++#: ../yum/__init__.py:3448 ../yum/__init__.py:3577 ../yum/__init__.py:3604
++#: ../yum/__init__.py:3630
+ #, python-format
+ msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+ msgstr "既に不要なパッケージの更新はありません: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3169 ../yum/__init__.py:3349
++#: ../yum/__init__.py:3489 ../yum/__init__.py:3680
+ #, python-format
+ msgid "%s"
+ msgstr "%s"
+
+-#: ../yum/__init__.py:3240
++#: ../yum/__init__.py:3566
+ #, python-format
+ msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+ msgstr "パッケージは既に不要です: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3271
++#: ../yum/__init__.py:3599
+ #, python-format
+ msgid "Not Updating Package that is obsoleted: %s"
+ msgstr "既に不要なパッケージの更新はありません: %s"
+
+-#: ../yum/__init__.py:3280 ../yum/__init__.py:3306
++#: ../yum/__init__.py:3608 ../yum/__init__.py:3634
+ #, python-format
+ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+ msgstr ""
+ "既にアップデートされているのでパッケージをアップデートしません: %s.%s %s:%s-%"
+ "s"
+
+-#: ../yum/__init__.py:3365
++#: ../yum/__init__.py:3697
+ msgid "No package matched to remove"
+ msgstr "削除に一致するパッケージはありません"
+
+-#: ../yum/__init__.py:3399
++#: ../yum/__init__.py:3703
++#, python-format
++msgid "Skipping the running kernel: %s"
++msgstr "実行中のカーネルを飛ばします: %s"
++
++#: ../yum/__init__.py:3736
+ #, python-format
+ msgid "Cannot open: %s. Skipping."
+ msgstr "ファイルが開けません: %s を飛ばします。"
+
+-#: ../yum/__init__.py:3402 ../yum/__init__.py:3501 ../yum/__init__.py:3585
++#: ../yum/__init__.py:3739 ../yum/__init__.py:3851 ../yum/__init__.py:3927
+ #, python-format
+ msgid "Examining %s: %s"
+ msgstr "%s を調べています: %s"
+
+-#: ../yum/__init__.py:3410 ../yum/__init__.py:3504 ../yum/__init__.py:3588
++#: ../yum/__init__.py:3743
++#, fuzzy, python-format
++msgid "Cannot localinstall deltarpm: %s. Skipping."
++msgstr "ファイル %s が開けません。飛ばします。"
++
++#: ../yum/__init__.py:3752 ../yum/__init__.py:3854 ../yum/__init__.py:3930
+ #, python-format
+ msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+ msgstr ""
+ "トランザクションにパッケージ %s を追加できません。アーキテクチャに互換性があ"
+ "りません: %s"
+
+-#: ../yum/__init__.py:3418
++#: ../yum/__init__.py:3758
++#, python-format
++msgid "Cannot install package %s. It is obsoleted by installed package %s"
++msgstr "パッケージ %s をインストールできません。それはパッケージ %s により不要になっています。"
++
++#: ../yum/__init__.py:3766
+ #, python-format
+ msgid ""
+ "Package %s not installed, cannot update it. Run yum install to install it "
+@@ -2444,108 +2637,126 @@ msgstr ""
+ "パッケージ %s はインストールされていないので更新できません。代わりに「yum "
+ "install」を実行してインストールしてください。"
+
+-#: ../yum/__init__.py:3447 ../yum/__init__.py:3509 ../yum/__init__.py:3593
++#: ../yum/__init__.py:3795 ../yum/__init__.py:3859 ../yum/__init__.py:3935
+ #, python-format
+ msgid "Excluding %s"
+ msgstr "%s の除外中"
+
+-#: ../yum/__init__.py:3452
++#: ../yum/__init__.py:3800
+ #, python-format
+ msgid "Marking %s to be installed"
+ msgstr "%s をインストール済みとして設定しています"
+
+-#: ../yum/__init__.py:3458
++#: ../yum/__init__.py:3806
+ #, python-format
+ msgid "Marking %s as an update to %s"
+ msgstr "次のリポジトリーへの更新として %s を設定します: %s"
+
+-#: ../yum/__init__.py:3465
++#: ../yum/__init__.py:3813
+ #, python-format
+ msgid "%s: does not update installed package."
+ msgstr "%s: インストールされたパッケージを更新しません。"
+
+-#: ../yum/__init__.py:3498 ../yum/__init__.py:3582
++#: ../yum/__init__.py:3848 ../yum/__init__.py:3924
+ #, python-format
+ msgid "Cannot open file: %s. Skipping."
+ msgstr "ファイル %s が開けません。飛ばします。"
+
+-#: ../yum/__init__.py:3528
++#: ../yum/__init__.py:3878
+ msgid "Problem in reinstall: no package matched to remove"
+ msgstr "再インストール中に問題: 削除するパッケージがありません"
+
+-#: ../yum/__init__.py:3541 ../yum/__init__.py:3673
+-#, python-format
+-msgid "Package %s is allowed multiple installs, skipping"
+-msgstr "パッケージ %s は複数インストールが許可されています。飛ばします"
+-
+-#: ../yum/__init__.py:3562
++#: ../yum/__init__.py:3904
+ #, python-format
+ msgid "Problem in reinstall: no package %s matched to install"
+-msgstr ""
++msgstr "再インストールでの問題: インストールのための %s に一致するパッケーがありません"
+
+-#: ../yum/__init__.py:3665
++#: ../yum/__init__.py:4010
+ msgid "No package(s) available to downgrade"
+ msgstr "ダウングレードに利用できるパッケージはありません"
+
+-#: ../yum/__init__.py:3718
++#: ../yum/__init__.py:4018
++#, python-format
++msgid "Package %s is allowed multiple installs, skipping"
++msgstr "パッケージ %s は複数インストールが許可されています。飛ばします"
++
++#: ../yum/__init__.py:4064
+ #, python-format
+ msgid "No Match for available package: %s"
+ msgstr "利用できるパッケージに一致しません: %s"
+
+-#: ../yum/__init__.py:3725
++#: ../yum/__init__.py:4071
+ #, python-format
+ msgid "Only Upgrade available on package: %s"
+ msgstr "アップグレードにのみ利用できるパッケージ: %s"
+
+-#: ../yum/__init__.py:3795 ../yum/__init__.py:3832
++#: ../yum/__init__.py:4141 ../yum/__init__.py:4178
+ #, python-format
+ msgid "Failed to downgrade: %s"
+ msgstr "ダウングレードに失敗: %s"
+
+-#: ../yum/__init__.py:3864
++#: ../yum/__init__.py:4210
+ #, python-format
+ msgid "Retrieving GPG key from %s"
+ msgstr "%s から GPG 鍵を取得しています"
+
+-#: ../yum/__init__.py:3884
++#: ../yum/__init__.py:4230
+ msgid "GPG key retrieval failed: "
+ msgstr "GPG 鍵の取得に失敗しました: "
+
+-#: ../yum/__init__.py:3890
++#: ../yum/__init__.py:4236
+ #, python-format
+ msgid "Invalid GPG Key from %s: %s"
+ msgstr "%s からの GPG 鍵が正しくありません: %s"
+
+-#: ../yum/__init__.py:3899
++#: ../yum/__init__.py:4245
+ #, python-format
+ msgid "GPG key parsing failed: key does not have value %s"
+ msgstr "GPG 鍵の解析に失敗しました: 鍵は値 %s を持っていません"
+
+-#: ../yum/__init__.py:3931
++#: ../yum/__init__.py:4259
+ #, python-format
+-msgid "GPG key at %s (0x%s) is already installed"
+-msgstr "GPG 鍵 %s (0x%s) はすでにインストールしています"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid : %s\n"
++" Package: %s (%s)\n"
++" From : %s"
++msgstr ""
++"GPG 鍵 0x%s をインポートしています:\n"
++" ユーザー ID : %s\n"
++" パッケージ : %s (%s)\n"
++" インポート元 : %s"
+
+-#. Try installing/updating GPG key
+-#: ../yum/__init__.py:3936 ../yum/__init__.py:3998
++#: ../yum/__init__.py:4267
+ #, python-format
+-msgid "Importing GPG key 0x%s \"%s\" from %s"
+-msgstr "GPG 公開鍵 0x%s 「%s」を %s からインポートしています"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid: \"%s\"\n"
++" From : %s"
++msgstr ""
++"GPG 鍵 0x%s をインポートしています:\n"
++" ユーザー ID : %s\n"
++" インポート元: %s"
++
++#: ../yum/__init__.py:4299
++#, python-format
++msgid "GPG key at %s (0x%s) is already installed"
++msgstr "GPG 鍵 %s (0x%s) はすでにインストールしています"
+
+-#: ../yum/__init__.py:3953
++#: ../yum/__init__.py:4318
+ msgid "Not installing key"
+ msgstr "インストールする鍵がありません"
+
+-#: ../yum/__init__.py:3959
++#: ../yum/__init__.py:4324
+ #, python-format
+ msgid "Key import failed (code %d)"
+ msgstr "鍵のインポートに失敗しました (コード: %d)"
+
+-#: ../yum/__init__.py:3960 ../yum/__init__.py:4019
++#: ../yum/__init__.py:4325 ../yum/__init__.py:4381
+ msgid "Key imported successfully"
+ msgstr "鍵のインポートに成功しました"
+
+-#: ../yum/__init__.py:3965 ../yum/__init__.py:4024
++#: ../yum/__init__.py:4330
+ #, python-format
+ msgid ""
+ "The GPG keys listed for the \"%s\" repository are already installed but they "
+@@ -2553,102 +2764,110 @@ msgid ""
+ "Check that the correct key URLs are configured for this repository."
+ msgstr ""
+
+-#: ../yum/__init__.py:3974
++#: ../yum/__init__.py:4339
+ msgid "Import of key(s) didn't help, wrong key(s)?"
+-msgstr ""
++msgstr "鍵のインポートを助けられません。鍵が壊れていませんか?"
+
+-#: ../yum/__init__.py:3993
++#: ../yum/__init__.py:4358
+ #, python-format
+ msgid "GPG key at %s (0x%s) is already imported"
+ msgstr "GPG 鍵 %s (0x%s) はすでにインポートしています"
+
+-#: ../yum/__init__.py:4013
++#: ../yum/__init__.py:4375
+ #, python-format
+ msgid "Not installing key for repo %s"
+ msgstr "リポジトリー %s の鍵がインストールされていません"
+
+-#: ../yum/__init__.py:4018
++#: ../yum/__init__.py:4380
+ msgid "Key import failed"
+ msgstr "鍵のインポートに失敗しました"
+
+-#: ../yum/__init__.py:4144
++#: ../yum/__init__.py:4386
++#, python-format
++msgid ""
++"The GPG keys listed for the \"%s\" repository are already installed but they "
++"are not correct.\n"
++"Check that the correct key URLs are configured for this repository."
++msgstr ""
++
++#: ../yum/__init__.py:4513
+ msgid "Unable to find a suitable mirror."
+ msgstr "適当なミラーを見つけることができませんでした。"
+
+-#: ../yum/__init__.py:4146
++#: ../yum/__init__.py:4515
+ msgid "Errors were encountered while downloading packages."
+ msgstr "パッケージのダウンロード中にエラーに遭遇しました。"
+
+-#: ../yum/__init__.py:4196
++#: ../yum/__init__.py:4565
+ #, python-format
+ msgid "Please report this error at %s"
+ msgstr "%s にこのエラーを報告してください"
+
+-#: ../yum/__init__.py:4220
++#: ../yum/__init__.py:4589
+ msgid "Test Transaction Errors: "
+ msgstr "テストトランザクションでエラー: "
+
+-#: ../yum/__init__.py:4321
++#: ../yum/__init__.py:4692
+ #, python-format
+ msgid "Could not set cachedir: %s"
+ msgstr "cackedir が設定できません: %s"
+
+ #. Mostly copied from YumOutput._outKeyValFill()
+-#: ../yum/plugins.py:202
++#: ../yum/plugins.py:208
+ msgid "Loaded plugins: "
+ msgstr "読み込んだプラグイン:"
+
+-#: ../yum/plugins.py:216 ../yum/plugins.py:222
++#: ../yum/plugins.py:222 ../yum/plugins.py:228
+ #, python-format
+ msgid "No plugin match for: %s"
+ msgstr "プラグインが一致しません: %s"
+
+-#: ../yum/plugins.py:252
++#: ../yum/plugins.py:258
+ #, python-format
+ msgid "Not loading \"%s\" plugin, as it is disabled"
+ msgstr "無効になっているため、プラグイン「%s」は読み込みません"
+
+ #. Give full backtrace:
+-#: ../yum/plugins.py:264
++#: ../yum/plugins.py:270
+ #, python-format
+ msgid "Plugin \"%s\" can't be imported"
+ msgstr "プラグイン「%s」はインポートできませんでした"
+
+-#: ../yum/plugins.py:271
++#: ../yum/plugins.py:277
+ #, python-format
+ msgid "Plugin \"%s\" doesn't specify required API version"
+ msgstr "プラグイン「%s」は要求された API バージョンを明記していません"
+
+-#: ../yum/plugins.py:276
++#: ../yum/plugins.py:282
+ #, python-format
+ msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+ msgstr ""
+ "プラグイン「%s」は API %s を要求しています。サポートした API は %s です。"
+
+-#: ../yum/plugins.py:309
++#: ../yum/plugins.py:315
+ #, python-format
+ msgid "Loading \"%s\" plugin"
+ msgstr "プラグイン「%s」を読み込んでいます"
+
+-#: ../yum/plugins.py:316
++#: ../yum/plugins.py:322
+ #, python-format
+ msgid ""
+ "Two or more plugins with the name \"%s\" exist in the plugin search path"
+ msgstr ""
+
+-#: ../yum/plugins.py:336
++#: ../yum/plugins.py:342
+ #, python-format
+ msgid "Configuration file %s not found"
+ msgstr "構成ファイル %s が見つかりません"
+
+ #. for
+ #. Configuration files for the plugin not found
+-#: ../yum/plugins.py:339
++#: ../yum/plugins.py:345
+ #, python-format
+ msgid "Unable to find configuration file for plugin %s"
+ msgstr "プラグイン %s の構成ファイルの検索に失敗しました"
+
+-#: ../yum/plugins.py:501
++#: ../yum/plugins.py:507
+ msgid "registration of commands not supported"
+ msgstr "コマンドの登録をサポートしていません"
+
+@@ -2665,6 +2884,16 @@ msgstr "は次のインストール済みと衝突しています: "
+ msgid "%s is a duplicate with %s"
+ msgstr "%s は %s の複製です"
+
++#: ../yum/rpmsack.py:122
++#, python-format
++msgid "%s is obsoleted by %s"
++msgstr "%s は %s によって不要になりました。"
++
++#: ../yum/rpmsack.py:130
++#, python-format
++msgid "%s provides %s but it cannot be found"
++msgstr "%s は %s を提供していますが、見つかりません。"
++
+ #: ../yum/rpmtrans.py:79
+ msgid "Repackaging"
+ msgstr "再パッケージをしています"
+@@ -2700,6 +2929,27 @@ msgstr "ヘッダー %s は損傷があります"
+ msgid "Error opening rpm %s - error %s"
+ msgstr "RPM %s へのアクセスでエラー - %s エラー"
+
++#~ msgid "Repo : %s"
++#~ msgstr "リポジトリー : %s"
++
++#~ msgid "URL : %s"
++#~ msgstr "URL : %s"
++
++#~ msgid "Description: "
++#~ msgstr "説明 : "
++
++#~ msgid ""
++#~ "Remove %5.5s Package(s)\n"
++#~ "Reinstall %5.5s Package(s)\n"
++#~ "Downgrade %5.5s Package(s)\n"
++#~ msgstr ""
++#~ "削除 %5.5s パッケージ\n"
++#~ "再インストール %5.5s パッケージ\n"
++#~ "ダウングレード %5.5s パッケージ\n"
++
++#~ msgid "Weird"
++#~ msgstr "異様"
++
+ #~ msgid "Matched %s to require for %s"
+ #~ msgstr "%s は %s の要求に一致しました"
+
+@@ -2745,9 +2995,6 @@ msgstr "RPM %s へのアクセスでエラー - %s エラー"
+ #~ msgid "Excluding Packages from %s"
+ #~ msgstr "%s からパッケージを除外しています"
+
+-#~ msgid "Keeping included package %s"
+-#~ msgstr "%s を含んで維持しています"
+-
+ #~ msgid "Removing unmatched package %s"
+ #~ msgstr "%s に一致しないものを削除しています"
+
+diff --git a/po/pa.po b/po/pa.po
+index bcf02a6..967cfe1 100644
+--- a/po/pa.po
++++ b/po/pa.po
+@@ -1,22 +1,22 @@
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+-#
++#
+ # A S Alam <aalam at users.sf.net>, 2010.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: \n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-02-11 10:54-0500\n"
+-"PO-Revision-Date: 2010-02-20 08:37+0530\n"
++"POT-Creation-Date: 2010-08-17 10:15-0400\n"
++"PO-Revision-Date: 2010-09-09 10:29+0530\n"
+ "Last-Translator: A S Alam <aalam at users.sf.net>\n"
+-"Language-Team: Punjabi/Panjabi <kde-i18n-doc at kde.org>\n"
++"Language-Team: Punjabi/Panjabi <punjabi-users at lists.sf.net>\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: Lokalize 1.0\n"
+ "Plural-Forms: nplurals=2; plural=n != 1;\n"
++"X-Generator: Lokalize 1.0\n"
+
+-#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72
++#: ../callback.py:48 ../output.py:1027 ../yum/rpmtrans.py:72
+ msgid "Updating"
+ msgstr "ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+@@ -24,32 +24,32 @@ msgstr "ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+ msgid "Erasing"
+ msgstr "ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946
+-#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1026
++#: ../output.py:1919 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
+ #: ../yum/rpmtrans.py:77
+ msgid "Installing"
+ msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76
++#: ../callback.py:52 ../callback.py:58 ../output.py:1640 ../yum/rpmtrans.py:76
+ msgid "Obsoleted"
+-msgstr "ਬਰਤਰਫ਼ ਕੀਤਾ"
++msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ"
+
+-#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491
++#: ../callback.py:54 ../output.py:1157 ../output.py:1518 ../output.py:1647
+ msgid "Updated"
+ msgstr "ਅੱਪਡੇਟ ਕੀਤੇ"
+
+-#: ../callback.py:55 ../output.py:1438
++#: ../callback.py:55 ../output.py:1517
+ msgid "Erased"
+-msgstr "ਸਾਫ਼ ਕੀਤੇ"
++msgstr "ਸਾਫ਼ ਕੀਤਾ"
+
+-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068
+-#: ../output.py:1434 ../output.py:1646
++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1155
++#: ../output.py:1517 ../output.py:1519 ../output.py:1891
+ msgid "Installed"
+-msgstr "ਇੰਸਟਾਲ ਕੀਤੇ"
++msgstr "ਇੰਸਟਾਲ ਕੀਤਾ"
+
+ #: ../callback.py:130
+ msgid "No header - huh?"
+-msgstr "ਹੈੱਡ ਨਹੀਂ - ਓਹ?"
++msgstr "ਹੈੱਡਰ ਨਹੀਂ - ਓਹ?"
+
+ #: ../callback.py:168
+ msgid "Repackage"
+@@ -63,75 +63,75 @@ msgstr ""
+ #: ../callback.py:212
+ #, python-format
+ msgid "Erased: %s"
+-msgstr "ਸਾਫ਼ ਕੀਤੇ: %s"
++msgstr "ਸਾਫ਼ ਕੀਤਾ: %s"
+
+-#: ../callback.py:217 ../output.py:948 ../output.py:1648
++#: ../callback.py:217 ../output.py:1028 ../output.py:1894
+ msgid "Removing"
+ msgstr "ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+ #: ../callback.py:219 ../yum/rpmtrans.py:78
+ msgid "Cleanup"
+-msgstr "ਸਾਫ਼ ਕਰੋ"
++msgstr "ਸਾਫ਼"
+
+-#: ../cli.py:107
++#: ../cli.py:108
+ #, python-format
+ msgid "Command \"%s\" already defined"
+ msgstr "ਕਮਾਂਡ \"%s\" ਪਹਿਲਾਂ ਦੀ ਦਿੱਤੀ ਹੈ"
+
+-#: ../cli.py:119
++#: ../cli.py:120
+ msgid "Setting up repositories"
+ msgstr "ਰਿਪੋਜ਼ਟਰੀਆਂ ਸੈਟਅੱਪ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
+
+-#: ../cli.py:130
++#: ../cli.py:131
+ msgid "Reading repository metadata in from local files"
+ msgstr "ਲੋਕਲ ਫਾਇਲਾਂ ਤੋਂ ਰਿਪੋਜ਼ਟਰੀ ਮੇਟਾਡਾਟਾ ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../cli.py:194 ../utils.py:193
++#: ../cli.py:234 ../utils.py:254
+ #, python-format
+ msgid "Config Error: %s"
+ msgstr "ਸੰਰਚਨਾ ਗਲਤੀ: %s"
+
+-#: ../cli.py:197 ../cli.py:1272 ../utils.py:196
++#: ../cli.py:237 ../cli.py:1403 ../utils.py:257
+ #, python-format
+ msgid "Options Error: %s"
+ msgstr "ਚੋਣ ਗਲਤੀ: %s"
+
+-#: ../cli.py:227
++#: ../cli.py:267
+ #, python-format
+ msgid " Installed: %s-%s at %s"
+ msgstr " ਇੰਸਟਾਲ ਕੀਤਾ:%s-%s %s ਉੱਤੇ "
+
+-#: ../cli.py:229
++#: ../cli.py:269
+ #, python-format
+ msgid " Built : %s at %s"
+ msgstr " ਬਿਲਡ: %s %s ਉੱਤੇ "
+
+-#: ../cli.py:231
++#: ../cli.py:271
+ #, python-format
+ msgid " Committed: %s at %s"
+ msgstr " ਕਮਿਟ ਕੀਤਾ: %s %s ਉੱਤੇ"
+
+-#: ../cli.py:270
++#: ../cli.py:310
+ msgid "You need to give some command"
+ msgstr "ਤੁਹਾਨੂੰ ਕੁਝ ਕਮਾਂਡ ਦੇਣ ਦੀ ਲੋੜ ਹੈ"
+
+-#: ../cli.py:284
++#: ../cli.py:324
+ #, python-format
+ msgid "No such command: %s. Please use %s --help"
+-msgstr ""
++msgstr "ਇੰਝ ਦੀ ਕੋਈ ਕਮਾਂਡ ਨਹੀਂ ਹੈ: %s। %s --help ਵਰਤੋਂ ਜੀ"
+
+-#: ../cli.py:314
++#: ../cli.py:354
+ msgid "Disk Requirements:\n"
+ msgstr "ਡਿਸਕ ਲੋੜਾਂ:\n"
+
+-#: ../cli.py:316
++#: ../cli.py:356
+ #, python-format
+ msgid " At least %dMB more space needed on the %s filesystem.\n"
+ msgstr " ਘੱਟੋ-ਘੱਟ %dMB ਹੋਰ ਖਾਲੀ ਥਾਂ %s ਫਾਇਲ ਸਿਸਟਮ ਉੱਤੇ ਚਾਹੀਦੀ ਹੈ।\n"
+
+ #. TODO: simplify the dependency errors?
+ #. Fixup the summary
+-#: ../cli.py:321
++#: ../cli.py:361
+ msgid ""
+ "Error Summary\n"
+ "-------------\n"
+@@ -139,252 +139,265 @@ msgstr ""
+ "ਗਲਤੀ ਸੰਖੇਪ\n"
+ "------------\n"
+
+-#: ../cli.py:364
++#: ../cli.py:404
+ msgid "Trying to run the transaction but nothing to do. Exiting."
+-msgstr ""
++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ, ਪਰ ਕੁਝ ਵੀ ਕਰਨ ਲਈ ਨਹੀਂ ਹੈ। ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
+
+-#: ../cli.py:403
++#: ../cli.py:451
+ msgid "Exiting on user Command"
+ msgstr "ਯੂਜ਼ਰ ਕਮਾਂਡ ਮੌਜੂਦ ਹੈ"
+
+-#: ../cli.py:407
++#: ../cli.py:455
+ msgid "Downloading Packages:"
+ msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:"
+
+-#: ../cli.py:412
++#: ../cli.py:460
+ msgid "Error Downloading Packages:\n"
+ msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:\n"
+
+-#: ../cli.py:426 ../yum/__init__.py:4195
++#: ../cli.py:474 ../yum/__init__.py:4559
+ msgid "Running rpm_check_debug"
+-msgstr ""
++msgstr "rpm_check_debug ਚਲਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../cli.py:435 ../yum/__init__.py:4204
++#: ../cli.py:483 ../yum/__init__.py:4568
+ msgid "ERROR You need to update rpm to handle:"
+-msgstr ""
++msgstr "ਗਲਤੀ, ਤੁਹਾਨੂੰ ਹੈਂਡਲ ਕਰਨ ਲਈ rpm ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ:"
+
+-#: ../cli.py:437 ../yum/__init__.py:4207
++#: ../cli.py:485 ../yum/__init__.py:4571
+ msgid "ERROR with rpm_check_debug vs depsolve:"
+ msgstr ""
+
+-#: ../cli.py:443
++#: ../cli.py:491
+ msgid "RPM needs to be updated"
+ msgstr "RPM ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"
+
+-#: ../cli.py:444
++#: ../cli.py:492
+ #, python-format
+ msgid "Please report this error in %s"
+ msgstr "%s ਵਿੱਚ ਇਹ ਗਲਤੀ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਉ"
+
+-#: ../cli.py:450
++#: ../cli.py:498
+ msgid "Running Transaction Test"
+ msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਟੈਸਟ ਚੱਲ ਰਿਹਾ ਹੈ"
+
+-#: ../cli.py:466
++#: ../cli.py:514
+ msgid "Transaction Check Error:\n"
+ msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਗਲਤੀ:\n"
+
+-#: ../cli.py:473
++#: ../cli.py:521
+ msgid "Transaction Test Succeeded"
+ msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਟੈਸਟ ਸਫ਼ਲ ਰਿਹਾ"
+
+-#: ../cli.py:495
++#: ../cli.py:543
+ msgid "Running Transaction"
+ msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੱਲ ਰਹੀ ਹੈ"
+
+-#: ../cli.py:525
++#: ../cli.py:573
+ msgid ""
+ "Refusing to automatically import keys when running unattended.\n"
+ "Use \"-y\" to override."
+ msgstr ""
+
+-#: ../cli.py:544 ../cli.py:578
++#: ../cli.py:592 ../cli.py:626
+ msgid " * Maybe you meant: "
+ msgstr " * ਸ਼ਾਇਦ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ: "
+
+-#: ../cli.py:561 ../cli.py:569
++#: ../cli.py:609 ../cli.py:617
+ #, python-format
+ msgid "Package(s) %s%s%s available, but not installed."
+ msgstr "ਪੈਕੇਜ %s%s%s ਉਪਲੱਬਧ ਹਨ, ਪਰ ਇੰਸਟਾਲ ਨਹੀਂ।"
+
+-#: ../cli.py:575 ../cli.py:607 ../cli.py:687
++#: ../cli.py:623 ../cli.py:656 ../cli.py:810
+ #, python-format
+ msgid "No package %s%s%s available."
+-msgstr "%s%s%s ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
++msgstr "ਕੋਈ %s%s%s ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
+
+-#: ../cli.py:612 ../cli.py:748
++#: ../cli.py:663 ../cli.py:875
+ msgid "Package(s) to install"
+ msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ"
+
+-#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749
+-#: ../yumcommands.py:160
++#: ../cli.py:666 ../cli.py:667 ../cli.py:816 ../cli.py:850 ../cli.py:876
++#: ../yumcommands.py:179
+ msgid "Nothing to do"
+ msgstr "ਕਰਨ ਲਈ ਕੁਝ ਨਹੀਂ"
+
+-#: ../cli.py:647
++#: ../cli.py:701
+ #, python-format
+ msgid "%d packages marked for Update"
+ msgstr "ਅੱਪਡੇਟ ਕਰਨ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ"
+
+-#: ../cli.py:650
++#: ../cli.py:704
+ msgid "No Packages marked for Update"
+ msgstr "ਅੱਪਡੇਟ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ"
+
+-#: ../cli.py:664
++#: ../cli.py:770
++#, python-format
++msgid "%d packages marked for Distribution Synchronization"
++msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ"
++
++#: ../cli.py:773
++msgid "No Packages marked for Distribution Synchronization"
++msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਮਾਰਕ ਨਹੀਂ ਕੀਤਾ"
++
++#: ../cli.py:787
+ #, python-format
+ msgid "%d packages marked for removal"
+ msgstr "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ"
+
+-#: ../cli.py:667
++#: ../cli.py:790
+ msgid "No Packages marked for removal"
+ msgstr "ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ"
+
+-#: ../cli.py:692
++#: ../cli.py:815
+ msgid "Package(s) to downgrade"
+ msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਪੈਕੇਜ"
+
+-#: ../cli.py:717
++#: ../cli.py:840
+ #, python-format
+ msgid " (from %s)"
+ msgstr " (%s ਵਲੋਂ)"
+
+-#: ../cli.py:719
++#: ../cli.py:841
+ #, python-format
+ msgid "Installed package %s%s%s%s not available."
+ msgstr "ਇੰਸਟਾਲ ਹੋਏ ਪੈਕੇਜ %s%s%s%s ਉਪਲੱਬਧ ਨਹੀਂ।"
+
+-#: ../cli.py:726
++#: ../cli.py:849
+ msgid "Package(s) to reinstall"
+ msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ"
+
+-#: ../cli.py:739
++#: ../cli.py:862
+ msgid "No Packages Provided"
+ msgstr "ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਦਿੰਦਾ"
+
+-#: ../cli.py:818
++#: ../cli.py:945
+ #, python-format
+ msgid "Matched: %s"
+ msgstr "ਮਿਲਦੇ: %s"
+
+-#: ../cli.py:825
++#: ../cli.py:952
+ #, python-format
+ msgid "Warning: No matches found for: %s"
+-msgstr ""
++msgstr "ਚੇਤਾਵਨੀ: %s :ਲਈ ਕੋਈ ਮੇਲ ਨਹੀਂ ਲੱਭਿਆ"
+
+-#: ../cli.py:828
++#: ../cli.py:955
+ msgid "No Matches found"
+ msgstr "ਕੋਈ ਮਿਲਦਾ ਨਹੀਂ"
+
+-#: ../cli.py:868
+-#, python-format
++#: ../cli.py:995
++#, python-format, fuzzy
+ msgid ""
+ "Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+ " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
+ msgstr ""
+
+-#: ../cli.py:884
++#: ../cli.py:1011
+ #, python-format
+ msgid "No Package Found for %s"
+ msgstr "%s ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਲੱਭਿਆ"
+
+-#: ../cli.py:896
++#: ../cli.py:1021
++msgid "Cleaning repos: "
++msgstr "ਰੈਪੋ ਸਾਫ਼ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ: "
++
++#: ../cli.py:1026
+ msgid "Cleaning up Everything"
+ msgstr "ਹਰ ਚੀਜ਼ ਸਾਫ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../cli.py:912
++#: ../cli.py:1042
+ msgid "Cleaning up Headers"
+ msgstr "ਹੈੱਡਰ ਸਾਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
+
+-#: ../cli.py:915
++#: ../cli.py:1045
+ msgid "Cleaning up Packages"
+ msgstr "ਪੈਕੇਜ ਸਾਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
+
+-#: ../cli.py:918
++#: ../cli.py:1048
+ msgid "Cleaning up xml metadata"
+ msgstr "xml ਮੇਟਾਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../cli.py:921
++#: ../cli.py:1051
+ msgid "Cleaning up database cache"
+ msgstr "ਡਾਟਾਬੇਸ ਕੈਸ਼ ਸਾਫ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../cli.py:924
++#: ../cli.py:1054
+ msgid "Cleaning up expire-cache metadata"
+ msgstr "ਐਕਸਪਾਇਰ-ਕੈਸ਼ ਮੇਟਾਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../cli.py:927
++#: ../cli.py:1057
+ msgid "Cleaning up cached rpmdb data"
+ msgstr "ਕੈਸ਼ ਕੀਤਾ rpmdb ਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../cli.py:930
++#: ../cli.py:1060
+ msgid "Cleaning up plugins"
+ msgstr "ਪਲੱਗਇਨ ਸਾਫ਼ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
+
+-#: ../cli.py:955
++#: ../cli.py:1085
+ msgid "Installed Groups:"
+ msgstr "ਇੰਸਟਾਲ ਹੋਏ ਗਰੁੱਪ:"
+
+-#: ../cli.py:967
++#: ../cli.py:1097
+ msgid "Available Groups:"
+ msgstr "ਉਪਲੱਬਧ ਗਰੁੱਪ:"
+
+-#: ../cli.py:977
++#: ../cli.py:1107
+ msgid "Done"
+ msgstr "ਮੁਕੰਮਲ"
+
+-#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788
++#: ../cli.py:1118 ../cli.py:1136 ../cli.py:1142 ../yum/__init__.py:3069
+ #, python-format
+ msgid "Warning: Group %s does not exist."
+ msgstr "ਚੇਤਾਵਨੀ: ਗਰੁੱਪ %s ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
+
+-#: ../cli.py:1016
++#: ../cli.py:1146
+ msgid "No packages in any requested group available to install or update"
+ msgstr "ਮੰਗੇ ਗਏ ਗਰੁੱਪ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਪੈਕੇਜ ਇੰਸਟਾਲ ਜਾਂ ਅੱਪਡੇਟ ਲਈ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+-#: ../cli.py:1018
++#: ../cli.py:1148
+ #, python-format
+ msgid "%d Package(s) to Install"
+ msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ"
+
+-#: ../cli.py:1028 ../yum/__init__.py:2800
++#: ../cli.py:1158 ../yum/__init__.py:3081
+ #, python-format
+ msgid "No group named %s exists"
+ msgstr "%s ਨਾਂ ਦਾ ਕੋਈ ਗਰੁੱਪ ਮੌਜੂਦ ਨਹੀਂ"
+
+-#: ../cli.py:1034
++#: ../cli.py:1164
+ msgid "No packages to remove from groups"
+ msgstr "ਗਰੁੱਪ ਵਿੱਚੋਂ ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ"
+
+-#: ../cli.py:1036
++#: ../cli.py:1166
+ #, python-format
+ msgid "%d Package(s) to remove"
+ msgstr "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ"
+
+-#: ../cli.py:1078
++#: ../cli.py:1208
+ #, python-format
+ msgid "Package %s is already installed, skipping"
+ msgstr "%s ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ, ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../cli.py:1089
++#: ../cli.py:1219
+ #, python-format
+ msgid "Discarding non-comparable pkg %s.%s"
+ msgstr ""
+
+ #. we've not got any installed that match n or n+a
+-#: ../cli.py:1115
++#: ../cli.py:1245
+ #, python-format
+ msgid "No other %s installed, adding to list for potential install"
+ msgstr ""
+
+-#: ../cli.py:1135
++#: ../cli.py:1265
+ msgid "Plugin Options"
+ msgstr "ਪਲੱਗਇਨ ਚੋਣਾਂ"
+
+-#: ../cli.py:1143
++#: ../cli.py:1273
+ #, python-format
+ msgid "Command line error: %s"
+ msgstr "ਕਮਾਂਡ ਲਾਈਨ ਗਲਤੀ: %s"
+
+-#: ../cli.py:1156
++#: ../cli.py:1287
+ #, python-format
+ msgid ""
+ "\n"
+@@ -395,113 +408,120 @@ msgstr ""
+ "\n"
+ "%s:%s ਚੋਣ ਲਈ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ ਹੈ"
+
+-#: ../cli.py:1209
++#: ../cli.py:1340
+ msgid "--color takes one of: auto, always, never"
+ msgstr ""
+
+-#: ../cli.py:1319
++#: ../cli.py:1450
+ msgid "show this help message and exit"
+ msgstr "ਇਹ ਮੱਦਦ ਸੁਨੇਹਾ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ"
+
+-#: ../cli.py:1323
++#: ../cli.py:1454
+ msgid "be tolerant of errors"
+ msgstr ""
+
+-#: ../cli.py:1326
++#: ../cli.py:1457
+ msgid "run entirely from system cache, don't update cache"
+-msgstr ""
++msgstr "ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਿਸਟਮ ਕੈਸ਼ ਤੋਂ ਚਲਾਓ, ਕੈਸ਼ ਅੱਪਡੇਟ ਨਾ ਕਰੋ"
+
+-#: ../cli.py:1329
++#: ../cli.py:1460
+ msgid "config file location"
+ msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਟਿਕਾਣਾ"
+
+-#: ../cli.py:1332
++#: ../cli.py:1463
+ msgid "maximum command wait time"
+ msgstr "ਵੱਧੋ-ਵੱਧ ਕਮਾਂਡ ਉਡੀਕ ਸਮਾਂ"
+
+-#: ../cli.py:1334
++#: ../cli.py:1465
+ msgid "debugging output level"
+ msgstr "ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਲੈਵਲ"
+
+-#: ../cli.py:1338
++#: ../cli.py:1469
+ msgid "show duplicates, in repos, in list/search commands"
+ msgstr "ਡੁਪਲੀਕੇਟ ਵੇਖੋ, ਰਿਪੋ ਵਿੱਚ, ਲਿਸਟ/ਖੋਜ ਕਮਾਂਡ ਵਿੱਚ"
+
+-#: ../cli.py:1340
++#: ../cli.py:1471
+ msgid "error output level"
+ msgstr "ਗਲਤੀ ਆਉਟਪੁੱਟ ਲੈਵਲ"
+
+-#: ../cli.py:1343
++#: ../cli.py:1474
+ msgid "debugging output level for rpm"
+-msgstr "rpm ਲਈ ਡੀੱਬੱਗ ਆਉਟਪੁੱਟ ਲੈਵਲ"
++msgstr "rpm ਲਈ ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਲੈਵਲ"
+
+-#: ../cli.py:1346
++#: ../cli.py:1477
+ msgid "quiet operation"
+ msgstr "ਚੁੱਪ-ਚਾਪ ਕਾਰਵਾਈ"
+
+-#: ../cli.py:1348
++#: ../cli.py:1479
+ msgid "verbose operation"
+ msgstr "ਜਾਣਕਾਰੀ ਸਮੇਤ ਕਾਰਵਾਈ"
+
+-#: ../cli.py:1350
++#: ../cli.py:1481
+ msgid "answer yes for all questions"
+ msgstr "ਸਭ ਸਵਾਲਾਂ ਦੇ ਜਵਾਬ ਹਾਂ"
+
+-#: ../cli.py:1352
++#: ../cli.py:1483
+ msgid "show Yum version and exit"
+ msgstr "ਯੱਮ ਵਰਜਨ ਵੇਖਾਓ ਅਤੇ ਬੰਦ ਕਰੋ"
+
+-#: ../cli.py:1353
++#: ../cli.py:1484
+ msgid "set install root"
+-msgstr ""
++msgstr "install root ਸੈੱਟ ਕਰੋ"
+
+-#: ../cli.py:1357
++#: ../cli.py:1488
+ msgid "enable one or more repositories (wildcards allowed)"
+ msgstr "ਇੱਕ ਜਾਂ ਵੱਧ ਰਿਪੋਜ਼ਟਰੀਆਂ ਚਾਲੂ ਕਰੋ (ਵਾਈਲਡਕਾਰਡ ਮਨਜ਼ੂਰ ਹਨ)"
+
+-#: ../cli.py:1361
++#: ../cli.py:1492
+ msgid "disable one or more repositories (wildcards allowed)"
+-msgstr ""
++msgstr "ਇੱਕ ਜਾਂ ਵੱਧ ਰਿਪੋਜ਼ਟਰੀਆਂ ਬੰਦ (ਵਾਇਲਡਕਾਰਡ ਮਨਜ਼ੂਰ)"
+
+-#: ../cli.py:1364
++#: ../cli.py:1495
+ msgid "exclude package(s) by name or glob"
+ msgstr ""
+
+-#: ../cli.py:1366
++#: ../cli.py:1497
+ msgid "disable exclude from main, for a repo or for everything"
+ msgstr ""
+
+-#: ../cli.py:1369
++#: ../cli.py:1500
+ msgid "enable obsoletes processing during updates"
+-msgstr ""
++msgstr "ਅੱਪਡੇਟ ਦੇ ਦੌਰਾਨ ਬਰਤਰਫ਼ ਕਾਰਵਾਈਆਂ ਚਾਲੂ"
+
+-#: ../cli.py:1371
++#: ../cli.py:1502
+ msgid "disable Yum plugins"
+ msgstr "ਯੱਮ ਪਲੱਗਇਨ ਬੰਦ ਕਰੋ"
+
+-#: ../cli.py:1373
++#: ../cli.py:1504
+ msgid "disable gpg signature checking"
+-msgstr ""
++msgstr "gpg ਦਸਤਖਤ ਚੈੱਕ ਕਰਨਾ ਬੰਦ"
+
+-#: ../cli.py:1375
++#: ../cli.py:1506
+ msgid "disable plugins by name"
+ msgstr "ਨਾਂ ਨਾਲ ਪਲੱਗਇਨ ਬੰਦ ਕਰੋ"
+
+-#: ../cli.py:1378
++#: ../cli.py:1509
+ msgid "enable plugins by name"
+ msgstr "ਪਲੱਗਇਨ ਨਾਂ ਨਾਲ ਚਾਲੂ ਕਰੋ"
+
+-#: ../cli.py:1381
++#: ../cli.py:1512
+ msgid "skip packages with depsolving problems"
+ msgstr "ਨਿਰਭਰਤਾ ਸਮੱਸਿਆਵਾਂ ਵਾਲੇ ਪੈਕੇਜ ਛੱਡ ਦਿਉ"
+
+-#: ../cli.py:1383
++#: ../cli.py:1514
+ msgid "control whether color is used"
+-msgstr ""
++msgstr "ਕੰਟਰੋਲ ਕਰੋ ਕਿ ਕੀ ਰੰਗ ਵਰਤਣੇ ਹਨ"
+
+-#: ../cli.py:1385
++#: ../cli.py:1516
+ msgid "set value of $releasever in yum config and repo files"
++msgstr "ਯੱਮ ਸੰਰਚਨਾ ਤੇ ਰਿਪੋ ਫਾਇਲਾਂ 'ਚ $releasever ਦਾ ਮੁੱਲ ਸੈੱਟ ਕਰੋ"
++
++#: ../cli.py:1518
++#, fuzzy
++msgid "set arbitrary config and repo options"
+ msgstr ""
++"ਯੱਮ ਸੰਰਚਨਾ ਤੇ ਰਿਪੋ ਫਾਇਲਾਂ 'ਚ \n"
++"ਦਾ ਮੁੱਲ ਸੈੱਟ ਕਰੋ"
+
+ #: ../output.py:305
+ msgid "Jan"
+@@ -555,104 +575,114 @@ msgstr "ਦਸੰ"
+ msgid "Trying other mirror."
+ msgstr "ਹੋਰ ਮਿੱਰਰ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਜਾਰੀ"
+
+-#: ../output.py:534
++#: ../output.py:579
+ #, python-format
+-msgid "Name : %s%s%s"
+-msgstr "ਨਾਂ : %s%s%s"
++msgid "Name : %s%s%s"
++msgstr "ਨਾਂ : %s%s%s"
+
+-#: ../output.py:535
++#: ../output.py:580
+ #, python-format
+-msgid "Arch : %s"
+-msgstr "ਢਾਂਚਾ : %s"
++msgid "Arch : %s"
++msgstr "ਢਾਂਚਾ : %s"
+
+-#: ../output.py:537
++#: ../output.py:582
+ #, python-format
+-msgid "Epoch : %s"
+-msgstr ""
++msgid "Epoch : %s"
++msgstr "Epoch : %s"
+
+-#: ../output.py:538
++#: ../output.py:583
+ #, python-format
+-msgid "Version : %s"
+-msgstr "ਵਰਜਨ : %s"
++msgid "Version : %s"
++msgstr "ਵਰਜਨ : %s"
+
+-#: ../output.py:539
++#: ../output.py:584
+ #, python-format
+-msgid "Release : %s"
+-msgstr "ਰੀਲਿਜ਼ : %s"
++msgid "Release : %s"
++msgstr "ਰੀਲਿਜ਼ : %s"
+
+-#: ../output.py:540
++#: ../output.py:585
+ #, python-format
+-msgid "Size : %s"
++msgid "Size : %s"
+ msgstr "ਸਾਈਜ਼ : %s"
+
+-#: ../output.py:541
++#: ../output.py:586 ../output.py:890
+ #, python-format
+-msgid "Repo : %s"
+-msgstr "ਰਿਪੋ : %s"
++msgid "Repo : %s"
++msgstr "ਰਿਪੋ : %s"
+
+-#: ../output.py:543
++#: ../output.py:588
+ #, python-format
+-msgid "From repo : %s"
+-msgstr "ਰਿਪੋ ਤੋਂ : %s"
++msgid "From repo : %s"
++msgstr "ਰਿਪੋ ਤੋਂ : %s"
+
+-#: ../output.py:545
++#: ../output.py:590
+ #, python-format
+-msgid "Committer : %s"
+-msgstr "ਕਮਿੱਟਰ : %s"
++msgid "Committer : %s"
++msgstr "ਕਮਿੱਟਰ : %s"
+
+-#: ../output.py:546
++#: ../output.py:591
+ #, python-format
+-msgid "Committime : %s"
+-msgstr ""
++msgid "Committime : %s"
++msgstr "ਕਮਿਟ-ਸਮਾਂ : %s"
+
+-#: ../output.py:547
++#: ../output.py:592
+ #, python-format
+-msgid "Buildtime : %s"
+-msgstr "ਬਿਲਡ ਸਮਾਂ : %s"
++msgid "Buildtime : %s"
++msgstr "ਬਿਲਡ ਸਮਾਂ : %s"
+
+-#: ../output.py:549
++#: ../output.py:594
+ #, python-format
+-msgid "Installtime: %s"
++msgid "Install time: %s"
+ msgstr "ਇੰਸਟਾਲ ਸਮਾਂ: %s"
+
+-#: ../output.py:550
+-msgid "Summary : "
++#: ../output.py:602
++#, python-format
++msgid "Installed by: %s"
++msgstr "ਇੰਸਟਾਲ ਇਸ ਵਲੋਂ: %s"
++
++#: ../output.py:609
++#, python-format
++msgid "Changed by : %s"
++msgstr "ਇਸ ਵਲੋਂ ਬਦਲਿਆ : %s"
++
++#: ../output.py:610
++msgid "Summary : "
+ msgstr "ਸੰਖੇਪ : "
+
+-#: ../output.py:552
++#: ../output.py:612 ../output.py:903
+ #, python-format
+-msgid "URL : %s"
+-msgstr "URL : %s"
++msgid "URL : %s"
++msgstr "URL : %s"
+
+-#: ../output.py:553
+-msgid "License : "
++#: ../output.py:613
++msgid "License : "
+ msgstr "ਲਾਈਸੈਂਸ : "
+
+-#: ../output.py:554
+-msgid "Description: "
++#: ../output.py:614 ../output.py:900
++msgid "Description : "
+ msgstr "ਵੇਰਵਾ: "
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "y"
+ msgstr "y"
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "yes"
+ msgstr "yes"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "n"
+ msgstr "n"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "no"
+ msgstr "no"
+
+-#: ../output.py:627
++#: ../output.py:687
+ msgid "Is this ok [y/N]: "
+ msgstr "ਕੀ ਇਹ ਠੀਕ ਹੈ [y/N]: "
+
+-#: ../output.py:715
++#: ../output.py:775
+ #, python-format
+ msgid ""
+ "\n"
+@@ -661,151 +691,141 @@ msgstr ""
+ "\n"
+ "ਗਰੁੱਪ: %s"
+
+-#: ../output.py:719
++#: ../output.py:779
+ #, python-format
+ msgid " Group-Id: %s"
+ msgstr " ਗਰੁੱਪ-Id: %s"
+
+-#: ../output.py:724
++#: ../output.py:784
+ #, python-format
+ msgid " Description: %s"
+ msgstr " ਵੇਰਵਾ: %s"
+
+-#: ../output.py:726
++#: ../output.py:786
+ msgid " Mandatory Packages:"
+ msgstr " ਲਾਜ਼ਮੀ ਪੈਕੇਜ:"
+
+-#: ../output.py:727
++#: ../output.py:787
+ msgid " Default Packages:"
+ msgstr " ਡਿਫਾਲਟ ਪੈਕੇਜ:"
+
+-#: ../output.py:728
++#: ../output.py:788
+ msgid " Optional Packages:"
+ msgstr " ਚੋਣਵੇਂ ਪੈਕੇਜ:"
+
+-#: ../output.py:729
++#: ../output.py:789
+ msgid " Conditional Packages:"
+ msgstr " ਸ਼ਰਤੀਆ ਪੈਕੇਜ:"
+
+-#: ../output.py:749
++#: ../output.py:809
+ #, python-format
+ msgid "package: %s"
+ msgstr "ਪੈਕੇਜ: %s"
+
+-#: ../output.py:751
++#: ../output.py:811
+ msgid " No dependencies for this package"
+ msgstr " ਇਹ ਪੈਕੇਜ ਲਈ ਕੋਈ ਨਿਰਭਰਤਾ ਨਹੀਂ ਹੈ"
+
+-#: ../output.py:756
++#: ../output.py:816
+ #, python-format
+ msgid " dependency: %s"
+ msgstr " ਨਿਰਭਰਤਾ: %s"
+
+-#: ../output.py:758
++#: ../output.py:818
+ msgid " Unsatisfied dependency"
+-msgstr ""
++msgstr " ਨਾ-ਹੱਲ ਹੋਈ ਨਿਰਭਰਤਾ"
+
+-#: ../output.py:830
+-#, python-format
+-msgid "Repo : %s"
+-msgstr "ਰਿਪੋ : %s"
+-
+-#: ../output.py:831
++#: ../output.py:891
+ msgid "Matched from:"
+-msgstr ""
++msgstr "ਇਸ ਤੋਂ ਮੇਲ:"
+
+-#: ../output.py:840
+-msgid "Description : "
+-msgstr "ਵੇਰਵਾ: "
+-
+-#: ../output.py:843
+-#, python-format
+-msgid "URL : %s"
+-msgstr "URL : %s"
+-
+-#: ../output.py:846
++#: ../output.py:906
+ #, python-format
+ msgid "License : %s"
+ msgstr "ਲਾਈਸੈਂਸ : %s"
+
+-#: ../output.py:849
++#: ../output.py:909
+ #, python-format
+ msgid "Filename : %s"
+ msgstr "ਫਾਇਲ ਨਾਂ : %s"
+
+-#: ../output.py:853
++#: ../output.py:913
+ msgid "Other : "
+ msgstr "ਹੋਰ : "
+
+-#: ../output.py:896
++#: ../output.py:956
+ msgid "There was an error calculating total download size"
+-msgstr ""
++msgstr "ਕੁੱਲ ਡਾਊਨਲੋਡ ਆਕਾਰ ਲੱਭਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+-#: ../output.py:901
++#: ../output.py:961
+ #, python-format
+ msgid "Total size: %s"
+ msgstr "ਕੁੱਲ ਸਾਈਜ਼: %s"
+
+-#: ../output.py:904
++#: ../output.py:964
+ #, python-format
+ msgid "Total download size: %s"
+ msgstr "ਕੁੱਲ ਡਾਊਨਲੋਡ ਸਾਈਜ਼: %s"
+
+-#: ../output.py:908
++#: ../output.py:968 ../output.py:988
+ #, python-format
+ msgid "Installed size: %s"
+ msgstr "ਇੰਸਟਾਲ ਦਾ ਸਾਈਜ਼: %s"
+
+-#: ../output.py:949
++#: ../output.py:984
++msgid "There was an error calculating installed size"
++msgstr "ਇੰਸਟਾਲ ਆਕਾਰ ਗਿਣਨ ਦੌਰਾਨ ਗਲਤੀ"
++
++#: ../output.py:1029
+ msgid "Reinstalling"
+ msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../output.py:950
++#: ../output.py:1030
+ msgid "Downgrading"
+ msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../output.py:951
++#: ../output.py:1031
+ msgid "Installing for dependencies"
+ msgstr "ਨਿਰਭਰਤਾ ਲਈ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../output.py:952
++#: ../output.py:1032
+ msgid "Updating for dependencies"
+ msgstr "ਨਿਰਭਰਤਾ ਲਈ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../output.py:953
++#: ../output.py:1033
+ msgid "Removing for dependencies"
+ msgstr "ਨਿਰਭਰਤਾ ਲਈ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../output.py:960 ../output.py:1072
++#: ../output.py:1040 ../output.py:1159
+ msgid "Skipped (dependency problems)"
+ msgstr "ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ (ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ)"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Package"
+ msgstr "ਪੈਕੇਜ"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Arch"
+ msgstr "ਢਾਂਚਾ"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Version"
+ msgstr "ਵਰਜਨ"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Repository"
+ msgstr "ਰਿਪੋਜ਼ਟਰੀ"
+
+-#: ../output.py:985
++#: ../output.py:1065
+ msgid "Size"
+ msgstr "ਸਾਈਜ਼"
+
+-#: ../output.py:997
++#: ../output.py:1077
+ #, python-format
+ msgid " replacing %s%s%s.%s %s\n"
+ msgstr " %s%s%s.%s %s ਨੂੰ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ\n"
+
+-#: ../output.py:1006
++#: ../output.py:1086
+ #, python-format
+ msgid ""
+ "\n"
+@@ -813,55 +833,60 @@ msgid ""
+ "%s\n"
+ msgstr ""
+ "\n"
+-"ਟਰਾਂਸੈਕਸ਼ਨ ਸੰਖੇਪ\n"
++"ਟਰਾਂਸੈਕਸ਼ਨ ਸੰਖੇਪ ਜਾਣਕਾਰੀ\n"
+ "%s\n"
+
+-#: ../output.py:1013
++#: ../output.py:1097
+ #, python-format
+-msgid ""
+-"Install %5.5s Package(s)\n"
+-"Upgrade %5.5s Package(s)\n"
+-msgstr ""
+-"ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n"
+-"ਅੱਪਗਰੇਡ %5.5s ਪੈਕੇਜ\n"
++msgid "Install %5.5s Package(s)\n"
++msgstr "ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n"
+
+-#: ../output.py:1022
++#: ../output.py:1101
+ #, python-format
+-msgid ""
+-"Remove %5.5s Package(s)\n"
+-"Reinstall %5.5s Package(s)\n"
+-"Downgrade %5.5s Package(s)\n"
+-msgstr ""
+-"ਹਟਾਏ %5.5s ਪੈਕੇਜ\n"
+-"ਮੁੜ-ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n"
+-"ਡਾਊਨਗਰੇਡ %5.5s ਪੈਕੇਜ\n"
++msgid "Upgrade %5.5s Package(s)\n"
++msgstr "ਅੱਪਗਰੇਡ %5.5s ਪੈਕੇਜ\n"
++
++#: ../output.py:1105
++#, python-format
++msgid "Remove %5.5s Package(s)\n"
++msgstr "ਹਟਾਉਣੇ %5.5s ਪੈਕੇਜ\n"
+
+-#: ../output.py:1066
++#: ../output.py:1109
++#, python-format
++msgid "Reinstall %5.5s Package(s)\n"
++msgstr "ਮੁੜ-ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n"
++
++#: ../output.py:1113
++#, python-format
++msgid "Downgrade %5.5s Package(s)\n"
++msgstr "ਡਾਊਨਗਰੇਡ %5.5s ਪੈਕੇਜ\n"
++
++#: ../output.py:1153
+ msgid "Removed"
+ msgstr "ਹਟਾਏ"
+
+-#: ../output.py:1067
++#: ../output.py:1154
+ msgid "Dependency Removed"
+ msgstr "ਨਿਰਭਰਤਾ ਹਟਾਈ"
+
+-#: ../output.py:1069
++#: ../output.py:1156
+ msgid "Dependency Installed"
+-msgstr "ਨਿਰਭਰਤਾ ਇੰਸਟਾਲ"
++msgstr "ਨਿਰਭਰਤਾ ਇੰਸਟਾਲ ਕੀਤੀ"
+
+-#: ../output.py:1071
++#: ../output.py:1158
+ msgid "Dependency Updated"
+-msgstr "ਨਿਰਭਰਤਾ ਅੱਪਡੇਟ"
++msgstr "ਨਿਰਭਰਤਾ ਅੱਪਡੇਟ ਕੀਤੀ"
+
+-#: ../output.py:1073
++#: ../output.py:1160
+ msgid "Replaced"
+ msgstr "ਬਦਲੇ ਗਏ"
+
+-#: ../output.py:1074
++#: ../output.py:1161
+ msgid "Failed"
+ msgstr "ਫੇਲ੍ਹ ਹੋਏ"
+
+ #. Delta between C-c's so we treat as exit
+-#: ../output.py:1140
++#: ../output.py:1245
+ msgid "two"
+ msgstr "ਦੋ"
+
+@@ -869,283 +894,339 @@ msgstr "ਦੋ"
+ #. Current download cancelled, interrupt (ctrl-c) again within two seconds
+ #. to exit.
+ #. Where "interupt (ctrl-c) again" and "two" are highlighted.
+-#: ../output.py:1151
++#: ../output.py:1256
+ #, python-format
+ msgid ""
+ "\n"
+-" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
+-"seconds\n"
++" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n"
+ "to exit.\n"
+ msgstr ""
+ "\n"
+-" ਮੌਜੂਦਾ ਡਾਊਨਲੋਡ ਰੱਦ ਕੀਤਾ ਗਿਆ, ਬੰਦ ਕਰਨ ਲਈ %sinterrupt (ctrl-c) %s %s%s%s "
+-"ਸਕਿੰਟ ਵਿੱਚ\n"
++" ਮੌਜੂਦਾ ਡਾਊਨਲੋਡ ਰੱਦ ਕੀਤਾ ਗਿਆ, ਬੰਦ ਕਰਨ ਲਈ %sinterrupt (ctrl-c) %s %s%s%s ਸਕਿੰਟ ਵਿੱਚ\n"
+ "ਦਬਾਉ\n"
+
+-#: ../output.py:1162
++#: ../output.py:1267
+ msgid "user interrupt"
+ msgstr "ਯੂਜ਼ਰ ਵਲੋਂ ਦਖ਼ਲ"
+
+-#: ../output.py:1180
++#: ../output.py:1285
+ msgid "Total"
+ msgstr "ਕੁੱਲ"
+
+-#: ../output.py:1202
++#: ../output.py:1307
+ msgid "I"
+ msgstr "I"
+
+-#: ../output.py:1203
++#: ../output.py:1308
+ msgid "O"
+ msgstr "O"
+
+-#: ../output.py:1204
++#: ../output.py:1309
+ msgid "E"
+ msgstr "E"
+
+-#: ../output.py:1205
++#: ../output.py:1310
+ msgid "R"
+ msgstr "R"
+
+-#: ../output.py:1206
++#: ../output.py:1311
+ msgid "D"
+ msgstr "D"
+
+-#: ../output.py:1207
++#: ../output.py:1312
+ msgid "U"
+ msgstr "U"
+
+-#: ../output.py:1217
++#: ../output.py:1323
+ msgid "<unset>"
+ msgstr "<ਅਣ-ਸੈੱਟ>"
+
+-#: ../output.py:1218
++#: ../output.py:1324
+ msgid "System"
+ msgstr "ਸਿਸਟਮ"
+
+-#: ../output.py:1254
++#: ../output.py:1368
+ msgid "Bad transaction IDs, or package(s), given"
+-msgstr ""
++msgstr "ਖ਼ਰਾਬ ਟਰਾਂਸੈਕਸ਼ਨ ID, ਜਾਂ ਪੈਕੇਜ ਦਿੱਤਾ"
+
+-#: ../output.py:1266
++#: ../output.py:1380
+ msgid "ID"
+ msgstr "ID"
+
+-#: ../output.py:1267 ../output.py:1520
++#: ../output.py:1381 ../output.py:1699
+ msgid "Login user"
+ msgstr "ਲਾਗਇਨ ਯੂਜ਼ਰ"
+
+-#: ../output.py:1268
++#: ../output.py:1382
+ msgid "Date and time"
+ msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ"
+
+-#: ../output.py:1269 ../output.py:1522
++#: ../output.py:1383 ../output.py:1701
+ msgid "Action(s)"
+ msgstr "ਐਕਸ਼ਨ"
+
+-#: ../output.py:1270 ../output.py:1523
++#: ../output.py:1384 ../output.py:1702
+ msgid "Altered"
+ msgstr "ਬਦਲੇ"
+
+-#: ../output.py:1310
++#: ../output.py:1431 ../output.py:1760
+ msgid "No transaction ID given"
+ msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ID ਦਿੱਤਾ"
+
+-#: ../output.py:1336
++#: ../output.py:1457
+ msgid "Bad transaction ID given"
+-msgstr ""
++msgstr "ਖ਼ਰਾਬ ਟਰਾਂਸੈਕਸ਼ਨ ID ਦਿੱਤਾ"
+
+-#: ../output.py:1341
++#: ../output.py:1462
+ msgid "Not found given transaction ID"
+-msgstr ""
++msgstr "ਦਿੱਤਾ ਟਰਾਂਸੈਕਸ਼ਨ ID ਨਹੀਂ ਲੱਭਿਆ"
+
+-#: ../output.py:1349
++#: ../output.py:1470
+ msgid "Found more than one transaction ID!"
+-msgstr ""
++msgstr "ਇੱਕ ਤੋਂ ਵੱਧ ਟਰਾਂਸੈਕਸ਼ਨ ID ਲੱਭਿਆ!"
+
+-#: ../output.py:1370
++#: ../output.py:1491 ../output.py:1770
+ msgid "No transaction ID, or package, given"
+-msgstr ""
++msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ID, ਜਾਂ ਪੈਕੇਜ ਨਹੀਂ ਦਿੱਤਾ"
++
++#: ../output.py:1518 ../output.py:1645
++msgid "Downgraded"
++msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤੇ"
++
++#: ../output.py:1519
++msgid "Not installed"
++msgstr "ਇੰਸਟਾਲ ਨਹੀਂ"
+
+-#: ../output.py:1396
++#: ../output.py:1520
++msgid "Older"
++msgstr "ਪੁਰਾਣੇ"
++
++#: ../output.py:1520
++msgid "Newer"
++msgstr "ਨਵੇਂ"
++
++#: ../output.py:1552
+ msgid "Transaction ID :"
+ msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ID:"
+
+-#: ../output.py:1398
++#: ../output.py:1554
+ msgid "Begin time :"
+ msgstr "ਸ਼ੁਰੂ ਸਮਾਂ :"
+
+-#: ../output.py:1401 ../output.py:1403
++#: ../output.py:1557 ../output.py:1559
+ msgid "Begin rpmdb :"
+ msgstr "rpmdb ਸ਼ੁਰੂ :"
+
+-#: ../output.py:1417
++#: ../output.py:1573
+ #, python-format
+ msgid "(%s seconds)"
+ msgstr "(%s ਸਕਿੰਟ)"
+
+-#: ../output.py:1418
++#: ../output.py:1574
+ msgid "End time :"
+ msgstr "ਅੰਤ ਸਮਾਂ :"
+
+-#: ../output.py:1421 ../output.py:1423
++#: ../output.py:1577 ../output.py:1579
+ msgid "End rpmdb :"
+ msgstr "rpmdb ਅੰਤ :"
+
+-#: ../output.py:1424
++#: ../output.py:1580
+ msgid "User :"
+ msgstr "ਯੂਜ਼ਰ :"
+
+-#: ../output.py:1426 ../output.py:1428 ../output.py:1430
++#: ../output.py:1582 ../output.py:1584 ../output.py:1586
+ msgid "Return-Code :"
+-msgstr ""
++msgstr "ਰੀਟਰਨ-ਕੋਡ :"
+
+-#: ../output.py:1426
++#: ../output.py:1582
+ msgid "Aborted"
+ msgstr "ਅਧੂਰਾ ਛੱਡਿਆ"
+
+-#: ../output.py:1428
++#: ../output.py:1584
+ msgid "Failure:"
+ msgstr "ਫੇਲ੍ਹ:"
+
+-#: ../output.py:1430
++#: ../output.py:1586
+ msgid "Success"
+ msgstr "ਸਫ਼ਲ"
+
+-#: ../output.py:1431
+-msgid "Transaction performed with:"
+-msgstr ""
++#: ../output.py:1589
++msgid "Command Line :"
++msgstr "ਕਮਾਂਡ ਲਾਈਨ :"
+
+-#: ../output.py:1444 ../output.py:1489
+-msgid "Downgraded"
+-msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤੇ"
+-
+-#. multiple versions installed, both older and newer
+-#: ../output.py:1446
+-msgid "Weird"
++#: ../output.py:1597
++#, python-format
++msgid "Additional non-default information stored: %d"
+ msgstr ""
+
+-#: ../output.py:1448
++#: ../output.py:1600
++msgid "Transaction performed with:"
++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਕੀਤੀ ਗਈ ਇਸ ਨਾਲ:"
++
++#: ../output.py:1603
+ msgid "Packages Altered:"
+ msgstr "ਪੈਕੇਜ ਬਦਲੇ:"
+
+-#: ../output.py:1451
++#: ../output.py:1607
++msgid "Packages Skipped:"
++msgstr "ਪੈਕੇਜ ਛੱਡੇ ਗਏ:"
++
++#: ../output.py:1612
++msgid "Rpmdb Problems:"
++msgstr "Rpmdb ਸਮੱਸਿਆਵਾਂ:"
++
++#: ../output.py:1620
+ msgid "Scriptlet output:"
+-msgstr ""
++msgstr "Scriptlet ਆਉਟਪੁੱਟ:"
+
+-#: ../output.py:1457
++#: ../output.py:1626
+ msgid "Errors:"
+ msgstr "ਗਲਤੀਆਂ:"
+
+-#: ../output.py:1481 ../output.py:1482
++#. Note that these don't use _simple_pkg() because we are showing what
++#. happened to them in the transaction ... not the difference between the
++#. version in the transaction and now.
++#: ../output.py:1637 ../output.py:1638
+ msgid "Install"
+ msgstr "ਇੰਸਟਾਲ"
+
+-#: ../output.py:1483
++#: ../output.py:1639
+ msgid "Dep-Install"
+ msgstr "ਨਿਰਭ-ਇੰਸਟਾਲ"
+
+-#: ../output.py:1485
++#: ../output.py:1641
+ msgid "Obsoleting"
+-msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
++msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ"
+
+-#: ../output.py:1486
++#: ../output.py:1642
+ msgid "Erase"
+ msgstr "ਸਾਫ਼"
+
+-#: ../output.py:1487
++#: ../output.py:1643
+ msgid "Reinstall"
+ msgstr "ਮੁੜ-ਇੰਸਟਾਲ"
+
+-#: ../output.py:1488
++#: ../output.py:1644
+ msgid "Downgrade"
+ msgstr "ਡਾਊਨਗਰੇਡ"
+
+-#: ../output.py:1490
++#: ../output.py:1646
+ msgid "Update"
+ msgstr "ਅੱਪਡੇਟ"
+
+-#: ../output.py:1521
++#: ../output.py:1700
+ msgid "Time"
+ msgstr "ਸਮਾਂ"
+
+-#: ../output.py:1547
++#: ../output.py:1726
+ msgid "Last day"
+ msgstr "ਪਿਛਲੇ ਦਿਨ"
+
+-#: ../output.py:1548
++#: ../output.py:1727
+ msgid "Last week"
+ msgstr "ਪਿਛਲੇ ਹਫ਼ਤੇ"
+
+-#: ../output.py:1549
++#: ../output.py:1728
+ msgid "Last 2 weeks"
+ msgstr "ਪਿਛਲੇ ੨ ਹਫ਼ਤੇ"
+
+ #. US default :p
+-#: ../output.py:1550
++#: ../output.py:1729
+ msgid "Last 3 months"
+ msgstr "ਪਿਛਲੇ ੩ ਮਹੀਨੇ"
+
+-#: ../output.py:1551
++#: ../output.py:1730
+ msgid "Last 6 months"
+ msgstr "ਪਿਛਲੇ ੬ ਮਹੀਨੇ"
+
+-#: ../output.py:1552
++#: ../output.py:1731
+ msgid "Last year"
+ msgstr "ਪਿਛਲੇ ਸਾਲ"
+
+-#: ../output.py:1553
++#: ../output.py:1732
+ msgid "Over a year ago"
+ msgstr "ਲਗਭਗ ਸਾਲ ਪਹਿਲਾਂ"
+
+-#: ../output.py:1585
++#: ../output.py:1774
++#, python-format
++msgid "No Transaction %s found"
++msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ %s ਨਹੀਂ ਲੱਭੀ"
++
++#: ../output.py:1780
++msgid "Transaction ID:"
++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ID:"
++
++#: ../output.py:1781
++msgid "Available additional history information:"
++msgstr "ਉਪਲੱਬਧ ਹੋਰ ਅਤੀਤ ਜਾਣਕਾਰੀ:"
++
++#: ../output.py:1793
++#, python-format
++msgid "%s: No additional data found by this name"
++msgstr "%s: ਇਸ ਨਾਂ ਨਾਲ ਕੋਈ ਹੋਰ ਵਾਧੂ ਡਾਟਾ ਨਹੀਂ ਲੱਭਿਆ"
++
++#: ../output.py:1809
+ msgid "installed"
+ msgstr "ਇੰਸਟਾਲ ਕੀਤੇ"
+
+-#: ../output.py:1586
++#: ../output.py:1810
+ msgid "updated"
+ msgstr "ਅੱਪਡੇਟ ਕੀਤੇ"
+
+-#: ../output.py:1587
++#: ../output.py:1811
+ msgid "obsoleted"
+ msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ"
+
+-#: ../output.py:1588
++#: ../output.py:1812
+ msgid "erased"
+ msgstr "ਸਾਫ਼ ਕੀਤੇ"
+
+-#: ../output.py:1592
++#: ../output.py:1813
++msgid "reinstalled"
++msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤੇ"
++
++#: ../output.py:1814
++msgid "downgraded"
++msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤੇ"
++
++#: ../output.py:1818
+ #, python-format
+ msgid "---> Package %s.%s %s:%s-%s set to be %s"
+ msgstr "---> ਪੈਕੇਜ %s.%s %s:%s-%s ਨੂੰ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ %s"
+
+-#: ../output.py:1599
++#: ../output.py:1825
+ msgid "--> Running transaction check"
+-msgstr "--> ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਜਾਰੀ ਹੈ"
++msgstr "--> ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../output.py:1604
++#: ../output.py:1830
+ msgid "--> Restarting Dependency Resolution with new changes."
+ msgstr "--> ਨਵੇਂ ਬਦਲਾਅ ਨਾਲ ਨਿਰਭਰਤਾ ਹੱਲ਼ ਲਈ ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
+
+-#: ../output.py:1609
++#: ../output.py:1835
+ msgid "--> Finished Dependency Resolution"
+ msgstr "--> ਨਿਰਭਰਤਾ ਹੱਲ ਮੁਕੰਮਲ ਹੋਇਆ"
+
+-#: ../output.py:1614 ../output.py:1619
++#: ../output.py:1840 ../output.py:1845
+ #, python-format
+ msgid "--> Processing Dependency: %s for package: %s"
+ msgstr "--> ਨਿਰਭਰਤਾ ਲਈ ਕਾਰਵਾਈ ਜਾਰੀ: %s ਪੈਕੇਜ ਲਈ: %s"
+
+-#: ../output.py:1623
++#: ../output.py:1850
++#, python-format
++msgid "---> Keeping package: %s"
++msgstr "---> ਪੈਕੇਜ ਰੱਖਿਆ ਜਾਂਦਾ ਹੈ: %s"
++
++#: ../output.py:1853
+ #, python-format
+ msgid "--> Unresolved Dependency: %s"
+ msgstr "--> ਨਾ-ਹੱਲ਼ ਹੋਈ ਨਿਰਭਰਤਾ: %s"
+
+-#: ../output.py:1634
++#: ../output.py:1864
+ #, python-format
+ msgid "Package: %s"
+ msgstr "ਪੈਕੇਜ: %s"
+
+-#: ../output.py:1636
++#: ../output.py:1866
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1154,7 +1235,7 @@ msgstr ""
+ "\n"
+ " ਚਾਹੀਦਾ ਹੈ: %s"
+
+-#: ../output.py:1649 ../output.py:1660
++#: ../output.py:1875
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1163,83 +1244,103 @@ msgstr ""
+ "\n"
+ " %s: %s (%s)"
+
+-#: ../output.py:1657
++#: ../output.py:1880
++#, python-format
++msgid ""
++"\n"
++" %s"
++msgstr ""
++"\n"
++" %s"
++
++#: ../output.py:1882
++msgid ""
++"\n"
++" Not found"
++msgstr ""
++"\n"
++" ਨਹੀਂ ਲੱਭਾ"
++
++#. These should be the only three things we care about:
++#: ../output.py:1897
++msgid "Updated By"
++msgstr "ਅੱਪਡੇਟ ਕੀਤਾ"
++
++#: ../output.py:1898
++msgid "Downgraded By"
++msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤਾ"
++
++#: ../output.py:1899
++msgid "Obsoleted By"
++msgstr "ਬਰਤਰਫ਼ ਕੀਤਾ"
++
++#: ../output.py:1917
+ msgid "Available"
+ msgstr "ਉਪਲੱਬਧ"
+
+-#: ../output.py:1665 ../output.py:1670
++#: ../output.py:1944 ../output.py:1949
+ #, python-format
+ msgid "--> Processing Conflict: %s conflicts %s"
+ msgstr "--> ਅਪਵਾਦ ਹੱਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s ਦਾ %s ਨਾਲ ਟਕਰਾ"
+
+-#: ../output.py:1674
++#: ../output.py:1953
+ msgid "--> Populating transaction set with selected packages. Please wait."
+ msgstr "--> ਚੁਣੇ ਪੈਕੇਜਾਂ ਲਈ ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ ਪਾਪੂਲੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ।"
+
+-#: ../output.py:1678
++#: ../output.py:1957
+ #, python-format
+ msgid "---> Downloading header for %s to pack into transaction set."
+-msgstr "---> Downloading header for %s to pack into transaction set."
++msgstr "---> ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ 'ਚ ਪੈਕ ਕਰਨ ਲਈ %s ਵਾਸਤੇ ਹੈੱਡਰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
+
+-#: ../utils.py:93
++#: ../utils.py:94
+ msgid "Running"
+ msgstr "ਚੱਲ ਰਿਹਾ ਹੈ"
+
+-#: ../utils.py:94
++#: ../utils.py:95
+ msgid "Sleeping"
+ msgstr "ਸਲੀਪਿੰਗ"
+
+-#: ../utils.py:95
++#: ../utils.py:96
+ msgid "Uninterruptible"
+-msgstr ""
++msgstr "ਗ਼ੈਰ-ਰੁਕਾਵਟ-ਯੋਗ"
+
+-#: ../utils.py:96
++#: ../utils.py:97
+ msgid "Zombie"
+ msgstr "ਜੋਮਬਿਈ"
+
+-#: ../utils.py:97
++#: ../utils.py:98
+ msgid "Traced/Stopped"
+-msgstr ""
++msgstr "ਟਰੇਸ ਕੀਤਾ/ਰੋਕਿਆ"
+
+-#: ../utils.py:98 ../yumcommands.py:917
++#: ../utils.py:99 ../yumcommands.py:972
+ msgid "Unknown"
+ msgstr "ਅਣਜਾਣ"
+
+-#: ../utils.py:109
++#: ../utils.py:110
+ msgid " The other application is: PackageKit"
+ msgstr " ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਹੈ: ਪੈਕੇਜਕਿੱਟ"
+
+-#: ../utils.py:111
++#: ../utils.py:112
+ #, python-format
+ msgid " The other application is: %s"
+ msgstr " ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਹੈ: %s"
+
+-#: ../utils.py:114
++#: ../utils.py:115
+ #, python-format
+ msgid " Memory : %5s RSS (%5sB VSZ)"
+ msgstr " ਮੈਮੋਰੀ : %5s RSS (%5sB VSZ)"
+
+-#: ../utils.py:119
++#: ../utils.py:120
+ #, python-format
+ msgid " Started: %s - %s ago"
+ msgstr " ਸ਼ੁਰੂ ਹੋਇਆ: %s - %s ਪਹਿਲਾਂ"
+
+-#: ../utils.py:121
++#: ../utils.py:122
+ #, python-format
+ msgid " State : %s, pid: %d"
+ msgstr " ਹਾਲਤ : %s, pid: %d"
+
+-#: ../utils.py:199
+-#, python-format
+-msgid "PluginExit Error: %s"
+-msgstr "PluginExit ਗਲਤੀ: %s"
+-
+-#: ../utils.py:202
+-#, python-format
+-msgid "Yum Error: %s"
+-msgstr "ਯੱਮ ਗਲਤੀ: %s"
+-
+-#: ../utils.py:235 ../yummain.py:42
++#: ../utils.py:143 ../yummain.py:42
+ msgid ""
+ "\n"
+ "\n"
+@@ -1249,14 +1350,17 @@ msgstr ""
+ "\n"
+ "ਯੂਜ਼ਰ ਰੱਦ ਕਰਨ ਉੱਤੇ ਮੌਜੂਦ"
+
+-#: ../utils.py:241 ../yummain.py:48
++#: ../utils.py:149 ../yummain.py:48
+ msgid ""
+ "\n"
+ "\n"
+ "Exiting on Broken Pipe"
+ msgstr ""
++"\n"
++"\n"
++"ਖਰਾਬ ਪਾਈਪ ਉੱਤੇ ਬੰਦ"
+
+-#: ../utils.py:243 ../yummain.py:50
++#: ../utils.py:151 ../yummain.py:50
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1267,7 +1371,47 @@ msgstr ""
+ "\n"
+ "%s"
+
+-#: ../utils.py:282 ../yummain.py:211
++#: ../utils.py:201 ../yummain.py:107
++msgid "Another app is currently holding the yum lock; exiting as configured by exit_on_lock"
++msgstr "ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; exit_on_lock ਵਲੋਂ ਸੰਰਚਨਾ ਮੁਤਾਬਕ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
++
++#: ../utils.py:260
++#, python-format
++msgid "PluginExit Error: %s"
++msgstr "PluginExit ਗਲਤੀ: %s"
++
++#: ../utils.py:263
++#, python-format
++msgid "Yum Error: %s"
++msgstr "ਯੱਮ ਗਲਤੀ: %s"
++
++#: ../utils.py:315 ../yummain.py:134 ../yummain.py:173
++#, python-format
++msgid "Error: %s"
++msgstr "ਗਲਤੀ: %s"
++
++#: ../utils.py:319 ../yummain.py:177
++msgid " You could try using --skip-broken to work around the problem"
++msgstr " ਤੁਸੀਂ ਸਮੱਸਿਆ ਨਾਲ ਨਿਪਟ ਲਈ --skip-broken ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੰਮ ਚਲਾ ਸਕਦੇ ਹੋ"
++
++#: ../utils.py:321 ../yummain.py:179 ../yummain.py:212
++msgid " You could try running: rpm -Va --nofiles --nodigest"
++msgstr " ਤੁਹਾਨੂੰ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ: rpm -Va --nofiles --nodigest"
++
++#: ../utils.py:328 ../yummain.py:144 ../yummain.py:186
++#, python-format
++msgid "Unknown Error(s): Exit Code: %d:"
++msgstr "ਅਣਜਾਣ ਗਲਤੀ: ਬੰਦ ਕਰੋ: %d:"
++
++#: ../utils.py:334 ../yummain.py:192
++msgid ""
++"\n"
++"Dependencies Resolved"
++msgstr ""
++"\n"
++"ਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ"
++
++#: ../utils.py:349 ../yummain.py:215
+ msgid "Complete!"
+ msgstr "ਮੁਕੰਮਲ!"
+
+@@ -1279,8 +1423,7 @@ msgstr "ਤੁਹਾਨੂੰ ਇਹ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਰੂ
+ msgid ""
+ "\n"
+ "You have enabled checking of packages via GPG keys. This is a good thing. \n"
+-"However, you do not have any GPG public keys installed. You need to "
+-"download\n"
++"However, you do not have any GPG public keys installed. You need to download\n"
+ "the keys for packages you wish to install and install them.\n"
+ "You can do that by running the command:\n"
+ " rpm --import public.gpg.key\n"
+@@ -1300,7 +1443,7 @@ msgstr ""
+
+ #: ../yumcommands.py:76
+ msgid "Error: Need an item to match"
+-msgstr ""
++msgstr "ਗਲਤੀ: ਮਿਲਦੀ ਆਈਟਮ ਦੀ ਲੋੜ ਹੈ"
+
+ #: ../yumcommands.py:82
+ msgid "Error: Need a group or list of groups"
+@@ -1309,12 +1452,12 @@ msgstr "ਗਲਤੀ: ਗਰੁੱਪ ਜਾਂ ਗਰੁੱਪਾਂ ਦੀ ਲ
+ #: ../yumcommands.py:91
+ #, python-format
+ msgid "Error: clean requires an option: %s"
+-msgstr ""
++msgstr "ਗਲਤੀ: ਸਾਫ਼ ਕਰਨ (clean) ਲਈ ਕੋਈ ਚੋਣ ਦਿੱਤੀ ਜਾਣੀ ਚਾਹੀਦੀ ਹੈ: %s"
+
+ #: ../yumcommands.py:96
+ #, python-format
+ msgid "Error: invalid clean argument: %r"
+-msgstr ""
++msgstr "ਗਲਤੀ: ਗਲਤ clean ਆਰਗੂਮੈਂਟ: %r"
+
+ #: ../yumcommands.py:109
+ msgid "No argument to shell"
+@@ -1334,294 +1477,309 @@ msgstr ""
+ msgid "Error: more than one file given as argument to shell."
+ msgstr ""
+
+-#: ../yumcommands.py:170
++#: ../yumcommands.py:138
++msgid ""
++"There are no enabled repos.\n"
++" Run \"yum repolist all\" to see the repos you have.\n"
++" You can enable repos with yum-config-manager --enable <repo>"
++msgstr ""
++
++#: ../yumcommands.py:189
+ msgid "PACKAGE..."
+ msgstr "ਪੈਕੇਜ..."
+
+-#: ../yumcommands.py:173
++#: ../yumcommands.py:192
+ msgid "Install a package or packages on your system"
+ msgstr "ਆਪਣੇ ਸਿਸਟਮ ਉੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰੋ"
+
+-#: ../yumcommands.py:181
++#: ../yumcommands.py:201
+ msgid "Setting up Install Process"
+ msgstr "ਇੰਸਟਾਲ ਕਾਰਵਾਈ ਸੈੱਟ ਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yumcommands.py:192
++#: ../yumcommands.py:212 ../yumcommands.py:234
+ msgid "[PACKAGE...]"
+ msgstr "[ਪੈਕੇਜ...]"
+
+-#: ../yumcommands.py:195
++#: ../yumcommands.py:215
+ msgid "Update a package or packages on your system"
+ msgstr "ਆਪਣੇ ਸਿਸਟਮ ਉੱਤੇ ਪੈਕੇਜ ਅੱਪਡੇਟ ਕਰੋ"
+
+-#: ../yumcommands.py:202
++#: ../yumcommands.py:223
+ msgid "Setting up Update Process"
+ msgstr "ਅੱਪਡੇਟ ਕਾਰਵਾਈ ਸੈੱਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yumcommands.py:244
++#: ../yumcommands.py:237
++msgid "Synchronize installed packages to the latest available versions"
++msgstr "ਸਭ ਇੰਸਟਾਲ ਕੀਤੇ ਪੈਕੇਜਾਂ ਨੂੰ ਸਭ ਤੋਂ ਨਵੇਂ ਉਪਲੱਬਧ ਵਰਜਨਾਂ ਨਾਲ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰੋ"
++
++#: ../yumcommands.py:245
++msgid "Setting up Distribution Synchronization Process"
++msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਾਰਵਾਈ ਸੈਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
++
++#: ../yumcommands.py:288
+ msgid "Display details about a package or group of packages"
+ msgstr "ਪੈਕੇਜ ਜਾਂ ਪੈਕੇਜਾਂ ਦੇ ਗਰੁੱਪ ਬਾਰੇ ਵੇਰਵੇ ਸਮੇਤ ਜਾਣਕਾਰੀ ਵੇਖੋ"
+
+-#: ../yumcommands.py:293
++#: ../yumcommands.py:337
+ msgid "Installed Packages"
+ msgstr "ਇੰਸਟਾਲ ਹੋਏ ਪੈਕੇਜ"
+
+-#: ../yumcommands.py:301
++#: ../yumcommands.py:345
+ msgid "Available Packages"
+ msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ"
+
+-#: ../yumcommands.py:305
++#: ../yumcommands.py:349
+ msgid "Extra Packages"
+ msgstr "ਵਾਧੂ ਪੈਕੇਜ"
+
+-#: ../yumcommands.py:309
++#: ../yumcommands.py:353
+ msgid "Updated Packages"
+ msgstr "ਅੱਪਡੇਟ ਕੀਤੇ ਪੈਕੇਜ"
+
+ #. This only happens in verbose mode
+-#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601
++#: ../yumcommands.py:361 ../yumcommands.py:368 ../yumcommands.py:655
+ msgid "Obsoleting Packages"
+ msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਪੈਕੇਜ"
+
+-#: ../yumcommands.py:326
++#: ../yumcommands.py:370
+ msgid "Recently Added Packages"
+ msgstr "ਤਾਜ਼ਾ ਸ਼ਾਮਲ ਕੀਤੇ ਪੈਕੇਜ"
+
+-#: ../yumcommands.py:333
++#: ../yumcommands.py:377
+ msgid "No matching Packages to list"
+ msgstr "ਲਿਸਟ ਲਈ ਕੋਈ ਮਿਲਦਾ ਪੈਕੇਜ ਨਹੀਂ"
+
+-#: ../yumcommands.py:347
++#: ../yumcommands.py:391
+ msgid "List a package or groups of packages"
+ msgstr "ਪੈਕੇਜ ਜਾਂ ਪੈਕੇਜਾਂ ਦੇ ਗਰੁੱਪ ਦੀ ਲਿਸਟ"
+
+-#: ../yumcommands.py:359
++#: ../yumcommands.py:403
+ msgid "Remove a package or packages from your system"
+ msgstr "ਆਪਣੇ ਸਿਸਟਮ ਤੋਂ ਪੈਕੇਜ ਹਟਾਓ"
+
+-#: ../yumcommands.py:366
++#: ../yumcommands.py:410
+ msgid "Setting up Remove Process"
+ msgstr "ਹਟਾਉਣ ਕਾਰਵਾਈ ਲਈ ਸੈਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yumcommands.py:380
++#: ../yumcommands.py:424
+ msgid "Setting up Group Process"
+ msgstr "ਗਰੁੱਪ ਕਾਰਵਾਈ ਸੈਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yumcommands.py:386
++#: ../yumcommands.py:430
+ msgid "No Groups on which to run command"
+ msgstr "ਕੋਈ ਗਰੁੱਪ ਨਹੀਂ, ਜਿਸ ਉੱਤੇ ਕਮਾਂਡ ਚਲਾਈ ਜਾ ਸਕੇ"
+
+-#: ../yumcommands.py:399
++#: ../yumcommands.py:443
+ msgid "List available package groups"
+ msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ ਗਰੁੱਪਾਂ ਦੀ ਲਿਸਟ"
+
+-#: ../yumcommands.py:416
++#: ../yumcommands.py:463
+ msgid "Install the packages in a group on your system"
+ msgstr "ਆਪਣੇ ਸਿਸਟਮ ਉੱਤੇ ਗਰੁੱਪ ਵਿੱਚੋਂ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰੋ"
+
+-#: ../yumcommands.py:438
++#: ../yumcommands.py:486
+ msgid "Remove the packages in a group from your system"
+ msgstr "ਆਪਣੇ ਸਿਸਟਮ ਤੋਂ ਗਰੁੱਪ ਵਿੱਚੋਂ ਪੈਕੇਜ ਹਟਾਓ"
+
+-#: ../yumcommands.py:465
++#: ../yumcommands.py:514
+ msgid "Display details about a package group"
+ msgstr "ਪੈਕੇਜ ਗਰੁੱਪ ਬਾਰੇ ਵੇਰਵੇ ਸਮੇਤ ਜਾਣਕਾਰੀ ਵੇਖੋ"
+
+-#: ../yumcommands.py:489
++#: ../yumcommands.py:539
+ msgid "Generate the metadata cache"
+ msgstr "ਮੇਟਾਡਾਟਾ ਕੈਸ਼ ਤਿਆਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yumcommands.py:495
++#: ../yumcommands.py:545
+ msgid "Making cache files for all metadata files."
+ msgstr "ਸਭ ਮੇਟਾਡਾਟਾ ਫਾਇਲਾਂ ਲਈ ਕੈਸ਼ ਫਾਇਲਾਂ ਬਣਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ।"
+
+-#: ../yumcommands.py:496
++#: ../yumcommands.py:546
+ msgid "This may take a while depending on the speed of this computer"
+ msgstr "ਇਹ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਦੀ ਸਪੀਡ ਦੇ ਮੁਤਾਬਕ ਕੁਝ ਸਮਾਂ ਲੈ ਸਕਦਾ ਹੈ।"
+
+-#: ../yumcommands.py:517
++#: ../yumcommands.py:567
+ msgid "Metadata Cache Created"
+ msgstr "ਮੇਟਾਡਾਟਾ ਕੈਸ਼ ਬਣਾਈ ਗਈ"
+
+-#: ../yumcommands.py:531
++#: ../yumcommands.py:581
+ msgid "Remove cached data"
+ msgstr "ਕੈਸ਼ ਡਾਟਾ ਹਟਾਓ"
+
+-#: ../yumcommands.py:551
++#: ../yumcommands.py:602
+ msgid "Find what package provides the given value"
+ msgstr "ਲੱਭੋ ਕਿ ਕਿਹੜਾ ਪੈਕੇਜ ਦਿੱਤਾ ਮੁੱਲ ਦਿੰਦਾ ਹੈ"
+
+-#: ../yumcommands.py:571
++#: ../yumcommands.py:622
+ msgid "Check for available package updates"
+ msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ ਅੱਪਡੇਟ ਲਈ ਚੈੱਕ"
+
+-#: ../yumcommands.py:621
++#: ../yumcommands.py:675
+ msgid "Search package details for the given string"
+ msgstr "ਦਿੱਤੀ ਲਾਈਨ ਲਈ ਪੈਕੇਜ ਵੇਰਵਾ ਲੱਭੋ"
+
+-#: ../yumcommands.py:627
++#: ../yumcommands.py:681
+ msgid "Searching Packages: "
+ msgstr "ਪੈਕੇਜਾਂ ਲਈ ਖੋਜ ਜਾਰੀ: "
+
+-#: ../yumcommands.py:644
++#: ../yumcommands.py:698
+ msgid "Update packages taking obsoletes into account"
+-msgstr ""
++msgstr "ਪੈਕੇਜ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਬਰਤਰਫ਼ ਨੂੰ ਧਿਆਨ 'ਚ ਰੱਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yumcommands.py:652
++#: ../yumcommands.py:707
+ msgid "Setting up Upgrade Process"
+ msgstr "ਅੱਪਗਰੇਡ ਕਰਾਵਾਈ ਸੈੱਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yumcommands.py:666
++#: ../yumcommands.py:721
+ msgid "Install a local RPM"
+ msgstr "ਲੋਕਲ RPM ਇੰਸਟਾਲ ਕਰੋ"
+
+-#: ../yumcommands.py:674
++#: ../yumcommands.py:729
+ msgid "Setting up Local Package Process"
+ msgstr "ਲੋਕਲ ਪੈਕੇਜ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yumcommands.py:693
++#: ../yumcommands.py:748
+ msgid "Determine which package provides the given dependency"
+-msgstr ""
++msgstr "ਦੱਸੋ ਕਿ ਕਿਹੜਾ ਪੈਕੇਜ ਦਿੱਤੀ ਨਿਰਭਰਤਾ ਦਿੰਦਾ ਹੈ"
+
+-#: ../yumcommands.py:696
++#: ../yumcommands.py:751
+ msgid "Searching Packages for Dependency:"
+ msgstr "ਨਿਰਭਰਤਾ ਲਈ ਪੈਕੇਜਾਂ ਦੀ ਖੋਜ ਜਾਰੀ:"
+
+-#: ../yumcommands.py:710
++#: ../yumcommands.py:765
+ msgid "Run an interactive yum shell"
+-msgstr ""
++msgstr "ਇੰਟਰ-ਐਕਟਿਵ ਯੱਮ ਸ਼ੈੱਲ ਚਲਾਓ"
+
+-#: ../yumcommands.py:716
++#: ../yumcommands.py:771
+ msgid "Setting up Yum Shell"
+ msgstr "ਯੱਮ ਸ਼ੈੱਲ ਸੈੱਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yumcommands.py:734
++#: ../yumcommands.py:789
+ msgid "List a package's dependencies"
+ msgstr "ਪੈਕੇਜਾਂ ਦੀ ਨਿਰਭਰਤਾ ਦੀ ਲਿਸਟ"
+
+-#: ../yumcommands.py:740
++#: ../yumcommands.py:795
+ msgid "Finding dependencies: "
+ msgstr "ਨਿਰਭਰਤਾ ਲੱਭੀ ਜਾ ਰਹੀ ਹੈ: "
+
+-#: ../yumcommands.py:756
++#: ../yumcommands.py:811
+ msgid "Display the configured software repositories"
+ msgstr "ਸੰਰਚਿਤ ਸਾਫਟਵੇਅਰ ਰਿਪੋਜ਼ਟਰੀਆਂ ਵੇਖੋ"
+
+-#: ../yumcommands.py:822 ../yumcommands.py:823
++#: ../yumcommands.py:877 ../yumcommands.py:878
+ msgid "enabled"
+ msgstr "ਚਾਲੂ"
+
+-#: ../yumcommands.py:849 ../yumcommands.py:850
++#: ../yumcommands.py:904 ../yumcommands.py:905
+ msgid "disabled"
+ msgstr "ਬੰਦ"
+
+-#: ../yumcommands.py:866
++#: ../yumcommands.py:921
+ msgid "Repo-id : "
+ msgstr "ਰਿਪੋ-id : "
+
+-#: ../yumcommands.py:867
++#: ../yumcommands.py:922
+ msgid "Repo-name : "
+ msgstr "ਰਿਪੋ-ਨਾਂ : "
+
+-#: ../yumcommands.py:870
++#: ../yumcommands.py:925
+ msgid "Repo-status : "
+ msgstr "ਰਿਪੋ-ਹਾਲਤ : "
+
+-#: ../yumcommands.py:873
++#: ../yumcommands.py:928
+ msgid "Repo-revision: "
+ msgstr "ਰਿਪੋ-ਰੀਵਿਜ਼ਨ: "
+
+-#: ../yumcommands.py:877
++#: ../yumcommands.py:932
+ msgid "Repo-tags : "
+ msgstr "ਰਿਪੋ-ਟੈਗ : "
+
+-#: ../yumcommands.py:883
++#: ../yumcommands.py:938
+ msgid "Repo-distro-tags: "
+-msgstr ""
++msgstr "Repo-distro-tags: "
+
+-#: ../yumcommands.py:888
++#: ../yumcommands.py:943
+ msgid "Repo-updated : "
+ msgstr "ਰਿਪੋ-ਅੱਪਡੇਟ : "
+
+-#: ../yumcommands.py:890
++#: ../yumcommands.py:945
+ msgid "Repo-pkgs : "
+ msgstr "ਰਿਪੋ-ਪੈਕੇਜ : "
+
+-#: ../yumcommands.py:891
++#: ../yumcommands.py:946
+ msgid "Repo-size : "
+ msgstr "ਰਿਪੋ-ਸਾਈਜ਼ : "
+
+-#: ../yumcommands.py:898
++#: ../yumcommands.py:953
+ msgid "Repo-baseurl : "
+-msgstr ""
++msgstr "ਰਿਪੋ-baseurl : "
+
+-#: ../yumcommands.py:906
++#: ../yumcommands.py:961
+ msgid "Repo-metalink: "
+-msgstr ""
++msgstr "ਰਿਪੋ-metalink: "
+
+-#: ../yumcommands.py:910
++#: ../yumcommands.py:965
+ msgid " Updated : "
+ msgstr " ਅੱਪਡੇਟ : "
+
+-#: ../yumcommands.py:913
++#: ../yumcommands.py:968
+ msgid "Repo-mirrors : "
+-msgstr ""
++msgstr "ਰਿਪੋ-mirrors : "
+
+-#: ../yumcommands.py:923
++#: ../yumcommands.py:978
+ #, python-format
+ msgid "Never (last: %s)"
+ msgstr "ਕਦੇ ਨਹੀਂ (ਆਖਰੀ: %s)"
+
+-#: ../yumcommands.py:925
++#: ../yumcommands.py:980
+ #, python-format
+ msgid "Instant (last: %s)"
+ msgstr ""
+
+-#: ../yumcommands.py:928
++#: ../yumcommands.py:983
+ #, python-format
+ msgid "%s second(s) (last: %s)"
+ msgstr "%s ਸਕਿੰਟ (ਆਖਰੀ: %s)"
+
+-#: ../yumcommands.py:930
++#: ../yumcommands.py:985
+ msgid "Repo-expire : "
+-msgstr ""
++msgstr "ਰਿਪੋ-expire : "
+
+-#: ../yumcommands.py:933
++#: ../yumcommands.py:988
+ msgid "Repo-exclude : "
+-msgstr ""
++msgstr "Repo-ਨਾ-ਸ਼ਾਮਲ : "
+
+-#: ../yumcommands.py:937
++#: ../yumcommands.py:992
+ msgid "Repo-include : "
+-msgstr ""
++msgstr "Repo-ਸ਼ਾਮਲ : "
+
+-#: ../yumcommands.py:941
++#: ../yumcommands.py:996
+ msgid "Repo-excluded: "
+ msgstr ""
+
+ #. Work out the first (id) and last (enabled/disalbed/count),
+ #. then chop the middle (name)...
+-#: ../yumcommands.py:951 ../yumcommands.py:980
++#: ../yumcommands.py:1006 ../yumcommands.py:1035
+ msgid "repo id"
+ msgstr "repo id"
+
+-#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987
++#: ../yumcommands.py:1023 ../yumcommands.py:1024 ../yumcommands.py:1042
+ msgid "status"
+ msgstr "ਹਾਲਤ"
+
+-#: ../yumcommands.py:981
++#: ../yumcommands.py:1036
+ msgid "repo name"
+ msgstr "ਰਿਪੋ ਨਾਂ"
+
+-#: ../yumcommands.py:1018
++#: ../yumcommands.py:1073
+ msgid "Display a helpful usage message"
+ msgstr ""
+
+-#: ../yumcommands.py:1052
++#: ../yumcommands.py:1107
+ #, python-format
+ msgid "No help available for %s"
+ msgstr "%s ਲਈ ਕੋਈ ਮੱਦਦ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+-#: ../yumcommands.py:1057
++#: ../yumcommands.py:1112
+ msgid ""
+ "\n"
+ "\n"
+@@ -1631,7 +1789,7 @@ msgstr ""
+ "\n"
+ "ਏਲੀਆਸ: "
+
+-#: ../yumcommands.py:1059
++#: ../yumcommands.py:1114
+ msgid ""
+ "\n"
+ "\n"
+@@ -1641,105 +1799,81 @@ msgstr ""
+ "\n"
+ "ਏਲੀਆਸ: "
+
+-#: ../yumcommands.py:1087
++#: ../yumcommands.py:1143
+ msgid "Setting up Reinstall Process"
+ msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yumcommands.py:1095
++#: ../yumcommands.py:1151
+ msgid "reinstall a package"
+ msgstr "ਪੈਕੇਜ ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yumcommands.py:1113
++#: ../yumcommands.py:1170
+ msgid "Setting up Downgrade Process"
+ msgstr "ਡਾਊਨਗਰੇਡ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yumcommands.py:1120
++#: ../yumcommands.py:1177
+ msgid "downgrade a package"
+ msgstr "ਪੈਕੇਜ ਡਾਊਨਗਰੇਡ ਕਰੋ"
+
+-#: ../yumcommands.py:1134
++#: ../yumcommands.py:1191
+ msgid "Display a version for the machine and/or available repos."
+-msgstr ""
++msgstr "ਮਸ਼ੀਨ ਤੇ / ਜਾਂ ਉਪਲੱਬਧ ਰਿਪੋ ਲਈ ਵਰਜਨ ਵੇਖੋ।"
+
+-#: ../yumcommands.py:1173
++#: ../yumcommands.py:1230
+ msgid " Yum version groups:"
+ msgstr " ਯੱਮ ਵਰਜਨ ਗਰੁੱਪ:"
+
+-#: ../yumcommands.py:1183
++#: ../yumcommands.py:1240
+ msgid " Group :"
+ msgstr " ਗਰੁੱਪ :"
+
+-#: ../yumcommands.py:1184
++#: ../yumcommands.py:1241
+ msgid " Packages:"
+ msgstr " ਪੈਕੇਜ:"
+
+-#: ../yumcommands.py:1213
++#: ../yumcommands.py:1270
+ msgid "Installed:"
+ msgstr "ਇੰਸਟਾਲ ਹੋਏ:"
+
+-#: ../yumcommands.py:1218
++#: ../yumcommands.py:1278
+ msgid "Group-Installed:"
+ msgstr "ਗਰੁੱਪ-ਇੰਸਟਾਲ ਹੋਏ:"
+
+-#: ../yumcommands.py:1227
++#: ../yumcommands.py:1287
+ msgid "Available:"
+ msgstr "ਉਪਲੱਬਧ:"
+
+-#: ../yumcommands.py:1233
++#: ../yumcommands.py:1296
+ msgid "Group-Available:"
+ msgstr "ਉਪਲੱਬਧ-ਗਰੁੱਪ:"
+
+-#: ../yumcommands.py:1272
++#: ../yumcommands.py:1335
+ msgid "Display, or use, the transaction history"
+-msgstr ""
++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਅਤੀਤ ਵੇਖੋ ਜਾਂ ਵਰਤੋਂ"
+
+-#: ../yumcommands.py:1300
++#: ../yumcommands.py:1363
+ #, python-format
+ msgid "Invalid history sub-command, use: %s."
+ msgstr ""
+
+-#: ../yumcommands.py:1345
+-msgid "Check for problems in the rpmdb"
+-msgstr "rpmdb ਵਿੱਚ ਸਮੱਸਿਆ ਲਈ ਚੈੱਕ ਕਰੋ"
+-
+-#: ../yummain.py:102
+-msgid ""
+-"Another app is currently holding the yum lock; waiting for it to exit..."
++#: ../yumcommands.py:1370
++msgid "You don't have access to the history DB."
+ msgstr ""
+-"ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਣ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; ਉਸ ਨੂੰ ਬੰਦ ਹੋਣ ਤੱਕ ਉਡੀਕ ਜਾਰੀ..."
+
+-#: ../yummain.py:130 ../yummain.py:169
+-#, python-format
+-msgid "Error: %s"
+-msgstr "ਗਲਤੀ: %s"
++#: ../yumcommands.py:1413
++msgid "Check for problems in the rpmdb"
++msgstr "rpmdb ਵਿੱਚ ਸਮੱਸਿਆ ਲਈ ਚੈੱਕ ਕਰੋ"
+
+-#: ../yummain.py:140 ../yummain.py:182
+-#, python-format
+-msgid "Unknown Error(s): Exit Code: %d:"
+-msgstr "ਅਣਜਾਣ ਗਲਤੀ: ਬੰਦ ਕਰੋ: %d:"
++#: ../yummain.py:103
++msgid "Another app is currently holding the yum lock; waiting for it to exit..."
++msgstr "ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਣ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; ਉਸ ਨੂੰ ਬੰਦ ਹੋਣ ਤੱਕ ਉਡੀਕ ਜਾਰੀ..."
+
+ #. Depsolve stage
+-#: ../yummain.py:147
++#: ../yummain.py:151
+ msgid "Resolving Dependencies"
+ msgstr "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yummain.py:173
+-msgid " You could try using --skip-broken to work around the problem"
+-msgstr " ਤੁਸੀਂ ਸਮੱਸਿਆ ਨਾਲ ਨਿਪਟ ਲਈ --skip-broken ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੰਮ ਚਲਾ ਸਕਦੇ ਹੋ"
+-
+-#: ../yummain.py:175 ../yummain.py:208
+-msgid " You could try running: rpm -Va --nofiles --nodigest"
+-msgstr " ਤੁਹਾਨੂੰ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ: rpm -Va --nofiles --nodigest"
+-
+-#: ../yummain.py:188
+-msgid ""
+-"\n"
+-"Dependencies Resolved"
+-msgstr ""
+-"\n"
+-"ਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ"
+-
+-#: ../yummain.py:265
++#: ../yummain.py:269
+ msgid ""
+ "\n"
+ "\n"
+@@ -1757,137 +1891,127 @@ msgstr ""
+ msgid "Setting up TransactionSets before config class is up"
+ msgstr ""
+
+-#: ../yum/depsolve.py:148
++#: ../yum/depsolve.py:151
+ #, python-format
+ msgid "Invalid tsflag in config file: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:159
++#: ../yum/depsolve.py:162
+ #, python-format
+ msgid "Searching pkgSack for dep: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:175
+-#, python-format
+-msgid "Potential match for %s from %s"
+-msgstr ""
+-
+-#: ../yum/depsolve.py:183
+-#, python-format
+-msgid "Matched %s to require for %s"
+-msgstr ""
+-
+-#: ../yum/depsolve.py:225
++#: ../yum/depsolve.py:205
+ #, python-format
+ msgid "Member: %s"
+ msgstr "ਮੈਂਬਰ: %s"
+
+-#: ../yum/depsolve.py:239 ../yum/depsolve.py:754
++#: ../yum/depsolve.py:219 ../yum/depsolve.py:754
+ #, python-format
+ msgid "%s converted to install"
+-msgstr ""
++msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਬਦਲਿਆ"
+
+-#: ../yum/depsolve.py:246
++#: ../yum/depsolve.py:226
+ #, python-format
+ msgid "Adding Package %s in mode %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:256
++#: ../yum/depsolve.py:242
+ #, python-format
+ msgid "Removing Package %s"
+ msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yum/depsolve.py:278
++#: ../yum/depsolve.py:264
+ #, python-format
+ msgid "%s requires: %s"
+ msgstr "%s ਚਾਹੀਦਾ ਹੈ: %s"
+
+-#: ../yum/depsolve.py:319
++#: ../yum/depsolve.py:305
+ #, python-format
+ msgid "%s requires %s"
+ msgstr "%s ਨੂੰ ਚਾਹੀਦਾ ਹੈ %s"
+
+-#: ../yum/depsolve.py:346
++#: ../yum/depsolve.py:332
+ msgid "Needed Require has already been looked up, cheating"
+ msgstr ""
+
+-#: ../yum/depsolve.py:356
++#: ../yum/depsolve.py:342
+ #, python-format
+ msgid "Needed Require is not a package name. Looking up: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:363
++#: ../yum/depsolve.py:349
+ #, python-format
+ msgid "Potential Provider: %s"
+ msgstr "ਸੰਭਾਵਿਤ ਦੇਣ ਵਾਲਾ: %s"
+
+-#: ../yum/depsolve.py:386
++#: ../yum/depsolve.py:372
+ #, python-format
+ msgid "Mode is %s for provider of %s: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:390
++#: ../yum/depsolve.py:376
+ #, python-format
+ msgid "Mode for pkg providing %s: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:394
++#: ../yum/depsolve.py:380
+ #, python-format
+ msgid "TSINFO: %s package requiring %s marked as erase"
+ msgstr ""
+
+-#: ../yum/depsolve.py:407
++#: ../yum/depsolve.py:393
+ #, python-format
+ msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+ msgstr ""
+
+-#: ../yum/depsolve.py:410
++#: ../yum/depsolve.py:396
+ #, python-format
+ msgid "TSINFO: Updating %s to resolve dep."
+ msgstr ""
+
+-#: ../yum/depsolve.py:418
++#: ../yum/depsolve.py:404
+ #, python-format
+ msgid "Cannot find an update path for dep for: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:449
++#: ../yum/depsolve.py:435
+ #, python-format
+ msgid "Quick matched %s to require for %s"
+ msgstr ""
+
+ #. is it already installed?
+-#: ../yum/depsolve.py:491
++#: ../yum/depsolve.py:477
+ #, python-format
+ msgid "%s is in providing packages but it is already installed, removing."
+ msgstr ""
+
+-#: ../yum/depsolve.py:507
++#: ../yum/depsolve.py:493
+ #, python-format
+ msgid "Potential resolving package %s has newer instance in ts."
+ msgstr ""
+
+-#: ../yum/depsolve.py:518
++#: ../yum/depsolve.py:504
+ #, python-format
+ msgid "Potential resolving package %s has newer instance installed."
+ msgstr ""
+
+-#: ../yum/depsolve.py:536
++#: ../yum/depsolve.py:522
+ #, python-format
+ msgid "%s already in ts, skipping this one"
+ msgstr ""
+
+-#: ../yum/depsolve.py:578
++#: ../yum/depsolve.py:571
+ #, python-format
+ msgid "TSINFO: Marking %s as update for %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:586
++#: ../yum/depsolve.py:580
+ #, python-format
+ msgid "TSINFO: Marking %s as install for %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:690 ../yum/depsolve.py:781
++#: ../yum/depsolve.py:690 ../yum/depsolve.py:780
+ msgid "Success - empty transaction"
+ msgstr "ਸਫ਼ਲ - ਖਾਲੀ ਟਰਾਂਸੈਕਸ਼ਨ"
+
+@@ -1904,263 +2028,307 @@ msgstr "ਨਿਰਭਰਤਾ ਕਾਰਵਾਈ ਖਤਮ ਹੋ ਰਹੀ ਹ
+ msgid "%s from %s has depsolving problems"
+ msgstr ""
+
+-#: ../yum/depsolve.py:782
++#: ../yum/depsolve.py:781
+ msgid "Success - deps resolved"
+ msgstr "ਸਫ਼ਲ - ਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ"
+
+-#: ../yum/depsolve.py:796
++#: ../yum/depsolve.py:802
+ #, python-format
+ msgid "Checking deps for %s"
+ msgstr "%s ਲਈ ਨਿਰਭਰਤਾ ਚੈੱਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yum/depsolve.py:874
++#: ../yum/depsolve.py:888
+ #, python-format
+ msgid "looking for %s as a requirement of %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1090
++#: ../yum/depsolve.py:1119
+ #, python-format
+ msgid "Running compare_providers() for %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123
++#: ../yum/depsolve.py:1146 ../yum/depsolve.py:1152
+ #, python-format
+ msgid "better arch in po %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1218
++#: ../yum/depsolve.py:1244
+ #, python-format
+ msgid "%s obsoletes %s"
+ msgstr "%s ਨੇ %s ਬਰਤਰਫ਼ ਕੀਤਾ"
+
+-#: ../yum/depsolve.py:1230
++#: ../yum/depsolve.py:1256
+ #, python-format
+ msgid ""
+ "archdist compared %s to %s on %s\n"
+ " Winner: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1237
++#: ../yum/depsolve.py:1264
+ #, python-format
+ msgid "common sourcerpm %s and %s"
+-msgstr ""
++msgstr "ਆਮ sourcerpm %s ਅਤੇ %s"
+
+-#: ../yum/depsolve.py:1241
++#: ../yum/depsolve.py:1268
+ #, python-format
+ msgid "base package %s is installed for %s"
+ msgstr "ਬੇਸ ਪੈਕੇਜ %s %s ਲਈ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"
+
+-#: ../yum/depsolve.py:1247
++#: ../yum/depsolve.py:1274
+ #, python-format
+ msgid "common prefix of %s between %s and %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1256
++#: ../yum/depsolve.py:1305
++#, python-format
++msgid "requires minimal: %d"
++msgstr "ਘੱਟੋ-ਘੱਟ ਲੋੜ ਹੈ: %d"
++
++#: ../yum/depsolve.py:1309
++#, python-format
++msgid " Winner: %s"
++msgstr " ਜੇਤੂ: %s"
++
++#: ../yum/depsolve.py:1314
++#, python-format
++msgid " Loser(with %d): %s"
++msgstr " ਹਾਰਿਆ(%d ਨਾਲ): %s"
++
++#: ../yum/depsolve.py:1330
+ #, python-format
+ msgid "Best Order: %s"
+ msgstr "ਵਧੀਆ ਕ੍ਰਮ: %s"
+
+-#: ../yum/__init__.py:192
++#: ../yum/__init__.py:214
+ msgid "doConfigSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:424
++#: ../yum/__init__.py:453
++#, python-format
++msgid "Repository %r: Error parsing config: %s"
++msgstr ""
++
++#: ../yum/__init__.py:459
+ #, python-format
+ msgid "Repository %r is missing name in configuration, using id"
+ msgstr ""
+
+-#: ../yum/__init__.py:462
++#: ../yum/__init__.py:497
+ msgid "plugins already initialised"
+ msgstr "ਪਲੱਗਇਨ ਪਹਿਲਾਂ ਹੀ ਚਾਲੂ ਹੈ"
+
+-#: ../yum/__init__.py:469
++#: ../yum/__init__.py:504
+ msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:480
++#: ../yum/__init__.py:515
+ msgid "Reading Local RPMDB"
+ msgstr "ਲੋਕਲ RPMDB ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yum/__init__.py:504
++#: ../yum/__init__.py:538
+ msgid "doRepoSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:524
++#: ../yum/__init__.py:577
+ msgid "doSackSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:554
++#: ../yum/__init__.py:607
+ msgid "Setting up Package Sacks"
+ msgstr ""
+
+-#: ../yum/__init__.py:599
++#: ../yum/__init__.py:652
+ #, python-format
+ msgid "repo object for repo %s lacks a _resetSack method\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:600
++#: ../yum/__init__.py:653
+ msgid "therefore this repo cannot be reset.\n"
+-msgstr ""
++msgstr "ਇਸਕਰਕੇ ਇਹ ਰਿਪੋ ਮੁੜ-ਸੈੱਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।\n"
+
+-#: ../yum/__init__.py:605
++#: ../yum/__init__.py:658
+ msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:617
++#: ../yum/__init__.py:670
+ msgid "Building updates object"
+ msgstr "ਅੱਪਡੇਟ ਆਬਜੈਕਟ ਬਣਾਏ ਜਾ ਰਹੇ ਹਨ"
+
+-#: ../yum/__init__.py:652
++#: ../yum/__init__.py:709
+ msgid "doGroupSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:677
++#: ../yum/__init__.py:734
+ msgid "Getting group metadata"
+ msgstr "ਗਰੁੱਪ ਮੇਟਾਡਾਟਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yum/__init__.py:703
++#: ../yum/__init__.py:760
+ #, python-format
+ msgid "Adding group file from repository: %s"
+ msgstr "%s: ਰਿਪੋਜ਼ਟਰੀ ਤੋਂ ਗਰੁੱਪ ਫਾਇਲ ਸ਼ਾਮਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yum/__init__.py:712
++#: ../yum/__init__.py:769
+ #, python-format
+ msgid "Failed to add groups file for repository: %s - %s"
+ msgstr "%s - %s: ਰਿਪੋਜ਼ਟਰੀ ਲਈ ਗਰੁੱਪ ਫਾਇਲ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+-#: ../yum/__init__.py:718
++#: ../yum/__init__.py:775
+ msgid "No Groups Available in any repository"
+ msgstr "ਕਿਸੇ ਰਿਪੋਜ਼ਟਰੀ ਵਿੱਚ ਕੋਈ ਗਰੁੱਪ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+-#: ../yum/__init__.py:730
++#: ../yum/__init__.py:787
+ msgid "Getting pkgtags metadata"
+ msgstr "ਪੈਕੇਜਟੈਗ ਮੇਟਾਡਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yum/__init__.py:740
++#: ../yum/__init__.py:797
+ #, python-format
+ msgid "Adding tags from repository: %s"
+ msgstr "ਰਿਪੋਜ਼ਟਰੀ ਤੋਂ ਟੈਗ ਸ਼ਾਮਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ: %s"
+
+-#: ../yum/__init__.py:749
++#: ../yum/__init__.py:806
+ #, python-format
+ msgid "Failed to add Pkg Tags for repository: %s - %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:827
++#: ../yum/__init__.py:884
+ msgid "Importing additional filelist information"
+ msgstr "ਵਾਧੂ ਫਾਇਲ-ਲਿਸਟ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yum/__init__.py:841
++#: ../yum/__init__.py:898
+ #, python-format
+ msgid "The program %s%s%s is found in the yum-utils package."
+-msgstr ""
++msgstr "ਪਰੋਗਰਾਮ %s%s%s ਨੂੰ yum-utils ਪੈਕੇਜ 'ਚ ਲੱਭਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
+
+-#: ../yum/__init__.py:849
+-msgid ""
+-"There are unfinished transactions remaining. You might consider running yum-"
+-"complete-transaction first to finish them."
+-msgstr ""
++#: ../yum/__init__.py:906
++msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them."
++msgstr "ਅਧੂਰੀਆਂ ਟਰਾਂਸੈਕਸ਼ਨ ਬਾਕੀ ਹਨ। ਤੁਹਾਨੂੰ ਉਹਨਾਂ ਨੂੰ ਪੂਰਾ ਕਰਨ ਵਾਸਤੇ yum-complete-transaction ਚਲਾਉ ਬਾਰੇ ਸੋਚਣਾ ਚਾਹੀਦਾ ਹੈ।"
++
++#: ../yum/__init__.py:985
++#, python-format
++msgid "Trying to remove \"%s\", which is protected"
++msgstr "\"%s\" ਹਟਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼, ਜੋ ਕਿ ਸੁਰੱਖਿਅਤ ਹੈ"
+
+ #. Kind of hacky
+-#: ../yum/__init__.py:922
++#: ../yum/__init__.py:1044
+ #, python-format
+ msgid "Skip-broken round %i"
+ msgstr ""
+
+-#: ../yum/__init__.py:975
++#: ../yum/__init__.py:1101
+ #, python-format
+ msgid "Skip-broken took %i rounds "
+ msgstr ""
+
+-#: ../yum/__init__.py:976
++#: ../yum/__init__.py:1102
+ msgid ""
+ "\n"
+ "Packages skipped because of dependency problems:"
+ msgstr ""
++"\n"
++"ਪੈਕੇਜ ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਕਰਕੇ ਛੱਡੇ ਗਏ:"
+
+-#: ../yum/__init__.py:980
++#: ../yum/__init__.py:1106
+ #, python-format
+ msgid " %s from %s"
+ msgstr " %s %s ਤੋਂ"
+
+-#: ../yum/__init__.py:1121
++#. FIXME: _N()
++#: ../yum/__init__.py:1251
++#, python-format
++msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:"
++msgstr "** %d ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦਾ rpmdb ਸਮੱਸਿਆਵਾਂ ਲੱਭੀਆਂ, 'yum check' ਆਉਟਪੁੱਟ ਅੱਗੇ ਦਿੱਤੀ ਹੈ:"
++
++#: ../yum/__init__.py:1255
+ msgid "Warning: RPMDB altered outside of yum."
+-msgstr ""
++msgstr "ਚੇਤਾਵਨੀ: RPMDB ਨੂੰ ਯੱਮ ਤੋਂ ਬਿਨਾਂ ਬਦਲਿਆ ਗਿਆ।"
+
+-#: ../yum/__init__.py:1126
++#: ../yum/__init__.py:1267
+ msgid "missing requires"
+ msgstr "ਲੋੜੀਦੇ ਮੌਜੂਦ ਨਹੀਂ"
+
+-#: ../yum/__init__.py:1127
++#: ../yum/__init__.py:1268
+ msgid "installed conflict"
+ msgstr "ਇੰਸਟਾਲ ਨਾਲ ਟਕਰਾ"
+
+-#: ../yum/__init__.py:1180
+-msgid ""
+-"Warning: scriptlet or other non-fatal errors occurred during transaction."
++#: ../yum/__init__.py:1366
++msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
+ msgstr ""
+
+-#: ../yum/__init__.py:1198
++#: ../yum/__init__.py:1376
++msgid "Transaction couldn't start:"
++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ:"
++
++#. should this be 'to_unicoded'?
++#: ../yum/__init__.py:1379
++msgid "Could not run transaction."
++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚਲਾਈ ਨਹੀਂ ਜਾ ਸਕੀ।"
++
++#: ../yum/__init__.py:1392
+ #, python-format
+ msgid "Failed to remove transaction file %s"
+ msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਫਾਇਲ %s ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1227
++#: ../yum/__init__.py:1424
+ #, python-format
+ msgid "%s was supposed to be installed but is not!"
+-msgstr ""
++msgstr "%s ਇੰਸਟਾਲ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ, ਪਰ ਇਹ ਨਹੀਂ ਹੈ!"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1266
++#: ../yum/__init__.py:1486
+ #, python-format
+ msgid "%s was supposed to be removed but is not!"
+-msgstr ""
++msgstr "%s ਹਟਾਇਆ ਗਿਆ ਹੋਣਾ ਚਾਹੀਦਾ ਸੀ, ਪਰ ਨਹੀਂ ਗਿਆ!"
++
++#: ../yum/__init__.py:1597
++#, python-format
++msgid "Could not open lock %s: %s"
++msgstr "%s ਲਾਕ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s "
+
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1386
++#: ../yum/__init__.py:1614
+ #, python-format
+ msgid "Unable to check if PID %s is active"
+ msgstr ""
+
+ #. Another copy seems to be running.
+-#: ../yum/__init__.py:1390
++#: ../yum/__init__.py:1618
+ #, python-format
+ msgid "Existing lock %s: another copy is running as pid %s."
+ msgstr "ਮੌਜੂਦਾ ਲਾਕ %s: pid %s ਵਜੋਂ ਹੋਰ ਕਾਪੀ ਚੱਲ ਰਹੀ ਹੈ।"
+
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1425
++#: ../yum/__init__.py:1653
+ #, python-format
+ msgid "Could not create lock at %s: %s "
+ msgstr "%s ਲਈ ਲਾਕ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s "
+
+-#: ../yum/__init__.py:1470
+-msgid ""
+-"Package does not match intended download. Suggestion: run yum clean metadata"
++#: ../yum/__init__.py:1698
++#, python-format
++msgid "Package does not match intended download. Suggestion: run yum --enablerepo=%s clean metadata"
+ msgstr ""
+
+-#: ../yum/__init__.py:1486
++#: ../yum/__init__.py:1714
+ msgid "Could not perform checksum"
+-msgstr ""
++msgstr "checksum ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+-#: ../yum/__init__.py:1489
++#: ../yum/__init__.py:1717
+ msgid "Package does not match checksum"
+ msgstr "ਪੈਕੇਜ ਚੈਕਸਮ ਰਲਦਾ ਨਹੀਂ ਹੈ"
+
+-#: ../yum/__init__.py:1531
++#: ../yum/__init__.py:1769
+ #, python-format
+ msgid "package fails checksum but caching is enabled for %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1534 ../yum/__init__.py:1563
++#: ../yum/__init__.py:1772 ../yum/__init__.py:1801
+ #, python-format
+ msgid "using local copy of %s"
+ msgstr "%s ਦੀ ਲੋਕਲ ਕਾਪੀ ਦੀ ਵਰਤੋਂ"
+
+-#: ../yum/__init__.py:1575
++#: ../yum/__init__.py:1813
+ #, python-format
+ msgid ""
+ "Insufficient space in download directory %s\n"
+@@ -2171,464 +2339,499 @@ msgstr ""
+ " * ਖਾਲੀ %s\n"
+ " * ਚਾਹੀਦੀ %s"
+
+-#: ../yum/__init__.py:1624
++#: ../yum/__init__.py:1862
+ msgid "Header is not complete."
+ msgstr "ਹੈੱਡਰ ਪੂਰਾ ਨਹੀਂ ਹੈ।"
+
+-#: ../yum/__init__.py:1661
++#: ../yum/__init__.py:1899
+ #, python-format
+-msgid ""
+-"Header not in local cache and caching-only mode enabled. Cannot download %s"
++msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1716
++#: ../yum/__init__.py:1954
+ #, python-format
+ msgid "Public key for %s is not installed"
+ msgstr "%s ਲਈ ਪਬਲਿਕ ਕੁੰਜੀ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
+
+-#: ../yum/__init__.py:1720
++#: ../yum/__init__.py:1958
+ #, python-format
+ msgid "Problem opening package %s"
+ msgstr "ਪੈਕੇਜ %s ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਸਮੱਸਿਆ"
+
+-#: ../yum/__init__.py:1728
++#: ../yum/__init__.py:1966
+ #, python-format
+ msgid "Public key for %s is not trusted"
+ msgstr "%s ਲਈ ਪਬਲਿਕ ਕੁੰਜੀ ਭਰੋਸੇਯੋਗ ਨਹੀਂ"
+
+-#: ../yum/__init__.py:1732
++#: ../yum/__init__.py:1970
+ #, python-format
+ msgid "Package %s is not signed"
+ msgstr "ਪੈਕੇਜ %s ਸਾਈਨ ਨਹੀਂ ਕੀਤਾ"
+
+-#: ../yum/__init__.py:1770
++#: ../yum/__init__.py:2008
+ #, python-format
+ msgid "Cannot remove %s"
+ msgstr "%s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+
+-#: ../yum/__init__.py:1774
++#: ../yum/__init__.py:2012
+ #, python-format
+ msgid "%s removed"
+ msgstr "%s ਹਟਾਇਆ"
+
+-#: ../yum/__init__.py:1820
++#: ../yum/__init__.py:2058
+ #, python-format
+ msgid "Cannot remove %s file %s"
+ msgstr "%s ਫਾਇਲ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
+
+-#: ../yum/__init__.py:1824
++#: ../yum/__init__.py:2062
+ #, python-format
+ msgid "%s file %s removed"
+ msgstr "%s ਫਾਇਲ %s ਹਟਾਈ"
+
+-#: ../yum/__init__.py:1826
++#: ../yum/__init__.py:2064
+ #, python-format
+ msgid "%d %s files removed"
+ msgstr "%d %s ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਗਈਆਂ"
+
+-#: ../yum/__init__.py:1895
++#: ../yum/__init__.py:2133
+ #, python-format
+ msgid "More than one identical match in sack for %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1901
++#: ../yum/__init__.py:2139
+ #, python-format
+ msgid "Nothing matches %s.%s %s:%s-%s from update"
+ msgstr ""
+
+-#: ../yum/__init__.py:2180
+-msgid ""
+-"searchPackages() will go away in a future version of "
+-"Yum. Use searchGenerator() instead. \n"
++#: ../yum/__init__.py:2433
++msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
+ msgstr ""
+
+-#: ../yum/__init__.py:2219
++#: ../yum/__init__.py:2472
+ #, python-format
+ msgid "Searching %d packages"
+ msgstr "%d ਪੈਕੇਜਾਂ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ"
+
+-#: ../yum/__init__.py:2223
++#: ../yum/__init__.py:2476
+ #, python-format
+ msgid "searching package %s"
+ msgstr "ਪੈਕੇਜ %s ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ"
+
+-#: ../yum/__init__.py:2235
++#: ../yum/__init__.py:2488
+ msgid "searching in file entries"
+ msgstr "ਫਾਇਲ ਐਂਟਰੀਆਂ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ"
+
+-#: ../yum/__init__.py:2242
++#: ../yum/__init__.py:2495
+ msgid "searching in provides entries"
+-msgstr ""
++msgstr "ਪਰੋਵਾਇਡਰ ਐਂਟਰੀਆਂ ਵਿੱਚ ਖੋਜ ਜਾਰੀ"
+
+-#: ../yum/__init__.py:2275
++#: ../yum/__init__.py:2528
+ #, python-format
+ msgid "Provides-match: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2324
++#: ../yum/__init__.py:2577
+ msgid "No group data available for configured repositories"
+ msgstr "ਸੰਰਚਿਤ ਰਿਪੋਜ਼ਟਰੀਆਂ ਵਿੱਚ ਕੋਈ ਗਰੁੱਪ ਡਾਟਾ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+-#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405
+-#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497
+-#: ../yum/__init__.py:2814
++#: ../yum/__init__.py:2608 ../yum/__init__.py:2627 ../yum/__init__.py:2658
++#: ../yum/__init__.py:2664 ../yum/__init__.py:2746 ../yum/__init__.py:2750
++#: ../yum/__init__.py:3095
+ #, python-format
+ msgid "No Group named %s exists"
+ msgstr "%s ਨਾਂ ਦਾ ਕੋਈ ਗਰੁੱਪ ਮੌਜੂਦ ਨਹੀਂ"
+
+-#: ../yum/__init__.py:2386 ../yum/__init__.py:2513
++#: ../yum/__init__.py:2639 ../yum/__init__.py:2766
+ #, python-format
+ msgid "package %s was not marked in group %s"
+ msgstr "ਪੈਕੇਜ %s ਗਰੁੱਪ %s ਵਿੱਚ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਹੈ"
+
+-#: ../yum/__init__.py:2433
++#: ../yum/__init__.py:2686
+ #, python-format
+ msgid "Adding package %s from group %s"
+ msgstr "ਪੈਕੇਜ %s ਗਰੁੱਪ %s ਵਿੱਚੋਂ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yum/__init__.py:2437
++#: ../yum/__init__.py:2690
+ #, python-format
+ msgid "No package named %s available to be installed"
+ msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਨਾਂ ਦਾ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
+
+-#: ../yum/__init__.py:2539
++#. This can happen due to excludes after .up has
++#. happened.
++#: ../yum/__init__.py:2794
+ #, python-format
+ msgid "Package tuple %s could not be found in packagesack"
+ msgstr ""
+
+-#: ../yum/__init__.py:2558
++#: ../yum/__init__.py:2813
+ #, python-format
+ msgid "Package tuple %s could not be found in rpmdb"
+ msgstr ""
+
+-#: ../yum/__init__.py:2614 ../yum/__init__.py:2664
+-msgid "Invalid version flag"
+-msgstr ""
+-
+-#: ../yum/__init__.py:2634 ../yum/__init__.py:2639
++#: ../yum/__init__.py:2868 ../yum/__init__.py:2873
+ #, python-format
+ msgid "No Package found for %s"
+ msgstr "%s ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਲੱਭਿਆ"
+
+-#: ../yum/__init__.py:2855
++#: ../yum/__init__.py:2901
++msgid "Invalid version flag"
++msgstr "ਗਲਤ ਵਰਜਨ ਫਲੈਗ"
++
++#: ../yum/__init__.py:3145
+ msgid "Package Object was not a package object instance"
+ msgstr ""
+
+-#: ../yum/__init__.py:2859
++#: ../yum/__init__.py:3149
+ msgid "Nothing specified to install"
+ msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਕੁਝ ਨਹੀਂ ਦਿੱਤਾ"
+
+-#: ../yum/__init__.py:2875 ../yum/__init__.py:3652
++#: ../yum/__init__.py:3168 ../yum/__init__.py:3992
+ #, python-format
+ msgid "Checking for virtual provide or file-provide for %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365
+-#: ../yum/__init__.py:3658
++#: ../yum/__init__.py:3174 ../yum/__init__.py:3504 ../yum/__init__.py:3684
++#: ../yum/__init__.py:3998
+ #, python-format
+ msgid "No Match for argument: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2957
++#: ../yum/__init__.py:3250
+ #, python-format
+ msgid "Package %s installed and not available"
+ msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੈ ਤੇ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+-#: ../yum/__init__.py:2960
++#: ../yum/__init__.py:3253
+ msgid "No package(s) available to install"
+ msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+-#: ../yum/__init__.py:2972
++#: ../yum/__init__.py:3265
+ #, python-format
+ msgid "Package: %s - already in transaction set"
+-msgstr ""
++msgstr "ਪੈਕੇਜ: %s - ਪਹਿਲਾਂ ਹੀ ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ 'ਚ ਹੈ"
+
+-#: ../yum/__init__.py:2998
++#: ../yum/__init__.py:3291
+ #, python-format
+ msgid "Package %s is obsoleted by %s which is already installed"
+ msgstr "ਪੈਕੇਜ %s ਨੂੰ %s ਵਲੋਂ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ ਹੈ, ਜੋ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ"
+
+-#: ../yum/__init__.py:3001
++#: ../yum/__init__.py:3296
++#, python-format
++msgid "Package %s is obsoleted by %s, but obsoleting package does not provide for requirements"
++msgstr "%s ਪੈਕੇਜ %s ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਗਿਆ, ਪਰ ਬਦਲਿਆ ਗਿਆ ਪੈਕੇਜ ਲੋੜ ਪੂਰੀ ਨਹੀਂ ਕਰਦਾ"
++
++#: ../yum/__init__.py:3299
+ #, python-format
+ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+-msgstr ""
++msgstr "%s ਪੈਕੇਜ %s ਨਾਲ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ, %s ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yum/__init__.py:3009
++#: ../yum/__init__.py:3307
+ #, python-format
+ msgid "Package %s already installed and latest version"
+ msgstr "%s ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ ਅਤੇ ਨਵਾਂ ਵਰਜਨ ਹੈ"
+
+-#: ../yum/__init__.py:3023
++#: ../yum/__init__.py:3321
+ #, python-format
+ msgid "Package matching %s already installed. Checking for update."
+ msgstr "%s ਨਾਲ ਮਿਲਦਾ ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ। ਅੱਪਡੇਟ ਲਈ ਚੈਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+ #. update everything (the easy case)
+-#: ../yum/__init__.py:3126
++#: ../yum/__init__.py:3424
+ msgid "Updating Everything"
+ msgstr "ਹਰ ਚੀਜ਼ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289
+-#: ../yum/__init__.py:3315
++#: ../yum/__init__.py:3448 ../yum/__init__.py:3577 ../yum/__init__.py:3604
++#: ../yum/__init__.py:3630
+ #, python-format
+ msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3182 ../yum/__init__.py:3362
++#: ../yum/__init__.py:3489 ../yum/__init__.py:3680
+ #, python-format
+ msgid "%s"
+ msgstr "%s"
+
+-#: ../yum/__init__.py:3253
++#: ../yum/__init__.py:3566
+ #, python-format
+ msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+ msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਬਰਤਰਫ਼ ਕੀਤਾ: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3284
++#: ../yum/__init__.py:3599
+ #, python-format
+ msgid "Not Updating Package that is obsoleted: %s"
+-msgstr ""
++msgstr "ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ, ਜੋ ਬਰਤਰਫ਼ ਹੈ: %s"
+
+-#: ../yum/__init__.py:3293 ../yum/__init__.py:3319
++#: ../yum/__init__.py:3608 ../yum/__init__.py:3634
+ #, python-format
+ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+-msgstr ""
++msgstr "ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਇਹ ਪਹਿਲਾਂ ਹੀ ਅੱਪਡੇਟ ਹੈ: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3378
++#: ../yum/__init__.py:3697
+ msgid "No package matched to remove"
+ msgstr "ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਮਿਲਦਾ"
+
+-#: ../yum/__init__.py:3412
++#: ../yum/__init__.py:3703
++#, python-format
++msgid "Skipping the running kernel: %s"
++msgstr "ਚੱਲਦਾ ਕਰਨਲ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ: %s"
++
++#: ../yum/__init__.py:3709
++#, python-format
++msgid "Removing %s from the transaction"
++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਤੋਂ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
++
++#: ../yum/__init__.py:3744
+ #, python-format
+ msgid "Cannot open: %s. Skipping."
+-msgstr ""
++msgstr "ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s। ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹ।"
+
+-#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598
++#: ../yum/__init__.py:3747 ../yum/__init__.py:3859 ../yum/__init__.py:3935
+ #, python-format
+ msgid "Examining %s: %s"
+-msgstr ""
++msgstr "%s ਪੜਤਾਲ ਜਾਰੀ: %s"
+
+-#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601
++#: ../yum/__init__.py:3751
++#, python-format
++msgid "Cannot localinstall deltarpm: %s. Skipping."
++msgstr "deltarpm localinstall ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s। ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ।"
++
++#: ../yum/__init__.py:3760 ../yum/__init__.py:3862 ../yum/__init__.py:3938
+ #, python-format
+ msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+-msgstr ""
++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਲਈ %s ਪੈਕੇਜ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। %s: ਢਾਂਚੇ ਨਾਲ ਅਨੁਕੂਲ ਨਹੀਂ ਹੈ"
+
+-#: ../yum/__init__.py:3431
++#: ../yum/__init__.py:3766
+ #, python-format
+-msgid ""
+-"Package %s not installed, cannot update it. Run yum install to install it "
+-"instead."
++msgid "Cannot install package %s. It is obsoleted by installed package %s"
+ msgstr ""
+-"ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ, ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਇਸ ਦੀ ਬਜਾਏ ਇਸ ਨੂੰ ਇੰਸਟਾਲ "
+-"ਕਰਨ ਲਈ "
+-"yum install ਚਲਾਓ।"
+
+-#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606
++#: ../yum/__init__.py:3774
++#, python-format
++msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
++msgstr "ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ, ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਇਸ ਦੀ ਬਜਾਏ ਇਸ ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ yum install ਚਲਾਓ।"
++
++#: ../yum/__init__.py:3803 ../yum/__init__.py:3867 ../yum/__init__.py:3943
+ #, python-format
+ msgid "Excluding %s"
+ msgstr "%s ਅੱਡ ਕੀਤਾ"
+
+-#: ../yum/__init__.py:3465
++#: ../yum/__init__.py:3808
+ #, python-format
+ msgid "Marking %s to be installed"
+ msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸੈੱਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yum/__init__.py:3471
++#: ../yum/__init__.py:3814
+ #, python-format
+ msgid "Marking %s as an update to %s"
+ msgstr "%s ਨੂੰ %s ਦੇ ਲਈ ਅੱਪਡੇਟ ਵਜੋਂ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+-#: ../yum/__init__.py:3478
++#: ../yum/__init__.py:3821
+ #, python-format
+ msgid "%s: does not update installed package."
+ msgstr "%s: ਇੰਸਟਾਲ ਹੋਏ ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੇ ਜਾਂਦੇ।"
+
+-#: ../yum/__init__.py:3511 ../yum/__init__.py:3595
++#: ../yum/__init__.py:3856 ../yum/__init__.py:3932
+ #, python-format
+ msgid "Cannot open file: %s. Skipping."
+-msgstr ""
++msgstr "%s: ਫਾਇਲ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ। ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ।"
+
+-#: ../yum/__init__.py:3541
++#: ../yum/__init__.py:3886
+ msgid "Problem in reinstall: no package matched to remove"
+-msgstr ""
+-
+-#: ../yum/__init__.py:3554 ../yum/__init__.py:3686
+-#, python-format
+-msgid "Package %s is allowed multiple installs, skipping"
+-msgstr ""
++msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਸਮੱਸਿਆ: ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਮਿਲਦਾ"
+
+-#: ../yum/__init__.py:3575
++#: ../yum/__init__.py:3912
+ #, python-format
+ msgid "Problem in reinstall: no package %s matched to install"
+-msgstr ""
++msgstr "ਮੜ-ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਸਮੱਸਿਆ: ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਪੈਕੇਜ ਨਾਲ ਕੋਈ ਨਹੀਂ ਮਿਲਦਾ"
+
+-#: ../yum/__init__.py:3678
++#: ../yum/__init__.py:4018
+ msgid "No package(s) available to downgrade"
+ msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+-#: ../yum/__init__.py:3731
++#: ../yum/__init__.py:4026
++#, python-format
++msgid "Package %s is allowed multiple installs, skipping"
++msgstr "%s ਪੈਕੇਜ ਕਈ ਇੰਸਟਾਲ ਲਈ ਮਨਜ਼ੂਰ ਹੈ, ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ"
++
++#: ../yum/__init__.py:4072
+ #, python-format
+ msgid "No Match for available package: %s"
+ msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ ਲਈ ਕੋਈ ਮੇਲ ਨਹੀਂ: %s"
+
+-#: ../yum/__init__.py:3738
++#: ../yum/__init__.py:4079
+ #, python-format
+ msgid "Only Upgrade available on package: %s"
+ msgstr "%s: ਪੈਕੇਜ ਲਈ ਕੇਵਲ ਅੱਪਗਰੇਡ ਉਪਲੱਬਧ"
+
+-#: ../yum/__init__.py:3808 ../yum/__init__.py:3845
++#: ../yum/__init__.py:4149 ../yum/__init__.py:4186
+ #, python-format
+ msgid "Failed to downgrade: %s"
+ msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s"
+
+-#: ../yum/__init__.py:3877
++#: ../yum/__init__.py:4218
+ #, python-format
+ msgid "Retrieving GPG key from %s"
+-msgstr ""
++msgstr "%s ਤੋਂ GPG ਕੁੰਜੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yum/__init__.py:3897
++#: ../yum/__init__.py:4238
+ msgid "GPG key retrieval failed: "
+-msgstr ""
++msgstr "GPG ਕੁੰਜੀ ਲੈਣ ਲਈ ਫੇਲ੍ਹ: "
+
+-#: ../yum/__init__.py:3903
++#: ../yum/__init__.py:4244
+ #, python-format
+ msgid "Invalid GPG Key from %s: %s"
+-msgstr ""
++msgstr "%s ਤੋਂ ਗਲਤ GPG ਕੁੰਜੀ: %s"
+
+-#: ../yum/__init__.py:3912
++#: ../yum/__init__.py:4253
+ #, python-format
+ msgid "GPG key parsing failed: key does not have value %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3944
++#: ../yum/__init__.py:4267
+ #, python-format
+-msgid "GPG key at %s (0x%s) is already installed"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid : %s\n"
++" Package: %s (%s)\n"
++" From : %s"
+ msgstr ""
+
+-#. Try installing/updating GPG key
+-#: ../yum/__init__.py:3949 ../yum/__init__.py:4011
++#: ../yum/__init__.py:4275
+ #, python-format
+-msgid "Importing GPG key 0x%s \"%s\" from %s"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid: \"%s\"\n"
++" From : %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3966
+-msgid "Not installing key"
++#: ../yum/__init__.py:4307
++#, python-format
++msgid "GPG key at %s (0x%s) is already installed"
+ msgstr ""
+
+-#: ../yum/__init__.py:3972
++#: ../yum/__init__.py:4326
++msgid "Not installing key"
++msgstr "ਕੁੰਜੀ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
++
++#: ../yum/__init__.py:4332
+ #, python-format
+ msgid "Key import failed (code %d)"
+-msgstr ""
++msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ (ਕੋਡ %d)"
+
+-#: ../yum/__init__.py:3973 ../yum/__init__.py:4032
++#: ../yum/__init__.py:4333 ../yum/__init__.py:4389
+ msgid "Key imported successfully"
+-msgstr ""
++msgstr "ਕੁੰਜੀ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਪੋਰਟ ਕੀਤੀ ਗਈ"
+
+-#: ../yum/__init__.py:3978 ../yum/__init__.py:4037
++#: ../yum/__init__.py:4338
+ #, python-format
+ msgid ""
+-"The GPG keys listed for the \"%s\" repository are already installed but they "
+-"are not correct for this package.\n"
++"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
+ "Check that the correct key URLs are configured for this repository."
+ msgstr ""
+
+-#: ../yum/__init__.py:3987
++#: ../yum/__init__.py:4347
+ msgid "Import of key(s) didn't help, wrong key(s)?"
+ msgstr ""
+
+-#: ../yum/__init__.py:4006
++#: ../yum/__init__.py:4366
+ #, python-format
+ msgid "GPG key at %s (0x%s) is already imported"
+ msgstr ""
+
+-#: ../yum/__init__.py:4026
++#: ../yum/__init__.py:4383
+ #, python-format
+ msgid "Not installing key for repo %s"
+-msgstr ""
++msgstr "ਰਿਪੋ %s ਲਈ ਕੁੰਜੀ ਨਹੀਂ ਇੰਸਟਾਲ ਕੀਤੀ ਜਾ ਰਹੀ"
+
+-#: ../yum/__init__.py:4031
++#: ../yum/__init__.py:4388
+ msgid "Key import failed"
+ msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ ਫੇਲ੍ਹ"
+
+-#: ../yum/__init__.py:4157
+-msgid "Unable to find a suitable mirror."
++#: ../yum/__init__.py:4394
++#, python-format
++msgid ""
++"The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n"
++"Check that the correct key URLs are configured for this repository."
+ msgstr ""
+
+-#: ../yum/__init__.py:4159
++#: ../yum/__init__.py:4521
++msgid "Unable to find a suitable mirror."
++msgstr "ਢੁੱਕਵਾਂ ਮਿੱਰਰ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
++
++#: ../yum/__init__.py:4523
+ msgid "Errors were encountered while downloading packages."
+-msgstr ""
++msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀਆਂ ਆਈਆਂ ਹਨ।"
+
+-#: ../yum/__init__.py:4209
++#: ../yum/__init__.py:4573
+ #, python-format
+ msgid "Please report this error at %s"
+ msgstr "%s ਵਿੱਚ ਇਹ ਗਲਤੀ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਉ"
+
+-#: ../yum/__init__.py:4233
++#: ../yum/__init__.py:4597
+ msgid "Test Transaction Errors: "
+ msgstr "ਟੈਸਟ ਟਰਾਂਸੈਕਸ਼ਨ ਗਲਤੀਆਂ: "
+
+-#: ../yum/__init__.py:4334
++#: ../yum/__init__.py:4700
+ #, python-format
+ msgid "Could not set cachedir: %s"
+ msgstr ""
+
+ #. Mostly copied from YumOutput._outKeyValFill()
+-#: ../yum/plugins.py:202
++#: ../yum/plugins.py:208
+ msgid "Loaded plugins: "
+ msgstr "ਲੋਡ ਕੀਤੀਆਂ ਪਲੱਗਇਨ: "
+
+-#: ../yum/plugins.py:216 ../yum/plugins.py:222
++#: ../yum/plugins.py:222 ../yum/plugins.py:228
+ #, python-format
+ msgid "No plugin match for: %s"
+-msgstr ""
++msgstr "%s: ਨਾਲ ਮਿਲਦੀ ਕੋਈ ਪਲੱਗਇਨ ਨਹੀਂ ਹੈ"
+
+-#: ../yum/plugins.py:252
++#: ../yum/plugins.py:258
+ #, python-format
+ msgid "Not loading \"%s\" plugin, as it is disabled"
+-msgstr ""
++msgstr "\"%s\" ਪਲੱਗਇਨ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ, ਕਿਉਂਕਿ ਇਹ ਬੰਦ ਹੈ"
+
+ #. Give full backtrace:
+-#: ../yum/plugins.py:264
++#: ../yum/plugins.py:270
+ #, python-format
+ msgid "Plugin \"%s\" can't be imported"
+-msgstr ""
++msgstr "ਪਲੱਗਇਨ \"%s\" ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"
+
+-#: ../yum/plugins.py:271
++#: ../yum/plugins.py:277
+ #, python-format
+ msgid "Plugin \"%s\" doesn't specify required API version"
+ msgstr ""
+
+-#: ../yum/plugins.py:276
++#: ../yum/plugins.py:282
+ #, python-format
+ msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+ msgstr ""
+
+-#: ../yum/plugins.py:309
++#: ../yum/plugins.py:315
+ #, python-format
+ msgid "Loading \"%s\" plugin"
+ msgstr "\"%s\" ਪਲੱਗਇਨ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+-#: ../yum/plugins.py:316
++#: ../yum/plugins.py:322
+ #, python-format
+-msgid ""
+-"Two or more plugins with the name \"%s\" exist in the plugin search path"
++msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
+ msgstr ""
+
+-#: ../yum/plugins.py:336
++#: ../yum/plugins.py:342
+ #, python-format
+ msgid "Configuration file %s not found"
+-msgstr ""
++msgstr "ਸੰਰਚਨਾ ਫਾਇਲ %s ਨਹੀਂ ਲੱਭੀ"
+
+ #. for
+ #. Configuration files for the plugin not found
+-#: ../yum/plugins.py:339
++#: ../yum/plugins.py:345
+ #, python-format
+ msgid "Unable to find configuration file for plugin %s"
+-msgstr ""
++msgstr "ਪਲੱਗਇਨ %s ਲਈ ਸੰਰਚਨਾ ਫਾਇਲ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
+
+-#: ../yum/plugins.py:501
++#: ../yum/plugins.py:507
+ msgid "registration of commands not supported"
+-msgstr ""
++msgstr "ਕਮਾਂਡਾਂ ਲਈ ਰਜਿਸਟਰੇਸਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ"
+
+ #: ../yum/rpmsack.py:102
+ msgid "has missing requires of"
+@@ -2643,9 +2846,19 @@ msgstr ""
+ msgid "%s is a duplicate with %s"
+ msgstr "%s %s ਨਾਲ ਡੁਪਲੀਕੇਟ ਹੈ"
+
++#: ../yum/rpmsack.py:122
++#, python-format
++msgid "%s is obsoleted by %s"
++msgstr "%s ਨੂੰ %s ਨਾਲ ਬਦਲਿਆ ਜਾਂਦਾ ਹੈ"
++
++#: ../yum/rpmsack.py:130
++#, python-format
++msgid "%s provides %s but it cannot be found"
++msgstr ""
++
+ #: ../yum/rpmtrans.py:79
+ msgid "Repackaging"
+-msgstr ""
++msgstr "ਮੁੜ-ਪੈਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+ #: ../rpmUtils/oldUtils.py:33
+ #, python-format
+@@ -2659,11 +2872,11 @@ msgstr ""
+
+ #: ../rpmUtils/oldUtils.py:151
+ msgid "Could not open RPM database for reading. Perhaps it is already in use?"
+-msgstr ""
++msgstr "RPM ਡਾਟਾਬੇਸ ਪੜ੍ਹਨ ਲਈ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ। ਸ਼ਾਇਦ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ?"
+
+ #: ../rpmUtils/oldUtils.py:183
+ msgid "Got an empty Header, something has gone wrong"
+-msgstr ""
++msgstr "ਖਾਲੀ ਹੈੱਡਰ ਮਿਲਿਆ ਹੈ, ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ ਹੈ"
+
+ #: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+ #: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
+@@ -2674,5 +2887,25 @@ msgstr "ਖਰਾਬ ਹੋਇਆ ਹੈੱਡਰ %s"
+ #: ../rpmUtils/oldUtils.py:281
+ #, python-format
+ msgid "Error opening rpm %s - error %s"
+-msgstr ""
++msgstr "rpm %s ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ - ਗਲਤੀ %s"
++
++#~ msgid "Repo : %s"
++#~ msgstr "ਰਿਪੋ : %s"
++
++#~ msgid "URL : %s"
++#~ msgstr "URL : %s"
++
++#~ msgid "Description: "
++#~ msgstr "ਵੇਰਵਾ: "
++
++#~ msgid ""
++#~ "Remove %5.5s Package(s)\n"
++#~ "Reinstall %5.5s Package(s)\n"
++#~ "Downgrade %5.5s Package(s)\n"
++#~ msgstr ""
++#~ "ਹਟਾਏ %5.5s ਪੈਕੇਜ\n"
++#~ "ਮੁੜ-ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n"
++#~ "ਡਾਊਨਗਰੇਡ %5.5s ਪੈਕੇਜ\n"
+
++#~ msgid "Weird"
++#~ msgstr "ਸਮੱਸਿਆ"
+diff --git a/po/pl.po b/po/pl.po
+index b7b128c..1c5f272 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: 2010-02-11 10:54-0500\n"
+-"PO-Revision-Date: 2010-02-11 21:38+0100\n"
++"POT-Creation-Date: 2010-08-17 10:15-0400\n"
++"PO-Revision-Date: 2010-08-23 19:38+0200\n"
+ "Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
+ "Language-Team: Polish <trans-pl at lists.fedoraproject.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:947 ../yum/rpmtrans.py:72
++#: ../callback.py:48 ../output.py:1027 ../yum/rpmtrans.py:72
+ msgid "Updating"
+ msgstr "Aktualizowanie"
+
+@@ -21,26 +21,26 @@ msgstr "Aktualizowanie"
+ msgid "Erasing"
+ msgstr "Usuwanie"
+
+-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946
+-#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1026
++#: ../output.py:1919 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
+ #: ../yum/rpmtrans.py:77
+ msgid "Installing"
+ msgstr "Instalowanie"
+
+-#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76
++#: ../callback.py:52 ../callback.py:58 ../output.py:1640 ../yum/rpmtrans.py:76
+ msgid "Obsoleted"
+ msgstr "Przestarzałe"
+
+-#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491
++#: ../callback.py:54 ../output.py:1157 ../output.py:1518 ../output.py:1647
+ msgid "Updated"
+ msgstr "Zaktualizowano"
+
+-#: ../callback.py:55 ../output.py:1438
++#: ../callback.py:55 ../output.py:1517
+ msgid "Erased"
+ msgstr "Usunięto"
+
+-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068
+-#: ../output.py:1434 ../output.py:1646
++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1155
++#: ../output.py:1517 ../output.py:1519 ../output.py:1891
+ msgid "Installed"
+ msgstr "Zainstalowano"
+
+@@ -62,7 +62,7 @@ msgstr "Błąd: nieprawidłowy stan wyjścia: %s dla %s"
+ msgid "Erased: %s"
+ msgstr "Usunięto: %s"
+
+-#: ../callback.py:217 ../output.py:948 ../output.py:1648
++#: ../callback.py:217 ../output.py:1028 ../output.py:1894
+ msgid "Removing"
+ msgstr "Usuwanie"
+
+@@ -70,58 +70,58 @@ msgstr "Usuwanie"
+ msgid "Cleanup"
+ msgstr "Czyszczenie"
+
+-#: ../cli.py:107
++#: ../cli.py:108
+ #, python-format
+ msgid "Command \"%s\" already defined"
+ msgstr "Polecenie \"%s\" zostało już określone"
+
+-#: ../cli.py:119
++#: ../cli.py:120
+ msgid "Setting up repositories"
+ msgstr "Ustawianie repozytoriów"
+
+-#: ../cli.py:130
++#: ../cli.py:131
+ msgid "Reading repository metadata in from local files"
+ msgstr "Odczytywanie metadanych repozytoriów z lokalnych plików"
+
+-#: ../cli.py:194 ../utils.py:193
++#: ../cli.py:234 ../utils.py:254
+ #, python-format
+ msgid "Config Error: %s"
+ msgstr "Błąd konfiguracji: %s"
+
+-#: ../cli.py:197 ../cli.py:1272 ../utils.py:196
++#: ../cli.py:237 ../cli.py:1403 ../utils.py:257
+ #, python-format
+ msgid "Options Error: %s"
+ msgstr "Błąd opcji: %s"
+
+-#: ../cli.py:227
++#: ../cli.py:267
+ #, python-format
+ msgid " Installed: %s-%s at %s"
+ msgstr " Zainstalowane: %s-%s o %s"
+
+-#: ../cli.py:229
++#: ../cli.py:269
+ #, python-format
+ msgid " Built : %s at %s"
+ msgstr " Zbudowane : %s o %s"
+
+-#: ../cli.py:231
++#: ../cli.py:271
+ #, python-format
+ msgid " Committed: %s at %s"
+ msgstr " Wysłane: %s o %s"
+
+-#: ../cli.py:270
++#: ../cli.py:310
+ msgid "You need to give some command"
+ msgstr "Należy podać polecenie"
+
+-#: ../cli.py:284
++#: ../cli.py:324
+ #, python-format
+ msgid "No such command: %s. Please use %s --help"
+ msgstr "Nie ma takiego polecenia: %s. Proszę użyć %s --help"
+
+-#: ../cli.py:314
++#: ../cli.py:354
+ msgid "Disk Requirements:\n"
+ msgstr "Wymagane miejsce na dysku:\n"
+
+-#: ../cli.py:316
++#: ../cli.py:356
+ #, python-format
+ msgid " At least %dMB more space needed on the %s filesystem.\n"
+ msgstr ""
+@@ -129,7 +129,7 @@ msgstr ""
+
+ #. TODO: simplify the dependency errors?
+ #. Fixup the summary
+-#: ../cli.py:321
++#: ../cli.py:361
+ msgid ""
+ "Error Summary\n"
+ "-------------\n"
+@@ -137,62 +137,62 @@ msgstr ""
+ "Podsumowanie błędów\n"
+ "-------------------\n"
+
+-#: ../cli.py:364
++#: ../cli.py:404
+ msgid "Trying to run the transaction but nothing to do. Exiting."
+ msgstr ""
+ "Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie "
+ "działania."
+
+-#: ../cli.py:403
++#: ../cli.py:451
+ msgid "Exiting on user Command"
+ msgstr "Kończenie działania na polecenie użytkownika"
+
+-#: ../cli.py:407
++#: ../cli.py:455
+ msgid "Downloading Packages:"
+ msgstr "Pobieranie pakietów:"
+
+-#: ../cli.py:412
++#: ../cli.py:460
+ msgid "Error Downloading Packages:\n"
+ msgstr "Błąd podczas pobierania pakietów:\n"
+
+-#: ../cli.py:426 ../yum/__init__.py:4195
++#: ../cli.py:474 ../yum/__init__.py:4559
+ msgid "Running rpm_check_debug"
+ msgstr "Wykonywanie rpm_check_debug"
+
+-#: ../cli.py:435 ../yum/__init__.py:4204
++#: ../cli.py:483 ../yum/__init__.py:4568
+ msgid "ERROR You need to update rpm to handle:"
+ msgstr "BŁĄD należy zaktualizować pakiet RPM, aby obsłużyć:"
+
+-#: ../cli.py:437 ../yum/__init__.py:4207
++#: ../cli.py:485 ../yum/__init__.py:4571
+ msgid "ERROR with rpm_check_debug vs depsolve:"
+ msgstr "BŁĄD rpm_check_debug i rozwiązywania zależności:"
+
+-#: ../cli.py:443
++#: ../cli.py:491
+ msgid "RPM needs to be updated"
+ msgstr "Pakiet RPM musi zostać zaktualizowany"
+
+-#: ../cli.py:444
++#: ../cli.py:492
+ #, python-format
+ msgid "Please report this error in %s"
+ msgstr "Proszę zgłosić ten błąd na %s"
+
+-#: ../cli.py:450
++#: ../cli.py:498
+ msgid "Running Transaction Test"
+ msgstr "Wykonywanie testu transakcji"
+
+-#: ../cli.py:466
++#: ../cli.py:514
+ msgid "Transaction Check Error:\n"
+ msgstr "Błąd podczas sprawdzania transakcji:\n"
+
+-#: ../cli.py:473
++#: ../cli.py:521
+ msgid "Transaction Test Succeeded"
+ msgstr "Test transakcji został ukończony powodzeniem"
+
+-#: ../cli.py:495
++#: ../cli.py:543
+ msgid "Running Transaction"
+ msgstr "Wykonywanie transakcji"
+
+-#: ../cli.py:525
++#: ../cli.py:573
+ msgid ""
+ "Refusing to automatically import keys when running unattended.\n"
+ "Use \"-y\" to override."
+@@ -201,84 +201,93 @@ msgstr ""
+ "uruchomienia.\n"
+ "Należy użyć \"-y\", aby wymusić."
+
+-#: ../cli.py:544 ../cli.py:578
++#: ../cli.py:592 ../cli.py:626
+ msgid " * Maybe you meant: "
+ msgstr " * Czy chodziło o: "
+
+-#: ../cli.py:561 ../cli.py:569
++#: ../cli.py:609 ../cli.py:617
+ #, 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:575 ../cli.py:607 ../cli.py:687
++#: ../cli.py:623 ../cli.py:656 ../cli.py:810
+ #, python-format
+ msgid "No package %s%s%s available."
+ msgstr "Nie ma pakietu %s%s%s."
+
+-#: ../cli.py:612 ../cli.py:748
++#: ../cli.py:663 ../cli.py:875
+ msgid "Package(s) to install"
+ msgstr "Pakiety do zainstalowania"
+
+-#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749
+-#: ../yumcommands.py:160
++#: ../cli.py:666 ../cli.py:667 ../cli.py:816 ../cli.py:850 ../cli.py:876
++#: ../yumcommands.py:179
+ msgid "Nothing to do"
+ msgstr "Nie ma niczego do zrobienia"
+
+-#: ../cli.py:647
++#: ../cli.py:701
+ #, python-format
+ msgid "%d packages marked for Update"
+ msgstr "%d pakietów oznaczonych do aktualizacji"
+
+-#: ../cli.py:650
++#: ../cli.py:704
+ msgid "No Packages marked for Update"
+ msgstr "Brak pakietów oznaczonych do aktualizacji"
+
+-#: ../cli.py:664
++#: ../cli.py:770
++#, python-format
++msgid "%d packages marked for Distribution Synchronization"
++msgstr "%d pakietów oznaczonych do synchronizacji dystrybucji"
++
++#: ../cli.py:773
++msgid "No Packages marked for Distribution Synchronization"
++msgstr "Brak pakietów oznaczonych do synchronizacji dystrybucji"
++
++#: ../cli.py:787
+ #, python-format
+ msgid "%d packages marked for removal"
+ msgstr "%d pakietów oznaczonych do usunięcia"
+
+-#: ../cli.py:667
++#: ../cli.py:790
+ msgid "No Packages marked for removal"
+ msgstr "Brak pakietów oznaczonych do usunięcia"
+
+-#: ../cli.py:692
++#: ../cli.py:815
+ msgid "Package(s) to downgrade"
+ msgstr "Pakiety do instalacji poprzedniej wersji"
+
+-#: ../cli.py:717
++#: ../cli.py:840
+ #, python-format
+ msgid " (from %s)"
+ msgstr " (z %s)"
+
+-#: ../cli.py:719
++#: ../cli.py:841
+ #, python-format
+ msgid "Installed package %s%s%s%s not available."
+ msgstr "Zainstalowany pakiet %s%s%s%s jest niedostępny."
+
+-#: ../cli.py:726
++#: ../cli.py:849
+ msgid "Package(s) to reinstall"
+ msgstr "Pakiety do ponownego zainstalowania"
+
+-#: ../cli.py:739
++#: ../cli.py:862
+ msgid "No Packages Provided"
+ msgstr "Nie podano pakietów"
+
+-#: ../cli.py:818
++#: ../cli.py:945
+ #, python-format
+ msgid "Matched: %s"
+ msgstr "Pasujące: %s"
+
+-#: ../cli.py:825
++#: ../cli.py:952
+ #, python-format
+ msgid "Warning: No matches found for: %s"
+ msgstr "Ostrzeżenie: nie odnaleziono wyników dla: %s"
+
+-#: ../cli.py:828
++#: ../cli.py:955
+ msgid "No Matches found"
+ msgstr "Brak wyników"
+
+-#: ../cli.py:868
++#: ../cli.py:995
+ #, python-format
+ msgid ""
+ "Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+@@ -287,112 +296,116 @@ msgstr ""
+ "Ostrzeżenie: wersje 3.0.x programu yum błędnie dopasowują nazwy plików.\n"
+ " Można użyć \"%s*/%s%s\" i/lub \"%s*bin/%s%s\", aby uzyskać to zachowanie"
+
+-#: ../cli.py:884
++#: ../cli.py:1011
+ #, python-format
+ msgid "No Package Found for %s"
+ msgstr "Nie odnaleziono pakietów dla %s"
+
+-#: ../cli.py:896
++#: ../cli.py:1021
++msgid "Cleaning repos: "
++msgstr "Czyszczenie repozytoriów: "
++
++#: ../cli.py:1026
+ msgid "Cleaning up Everything"
+ msgstr "Czyszczenie wszystkiego"
+
+-#: ../cli.py:912
++#: ../cli.py:1042
+ msgid "Cleaning up Headers"
+ msgstr "Czyszczenie nagłówków"
+
+-#: ../cli.py:915
++#: ../cli.py:1045
+ msgid "Cleaning up Packages"
+ msgstr "Czyszczenie pakietów"
+
+-#: ../cli.py:918
++#: ../cli.py:1048
+ msgid "Cleaning up xml metadata"
+ msgstr "Czytanie metadanych XML"
+
+-#: ../cli.py:921
++#: ../cli.py:1051
+ msgid "Cleaning up database cache"
+ msgstr "Czyszczenie bazy danych w pamięci podręcznej"
+
+-#: ../cli.py:924
++#: ../cli.py:1054
+ msgid "Cleaning up expire-cache metadata"
+ msgstr "Czyszczenie metadanych wygasłej pamięci podręcznej"
+
+-#: ../cli.py:927
++#: ../cli.py:1057
+ msgid "Cleaning up cached rpmdb data"
+ msgstr "Czyszczenie bazy danych RPM w pamięci podręcznej"
+
+-#: ../cli.py:930
++#: ../cli.py:1060
+ msgid "Cleaning up plugins"
+ msgstr "Czyszczenie wtyczek"
+
+-#: ../cli.py:955
++#: ../cli.py:1085
+ msgid "Installed Groups:"
+ msgstr "Zainstalowane grupy:"
+
+-#: ../cli.py:967
++#: ../cli.py:1097
+ msgid "Available Groups:"
+ msgstr "Dostępne grupy:"
+
+-#: ../cli.py:977
++#: ../cli.py:1107
+ msgid "Done"
+ msgstr "Ukończono"
+
+-#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788
++#: ../cli.py:1118 ../cli.py:1136 ../cli.py:1142 ../yum/__init__.py:3069
+ #, python-format
+ msgid "Warning: Group %s does not exist."
+ msgstr "Ostrzeżenie: grupa %s nie istnieje."
+
+-#: ../cli.py:1016
++#: ../cli.py:1146
+ 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:1018
++#: ../cli.py:1148
+ #, python-format
+ msgid "%d Package(s) to Install"
+ msgstr "%d pakietów do instalacji"
+
+-#: ../cli.py:1028 ../yum/__init__.py:2800
++#: ../cli.py:1158 ../yum/__init__.py:3081
+ #, python-format
+ msgid "No group named %s exists"
+ msgstr "Grupa o nazwie %s nie istnieje"
+
+-#: ../cli.py:1034
++#: ../cli.py:1164
+ msgid "No packages to remove from groups"
+ msgstr "Brak pakietów do usunięcia z grup"
+
+-#: ../cli.py:1036
++#: ../cli.py:1166
+ #, python-format
+ msgid "%d Package(s) to remove"
+ msgstr "%d pakietów do usunięcia"
+
+-#: ../cli.py:1078
++#: ../cli.py:1208
+ #, python-format
+ msgid "Package %s is already installed, skipping"
+ msgstr "Pakiet %s jest już zainstalowany, pomijanie"
+
+-#: ../cli.py:1089
++#: ../cli.py:1219
+ #, 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:1115
++#: ../cli.py:1245
+ #, 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:1135
++#: ../cli.py:1265
+ msgid "Plugin Options"
+ msgstr "Opcje wtyczki"
+
+-#: ../cli.py:1143
++#: ../cli.py:1273
+ #, python-format
+ msgid "Command line error: %s"
+ msgstr "Błąd wiersza poleceń: %s"
+
+-#: ../cli.py:1156
++#: ../cli.py:1287
+ #, python-format
+ msgid ""
+ "\n"
+@@ -403,116 +416,120 @@ msgstr ""
+ "\n"
+ "%s: opcja %s wymaga parametru"
+
+-#: ../cli.py:1209
++#: ../cli.py:1340
+ msgid "--color takes one of: auto, always, never"
+ msgstr "--color przyjmuje jedną z: auto, always, never"
+
+-#: ../cli.py:1319
++#: ../cli.py:1450
+ msgid "show this help message and exit"
+ msgstr "wyświetla ten komunikat pomocy i kończy pracę"
+
+-#: ../cli.py:1323
++#: ../cli.py:1454
+ msgid "be tolerant of errors"
+ msgstr "toleruje błędy"
+
+-#: ../cli.py:1326
++#: ../cli.py:1457
+ msgid "run entirely from system cache, don't update cache"
+ msgstr "uruchamia wyłącznie z pamięci podręcznej systemu i nie aktualizuje jej"
+
+-#: ../cli.py:1329
++#: ../cli.py:1460
+ msgid "config file location"
+ msgstr "położenie pliku konfiguracji"
+
+-#: ../cli.py:1332
++#: ../cli.py:1463
+ msgid "maximum command wait time"
+ msgstr "maksymalny czas oczekiwania na polecenie"
+
+-#: ../cli.py:1334
++#: ../cli.py:1465
+ msgid "debugging output level"
+ msgstr "poziom wyjścia debugowania"
+
+-#: ../cli.py:1338
++#: ../cli.py:1469
+ msgid "show duplicates, in repos, in list/search commands"
+ msgstr "wyświetla duplikaty w repozytoriach w poleceniach list/search"
+
+-#: ../cli.py:1340
++#: ../cli.py:1471
+ msgid "error output level"
+ msgstr "poziom wyjścia błędów"
+
+-#: ../cli.py:1343
++#: ../cli.py:1474
+ msgid "debugging output level for rpm"
+ msgstr "poziom wyjścia debugowania dla programu RPM"
+
+-#: ../cli.py:1346
++#: ../cli.py:1477
+ msgid "quiet operation"
+ msgstr "mało komunikatów"
+
+-#: ../cli.py:1348
++#: ../cli.py:1479
+ msgid "verbose operation"
+ msgstr "dużo komunikatów"
+
+-#: ../cli.py:1350
++#: ../cli.py:1481
+ msgid "answer yes for all questions"
+ msgstr "odpowiada tak na wszystkie pytania"
+
+-#: ../cli.py:1352
++#: ../cli.py:1483
+ msgid "show Yum version and exit"
+ msgstr "wyświetla wersję programu yum i kończy pracę"
+
+-#: ../cli.py:1353
++#: ../cli.py:1484
+ msgid "set install root"
+ msgstr "ustawia roota instalacji"
+
+-#: ../cli.py:1357
++#: ../cli.py:1488
+ msgid "enable one or more repositories (wildcards allowed)"
+ msgstr "włącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)"
+
+-#: ../cli.py:1361
++#: ../cli.py:1492
+ msgid "disable one or more repositories (wildcards allowed)"
+ msgstr "wyłącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)"
+
+-#: ../cli.py:1364
++#: ../cli.py:1495
+ msgid "exclude package(s) by name or glob"
+ msgstr "wyklucza pakiety po nazwie lub wyrażeniu regularnym"
+
+-#: ../cli.py:1366
++#: ../cli.py:1497
+ msgid "disable exclude from main, for a repo or for everything"
+ msgstr "wyłącza wykluczanie z głównego, dla repozytorium lub wszystkiego"
+
+-#: ../cli.py:1369
++#: ../cli.py:1500
+ msgid "enable obsoletes processing during updates"
+ msgstr "włącza przetwarzanie przestarzałych pakietów podczas aktualizacji"
+
+-#: ../cli.py:1371
++#: ../cli.py:1502
+ msgid "disable Yum plugins"
+ msgstr "wyłącza wtyczki programu yum"
+
+-#: ../cli.py:1373
++#: ../cli.py:1504
+ msgid "disable gpg signature checking"
+ msgstr "wyłącza sprawdzanie podpisu GPG"
+
+-#: ../cli.py:1375
++#: ../cli.py:1506
+ msgid "disable plugins by name"
+ msgstr "wyłącza wtyczki po nazwie"
+
+-#: ../cli.py:1378
++#: ../cli.py:1509
+ msgid "enable plugins by name"
+ msgstr "włącza wtyczki po nazwie"
+
+-#: ../cli.py:1381
++#: ../cli.py:1512
+ msgid "skip packages with depsolving problems"
+ msgstr "pomija pakiety mające problemy z rozwiązaniem zależności"
+
+-#: ../cli.py:1383
++#: ../cli.py:1514
+ msgid "control whether color is used"
+ msgstr "kontroluje użycie kolorów"
+
+-#: ../cli.py:1385
++#: ../cli.py:1516
+ msgid "set value of $releasever in yum config and repo files"
+ msgstr ""
+ "ustawia wartość zmiennej $releasever w konfiguracji programu yum i plikach "
+ "repozytoriów"
+
++#: ../cli.py:1518
++msgid "set arbitrary config and repo options"
++msgstr "ustawia bezwzględne opcje konfiguracji i repozytoriów"
++
+ #: ../output.py:305
+ msgid "Jan"
+ msgstr "sty"
+@@ -565,104 +582,114 @@ msgstr "gru"
+ msgid "Trying other mirror."
+ msgstr "Próbowanie innego serwera lustrzanego."
+
+-#: ../output.py:534
++#: ../output.py:579
+ #, python-format
+-msgid "Name : %s%s%s"
++msgid "Name : %s%s%s"
+ msgstr "Nazwa : %s%s%s"
+
+-#: ../output.py:535
++#: ../output.py:580
+ #, python-format
+-msgid "Arch : %s"
++msgid "Arch : %s"
+ msgstr "Architektura : %s"
+
+-#: ../output.py:537
++#: ../output.py:582
+ #, python-format
+-msgid "Epoch : %s"
++msgid "Epoch : %s"
+ msgstr "Epoka : %s"
+
+-#: ../output.py:538
++#: ../output.py:583
+ #, python-format
+-msgid "Version : %s"
++msgid "Version : %s"
+ msgstr "Wersja : %s"
+
+-#: ../output.py:539
++#: ../output.py:584
+ #, python-format
+-msgid "Release : %s"
++msgid "Release : %s"
+ msgstr "Wydanie : %s"
+
+-#: ../output.py:540
++#: ../output.py:585
+ #, python-format
+-msgid "Size : %s"
++msgid "Size : %s"
+ msgstr "Rozmiar : %s"
+
+-#: ../output.py:541
++#: ../output.py:586 ../output.py:890
+ #, python-format
+-msgid "Repo : %s"
++msgid "Repo : %s"
+ msgstr "Repozytorium : %s"
+
+-#: ../output.py:543
++#: ../output.py:588
+ #, python-format
+-msgid "From repo : %s"
++msgid "From repo : %s"
+ msgstr "Z repozytorium : %s"
+
+-#: ../output.py:545
++#: ../output.py:590
+ #, python-format
+-msgid "Committer : %s"
++msgid "Committer : %s"
+ msgstr "Twórca : %s"
+
+-#: ../output.py:546
++#: ../output.py:591
+ #, python-format
+-msgid "Committime : %s"
++msgid "Committime : %s"
+ msgstr "Czas wysłania : %s"
+
+-#: ../output.py:547
++#: ../output.py:592
+ #, python-format
+-msgid "Buildtime : %s"
++msgid "Buildtime : %s"
+ msgstr "Czas zbudowania : %s"
+
+-#: ../output.py:549
++#: ../output.py:594
+ #, python-format
+-msgid "Installtime: %s"
++msgid "Install time: %s"
+ msgstr "Czas zainstalowania: %s"
+
+-#: ../output.py:550
+-msgid "Summary : "
++#: ../output.py:602
++#, python-format
++msgid "Installed by: %s"
++msgstr "Zainstalowane przez: %s"
++
++#: ../output.py:609
++#, python-format
++msgid "Changed by : %s"
++msgstr "Zmienione przez : %s"
++
++#: ../output.py:610
++msgid "Summary : "
+ msgstr "Podsumowanie : "
+
+-#: ../output.py:552
++#: ../output.py:612 ../output.py:903
+ #, python-format
+-msgid "URL : %s"
++msgid "URL : %s"
+ msgstr "Adres URL : %s"
+
+-#: ../output.py:553
+-msgid "License : "
++#: ../output.py:613
++msgid "License : "
+ msgstr "Licencja : "
+
+-#: ../output.py:554
+-msgid "Description: "
++#: ../output.py:614 ../output.py:900
++msgid "Description : "
+ msgstr "Opis : "
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "y"
+ msgstr "t"
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "yes"
+ msgstr "tak"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "n"
+ msgstr "n"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "no"
+ msgstr "nie"
+
+-#: ../output.py:627
++#: ../output.py:687
+ msgid "Is this ok [y/N]: "
+ msgstr "W porządku? [t/N]: "
+
+-#: ../output.py:715
++#: ../output.py:775
+ #, python-format
+ msgid ""
+ "\n"
+@@ -671,151 +698,141 @@ msgstr ""
+ "\n"
+ "Grupa: %s"
+
+-#: ../output.py:719
++#: ../output.py:779
+ #, python-format
+ msgid " Group-Id: %s"
+ msgstr " Identyfikator grupy: %s"
+
+-#: ../output.py:724
++#: ../output.py:784
+ #, python-format
+ msgid " Description: %s"
+ msgstr " Opis: %s"
+
+-#: ../output.py:726
++#: ../output.py:786
+ msgid " Mandatory Packages:"
+ msgstr " Pakiety obowiązkowe:"
+
+-#: ../output.py:727
++#: ../output.py:787
+ msgid " Default Packages:"
+ msgstr " Domyślne pakiety:"
+
+-#: ../output.py:728
++#: ../output.py:788
+ msgid " Optional Packages:"
+ msgstr " Pakiety opcjonalne:"
+
+-#: ../output.py:729
++#: ../output.py:789
+ msgid " Conditional Packages:"
+ msgstr " Pakiety warunkowe:"
+
+-#: ../output.py:749
++#: ../output.py:809
+ #, python-format
+ msgid "package: %s"
+ msgstr "pakiet: %s"
+
+-#: ../output.py:751
++#: ../output.py:811
+ msgid " No dependencies for this package"
+ msgstr " Brak zależności dla tego pakietu"
+
+-#: ../output.py:756
++#: ../output.py:816
+ #, python-format
+ msgid " dependency: %s"
+ msgstr " zależność: %s"
+
+-#: ../output.py:758
++#: ../output.py:818
+ msgid " Unsatisfied dependency"
+ msgstr " Nierozwiązana zależność"
+
+-#: ../output.py:830
+-#, python-format
+-msgid "Repo : %s"
+-msgstr "Repozytorium: %s"
+-
+-#: ../output.py:831
++#: ../output.py:891
+ msgid "Matched from:"
+ msgstr "Dopasowano z:"
+
+-#: ../output.py:840
+-msgid "Description : "
+-msgstr "Opis : "
+-
+-#: ../output.py:843
+-#, python-format
+-msgid "URL : %s"
+-msgstr "Adres URL : %s"
+-
+-#: ../output.py:846
++#: ../output.py:906
+ #, python-format
+ msgid "License : %s"
+ msgstr "Licencja : %s"
+
+-#: ../output.py:849
++#: ../output.py:909
+ #, python-format
+ msgid "Filename : %s"
+ msgstr "Nazwa pliku : %s"
+
+-#: ../output.py:853
++#: ../output.py:913
+ msgid "Other : "
+ msgstr "Inne : "
+
+-#: ../output.py:896
++#: ../output.py:956
+ msgid "There was an error calculating total download size"
+ msgstr "Wystąpił błąd podczas obliczania całkowitego rozmiaru pobierania"
+
+-#: ../output.py:901
++#: ../output.py:961
+ #, python-format
+ msgid "Total size: %s"
+ msgstr "Całkowity rozmiar: %s"
+
+-#: ../output.py:904
++#: ../output.py:964
+ #, python-format
+ msgid "Total download size: %s"
+ msgstr "Całkowity rozmiar pobierania: %s"
+
+-#: ../output.py:908
++#: ../output.py:968 ../output.py:988
+ #, python-format
+ msgid "Installed size: %s"
+ msgstr "Rozmiar po zainstalowaniu: %s"
+
+-#: ../output.py:949
++#: ../output.py:984
++msgid "There was an error calculating installed size"
++msgstr "Wystąpił błąd podczas obliczania rozmiaru po zainstalowaniu"
++
++#: ../output.py:1029
+ msgid "Reinstalling"
+ msgstr "Ponowne instalowanie"
+
+-#: ../output.py:950
++#: ../output.py:1030
+ msgid "Downgrading"
+ msgstr "Instalowanie poprzedniej wersji"
+
+-#: ../output.py:951
++#: ../output.py:1031
+ msgid "Installing for dependencies"
+ msgstr "Instalowanie, aby rozwiązać zależności"
+
+-#: ../output.py:952
++#: ../output.py:1032
+ msgid "Updating for dependencies"
+ msgstr "Aktualizowanie, aby rozwiązać zależności"
+
+-#: ../output.py:953
++#: ../output.py:1033
+ msgid "Removing for dependencies"
+ msgstr "Usuwanie, aby rozwiązać zależności"
+
+-#: ../output.py:960 ../output.py:1072
++#: ../output.py:1040 ../output.py:1159
+ msgid "Skipped (dependency problems)"
+ msgstr "Pominięto (problemy z zależnościami)"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Package"
+ msgstr "Pakiet"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Arch"
+ msgstr "Architektura"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Version"
+ msgstr "Wersja"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Repository"
+ msgstr "Repozytorium"
+
+-#: ../output.py:985
++#: ../output.py:1065
+ msgid "Size"
+ msgstr "Rozmiar"
+
+-#: ../output.py:997
++#: ../output.py:1077
+ #, python-format
+ msgid " replacing %s%s%s.%s %s\n"
+ msgstr " zastępuje %s%s%s.%s %s\n"
+
+-#: ../output.py:1006
++#: ../output.py:1086
+ #, python-format
+ msgid ""
+ "\n"
+@@ -826,52 +843,57 @@ msgstr ""
+ "Podsumowanie transakcji\n"
+ "%s\n"
+
+-#: ../output.py:1013
++#: ../output.py:1097
+ #, python-format
+-msgid ""
+-"Install %5.5s Package(s)\n"
+-"Upgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Instalacja %5.5s pakiet(y)\n"
+-"Aktualizacja %5.5s pakiet(y)\n"
++msgid "Install %5.5s Package(s)\n"
++msgstr "Instalacja %5.5s pakiet(y)\n"
+
+-#: ../output.py:1022
++#: ../output.py:1101
+ #, python-format
+-msgid ""
+-"Remove %5.5s Package(s)\n"
+-"Reinstall %5.5s Package(s)\n"
+-"Downgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Usunięcie %5.5s pakiet(y)\n"
+-"Ponowna instalacja %5.5s pakiet(y)\n"
+-"Instalacja poprzedniej wersji %5.5s pakiet(y)\n"
++msgid "Upgrade %5.5s Package(s)\n"
++msgstr "Aktualizacja %5.5s pakiet(y)\n"
+
+-#: ../output.py:1066
++#: ../output.py:1105
++#, python-format
++msgid "Remove %5.5s Package(s)\n"
++msgstr "Usunięcie %5.5s pakiet(y)\n"
++
++#: ../output.py:1109
++#, python-format
++msgid "Reinstall %5.5s Package(s)\n"
++msgstr "Ponowna instalacja %5.5s pakiet(y)\n"
++
++#: ../output.py:1113
++#, python-format
++msgid "Downgrade %5.5s Package(s)\n"
++msgstr "Instalacja poprzedniej wersji %5.5s pakiet(y)\n"
++
++#: ../output.py:1153
+ msgid "Removed"
+ msgstr "Usunięto"
+
+-#: ../output.py:1067
++#: ../output.py:1154
+ msgid "Dependency Removed"
+ msgstr "Usunięto zależność"
+
+-#: ../output.py:1069
++#: ../output.py:1156
+ msgid "Dependency Installed"
+ msgstr "Zainstalowano zależność"
+
+-#: ../output.py:1071
++#: ../output.py:1158
+ msgid "Dependency Updated"
+ msgstr "Zaktualizowano zależność"
+
+-#: ../output.py:1073
++#: ../output.py:1160
+ msgid "Replaced"
+ msgstr "Zastąpiono"
+
+-#: ../output.py:1074
++#: ../output.py:1161
+ msgid "Failed"
+ msgstr "Nie powiodło się"
+
+ #. Delta between C-c's so we treat as exit
+-#: ../output.py:1140
++#: ../output.py:1245
+ msgid "two"
+ msgstr "dwóch"
+
+@@ -879,7 +901,7 @@ msgstr "dwóch"
+ #. Current download cancelled, interrupt (ctrl-c) again within two seconds
+ #. to exit.
+ #. Where "interupt (ctrl-c) again" and "two" are highlighted.
+-#: ../output.py:1151
++#: ../output.py:1256
+ #, python-format
+ msgid ""
+ "\n"
+@@ -891,270 +913,328 @@ msgstr ""
+ " Obecne pobieranie zostało anulowane, należy %sprzerwać (Ctrl-C) ponownie%s "
+ "w ciągu %s%s%s sekund, aby zakończyć pracę.\n"
+
+-#: ../output.py:1162
++#: ../output.py:1267
+ msgid "user interrupt"
+ msgstr "przerwane przez użytkownika"
+
+-#: ../output.py:1180
++#: ../output.py:1285
+ msgid "Total"
+ msgstr "Razem"
+
+-#: ../output.py:1202
++#: ../output.py:1307
+ msgid "I"
+ msgstr "I"
+
+-#: ../output.py:1203
++#: ../output.py:1308
+ msgid "O"
+ msgstr "O"
+
+-#: ../output.py:1204
++#: ../output.py:1309
+ msgid "E"
+ msgstr "E"
+
+-#: ../output.py:1205
++#: ../output.py:1310
+ msgid "R"
+ msgstr "R"
+
+-#: ../output.py:1206
++#: ../output.py:1311
+ msgid "D"
+ msgstr "D"
+
+-#: ../output.py:1207
++#: ../output.py:1312
+ msgid "U"
+ msgstr "U"
+
+-#: ../output.py:1217
++#: ../output.py:1323
+ msgid "<unset>"
+ msgstr "<nie ustawiono>"
+
+-#: ../output.py:1218
++#: ../output.py:1324
+ msgid "System"
+ msgstr "System"
+
+-#: ../output.py:1254
++#: ../output.py:1368
+ msgid "Bad transaction IDs, or package(s), given"
+ msgstr "Podano błędne identyfikatory transakcji lub pakietów"
+
+-#: ../output.py:1266
++#: ../output.py:1380
+ msgid "ID"
+ msgstr "Identyfikator"
+
+-#: ../output.py:1267 ../output.py:1520
++#: ../output.py:1381 ../output.py:1699
+ msgid "Login user"
+ msgstr "Zalogowany użytkownik"
+
+-#: ../output.py:1268
++#: ../output.py:1382
+ msgid "Date and time"
+ msgstr "Data i czas"
+
+-#: ../output.py:1269 ../output.py:1522
++#: ../output.py:1383 ../output.py:1701
+ msgid "Action(s)"
+ msgstr "Czynności"
+
+-#: ../output.py:1270 ../output.py:1523
++#: ../output.py:1384 ../output.py:1702
+ msgid "Altered"
+ msgstr "Zmieniono"
+
+-#: ../output.py:1310
++#: ../output.py:1431 ../output.py:1760
+ msgid "No transaction ID given"
+ msgstr "Nie podano identyfikatora transakcji"
+
+-#: ../output.py:1336
++#: ../output.py:1457
+ msgid "Bad transaction ID given"
+ msgstr "Podano błędny identyfikator transakcji"
+
+-#: ../output.py:1341
++#: ../output.py:1462
+ msgid "Not found given transaction ID"
+ msgstr "Nie odnaleziono podanego identyfikatora transakcji"
+
+-#: ../output.py:1349
++#: ../output.py:1470
+ msgid "Found more than one transaction ID!"
+ msgstr "Odnaleziono więcej niż jeden identyfikator transakcji."
+
+-#: ../output.py:1370
++#: ../output.py:1491 ../output.py:1770
+ msgid "No transaction ID, or package, given"
+ msgstr "Podano błędny identyfikator transakcji lub pakietu"
+
+-#: ../output.py:1396
++#: ../output.py:1518 ../output.py:1645
++msgid "Downgraded"
++msgstr "Zainstalowano poprzednią wersję"
++
++#: ../output.py:1519
++msgid "Not installed"
++msgstr "Nie zainstalowano"
++
++#: ../output.py:1520
++msgid "Older"
++msgstr "Starsze"
++
++#: ../output.py:1520
++msgid "Newer"
++msgstr "Nowsze"
++
++#: ../output.py:1552
+ msgid "Transaction ID :"
+ msgstr "Identyfikator transakcji :"
+
+-#: ../output.py:1398
++#: ../output.py:1554
+ msgid "Begin time :"
+ msgstr "Czas rozpoczęcia :"
+
+-#: ../output.py:1401 ../output.py:1403
++#: ../output.py:1557 ../output.py:1559
+ msgid "Begin rpmdb :"
+ msgstr "Rozpoczęcie bazy danych RPM:"
+
+-#: ../output.py:1417
++#: ../output.py:1573
+ #, python-format
+ msgid "(%s seconds)"
+ msgstr "%s sekundy)"
+
+-#: ../output.py:1418
++#: ../output.py:1574
+ msgid "End time :"
+ msgstr "Czas ukończenia :"
+
+-#: ../output.py:1421 ../output.py:1423
++#: ../output.py:1577 ../output.py:1579
+ msgid "End rpmdb :"
+ msgstr "Ukończenie bazy danych RPM :"
+
+-#: ../output.py:1424
++#: ../output.py:1580
+ msgid "User :"
+ msgstr "Użytkownik :"
+
+-#: ../output.py:1426 ../output.py:1428 ../output.py:1430
++#: ../output.py:1582 ../output.py:1584 ../output.py:1586
+ msgid "Return-Code :"
+ msgstr "Kod zwrotny :"
+
+-#: ../output.py:1426
++#: ../output.py:1582
+ msgid "Aborted"
+ msgstr "Przerwano"
+
+-#: ../output.py:1428
++#: ../output.py:1584
+ msgid "Failure:"
+ msgstr "Niepowodzenie:"
+
+-#: ../output.py:1430
++#: ../output.py:1586
+ msgid "Success"
+ msgstr "Powodzenie"
+
+-#: ../output.py:1431
+-msgid "Transaction performed with:"
+-msgstr "Wykonano transakcję za pomocą:"
++#: ../output.py:1589
++msgid "Command Line :"
++msgstr "Wiersz poleceń :"
+
+-#: ../output.py:1444 ../output.py:1489
+-msgid "Downgraded"
+-msgstr "Zainstalowano poprzednią wersję"
++#: ../output.py:1597
++#, python-format
++msgid "Additional non-default information stored: %d"
++msgstr "Przechowano dodatkowe niedomyślne informacje: %d"
+
+-#. multiple versions installed, both older and newer
+-#: ../output.py:1446
+-msgid "Weird"
+-msgstr "Dziwne"
++#: ../output.py:1600
++msgid "Transaction performed with:"
++msgstr "Wykonano transakcję za pomocą:"
+
+-#: ../output.py:1448
++#: ../output.py:1603
+ msgid "Packages Altered:"
+ msgstr "Zmienione pakiety:"
+
+-#: ../output.py:1451
++#: ../output.py:1607
++msgid "Packages Skipped:"
++msgstr "Pominięte pakiety:"
++
++#: ../output.py:1612
++msgid "Rpmdb Problems:"
++msgstr "Problemy bazy danych RPM:"
++
++#: ../output.py:1620
+ msgid "Scriptlet output:"
+ msgstr "Wyjście skryptu:"
+
+-#: ../output.py:1457
++#: ../output.py:1626
+ msgid "Errors:"
+ msgstr "Błędy:"
+
+-#: ../output.py:1481 ../output.py:1482
++#. Note that these don't use _simple_pkg() because we are showing what
++#. happened to them in the transaction ... not the difference between the
++#. version in the transaction and now.
++#: ../output.py:1637 ../output.py:1638
+ msgid "Install"
+ msgstr "Instalacja"
+
+-#: ../output.py:1483
++#: ../output.py:1639
+ msgid "Dep-Install"
+ msgstr "Instalacja zależności"
+
+-#: ../output.py:1485
++#: ../output.py:1641
+ msgid "Obsoleting"
+ msgstr "Zastępowanie"
+
+-#: ../output.py:1486
++#: ../output.py:1642
+ msgid "Erase"
+ msgstr "Usunięcie"
+
+-#: ../output.py:1487
++#: ../output.py:1643
+ msgid "Reinstall"
+ msgstr "Ponowna instalacja"
+
+-#: ../output.py:1488
++#: ../output.py:1644
+ msgid "Downgrade"
+ msgstr "Instalacja poprzedniej wersji"
+
+-#: ../output.py:1490
++#: ../output.py:1646
+ msgid "Update"
+ msgstr "Aktualizacja"
+
+-#: ../output.py:1521
++#: ../output.py:1700
+ msgid "Time"
+ msgstr "Czas"
+
+-#: ../output.py:1547
++#: ../output.py:1726
+ msgid "Last day"
+ msgstr "Ostatni dzień"
+
+-#: ../output.py:1548
++#: ../output.py:1727
+ msgid "Last week"
+ msgstr "Ostatni tydzień"
+
+-#: ../output.py:1549
++#: ../output.py:1728
+ msgid "Last 2 weeks"
+ msgstr "Ostatnie dwa tygodnie"
+
+ #. US default :p
+-#: ../output.py:1550
++#: ../output.py:1729
+ msgid "Last 3 months"
+ msgstr "Ostatnie trzy miesiące"
+
+-#: ../output.py:1551
++#: ../output.py:1730
+ msgid "Last 6 months"
+ msgstr "Ostatnie pół roku"
+
+-#: ../output.py:1552
++#: ../output.py:1731
+ msgid "Last year"
+ msgstr "Ostatni rok"
+
+-#: ../output.py:1553
++#: ../output.py:1732
+ msgid "Over a year ago"
+ msgstr "Ponad rok temu"
+
+-#: ../output.py:1585
++#: ../output.py:1774
++#, python-format
++msgid "No Transaction %s found"
++msgstr "Nie odnaleziono transakcji %s"
++
++#: ../output.py:1780
++msgid "Transaction ID:"
++msgstr "Identyfikator transakcji:"
++
++#: ../output.py:1781
++msgid "Available additional history information:"
++msgstr "Dostępne są dodatkowe informacje o historii:"
++
++#: ../output.py:1793
++#, python-format
++msgid "%s: No additional data found by this name"
++msgstr "%s: nie odnaleziono dodatkowych danych dla tej nazwy"
++
++#: ../output.py:1809
+ msgid "installed"
+ msgstr "zainstalowany"
+
+-#: ../output.py:1586
++#: ../output.py:1810
+ msgid "updated"
+ msgstr "zaktualizowany"
+
+-#: ../output.py:1587
++#: ../output.py:1811
+ msgid "obsoleted"
+ msgstr "zastąpiony"
+
+-#: ../output.py:1588
++#: ../output.py:1812
+ msgid "erased"
+ msgstr "usunięty"
+
+-#: ../output.py:1592
++#: ../output.py:1813
++msgid "reinstalled"
++msgstr "ponownie zainstalowany"
++
++#: ../output.py:1814
++msgid "downgraded"
++msgstr "zainstalowana poprzednia wersja"
++
++#: ../output.py:1818
+ #, python-format
+ msgid "---> Package %s.%s %s:%s-%s set to be %s"
+ msgstr "---> Pakiet %s.%s %s:%s-%s zostanie %s"
+
+-#: ../output.py:1599
++#: ../output.py:1825
+ msgid "--> Running transaction check"
+ msgstr "--> Wykonywanie sprawdzania transakcji"
+
+-#: ../output.py:1604
++#: ../output.py:1830
+ msgid "--> Restarting Dependency Resolution with new changes."
+ msgstr "--> Ponowne uruchamianie rozwiązywania zależności z nowymi zmianami."
+
+-#: ../output.py:1609
++#: ../output.py:1835
+ msgid "--> Finished Dependency Resolution"
+ msgstr "--> Ukończono rozwiązywanie zależności"
+
+-#: ../output.py:1614 ../output.py:1619
++#: ../output.py:1840 ../output.py:1845
+ #, python-format
+ msgid "--> Processing Dependency: %s for package: %s"
+ msgstr "--> Przetwarzanie zależności: %s dla pakietu: %s"
+
+-#: ../output.py:1623
++#: ../output.py:1850
++#, python-format
++msgid "---> Keeping package: %s"
++msgstr "---> Utrzymywanie pakietu: %s"
++
++#: ../output.py:1853
+ #, python-format
+ msgid "--> Unresolved Dependency: %s"
+ msgstr "--> Nierozwiązana zależność: %s"
+
+-#: ../output.py:1634
++#: ../output.py:1864
+ #, python-format
+ msgid "Package: %s"
+ msgstr "Pakiet: %s"
+
+-#: ../output.py:1636
++#: ../output.py:1866
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1163,7 +1243,7 @@ msgstr ""
+ "\n"
+ " Wymaga: %s"
+
+-#: ../output.py:1649 ../output.py:1660
++#: ../output.py:1875
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1172,83 +1252,103 @@ msgstr ""
+ "\n"
+ " %s: %s (%s)"
+
+-#: ../output.py:1657
++#: ../output.py:1880
++#, python-format
++msgid ""
++"\n"
++" %s"
++msgstr ""
++"\n"
++" %s"
++
++#: ../output.py:1882
++msgid ""
++"\n"
++" Not found"
++msgstr ""
++"\n"
++" Nie odnaleziono"
++
++#. These should be the only three things we care about:
++#: ../output.py:1897
++msgid "Updated By"
++msgstr "Zaktualizowano przez"
++
++#: ../output.py:1898
++msgid "Downgraded By"
++msgstr "Zainstalowano poprzednią wersję przez"
++
++#: ../output.py:1899
++msgid "Obsoleted By"
++msgstr "Zastąpiono przez"
++
++#: ../output.py:1917
+ msgid "Available"
+ msgstr "Dostępne"
+
+-#: ../output.py:1665 ../output.py:1670
++#: ../output.py:1944 ../output.py:1949
+ #, python-format
+ msgid "--> Processing Conflict: %s conflicts %s"
+ msgstr "--> Przetwarzanie konfliktów: %s jest w konflikcie z %s"
+
+-#: ../output.py:1674
++#: ../output.py:1953
+ msgid "--> Populating transaction set with selected packages. Please wait."
+ msgstr "--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać."
+
+-#: ../output.py:1678
++#: ../output.py:1957
+ #, python-format
+ msgid "---> Downloading header for %s to pack into transaction set."
+ msgstr "---> Pobieranie nagłówka dla %s do umieszczenia w zestawie transakcji."
+
+-#: ../utils.py:93
++#: ../utils.py:94
+ msgid "Running"
+ msgstr "Wykonywanie"
+
+-#: ../utils.py:94
++#: ../utils.py:95
+ msgid "Sleeping"
+ msgstr "Zasypianie"
+
+-#: ../utils.py:95
++#: ../utils.py:96
+ msgid "Uninterruptible"
+ msgstr "Nie można przerywać"
+
+-#: ../utils.py:96
++#: ../utils.py:97
+ msgid "Zombie"
+ msgstr "Zombie"
+
+-#: ../utils.py:97
++#: ../utils.py:98
+ msgid "Traced/Stopped"
+ msgstr "Śledzone/zatrzymane"
+
+-#: ../utils.py:98 ../yumcommands.py:917
++#: ../utils.py:99 ../yumcommands.py:972
+ msgid "Unknown"
+ msgstr "Nieznane"
+
+-#: ../utils.py:109
++#: ../utils.py:110
+ msgid " The other application is: PackageKit"
+ msgstr " Inna aplikacja to PackageKit"
+
+-#: ../utils.py:111
++#: ../utils.py:112
+ #, python-format
+ msgid " The other application is: %s"
+ msgstr " Inna aplikacja to: %s"
+
+-#: ../utils.py:114
++#: ../utils.py:115
+ #, python-format
+ msgid " Memory : %5s RSS (%5sB VSZ)"
+ msgstr " Pamięć: %5s RSS (%5sB VSZ)"
+
+-#: ../utils.py:119
++#: ../utils.py:120
+ #, python-format
+ msgid " Started: %s - %s ago"
+ msgstr " Uruchomiono: %s - %s temu"
+
+-#: ../utils.py:121
++#: ../utils.py:122
+ #, python-format
+ msgid " State : %s, pid: %d"
+ msgstr " Stan: %s, PID: %d"
+
+-#: ../utils.py:199
+-#, python-format
+-msgid "PluginExit Error: %s"
+-msgstr "Błąd wyjścia wtyczki: %s"
+-
+-#: ../utils.py:202
+-#, python-format
+-msgid "Yum Error: %s"
+-msgstr "Błąd programu yum: %s"
+-
+-#: ../utils.py:235 ../yummain.py:42
++#: ../utils.py:143 ../yummain.py:42
+ msgid ""
+ "\n"
+ "\n"
+@@ -1258,7 +1358,7 @@ msgstr ""
+ "\n"
+ "Kończenie działania na polecenie użytkownika"
+
+-#: ../utils.py:241 ../yummain.py:48
++#: ../utils.py:149 ../yummain.py:48
+ msgid ""
+ "\n"
+ "\n"
+@@ -1268,7 +1368,7 @@ msgstr ""
+ "\n"
+ "Kończenie działania z powodu przerwanego potoku"
+
+-#: ../utils.py:243 ../yummain.py:50
++#: ../utils.py:151 ../yummain.py:50
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1279,7 +1379,51 @@ msgstr ""
+ "\n"
+ "%s"
+
+-#: ../utils.py:282 ../yummain.py:211
++#: ../utils.py:201 ../yummain.py:107
++msgid ""
++"Another app is currently holding the yum lock; exiting as configured by "
++"exit_on_lock"
++msgstr ""
++"Inna aplikacja obecnie blokuje program yum. Kończenie działania zgodnie z "
++"konfiguracją exit_on_lock"
++
++#: ../utils.py:260
++#, python-format
++msgid "PluginExit Error: %s"
++msgstr "Błąd wyjścia wtyczki: %s"
++
++#: ../utils.py:263
++#, python-format
++msgid "Yum Error: %s"
++msgstr "Błąd programu yum: %s"
++
++#: ../utils.py:315 ../yummain.py:134 ../yummain.py:173
++#, python-format
++msgid "Error: %s"
++msgstr "Błąd: %s"
++
++#: ../utils.py:319 ../yummain.py:177
++msgid " You could try using --skip-broken to work around the problem"
++msgstr " Można spróbować użyć --skip-broken, aby obejść problem"
++
++#: ../utils.py:321 ../yummain.py:179 ../yummain.py:212
++msgid " You could try running: rpm -Va --nofiles --nodigest"
++msgstr " Można spróbować wykonać polecenie: rpm -Va --nofiles --nodigest"
++
++#: ../utils.py:328 ../yummain.py:144 ../yummain.py:186
++#, python-format
++msgid "Unknown Error(s): Exit Code: %d:"
++msgstr "Nieznane błędy: kod wyjścia: %d:"
++
++#: ../utils.py:334 ../yummain.py:192
++msgid ""
++"\n"
++"Dependencies Resolved"
++msgstr ""
++"\n"
++"Rozwiązano zależności"
++
++#: ../utils.py:349 ../yummain.py:215
+ msgid "Complete!"
+ msgstr "Ukończono."
+
+@@ -1359,294 +1503,314 @@ 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:170
++#: ../yumcommands.py:138
++msgid ""
++"There are no enabled repos.\n"
++" Run \"yum repolist all\" to see the repos you have.\n"
++" You can enable repos with yum-config-manager --enable <repo>"
++msgstr ""
++"Brak włączonych repozytoriów.\n"
++" Wykonanie polecenia \"yum repolist all\" wyświetli wszystkie posiadane "
++"repozytoria.\n"
++" Można włączyć repozytoria za pomocą polecenia yum-config-manager --enable "
++"<repo>"
++
++#: ../yumcommands.py:189
+ msgid "PACKAGE..."
+ msgstr "PAKIET..."
+
+-#: ../yumcommands.py:173
++#: ../yumcommands.py:192
+ msgid "Install a package or packages on your system"
+ msgstr "Instaluje pakiet lub pakiety w systemie"
+
+-#: ../yumcommands.py:181
++#: ../yumcommands.py:201
+ msgid "Setting up Install Process"
+ msgstr "Ustawianie procesu instalacji"
+
+-#: ../yumcommands.py:192
++#: ../yumcommands.py:212 ../yumcommands.py:234
+ msgid "[PACKAGE...]"
+ msgstr "[PAKIET...]"
+
+-#: ../yumcommands.py:195
++#: ../yumcommands.py:215
+ msgid "Update a package or packages on your system"
+ msgstr "Aktualizuje pakiet lub pakiety w systemie"
+
+-#: ../yumcommands.py:202
++#: ../yumcommands.py:223
+ msgid "Setting up Update Process"
+ msgstr "Ustawianie procesu aktualizacji"
+
+-#: ../yumcommands.py:244
++#: ../yumcommands.py:237
++msgid "Synchronize installed packages to the latest available versions"
++msgstr "Synchronizuje zainstalowane pakiety do najnowszych dostępnych wersji"
++
++#: ../yumcommands.py:245
++msgid "Setting up Distribution Synchronization Process"
++msgstr "Ustawianie procesu synchronizacji dystrybucji"
++
++#: ../yumcommands.py:288
+ msgid "Display details about a package or group of packages"
+ msgstr "Wyświetla szczegóły o pakiecie lub grupie pakietów"
+
+-#: ../yumcommands.py:293
++#: ../yumcommands.py:337
+ msgid "Installed Packages"
+ msgstr "Zainstalowane pakiety"
+
+-#: ../yumcommands.py:301
++#: ../yumcommands.py:345
+ msgid "Available Packages"
+ msgstr "Dostępne pakiety"
+
+-#: ../yumcommands.py:305
++#: ../yumcommands.py:349
+ msgid "Extra Packages"
+ msgstr "Dodatkowe pakiety"
+
+-#: ../yumcommands.py:309
++#: ../yumcommands.py:353
+ msgid "Updated Packages"
+ msgstr "Zaktualizowane pakiety"
+
+ #. This only happens in verbose mode
+-#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601
++#: ../yumcommands.py:361 ../yumcommands.py:368 ../yumcommands.py:655
+ msgid "Obsoleting Packages"
+ msgstr "Zastępowanie przestarzałych pakietów"
+
+-#: ../yumcommands.py:326
++#: ../yumcommands.py:370
+ msgid "Recently Added Packages"
+ msgstr "Ostatnio dodane pakiety"
+
+-#: ../yumcommands.py:333
++#: ../yumcommands.py:377
+ msgid "No matching Packages to list"
+ msgstr "Brak pakietów pasujących do listy"
+
+-#: ../yumcommands.py:347
++#: ../yumcommands.py:391
+ msgid "List a package or groups of packages"
+ msgstr "Wyświetla listę pakietów lub grup pakietów"
+
+-#: ../yumcommands.py:359
++#: ../yumcommands.py:403
+ msgid "Remove a package or packages from your system"
+ msgstr "Usuwa pakiet lub pakiety z systemu"
+
+-#: ../yumcommands.py:366
++#: ../yumcommands.py:410
+ msgid "Setting up Remove Process"
+ msgstr "Ustawianie procesu usuwania"
+
+-#: ../yumcommands.py:380
++#: ../yumcommands.py:424
+ msgid "Setting up Group Process"
+ msgstr "Ustawianie procesu grup"
+
+-#: ../yumcommands.py:386
++#: ../yumcommands.py:430
+ msgid "No Groups on which to run command"
+ msgstr "Brak grup, na których można wykonać polecenie"
+
+-#: ../yumcommands.py:399
++#: ../yumcommands.py:443
+ msgid "List available package groups"
+ msgstr "Wyświetla listę dostępnych grup pakietów"
+
+-#: ../yumcommands.py:416
++#: ../yumcommands.py:463
+ msgid "Install the packages in a group on your system"
+ msgstr "Instaluje pakiety z grupy w systemie"
+
+-#: ../yumcommands.py:438
++#: ../yumcommands.py:486
+ msgid "Remove the packages in a group from your system"
+ msgstr "Usuwa pakiety z grupy z systemu"
+
+-#: ../yumcommands.py:465
++#: ../yumcommands.py:514
+ msgid "Display details about a package group"
+ msgstr "Wyświetla szczegóły o grupie pakietów"
+
+-#: ../yumcommands.py:489
++#: ../yumcommands.py:539
+ msgid "Generate the metadata cache"
+ msgstr "Utworzy pamięć podręczną metadanych"
+
+-#: ../yumcommands.py:495
++#: ../yumcommands.py:545
+ msgid "Making cache files for all metadata files."
+ msgstr "Tworzenie plików pamięci podręcznej ze wszystkich plików metadanych."
+
+-#: ../yumcommands.py:496
++#: ../yumcommands.py:546
+ msgid "This may take a while depending on the speed of this computer"
+ msgstr "Może to chwilę zająć, z zależności od prędkości komputera"
+
+-#: ../yumcommands.py:517
++#: ../yumcommands.py:567
+ msgid "Metadata Cache Created"
+ msgstr "Utworzono pamięć podręczną metadanych"
+
+-#: ../yumcommands.py:531
++#: ../yumcommands.py:581
+ msgid "Remove cached data"
+ msgstr "Usuwa dane z pamięci podręcznej"
+
+-#: ../yumcommands.py:551
++#: ../yumcommands.py:602
+ msgid "Find what package provides the given value"
+ msgstr "Wyszukuje pakiet dostarczający podaną wartość"
+
+-#: ../yumcommands.py:571
++#: ../yumcommands.py:622
+ msgid "Check for available package updates"
+ msgstr "Sprawdza dostępne aktualizacje pakietów"
+
+-#: ../yumcommands.py:621
++#: ../yumcommands.py:675
+ msgid "Search package details for the given string"
+ msgstr "Wyszukuje szczegóły pakietów dla podanego ciągu"
+
+-#: ../yumcommands.py:627
++#: ../yumcommands.py:681
+ msgid "Searching Packages: "
+ msgstr "Wyszukiwanie pakietów: "
+
+-#: ../yumcommands.py:644
++#: ../yumcommands.py:698
+ msgid "Update packages taking obsoletes into account"
+ msgstr "Aktualizuje pakiety, w tym przestarzałe"
+
+-#: ../yumcommands.py:652
++#: ../yumcommands.py:707
+ msgid "Setting up Upgrade Process"
+ msgstr "Ustawianie procesu aktualizacji"
+
+-#: ../yumcommands.py:666
++#: ../yumcommands.py:721
+ msgid "Install a local RPM"
+ msgstr "Instaluje lokalny pakiet RPM"
+
+-#: ../yumcommands.py:674
++#: ../yumcommands.py:729
+ msgid "Setting up Local Package Process"
+ msgstr "Ustawianie procesu lokalnego pakietu"
+
+-#: ../yumcommands.py:693
++#: ../yumcommands.py:748
+ msgid "Determine which package provides the given dependency"
+ msgstr "Określa, który pakiet dostarcza podaną zależność"
+
+-#: ../yumcommands.py:696
++#: ../yumcommands.py:751
+ msgid "Searching Packages for Dependency:"
+ msgstr "Wyszukiwanie pakietów dla zależności:"
+
+-#: ../yumcommands.py:710
++#: ../yumcommands.py:765
+ msgid "Run an interactive yum shell"
+ msgstr "Uruchamia interaktywną powłokę programu yum"
+
+-#: ../yumcommands.py:716
++#: ../yumcommands.py:771
+ msgid "Setting up Yum Shell"
+ msgstr "Ustawianie powłoki programu yum"
+
+-#: ../yumcommands.py:734
++#: ../yumcommands.py:789
+ msgid "List a package's dependencies"
+ msgstr "Wyświetla listę zależności pakietu"
+
+-#: ../yumcommands.py:740
++#: ../yumcommands.py:795
+ msgid "Finding dependencies: "
+ msgstr "Wyszukiwanie zależności: "
+
+-#: ../yumcommands.py:756
++#: ../yumcommands.py:811
+ msgid "Display the configured software repositories"
+ msgstr "Wyświetla skonfigurowane repozytoria oprogramowania"
+
+-#: ../yumcommands.py:822 ../yumcommands.py:823
++#: ../yumcommands.py:877 ../yumcommands.py:878
+ msgid "enabled"
+ msgstr "włączone"
+
+-#: ../yumcommands.py:849 ../yumcommands.py:850
++#: ../yumcommands.py:904 ../yumcommands.py:905
+ msgid "disabled"
+ msgstr "wyłączone"
+
+-#: ../yumcommands.py:866
++#: ../yumcommands.py:921
+ msgid "Repo-id : "
+ msgstr "Identyfikator repozytorium : "
+
+-#: ../yumcommands.py:867
++#: ../yumcommands.py:922
+ msgid "Repo-name : "
+ msgstr "Nazwa repozytorium : "
+
+-#: ../yumcommands.py:870
++#: ../yumcommands.py:925
+ msgid "Repo-status : "
+ msgstr "Stan repozytorium : "
+
+-#: ../yumcommands.py:873
++#: ../yumcommands.py:928
+ msgid "Repo-revision: "
+ msgstr "Wersja repozytorium : "
+
+-#: ../yumcommands.py:877
++#: ../yumcommands.py:932
+ msgid "Repo-tags : "
+ msgstr "Znaczniki repozytorium : "
+
+-#: ../yumcommands.py:883
++#: ../yumcommands.py:938
+ msgid "Repo-distro-tags: "
+ msgstr "Znaczniki dystrybucji repozytorium: "
+
+-#: ../yumcommands.py:888
++#: ../yumcommands.py:943
+ msgid "Repo-updated : "
+ msgstr "Aktualizacje repozytorium : "
+
+-#: ../yumcommands.py:890
++#: ../yumcommands.py:945
+ msgid "Repo-pkgs : "
+ msgstr "Pakiety repozytorium : "
+
+-#: ../yumcommands.py:891
++#: ../yumcommands.py:946
+ msgid "Repo-size : "
+ msgstr "Rozmiar repozytorium : "
+
+-#: ../yumcommands.py:898
++#: ../yumcommands.py:953
+ msgid "Repo-baseurl : "
+ msgstr "Podstawowy adres URL repozytorium : "
+
+-#: ../yumcommands.py:906
++#: ../yumcommands.py:961
+ msgid "Repo-metalink: "
+ msgstr "Metaodnośnik repozytorium : "
+
+-#: ../yumcommands.py:910
++#: ../yumcommands.py:965
+ msgid " Updated : "
+ msgstr " Zaktualizowano : "
+
+-#: ../yumcommands.py:913
++#: ../yumcommands.py:968
+ msgid "Repo-mirrors : "
+ msgstr "Serwery lustrzane repozytorium : "
+
+-#: ../yumcommands.py:923
++#: ../yumcommands.py:978
+ #, python-format
+ msgid "Never (last: %s)"
+ msgstr "Nigdy (ostatnio: %s)"
+
+-#: ../yumcommands.py:925
++#: ../yumcommands.py:980
+ #, python-format
+ msgid "Instant (last: %s)"
+ msgstr "Natychmiast (ostatnio: %s)"
+
+-#: ../yumcommands.py:928
++#: ../yumcommands.py:983
+ #, python-format
+ msgid "%s second(s) (last: %s)"
+ msgstr "%s sekundy (ostatnio: %s)"
+
+-#: ../yumcommands.py:930
++#: ../yumcommands.py:985
+ msgid "Repo-expire : "
+ msgstr "Wygaszenie repozytorium : "
+
+-#: ../yumcommands.py:933
++#: ../yumcommands.py:988
+ msgid "Repo-exclude : "
+ msgstr "Wykluczenia z repozytorium : "
+
+-#: ../yumcommands.py:937
++#: ../yumcommands.py:992
+ msgid "Repo-include : "
+ msgstr "Dołączone z repozytorium : "
+
+-#: ../yumcommands.py:941
++#: ../yumcommands.py:996
+ msgid "Repo-excluded: "
+ msgstr "Wykluczenia z repozytorium : "
+
+ #. Work out the first (id) and last (enabled/disalbed/count),
+ #. then chop the middle (name)...
+-#: ../yumcommands.py:951 ../yumcommands.py:980
++#: ../yumcommands.py:1006 ../yumcommands.py:1035
+ msgid "repo id"
+ msgstr "identyfikator repozytorium"
+
+-#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987
++#: ../yumcommands.py:1023 ../yumcommands.py:1024 ../yumcommands.py:1042
+ msgid "status"
+ msgstr "stan"
+
+-#: ../yumcommands.py:981
++#: ../yumcommands.py:1036
+ msgid "repo name"
+ msgstr "nazwa repozytorium"
+
+-#: ../yumcommands.py:1018
++#: ../yumcommands.py:1073
+ msgid "Display a helpful usage message"
+ msgstr "Wyświetla pomocny komunikat o używaniu"
+
+-#: ../yumcommands.py:1052
++#: ../yumcommands.py:1107
+ #, python-format
+ msgid "No help available for %s"
+ msgstr "Brak dostępnej pomocy dla %s"
+
+-#: ../yumcommands.py:1057
++#: ../yumcommands.py:1112
+ msgid ""
+ "\n"
+ "\n"
+@@ -1656,7 +1820,7 @@ msgstr ""
+ "\n"
+ "aliasy: "
+
+-#: ../yumcommands.py:1059
++#: ../yumcommands.py:1114
+ msgid ""
+ "\n"
+ "\n"
+@@ -1666,105 +1830,83 @@ msgstr ""
+ "\n"
+ "alias: "
+
+-#: ../yumcommands.py:1087
++#: ../yumcommands.py:1143
+ msgid "Setting up Reinstall Process"
+ msgstr "Ustawianie procesu ponownej instalacji"
+
+-#: ../yumcommands.py:1095
++#: ../yumcommands.py:1151
+ msgid "reinstall a package"
+ msgstr "Ponownie instaluje pakiet"
+
+-#: ../yumcommands.py:1113
++#: ../yumcommands.py:1170
+ msgid "Setting up Downgrade Process"
+ msgstr "Ustawianie procesu instalacji poprzedniej wersji pakietu"
+
+-#: ../yumcommands.py:1120
++#: ../yumcommands.py:1177
+ msgid "downgrade a package"
+ msgstr "Instaluje poprzednią wersję pakietu"
+
+-#: ../yumcommands.py:1134
++#: ../yumcommands.py:1191
+ msgid "Display a version for the machine and/or available repos."
+ msgstr "Wyświetla wersję dla komputera i/lub dostępnych repozytoriów."
+
+-#: ../yumcommands.py:1173
++#: ../yumcommands.py:1230
+ msgid " Yum version groups:"
+ msgstr " Grupy wersji programu yum:"
+
+-#: ../yumcommands.py:1183
++#: ../yumcommands.py:1240
+ msgid " Group :"
+ msgstr " Grupa :"
+
+-#: ../yumcommands.py:1184
++#: ../yumcommands.py:1241
+ msgid " Packages:"
+ msgstr " Pakiety:"
+
+-#: ../yumcommands.py:1213
++#: ../yumcommands.py:1270
+ msgid "Installed:"
+ msgstr "Zainstalowano:"
+
+-#: ../yumcommands.py:1218
++#: ../yumcommands.py:1278
+ msgid "Group-Installed:"
+ msgstr "Zainstalowana grupa:"
+
+-#: ../yumcommands.py:1227
++#: ../yumcommands.py:1287
+ msgid "Available:"
+ msgstr "Dostępne:"
+
+-#: ../yumcommands.py:1233
++#: ../yumcommands.py:1296
+ msgid "Group-Available:"
+ msgstr "Dostępne grupy:"
+
+-#: ../yumcommands.py:1272
++#: ../yumcommands.py:1335
+ msgid "Display, or use, the transaction history"
+ msgstr "Wyświetla lub używa historii transakcji"
+
+-#: ../yumcommands.py:1300
++#: ../yumcommands.py:1363
+ #, python-format
+ msgid "Invalid history sub-command, use: %s."
+ msgstr "Nieprawidłowe podpolecenie historii, należy użyć: %s."
+
+-#: ../yumcommands.py:1345
++#: ../yumcommands.py:1370
++msgid "You don't have access to the history DB."
++msgstr "Brak dostępu do bazy danych historii."
++
++#: ../yumcommands.py:1413
+ msgid "Check for problems in the rpmdb"
+ msgstr "Proszę sprawdzić, czy występują problemy w bazie danych RPM"
+
+-#: ../yummain.py:102
++#: ../yummain.py:103
+ msgid ""
+ "Another app is currently holding the yum lock; waiting for it to exit..."
+ msgstr ""
+ "Inna aplikacja obecnie blokuje program yum. Oczekiwanie na jej zakończenie..."
+
+-#: ../yummain.py:130 ../yummain.py:169
+-#, python-format
+-msgid "Error: %s"
+-msgstr "Błąd: %s"
+-
+-#: ../yummain.py:140 ../yummain.py:182
+-#, python-format
+-msgid "Unknown Error(s): Exit Code: %d:"
+-msgstr "Nieznane błędy: kod wyjścia: %d:"
+-
+ #. Depsolve stage
+-#: ../yummain.py:147
++#: ../yummain.py:151
+ msgid "Resolving Dependencies"
+ msgstr "Rozwiązywanie zależności"
+
+-#: ../yummain.py:173
+-msgid " You could try using --skip-broken to work around the problem"
+-msgstr " Można spróbować użyć --skip-broken, aby obejść problem"
+-
+-#: ../yummain.py:175 ../yummain.py:208
+-msgid " You could try running: rpm -Va --nofiles --nodigest"
+-msgstr " Można spróbować wykonać polecenie: rpm -Va --nofiles --nodigest"
+-
+-#: ../yummain.py:188
+-msgid ""
+-"\n"
+-"Dependencies Resolved"
+-msgstr ""
+-"\n"
+-"Rozwiązano zależności"
+-
+-#: ../yummain.py:265
++#: ../yummain.py:269
+ msgid ""
+ "\n"
+ "\n"
+@@ -1782,141 +1924,131 @@ msgstr "doTsSetup() zostanie usunięte w przyszłych wersjach programu yum.\n"
+ msgid "Setting up TransactionSets before config class is up"
+ msgstr "Ustawianie zestawów transakcji przed włączeniem klasy konfiguracji"
+
+-#: ../yum/depsolve.py:148
++#: ../yum/depsolve.py:151
+ #, python-format
+ msgid "Invalid tsflag in config file: %s"
+ msgstr "Nieprawidłowa flaga zestawu transakcji tsflag w pliku konfiguracji: %s"
+
+-#: ../yum/depsolve.py:159
++#: ../yum/depsolve.py:162
+ #, python-format
+ msgid "Searching pkgSack for dep: %s"
+ msgstr "Wyszukiwanie zestawu pakietów dla zależności: %s"
+
+-#: ../yum/depsolve.py:175
+-#, python-format
+-msgid "Potential match for %s from %s"
+-msgstr "Potencjalny wynik dla %s z %s"
+-
+-#: ../yum/depsolve.py:183
+-#, python-format
+-msgid "Matched %s to require for %s"
+-msgstr "%s pasuje jako wymaganie dla %s"
+-
+-#: ../yum/depsolve.py:225
++#: ../yum/depsolve.py:205
+ #, python-format
+ msgid "Member: %s"
+ msgstr "Element: %s"
+
+-#: ../yum/depsolve.py:239 ../yum/depsolve.py:754
++#: ../yum/depsolve.py:219 ../yum/depsolve.py:754
+ #, python-format
+ msgid "%s converted to install"
+ msgstr "%s przekonwertowano do zainstalowania"
+
+-#: ../yum/depsolve.py:246
++#: ../yum/depsolve.py:226
+ #, python-format
+ msgid "Adding Package %s in mode %s"
+ msgstr "Dodawanie pakietu %s w trybie %s"
+
+-#: ../yum/depsolve.py:256
++#: ../yum/depsolve.py:242
+ #, python-format
+ msgid "Removing Package %s"
+ msgstr "Usuwanie pakietu %s"
+
+-#: ../yum/depsolve.py:278
++#: ../yum/depsolve.py:264
+ #, python-format
+ msgid "%s requires: %s"
+ msgstr "%s wymaga: %s"
+
+-#: ../yum/depsolve.py:319
++#: ../yum/depsolve.py:305
+ #, python-format
+ msgid "%s requires %s"
+ msgstr "%s wymaga %s"
+
+-#: ../yum/depsolve.py:346
++#: ../yum/depsolve.py:332
+ msgid "Needed Require has already been looked up, cheating"
+ msgstr "Wymagana zależność została już odnaleziona, oszukiwanie"
+
+-#: ../yum/depsolve.py:356
++#: ../yum/depsolve.py:342
+ #, python-format
+ msgid "Needed Require is not a package name. Looking up: %s"
+ msgstr "Wymagana zależność nie jest nazwą pakietu. Wyszukiwanie: %s"
+
+-#: ../yum/depsolve.py:363
++#: ../yum/depsolve.py:349
+ #, python-format
+ msgid "Potential Provider: %s"
+ msgstr "Potencjalny dostawca: %s"
+
+-#: ../yum/depsolve.py:386
++#: ../yum/depsolve.py:372
+ #, python-format
+ msgid "Mode is %s for provider of %s: %s"
+ msgstr "Tryb to %s dla dostawcy %s: %s"
+
+-#: ../yum/depsolve.py:390
++#: ../yum/depsolve.py:376
+ #, python-format
+ msgid "Mode for pkg providing %s: %s"
+ msgstr "Tryb dla pakietu dostarczającego %s: %s"
+
+-#: ../yum/depsolve.py:394
++#: ../yum/depsolve.py:380
+ #, python-format
+ msgid "TSINFO: %s package requiring %s marked as erase"
+ msgstr "TSINFO: pakiet %s wymagający %s został oznaczony jako do usunięcia"
+
+-#: ../yum/depsolve.py:407
++#: ../yum/depsolve.py:393
+ #, 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:410
++#: ../yum/depsolve.py:396
+ #, python-format
+ msgid "TSINFO: Updating %s to resolve dep."
+ msgstr "TSINFO: aktualizowanie %s, aby rozwiązać zależność."
+
+-#: ../yum/depsolve.py:418
++#: ../yum/depsolve.py:404
+ #, python-format
+ msgid "Cannot find an update path for dep for: %s"
+ msgstr "Nie można odnaleźć ścieżki aktualizacji dla zależności dla: %s"
+
+-#: ../yum/depsolve.py:449
++#: ../yum/depsolve.py:435
+ #, python-format
+ msgid "Quick matched %s to require for %s"
+ msgstr "Szybko dopasowano %s jako wymaganie %s"
+
+ #. is it already installed?
+-#: ../yum/depsolve.py:491
++#: ../yum/depsolve.py:477
+ #, 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:507
++#: ../yum/depsolve.py:493
+ #, 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:518
++#: ../yum/depsolve.py:504
+ #, 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:536
++#: ../yum/depsolve.py:522
+ #, python-format
+ msgid "%s already in ts, skipping this one"
+ msgstr "%s jest już w zestawie transakcji, pomijanie"
+
+-#: ../yum/depsolve.py:578
++#: ../yum/depsolve.py:571
+ #, python-format
+ msgid "TSINFO: Marking %s as update for %s"
+ msgstr "TSINFO: oznaczanie %s jako aktualizacji dla %s"
+
+-#: ../yum/depsolve.py:586
++#: ../yum/depsolve.py:580
+ #, python-format
+ msgid "TSINFO: Marking %s as install for %s"
+ msgstr "TSINFO: oznaczanie %s jako do zainstalowania dla %s"
+
+-#: ../yum/depsolve.py:690 ../yum/depsolve.py:781
++#: ../yum/depsolve.py:690 ../yum/depsolve.py:780
+ msgid "Success - empty transaction"
+ msgstr "Powodzenie - pusta transakcja"
+
+@@ -1933,36 +2065,36 @@ msgstr "Kończenie procesu zależności"
+ msgid "%s from %s has depsolving problems"
+ msgstr "%s z %s ma problemy z rozwiązywaniem zależności"
+
+-#: ../yum/depsolve.py:782
++#: ../yum/depsolve.py:781
+ msgid "Success - deps resolved"
+ msgstr "Powodzenie - rozwiązano zależności"
+
+-#: ../yum/depsolve.py:796
++#: ../yum/depsolve.py:802
+ #, python-format
+ msgid "Checking deps for %s"
+ msgstr "Sprawdzanie zależności dla %s"
+
+-#: ../yum/depsolve.py:874
++#: ../yum/depsolve.py:888
+ #, python-format
+ msgid "looking for %s as a requirement of %s"
+ msgstr "wyszukiwanie %s jako wymagania %s"
+
+-#: ../yum/depsolve.py:1090
++#: ../yum/depsolve.py:1119
+ #, python-format
+ msgid "Running compare_providers() for %s"
+ msgstr "Wykonywanie compare_providers() dla %s"
+
+-#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123
++#: ../yum/depsolve.py:1146 ../yum/depsolve.py:1152
+ #, python-format
+ msgid "better arch in po %s"
+ msgstr "lepsze arch w po %s"
+
+-#: ../yum/depsolve.py:1218
++#: ../yum/depsolve.py:1244
+ #, python-format
+ msgid "%s obsoletes %s"
+ msgstr "%s zastępuje %s"
+
+-#: ../yum/depsolve.py:1230
++#: ../yum/depsolve.py:1256
+ #, python-format
+ msgid ""
+ "archdist compared %s to %s on %s\n"
+@@ -1971,125 +2103,145 @@ msgstr ""
+ "archdist porównało %s do %s na %s\n"
+ " Zwycięzca: %s"
+
+-#: ../yum/depsolve.py:1237
++#: ../yum/depsolve.py:1264
+ #, python-format
+ msgid "common sourcerpm %s and %s"
+ msgstr "wspólny źródłowy pakiet RPM %s i %s"
+
+-#: ../yum/depsolve.py:1241
++#: ../yum/depsolve.py:1268
+ #, python-format
+ msgid "base package %s is installed for %s"
+ msgstr "podstawowy pakiet %s jest zainstalowany dla %s"
+
+-#: ../yum/depsolve.py:1247
++#: ../yum/depsolve.py:1274
+ #, python-format
+ msgid "common prefix of %s between %s and %s"
+ msgstr "wspólny przedrostek %s dla %s i %s"
+
+-#: ../yum/depsolve.py:1256
++#: ../yum/depsolve.py:1305
++#, python-format
++msgid "requires minimal: %d"
++msgstr "wymaga minimum: %d"
++
++#: ../yum/depsolve.py:1309
++#, python-format
++msgid " Winner: %s"
++msgstr " Zwycięzca: %s"
++
++#: ../yum/depsolve.py:1314
++#, python-format
++msgid " Loser(with %d): %s"
++msgstr " Przegrany (za pomocą %d): %s"
++
++#: ../yum/depsolve.py:1330
+ #, python-format
+ msgid "Best Order: %s"
+ msgstr "Najlepszy porządek: %s"
+
+-#: ../yum/__init__.py:192
++#: ../yum/__init__.py:214
+ msgid "doConfigSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+ "doConfigSetup() zostanie usunięte w przyszłych wersjach programu yum.\n"
+
+-#: ../yum/__init__.py:424
++#: ../yum/__init__.py:453
++#, python-format
++msgid "Repository %r: Error parsing config: %s"
++msgstr "Repozytorium %r: błąd podczas przetwarzania konfiguracji: %s"
++
++#: ../yum/__init__.py:459
+ #, python-format
+ msgid "Repository %r is missing name in configuration, using id"
+ msgstr ""
+ "Repozytorium %r nie posiada nazwy w konfiguracji, używanie identyfikatora"
+
+-#: ../yum/__init__.py:462
++#: ../yum/__init__.py:497
+ msgid "plugins already initialised"
+ msgstr "wtyczki zostały już zainicjowane"
+
+-#: ../yum/__init__.py:469
++#: ../yum/__init__.py:504
+ msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+ msgstr "doRpmDBSetup() zostanie usunięte w przyszłych wersjach programu yum.\n"
+
+-#: ../yum/__init__.py:480
++#: ../yum/__init__.py:515
+ msgid "Reading Local RPMDB"
+ msgstr "Odczytywanie lokalnej bazy danych RPM"
+
+-#: ../yum/__init__.py:504
++#: ../yum/__init__.py:538
+ msgid "doRepoSetup() will go away in a future version of Yum.\n"
+ msgstr "doRepoSetup() zostanie usunięte w przyszłych wersjach programu yum.\n"
+
+-#: ../yum/__init__.py:524
++#: ../yum/__init__.py:577
+ msgid "doSackSetup() will go away in a future version of Yum.\n"
+ msgstr "doSackSetup() zostanie usunięte w przyszłych wersjach programu yum.\n"
+
+-#: ../yum/__init__.py:554
++#: ../yum/__init__.py:607
+ msgid "Setting up Package Sacks"
+ msgstr "Ustawianie zestawów pakietów"
+
+-#: ../yum/__init__.py:599
++#: ../yum/__init__.py:652
+ #, 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:600
++#: ../yum/__init__.py:653
+ msgid "therefore this repo cannot be reset.\n"
+ msgstr "więc to repozytorium nie może zostać przywrócone.\n"
+
+-#: ../yum/__init__.py:605
++#: ../yum/__init__.py:658
+ msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+ "doUpdateSetup() zostanie usunięte w przyszłych wersjach programu yum.\n"
+
+-#: ../yum/__init__.py:617
++#: ../yum/__init__.py:670
+ msgid "Building updates object"
+ msgstr "Budowanie obiektu aktualizacji"
+
+-#: ../yum/__init__.py:652
++#: ../yum/__init__.py:709
+ msgid "doGroupSetup() will go away in a future version of Yum.\n"
+ msgstr "doGroupSetup() zostanie usunięte w przyszłych wersjach programu yum.\n"
+
+-#: ../yum/__init__.py:677
++#: ../yum/__init__.py:734
+ msgid "Getting group metadata"
+ msgstr "Pobieranie metadanych grup"
+
+-#: ../yum/__init__.py:703
++#: ../yum/__init__.py:760
+ #, python-format
+ msgid "Adding group file from repository: %s"
+ msgstr "Dodawanie pliku grup z repozytorium: %s"
+
+-#: ../yum/__init__.py:712
++#: ../yum/__init__.py:769
+ #, 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:718
++#: ../yum/__init__.py:775
+ msgid "No Groups Available in any repository"
+ msgstr "Brak dostępnych grup we wszystkich repozytoriach"
+
+-#: ../yum/__init__.py:730
++#: ../yum/__init__.py:787
+ msgid "Getting pkgtags metadata"
+ msgstr "Pobieranie metadanych znaczników pakietów"
+
+-#: ../yum/__init__.py:740
++#: ../yum/__init__.py:797
+ #, python-format
+ msgid "Adding tags from repository: %s"
+ msgstr "Dodawanie znaczników z repozytorium: %s"
+
+-#: ../yum/__init__.py:749
++#: ../yum/__init__.py:806
+ #, python-format
+ msgid "Failed to add Pkg Tags for repository: %s - %s"
+ msgstr "Dodanie znaczników pakietów dla repozytorium nie powiodło się: %s - %s"
+
+-#: ../yum/__init__.py:827
++#: ../yum/__init__.py:884
+ msgid "Importing additional filelist information"
+ msgstr "Importowanie dodatkowych informacji o liście plików"
+
+-#: ../yum/__init__.py:841
++#: ../yum/__init__.py:898
+ #, python-format
+ msgid "The program %s%s%s is found in the yum-utils package."
+ msgstr "Program %s%s%s można odnaleźć w pakiecie yum-utils."
+
+-#: ../yum/__init__.py:849
++#: ../yum/__init__.py:906
+ msgid ""
+ "There are unfinished transactions remaining. You might consider running yum-"
+ "complete-transaction first to finish them."
+@@ -2097,18 +2249,23 @@ msgstr ""
+ "Pozostały nieukończone transakcje. Można rozważyć wykonanie najpierw "
+ "polecenia yum-complete-transaction, aby je ukończyć."
+
++#: ../yum/__init__.py:985
++#, python-format
++msgid "Trying to remove \"%s\", which is protected"
++msgstr "Próbowanie usunięcia pakietu \"%s\", który jest chroniony"
++
+ #. Kind of hacky
+-#: ../yum/__init__.py:922
++#: ../yum/__init__.py:1044
+ #, python-format
+ msgid "Skip-broken round %i"
+ msgstr "Pierwsza runda pomijania uszkodzonych %i"
+
+-#: ../yum/__init__.py:975
++#: ../yum/__init__.py:1101
+ #, python-format
+ msgid "Skip-broken took %i rounds "
+ msgstr "Pomijanie uszkodzonych zajęło %i rund "
+
+-#: ../yum/__init__.py:976
++#: ../yum/__init__.py:1102
+ msgid ""
+ "\n"
+ "Packages skipped because of dependency problems:"
+@@ -2116,94 +2273,118 @@ msgstr ""
+ "\n"
+ "Pakiety pominięto z powodu problemów z zależnościami:"
+
+-#: ../yum/__init__.py:980
++#: ../yum/__init__.py:1106
+ #, python-format
+ msgid " %s from %s"
+ msgstr " %s z %s"
+
+-#: ../yum/__init__.py:1121
++#. FIXME: _N()
++#: ../yum/__init__.py:1251
++#, python-format
++msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:"
++msgstr ""
++"** Odnaleziono %d wcześniej istniejących problemów bazy danych RPM. Wynik "
++"polecenia \"yum check\":"
++
++#: ../yum/__init__.py:1255
+ msgid "Warning: RPMDB altered outside of yum."
+ msgstr "Ostrzeżenie: baza danych RPM została zmieniona poza programem yum."
+
+-#: ../yum/__init__.py:1126
++#: ../yum/__init__.py:1267
+ msgid "missing requires"
+ msgstr "brak wymaganych"
+
+-#: ../yum/__init__.py:1127
++#: ../yum/__init__.py:1268
+ msgid "installed conflict"
+ msgstr "zainstalowano konflikt"
+
+-#: ../yum/__init__.py:1180
++#: ../yum/__init__.py:1366
+ msgid ""
+ "Warning: scriptlet or other non-fatal errors occurred during transaction."
+ msgstr ""
+ "Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie krytyczne błędy."
+
+-#: ../yum/__init__.py:1198
++#: ../yum/__init__.py:1376
++msgid "Transaction couldn't start:"
++msgstr "Nie można rozpocząć transakcji:"
++
++#. should this be 'to_unicoded'?
++#: ../yum/__init__.py:1379
++msgid "Could not run transaction."
++msgstr "Nie można wykonać transakcji."
++
++#: ../yum/__init__.py:1392
+ #, python-format
+ msgid "Failed to remove transaction file %s"
+ msgstr "Usunięcie pliku transakcji %s nie powiodło się"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1227
++#: ../yum/__init__.py:1424
+ #, python-format
+ msgid "%s was supposed to be installed but is not!"
+ msgstr "%s miało zostać zainstalowane, ale nie zostało."
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1266
++#: ../yum/__init__.py:1486
+ #, python-format
+ msgid "%s was supposed to be removed but is not!"
+ msgstr "%s miało zostać usunięte, ale nie zostało."
+
++#: ../yum/__init__.py:1597
++#, python-format
++msgid "Could not open lock %s: %s"
++msgstr "Nie można otworzyć blokady %s: %s"
++
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1386
++#: ../yum/__init__.py:1614
+ #, 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:1390
++#: ../yum/__init__.py:1618
+ #, python-format
+ msgid "Existing lock %s: another copy is running as pid %s."
+ msgstr "Istnieje blokada %s: inna kopia jest uruchomiona jako PID %s."
+
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1425
++#: ../yum/__init__.py:1653
+ #, python-format
+ msgid "Could not create lock at %s: %s "
+ msgstr "Nie można utworzyć blokady na %s: %s "
+
+-#: ../yum/__init__.py:1470
++#: ../yum/__init__.py:1698
++#, python-format
+ msgid ""
+-"Package does not match intended download. Suggestion: run yum clean metadata"
++"Package does not match intended download. Suggestion: run yum --enablerepo=%"
++"s clean metadata"
+ msgstr ""
+ "Pakiet nie zgadza się z zamierzonym pobieraniem. Sugestia: proszę wykonać "
+-"polecenie yum clean metadata"
++"polecenie yum --enablerepo=%s clean metadata"
+
+-#: ../yum/__init__.py:1486
++#: ../yum/__init__.py:1714
+ msgid "Could not perform checksum"
+ msgstr "Nie można wykonać sprawdzenia sum kontrolnych"
+
+-#: ../yum/__init__.py:1489
++#: ../yum/__init__.py:1717
+ msgid "Package does not match checksum"
+ msgstr "Sumy kontrolne pakietu nie zgadzają się"
+
+-#: ../yum/__init__.py:1531
++#: ../yum/__init__.py:1769
+ #, 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:1534 ../yum/__init__.py:1563
++#: ../yum/__init__.py:1772 ../yum/__init__.py:1801
+ #, python-format
+ msgid "using local copy of %s"
+ msgstr "używanie lokalnej kopii %s"
+
+-#: ../yum/__init__.py:1575
++#: ../yum/__init__.py:1813
+ #, python-format
+ msgid ""
+ "Insufficient space in download directory %s\n"
+@@ -2214,11 +2395,11 @@ msgstr ""
+ " * wolne %s\n"
+ " * wymagane %s"
+
+-#: ../yum/__init__.py:1624
++#: ../yum/__init__.py:1862
+ msgid "Header is not complete."
+ msgstr "Nagłówek nie jest pełny."
+
+-#: ../yum/__init__.py:1661
++#: ../yum/__init__.py:1899
+ #, python-format
+ msgid ""
+ "Header not in local cache and caching-only mode enabled. Cannot download %s"
+@@ -2226,62 +2407,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:1716
++#: ../yum/__init__.py:1954
+ #, python-format
+ msgid "Public key for %s is not installed"
+ msgstr "Klucz publiczny dla %s nie jest zainstalowany"
+
+-#: ../yum/__init__.py:1720
++#: ../yum/__init__.py:1958
+ #, python-format
+ msgid "Problem opening package %s"
+ msgstr "Wystąpił problem podczas otwierania pakietu %s"
+
+-#: ../yum/__init__.py:1728
++#: ../yum/__init__.py:1966
+ #, python-format
+ msgid "Public key for %s is not trusted"
+ msgstr "Klucz publiczny dla %s nie jest zaufany"
+
+-#: ../yum/__init__.py:1732
++#: ../yum/__init__.py:1970
+ #, python-format
+ msgid "Package %s is not signed"
+ msgstr "Pakiet %s nie jest podpisany"
+
+-#: ../yum/__init__.py:1770
++#: ../yum/__init__.py:2008
+ #, python-format
+ msgid "Cannot remove %s"
+ msgstr "Nie można usunąć %s"
+
+-#: ../yum/__init__.py:1774
++#: ../yum/__init__.py:2012
+ #, python-format
+ msgid "%s removed"
+ msgstr "Usunięto %s"
+
+-#: ../yum/__init__.py:1820
++#: ../yum/__init__.py:2058
+ #, python-format
+ msgid "Cannot remove %s file %s"
+ msgstr "Nie można usunąć %s pliku %s"
+
+-#: ../yum/__init__.py:1824
++#: ../yum/__init__.py:2062
+ #, python-format
+ msgid "%s file %s removed"
+ msgstr "Usunięto %s plik %s"
+
+-#: ../yum/__init__.py:1826
++#: ../yum/__init__.py:2064
+ #, python-format
+ msgid "%d %s files removed"
+ msgstr "Usunięto %d %s plików"
+
+-#: ../yum/__init__.py:1895
++#: ../yum/__init__.py:2133
+ #, 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:1901
++#: ../yum/__init__.py:2139
+ #, 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:2180
++#: ../yum/__init__.py:2433
+ msgid ""
+ "searchPackages() will go away in a future version of "
+ "Yum. Use searchGenerator() instead. \n"
+@@ -2289,180 +2470,213 @@ msgstr ""
+ "searchPackages() zostanie usunięte w przyszłych wersjach programu "
+ "yum. Zamiast tego należy użyć searchGenerator(). \n"
+
+-#: ../yum/__init__.py:2219
++#: ../yum/__init__.py:2472
+ #, python-format
+ msgid "Searching %d packages"
+ msgstr "Wyszukiwanie %d pakietów"
+
+-#: ../yum/__init__.py:2223
++#: ../yum/__init__.py:2476
+ #, python-format
+ msgid "searching package %s"
+ msgstr "wyszukiwanie pakietu %s"
+
+-#: ../yum/__init__.py:2235
++#: ../yum/__init__.py:2488
+ msgid "searching in file entries"
+ msgstr "wyszukiwanie we wpisach plików"
+
+-#: ../yum/__init__.py:2242
++#: ../yum/__init__.py:2495
+ msgid "searching in provides entries"
+ msgstr "wyszukiwanie we wpisach dostarczania"
+
+-#: ../yum/__init__.py:2275
++#: ../yum/__init__.py:2528
+ #, python-format
+ msgid "Provides-match: %s"
+ msgstr "Wyniki dostarczania: %s"
+
+-#: ../yum/__init__.py:2324
++#: ../yum/__init__.py:2577
+ msgid "No group data available for configured repositories"
+ msgstr "Brak dostępnych danych grup dla skonfigurowanych repozytoriów"
+
+-#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405
+-#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497
+-#: ../yum/__init__.py:2814
++#: ../yum/__init__.py:2608 ../yum/__init__.py:2627 ../yum/__init__.py:2658
++#: ../yum/__init__.py:2664 ../yum/__init__.py:2746 ../yum/__init__.py:2750
++#: ../yum/__init__.py:3095
+ #, python-format
+ msgid "No Group named %s exists"
+ msgstr "Grupa o nazwie %s nie istnieje"
+
+-#: ../yum/__init__.py:2386 ../yum/__init__.py:2513
++#: ../yum/__init__.py:2639 ../yum/__init__.py:2766
+ #, python-format
+ msgid "package %s was not marked in group %s"
+ msgstr "pakiet %s nie został oznaczony w grupie %s"
+
+-#: ../yum/__init__.py:2433
++#: ../yum/__init__.py:2686
+ #, python-format
+ msgid "Adding package %s from group %s"
+ msgstr "Dodawanie pakietu %s z grupy %s"
+
+-#: ../yum/__init__.py:2437
++#: ../yum/__init__.py:2690
+ #, python-format
+ msgid "No package named %s available to be installed"
+ msgstr "Brak dostępnego pakietu o nazwie %s do zainstalowania"
+
+-#: ../yum/__init__.py:2539
++#. This can happen due to excludes after .up has
++#. happened.
++#: ../yum/__init__.py:2794
+ #, python-format
+ msgid "Package tuple %s could not be found in packagesack"
+ msgstr "Nie można odnaleźć krotki pakietu %s w zestawie pakietów"
+
+-#: ../yum/__init__.py:2558
++#: ../yum/__init__.py:2813
+ #, python-format
+ msgid "Package tuple %s could not be found in rpmdb"
+ msgstr "Nie można odnaleźć krotki pakietu %s w bazie danych RPM"
+
+-#: ../yum/__init__.py:2614 ../yum/__init__.py:2664
+-msgid "Invalid version flag"
+-msgstr "Nieprawidłowa flaga wersji"
+-
+-#: ../yum/__init__.py:2634 ../yum/__init__.py:2639
++#: ../yum/__init__.py:2868 ../yum/__init__.py:2873
+ #, python-format
+ msgid "No Package found for %s"
+ msgstr "Nie odnaleziono pakietu %s"
+
+-#: ../yum/__init__.py:2855
++#: ../yum/__init__.py:2901
++msgid "Invalid version flag"
++msgstr "Nieprawidłowa flaga wersji"
++
++#: ../yum/__init__.py:3145
+ msgid "Package Object was not a package object instance"
+ msgstr "Obiekt pakietu nie był instancją obiektu pakietu"
+
+-#: ../yum/__init__.py:2859
++#: ../yum/__init__.py:3149
+ msgid "Nothing specified to install"
+ msgstr "Nie podano nic do zainstalowania"
+
+-#: ../yum/__init__.py:2875 ../yum/__init__.py:3652
++#: ../yum/__init__.py:3168 ../yum/__init__.py:3992
+ #, 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:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365
+-#: ../yum/__init__.py:3658
++#: ../yum/__init__.py:3174 ../yum/__init__.py:3504 ../yum/__init__.py:3684
++#: ../yum/__init__.py:3998
+ #, python-format
+ msgid "No Match for argument: %s"
+ msgstr "Brak wyników dla parametru: %s"
+
+-#: ../yum/__init__.py:2957
++#: ../yum/__init__.py:3250
+ #, python-format
+ msgid "Package %s installed and not available"
+ msgstr "Pakiet %s jest zainstalowany, ale nie jest dostępny"
+
+-#: ../yum/__init__.py:2960
++#: ../yum/__init__.py:3253
+ msgid "No package(s) available to install"
+ msgstr "Brak pakietów dostępnych do instalacji"
+
+-#: ../yum/__init__.py:2972
++#: ../yum/__init__.py:3265
+ #, python-format
+ msgid "Package: %s - already in transaction set"
+ msgstr "Pakiet: %s - jest już w zestawie transakcji"
+
+-#: ../yum/__init__.py:2998
++#: ../yum/__init__.py:3291
+ #, python-format
+ msgid "Package %s is obsoleted by %s which is already installed"
+ msgstr "Pakiet %s został zastąpiony przez %s, który jest już zainstalowany"
+
+-#: ../yum/__init__.py:3001
++#: ../yum/__init__.py:3296
++#, python-format
++msgid ""
++"Package %s is obsoleted by %s, but obsoleting package does not provide for "
++"requirements"
++msgstr ""
++"Pakiet %s został zastąpiony przez %s, ale zastępujący pakiet nie spełnia "
++"wymagań"
++
++#: ../yum/__init__.py:3299
+ #, 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:3009
++#: ../yum/__init__.py:3307
+ #, python-format
+ msgid "Package %s already installed and latest version"
+ msgstr "Pakiet %s jest już zainstalowany w najnowszej wersji"
+
+-#: ../yum/__init__.py:3023
++#: ../yum/__init__.py:3321
+ #, python-format
+ msgid "Package matching %s already installed. Checking for update."
+ msgstr ""
+ "Pakiet pasujący do %s jest już zainstalowany. Sprawdzanie aktualizacji."
+
+ #. update everything (the easy case)
+-#: ../yum/__init__.py:3126
++#: ../yum/__init__.py:3424
+ msgid "Updating Everything"
+ msgstr "Aktualizowanie wszystkiego"
+
+-#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289
+-#: ../yum/__init__.py:3315
++#: ../yum/__init__.py:3448 ../yum/__init__.py:3577 ../yum/__init__.py:3604
++#: ../yum/__init__.py:3630
+ #, 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:3182 ../yum/__init__.py:3362
++#: ../yum/__init__.py:3489 ../yum/__init__.py:3680
+ #, python-format
+ msgid "%s"
+ msgstr "%s"
+
+-#: ../yum/__init__.py:3253
++#: ../yum/__init__.py:3566
+ #, 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:3284
++#: ../yum/__init__.py:3599
+ #, python-format
+ msgid "Not Updating Package that is obsoleted: %s"
+ msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s"
+
+-#: ../yum/__init__.py:3293 ../yum/__init__.py:3319
++#: ../yum/__init__.py:3608 ../yum/__init__.py:3634
+ #, 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:3378
++#: ../yum/__init__.py:3697
+ msgid "No package matched to remove"
+ msgstr "Brak pasujących pakietów do usunięcia"
+
+-#: ../yum/__init__.py:3412
++#: ../yum/__init__.py:3703
++#, python-format
++msgid "Skipping the running kernel: %s"
++msgstr "Pomijanie uruchomionego jądra: %s"
++
++#: ../yum/__init__.py:3709
++#, python-format
++msgid "Removing %s from the transaction"
++msgstr "Usuwanie %s z transakcji"
++
++#: ../yum/__init__.py:3744
+ #, python-format
+ msgid "Cannot open: %s. Skipping."
+ msgstr "Nie można otworzyć: %s. Pomijanie."
+
+-#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598
++#: ../yum/__init__.py:3747 ../yum/__init__.py:3859 ../yum/__init__.py:3935
+ #, python-format
+ msgid "Examining %s: %s"
+ msgstr "Sprawdzanie %s: %s"
+
+-#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601
++#: ../yum/__init__.py:3751
++#, python-format
++msgid "Cannot localinstall deltarpm: %s. Skipping."
++msgstr "Nie można lokalnie zainstalować pakietu RPM delta: %s. Pomijanie."
++
++#: ../yum/__init__.py:3760 ../yum/__init__.py:3862 ../yum/__init__.py:3938
+ #, 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:3431
++#: ../yum/__init__.py:3766
++#, python-format
++msgid "Cannot install package %s. It is obsoleted by installed package %s"
++msgstr ""
++"Nie można zainstalować pakietu %s. Został zastąpiony zainstalowanym pakietem "
++"%s"
++
++#: ../yum/__init__.py:3774
+ #, python-format
+ msgid ""
+ "Package %s not installed, cannot update it. Run yum install to install it "
+@@ -2471,113 +2685,131 @@ msgstr ""
+ "Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Proszę wykonać "
+ "polecenie yum install, aby go zainstalować."
+
+-#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606
++#: ../yum/__init__.py:3803 ../yum/__init__.py:3867 ../yum/__init__.py:3943
+ #, python-format
+ msgid "Excluding %s"
+ msgstr "Wykluczanie %s"
+
+-#: ../yum/__init__.py:3465
++#: ../yum/__init__.py:3808
+ #, python-format
+ msgid "Marking %s to be installed"
+ msgstr "Oznaczanie %s do zainstalowania"
+
+-#: ../yum/__init__.py:3471
++#: ../yum/__init__.py:3814
+ #, python-format
+ msgid "Marking %s as an update to %s"
+ msgstr "Oznaczanie %s jako aktualizacji %s"
+
+-#: ../yum/__init__.py:3478
++#: ../yum/__init__.py:3821
+ #, python-format
+ msgid "%s: does not update installed package."
+ msgstr "%s: nie aktualizuj zainstalowanego pakietu."
+
+-#: ../yum/__init__.py:3511 ../yum/__init__.py:3595
++#: ../yum/__init__.py:3856 ../yum/__init__.py:3932
+ #, python-format
+ msgid "Cannot open file: %s. Skipping."
+ msgstr "Nie można otworzyć pliku: %s. Pomijanie."
+
+-#: ../yum/__init__.py:3541
++#: ../yum/__init__.py:3886
+ 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:3554 ../yum/__init__.py:3686
+-#, python-format
+-msgid "Package %s is allowed multiple installs, skipping"
+-msgstr "Pakiet %s może być wielokrotnie instalowany, pomijanie"
+-
+-#: ../yum/__init__.py:3575
++#: ../yum/__init__.py:3912
+ #, python-format
+ msgid "Problem in reinstall: no package %s matched to install"
+ msgstr ""
+ "Podczas ponownego instalowania wystąpił problem: brak pakietu %s pasującego "
+ "do zainstalowania"
+
+-#: ../yum/__init__.py:3678
++#: ../yum/__init__.py:4018
+ msgid "No package(s) available to downgrade"
+ msgstr "Brak pakietów dostępnych do instalacji poprzedniej wersji"
+
+-#: ../yum/__init__.py:3731
++#: ../yum/__init__.py:4026
++#, python-format
++msgid "Package %s is allowed multiple installs, skipping"
++msgstr "Pakiet %s może być wielokrotnie instalowany, pomijanie"
++
++#: ../yum/__init__.py:4072
+ #, python-format
+ msgid "No Match for available package: %s"
+ msgstr "Brak wyników dla dostępnych pakietów: %s"
+
+-#: ../yum/__init__.py:3738
++#: ../yum/__init__.py:4079
+ #, python-format
+ msgid "Only Upgrade available on package: %s"
+ msgstr "Dla pakietu dostępna jest tylko aktualizacja: %s"
+
+-#: ../yum/__init__.py:3808 ../yum/__init__.py:3845
++#: ../yum/__init__.py:4149 ../yum/__init__.py:4186
+ #, python-format
+ msgid "Failed to downgrade: %s"
+ msgstr "Zainstalowanie poprzedniej wersji nie powiodło się: %s"
+
+-#: ../yum/__init__.py:3877
++#: ../yum/__init__.py:4218
+ #, python-format
+ msgid "Retrieving GPG key from %s"
+ msgstr "Pobieranie klucza GPG z %s"
+
+-#: ../yum/__init__.py:3897
++#: ../yum/__init__.py:4238
+ msgid "GPG key retrieval failed: "
+ msgstr "Pobranie klucza GPG nie powiodło się: "
+
+-#: ../yum/__init__.py:3903
++#: ../yum/__init__.py:4244
+ #, python-format
+ msgid "Invalid GPG Key from %s: %s"
+ msgstr "Nieprawidłowy klucz GPG z %s: %s"
+
+-#: ../yum/__init__.py:3912
++#: ../yum/__init__.py:4253
+ #, python-format
+ msgid "GPG key parsing failed: key does not have value %s"
+ msgstr ""
+ "Przetworzenie klucza GPG nie powiodło się: klucz nie posiada wartości %s"
+
+-#: ../yum/__init__.py:3944
++#: ../yum/__init__.py:4267
+ #, python-format
+-msgid "GPG key at %s (0x%s) is already installed"
+-msgstr "Klucz GPG %s (0x%s) jest już zainstalowany"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid : %s\n"
++" Package: %s (%s)\n"
++" From : %s"
++msgstr ""
++"Importowanie klucza GPG 0x%s:\n"
++" Identyfikator użytkownika: %s\n"
++" Pakiet : %s (%s)\n"
++" Od : %s"
+
+-#. Try installing/updating GPG key
+-#: ../yum/__init__.py:3949 ../yum/__init__.py:4011
++#: ../yum/__init__.py:4275
+ #, python-format
+-msgid "Importing GPG key 0x%s \"%s\" from %s"
+-msgstr "Importowanie klucza GPG 0x%s \"%s\" z %s"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid: \"%s\"\n"
++" From : %s"
++msgstr ""
++"Importowanie klucza GPG 0x%s:\n"
++" Identyfikator użytkownika: \"%s\"\n"
++" Od : %s"
+
+-#: ../yum/__init__.py:3966
++#: ../yum/__init__.py:4307
++#, python-format
++msgid "GPG key at %s (0x%s) is already installed"
++msgstr "Klucz GPG %s (0x%s) jest już zainstalowany"
++
++#: ../yum/__init__.py:4326
+ msgid "Not installing key"
+ msgstr "Klucz nie zostanie zainstalowany"
+
+-#: ../yum/__init__.py:3972
++#: ../yum/__init__.py:4332
+ #, python-format
+ msgid "Key import failed (code %d)"
+ msgstr "Zaimportowanie klucza nie powiodło się (kod %d)"
+
+-#: ../yum/__init__.py:3973 ../yum/__init__.py:4032
++#: ../yum/__init__.py:4333 ../yum/__init__.py:4389
+ msgid "Key imported successfully"
+ msgstr "Klucz został pomyślnie zaimportowany"
+
+-#: ../yum/__init__.py:3978 ../yum/__init__.py:4037
++#: ../yum/__init__.py:4338
+ #, python-format
+ msgid ""
+ "The GPG keys listed for the \"%s\" repository are already installed but they "
+@@ -2589,83 +2821,95 @@ msgstr ""
+ "Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne "
+ "adresy URL do kluczy."
+
+-#: ../yum/__init__.py:3987
++#: ../yum/__init__.py:4347
+ msgid "Import of key(s) didn't help, wrong key(s)?"
+ msgstr "Zaimportowanie kluczy nie pomogło, błędne klucze?"
+
+-#: ../yum/__init__.py:4006
++#: ../yum/__init__.py:4366
+ #, python-format
+ msgid "GPG key at %s (0x%s) is already imported"
+ msgstr "Klucz GPG %s (0x%s) został już zaimportowany"
+
+-#: ../yum/__init__.py:4026
++#: ../yum/__init__.py:4383
+ #, python-format
+ msgid "Not installing key for repo %s"
+ msgstr "Klucz dla repozytorium %s nie zostanie zainstalowany"
+
+-#: ../yum/__init__.py:4031
++#: ../yum/__init__.py:4388
+ msgid "Key import failed"
+ msgstr "Zaimportowanie klucza nie powiodło się"
+
+-#: ../yum/__init__.py:4157
++#: ../yum/__init__.py:4394
++#, python-format
++msgid ""
++"The GPG keys listed for the \"%s\" repository are already installed but they "
++"are not correct.\n"
++"Check that the correct key URLs are configured for this repository."
++msgstr ""
++"Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie "
++"są poprawne.\n"
++"Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne "
++"adresy URL do kluczy."
++
++#: ../yum/__init__.py:4521
+ msgid "Unable to find a suitable mirror."
+ msgstr "Nie można odnaleźć odpowiedniego serwera lustrzanego."
+
+-#: ../yum/__init__.py:4159
++#: ../yum/__init__.py:4523
+ msgid "Errors were encountered while downloading packages."
+ msgstr "Wystąpiły błędy podczas pobierania pakietów."
+
+-#: ../yum/__init__.py:4209
++#: ../yum/__init__.py:4573
+ #, python-format
+ msgid "Please report this error at %s"
+ msgstr "Proszę zgłosić ten błąd na %s"
+
+-#: ../yum/__init__.py:4233
++#: ../yum/__init__.py:4597
+ msgid "Test Transaction Errors: "
+ msgstr "Błędy testu transakcji: "
+
+-#: ../yum/__init__.py:4334
++#: ../yum/__init__.py:4700
+ #, python-format
+ msgid "Could not set cachedir: %s"
+ msgstr "Nie można ustawić katalogu pamięci podręcznej: %s "
+
+ #. Mostly copied from YumOutput._outKeyValFill()
+-#: ../yum/plugins.py:202
++#: ../yum/plugins.py:208
+ msgid "Loaded plugins: "
+ msgstr "Wczytane wtyczki: "
+
+-#: ../yum/plugins.py:216 ../yum/plugins.py:222
++#: ../yum/plugins.py:222 ../yum/plugins.py:228
+ #, python-format
+ msgid "No plugin match for: %s"
+ msgstr "Brak wyników dla wtyczki: %s"
+
+-#: ../yum/plugins.py:252
++#: ../yum/plugins.py:258
+ #, python-format
+ msgid "Not loading \"%s\" plugin, as it is disabled"
+ msgstr "Wtyczka \"%s\" nie została wczytana, ponieważ jest wyłączona"
+
+ #. Give full backtrace:
+-#: ../yum/plugins.py:264
++#: ../yum/plugins.py:270
+ #, python-format
+ msgid "Plugin \"%s\" can't be imported"
+ msgstr "Nie można zaimportować wtyczki \"%s\""
+
+-#: ../yum/plugins.py:271
++#: ../yum/plugins.py:277
+ #, python-format
+ msgid "Plugin \"%s\" doesn't specify required API version"
+ msgstr "Wtyczka \"%s\" nie określa wymaganej wersji API"
+
+-#: ../yum/plugins.py:276
++#: ../yum/plugins.py:282
+ #, 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:309
++#: ../yum/plugins.py:315
+ #, python-format
+ msgid "Loading \"%s\" plugin"
+ msgstr "Wczytywanie wtyczki \"%s\""
+
+-#: ../yum/plugins.py:316
++#: ../yum/plugins.py:322
+ #, python-format
+ msgid ""
+ "Two or more plugins with the name \"%s\" exist in the plugin search path"
+@@ -2673,19 +2917,19 @@ msgstr ""
+ "Istnieją dwie lub więcej wtyczek o nazwie \"%s\" w ścieżce wyszukiwania "
+ "wtyczek"
+
+-#: ../yum/plugins.py:336
++#: ../yum/plugins.py:342
+ #, python-format
+ msgid "Configuration file %s not found"
+ msgstr "Nie odnaleziono pliku konfiguracji %s"
+
+ #. for
+ #. Configuration files for the plugin not found
+-#: ../yum/plugins.py:339
++#: ../yum/plugins.py:345
+ #, python-format
+ msgid "Unable to find configuration file for plugin %s"
+ msgstr "Nie można odnaleźć pliku konfiguracji dla wtyczki %s"
+
+-#: ../yum/plugins.py:501
++#: ../yum/plugins.py:507
+ msgid "registration of commands not supported"
+ msgstr "rejestracja poleceń nie jest obsługiwana"
+
+@@ -2702,6 +2946,16 @@ msgstr "posiada zainstalowane konflikty"
+ msgid "%s is a duplicate with %s"
+ msgstr "%s jest duplikatem %s"
+
++#: ../yum/rpmsack.py:122
++#, python-format
++msgid "%s is obsoleted by %s"
++msgstr "%s zostaje zastąpiony przez %s"
++
++#: ../yum/rpmsack.py:130
++#, python-format
++msgid "%s provides %s but it cannot be found"
++msgstr "%s dostarcza %s, ale nie można go odnaleźć"
++
+ #: ../yum/rpmtrans.py:79
+ msgid "Repackaging"
+ msgstr "Ponowne tworzenie pakietu"
+diff --git a/po/ru.po b/po/ru.po
+index f1cbc2f..922be6f 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -1,71 +1,53 @@
+ # Russian translation of yum.
+ # Copyright (C) 2010 yum's COPYRIGHT HOLDER
+ # This file is distributed under the same license as the yum package.
+-#
++#
+ # Vladimir Bormotov <bor at insight.donbass.com>, 2002
+ # Grigory Bakunov <black at asplinux.ru>, 2002, 2003
+ # Timur Malikin <sora_tm at mail.ru>, 2010
+-# Misha Shnurapet <zayzayats at yandex.ru>, 2010
++# Misha Shnurapet <shnurapet at fedoraproject.org>, 2010
++#
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: yum\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-02-11 10:54-0500\n"
+-"PO-Revision-Date: 2010-06-28 16:09+0500\n"
+-"Last-Translator: Timon <timosha at gmail.com>\n"
++"POT-Creation-Date: 2010-08-17 10:15-0400\n"
++"PO-Revision-Date: 2010-09-07 10:36+0800\n"
++"Last-Translator: Misha Shnurapet <shnurapet at fedoraproject.org>\n"
+ "Language-Team: ru <fedora-localization at www.russianfedora.ru>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Generated-By: pygettext.py 1.1\n"
+
+-#: ../callback.py:48
+-#: ../output.py:947
+-#: ../yum/rpmtrans.py:72
++#: ../callback.py:48 ../output.py:1027 ../yum/rpmtrans.py:72
+ msgid "Updating"
+ msgstr "Обновление"
+
+-#: ../callback.py:49
+-#: ../yum/rpmtrans.py:73
++#: ../callback.py:49 ../yum/rpmtrans.py:73
+ msgid "Erasing"
+ msgstr "Удаление"
+
+-#: ../callback.py:50
+-#: ../callback.py:51
+-#: ../callback.py:53
+-#: ../output.py:946
+-#: ../output.py:1659
+-#: ../yum/rpmtrans.py:74
+-#: ../yum/rpmtrans.py:75
++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1026
++#: ../output.py:1919 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
+ #: ../yum/rpmtrans.py:77
+ msgid "Installing"
+ msgstr "Установка"
+
+-#: ../callback.py:52
+-#: ../callback.py:58
+-#: ../output.py:1484
+-#: ../yum/rpmtrans.py:76
++#: ../callback.py:52 ../callback.py:58 ../output.py:1640 ../yum/rpmtrans.py:76
+ msgid "Obsoleted"
+ msgstr "Исключено"
+
+-#: ../callback.py:54
+-#: ../output.py:1070
+-#: ../output.py:1442
+-#: ../output.py:1491
++#: ../callback.py:54 ../output.py:1157 ../output.py:1518 ../output.py:1647
+ msgid "Updated"
+ msgstr "Обновлено"
+
+-#: ../callback.py:55
+-#: ../output.py:1438
++#: ../callback.py:55 ../output.py:1517
+ msgid "Erased"
+ msgstr "Удалено"
+
+-#: ../callback.py:56
+-#: ../callback.py:57
+-#: ../callback.py:59
+-#: ../output.py:1068
+-#: ../output.py:1434
+-#: ../output.py:1646
++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1155
++#: ../output.py:1517 ../output.py:1519 ../output.py:1891
+ msgid "Installed"
+ msgstr "Установлено"
+
+@@ -85,81 +67,75 @@ msgstr "Ошибка: неверный выходной статус: %s для
+ #: ../callback.py:212
+ #, python-format
+ msgid "Erased: %s"
+-msgstr "Удалено: %s"
++msgstr "Удален: %s"
+
+-#: ../callback.py:217
+-#: ../output.py:948
+-#: ../output.py:1648
++#: ../callback.py:217 ../output.py:1028 ../output.py:1894
+ msgid "Removing"
+ msgstr "Удаление"
+
+-#: ../callback.py:219
+-#: ../yum/rpmtrans.py:78
++#: ../callback.py:219 ../yum/rpmtrans.py:78
+ msgid "Cleanup"
+ msgstr "Очистка"
+
+-#: ../cli.py:107
++#: ../cli.py:108
+ #, python-format
+ msgid "Command \"%s\" already defined"
+ msgstr "Команда \"%s\" уже используется"
+
+-#: ../cli.py:119
++#: ../cli.py:120
+ msgid "Setting up repositories"
+ msgstr "Настройка репозиториев"
+
+-#: ../cli.py:130
++#: ../cli.py:131
+ msgid "Reading repository metadata in from local files"
+ msgstr "Чтение локальных метаданных для репозиториев"
+
+-#: ../cli.py:194
+-#: ../utils.py:193
++#: ../cli.py:234 ../utils.py:254
+ #, python-format
+ msgid "Config Error: %s"
+ msgstr "Ошибка конфигурации: %s"
+
+-#: ../cli.py:197
+-#: ../cli.py:1272
+-#: ../utils.py:196
++#: ../cli.py:237 ../cli.py:1403 ../utils.py:257
+ #, python-format
+ msgid "Options Error: %s"
+ msgstr "Ошибка опции: %s"
+
+-#: ../cli.py:227
++#: ../cli.py:267
+ #, python-format
+ msgid " Installed: %s-%s at %s"
+ msgstr " Установлено: %s-%s из %s"
+
+-#: ../cli.py:229
++#: ../cli.py:269
+ #, python-format
+ msgid " Built : %s at %s"
+ msgstr " Собрано : %s из %s"
+
+-#: ../cli.py:231
++#: ../cli.py:271
+ #, python-format
+ msgid " Committed: %s at %s"
+ msgstr " Передано : %s из %s"
+
+-#: ../cli.py:270
++#: ../cli.py:310
+ msgid "You need to give some command"
+ msgstr "Необходимо задать команду"
+
+-#: ../cli.py:284
++#: ../cli.py:324
+ #, python-format
+ msgid "No such command: %s. Please use %s --help"
+ msgstr "Не найдена команда: %s Пожалуйста используйте для справки %s --help"
+
+-#: ../cli.py:314
++#: ../cli.py:354
+ msgid "Disk Requirements:\n"
+ msgstr "Необходимо места на диске:\n"
+
+-#: ../cli.py:316
++#: ../cli.py:356
+ #, python-format
+ msgid " At least %dMB more space needed on the %s filesystem.\n"
+ msgstr " Как минимум %d Мбайт необходимо на %s.\n"
+
+ #. TODO: simplify the dependency errors?
+ #. Fixup the summary
+-#: ../cli.py:321
++#: ../cli.py:361
+ msgid ""
+ "Error Summary\n"
+ "-------------\n"
+@@ -167,63 +143,60 @@ msgstr ""
+ "Обзор ошибок \n"
+ "-------------\n"
+
+-#: ../cli.py:364
++#: ../cli.py:404
+ msgid "Trying to run the transaction but nothing to do. Exiting."
+ msgstr "Попытка предпринята, делать нечего. Завершение."
+
+-#: ../cli.py:403
++#: ../cli.py:451
+ msgid "Exiting on user Command"
+ msgstr "Выход по запросу пользователя"
+
+-#: ../cli.py:407
++#: ../cli.py:455
+ msgid "Downloading Packages:"
+ msgstr "Загрузка пакетов:"
+
+-#: ../cli.py:412
++#: ../cli.py:460
+ msgid "Error Downloading Packages:\n"
+ msgstr "Ошибка загрузки пакетов:\n"
+
+-#: ../cli.py:426
+-#: ../yum/__init__.py:4195
++#: ../cli.py:474 ../yum/__init__.py:4559
+ msgid "Running rpm_check_debug"
+ msgstr "Запуск rpm_check_debug"
+
+-#: ../cli.py:435
+-#: ../yum/__init__.py:4204
++#: ../cli.py:483 ../yum/__init__.py:4568
+ msgid "ERROR You need to update rpm to handle:"
+ msgstr "ОШИБКА Вам необходимо обновить rpm:"
+
+-#: ../cli.py:437
+-#: ../yum/__init__.py:4207
++#: ../cli.py:485 ../yum/__init__.py:4571
+ msgid "ERROR with rpm_check_debug vs depsolve:"
+ msgstr "ОШИБКА в rpm_check_debug и разрешении зависимостей:"
+
+-#: ../cli.py:443
++#: ../cli.py:491
+ msgid "RPM needs to be updated"
+ msgstr "менеджер пакетов RPM должен быть обновлен"
+
+-#: ../cli.py:444
++#: ../cli.py:492
+ #, python-format
+ msgid "Please report this error in %s"
+ msgstr "Пожалуйста, сообщите об ошибке в %s"
+
+-#: ../cli.py:450
++#: ../cli.py:498
+ msgid "Running Transaction Test"
+ msgstr "Проверяем сценарий"
+
+-#: ../cli.py:466
++#: ../cli.py:514
+ msgid "Transaction Check Error:\n"
+ msgstr "Проверка сценария завершена с ошибкой:\n"
+
+-#: ../cli.py:473
++#: ../cli.py:521
+ msgid "Transaction Test Succeeded"
+ msgstr "Проверка сценария прошла успешно"
+
+-#: ../cli.py:495
++#: ../cli.py:543
+ msgid "Running Transaction"
+ msgstr "Запускается сценарий"
+
+-#: ../cli.py:525
++#: ../cli.py:573
+ msgid ""
+ "Refusing to automatically import keys when running unattended.\n"
+ "Use \"-y\" to override."
+@@ -231,92 +204,93 @@ msgstr ""
+ "Отмена автоматического импорта ключей во время запуска без контроля.\n"
+ "Используйте \"-y\" для игнорирования."
+
+-#: ../cli.py:544
+-#: ../cli.py:578
++#: ../cli.py:592 ../cli.py:626
+ msgid " * Maybe you meant: "
+-msgstr " * Возможно вы имели в виду: "
++msgstr " * Возможно, вы имели в виду: "
+
+-#: ../cli.py:561
+-#: ../cli.py:569
++#: ../cli.py:609 ../cli.py:617
+ #, python-format
+ msgid "Package(s) %s%s%s available, but not installed."
+ msgstr "Пакет(ы) %s%s%s доступны, но не установлены."
+
+-#: ../cli.py:575
+-#: ../cli.py:607
+-#: ../cli.py:687
++#: ../cli.py:623 ../cli.py:656 ../cli.py:810
+ #, python-format
+ msgid "No package %s%s%s available."
+ msgstr "Пакет %s%s%s недоступен."
+
+-#: ../cli.py:612
+-#: ../cli.py:748
++#: ../cli.py:663 ../cli.py:875
+ msgid "Package(s) to install"
+ msgstr "Пакет(ы) для установки"
+
+-#: ../cli.py:613
+-#: ../cli.py:693
+-#: ../cli.py:727
+-#: ../cli.py:749
+-#: ../yumcommands.py:160
++#: ../cli.py:666 ../cli.py:667 ../cli.py:816 ../cli.py:850 ../cli.py:876
++#: ../yumcommands.py:179
+ msgid "Nothing to do"
+ msgstr "Выполнять нечего"
+
+-#: ../cli.py:647
++#: ../cli.py:701
+ #, python-format
+ msgid "%d packages marked for Update"
+ msgstr "%d пакеты отмечены для обновления"
+
+-#: ../cli.py:650
++#: ../cli.py:704
+ msgid "No Packages marked for Update"
+ msgstr "Нет пакетов, отмеченных для обновления"
+
+-#: ../cli.py:664
++#: ../cli.py:770
++#, python-format
++msgid "%d packages marked for Distribution Synchronization"
++msgstr "Отмечено пакетов для синхронизации: %d"
++
++#: ../cli.py:773
++msgid "No Packages marked for Distribution Synchronization"
++msgstr "Пакетов, отмеченных для синхронизации, нет"
++
++#: ../cli.py:787
+ #, python-format
+ msgid "%d packages marked for removal"
+ msgstr "%d пакеты отмечены для удаления"
+
+-#: ../cli.py:667
++#: ../cli.py:790
+ msgid "No Packages marked for removal"
+ msgstr "Нет пакетов, отмеченных для удаления"
+
+-#: ../cli.py:692
++#: ../cli.py:815
+ msgid "Package(s) to downgrade"
+ msgstr "Пакет(ы) для отката версии"
+
+-#: ../cli.py:717
++#: ../cli.py:840
+ #, python-format
+ msgid " (from %s)"
+ msgstr " (из %s)"
+
+-#: ../cli.py:719
++#: ../cli.py:841
+ #, python-format
+ msgid "Installed package %s%s%s%s not available."
+ msgstr "Установленный пакет %s%s%s%s недоступен."
+
+-#: ../cli.py:726
++#: ../cli.py:849
+ msgid "Package(s) to reinstall"
+ msgstr "Пакет(ы) для переустановки"
+
+-#: ../cli.py:739
++#: ../cli.py:862
+ msgid "No Packages Provided"
+ msgstr "Пакеты не предоставлены"
+
+-#: ../cli.py:818
++#: ../cli.py:945
+ #, python-format
+ msgid "Matched: %s"
+ msgstr "Совпадений: %s"
+
+-#: ../cli.py:825
++#: ../cli.py:952
+ #, python-format
+ msgid "Warning: No matches found for: %s"
+ msgstr "Внимание: совпадений для %s не найдено"
+
+-#: ../cli.py:828
++#: ../cli.py:955
+ msgid "No Matches found"
+ msgstr "Совпадений не найдено"
+
+-#: ../cli.py:868
++#: ../cli.py:995
+ #, python-format
+ msgid ""
+ "Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+@@ -326,113 +300,113 @@ msgstr ""
+ " Вы можете использовать \"%s*/%s%s\" и/или \"%s*bin/%s%s\" \n"
+ " чтобы получить соответствующее поведение"
+
+-#: ../cli.py:884
++#: ../cli.py:1011
+ #, python-format
+ msgid "No Package Found for %s"
+ msgstr "Пакет для %s не найден"
+
+-#: ../cli.py:896
++#: ../cli.py:1021
++msgid "Cleaning repos: "
++msgstr "Сброс источников:"
++
++#: ../cli.py:1026
+ msgid "Cleaning up Everything"
+ msgstr "Очистка всего"
+
+-#: ../cli.py:912
++#: ../cli.py:1042
+ msgid "Cleaning up Headers"
+ msgstr "Очистка заголовков"
+
+-#: ../cli.py:915
++#: ../cli.py:1045
+ msgid "Cleaning up Packages"
+ msgstr "Очистка пакетов"
+
+-#: ../cli.py:918
++#: ../cli.py:1048
+ msgid "Cleaning up xml metadata"
+ msgstr "Очистка xml метаданных"
+
+-#: ../cli.py:921
++#: ../cli.py:1051
+ msgid "Cleaning up database cache"
+ msgstr "Очистка кэша данных"
+
+-#: ../cli.py:924
++#: ../cli.py:1054
+ msgid "Cleaning up expire-cache metadata"
+ msgstr "Очистка устаревшего кэша"
+
+-#: ../cli.py:927
++#: ../cli.py:1057
+ msgid "Cleaning up cached rpmdb data"
+ msgstr "Очистка кэша данных базы RPM"
+
+-#: ../cli.py:930
++#: ../cli.py:1060
+ msgid "Cleaning up plugins"
+ msgstr "Сброс модулей"
+
+-#: ../cli.py:955
++#: ../cli.py:1085
+ msgid "Installed Groups:"
+ msgstr "Установлены коллекции:"
+
+-#: ../cli.py:967
++#: ../cli.py:1097
+ msgid "Available Groups:"
+ msgstr "Доступные коллекции:"
+
+-#: ../cli.py:977
++#: ../cli.py:1107
+ msgid "Done"
+ msgstr "Выполнено"
+
+-#: ../cli.py:988
+-#: ../cli.py:1006
+-#: ../cli.py:1012
+-#: ../yum/__init__.py:2788
++#: ../cli.py:1118 ../cli.py:1136 ../cli.py:1142 ../yum/__init__.py:3069
+ #, python-format
+ msgid "Warning: Group %s does not exist."
+ msgstr "Внимание: коллекции %s не существует."
+
+-#: ../cli.py:1016
++#: ../cli.py:1146
+ msgid "No packages in any requested group available to install or update"
+ msgstr "Во всех указанных коллекциях пакеты для установки или обновления отсутствуют"
+
+-#: ../cli.py:1018
++#: ../cli.py:1148
+ #, python-format
+ msgid "%d Package(s) to Install"
+ msgstr "%d Пакет(ы) для установки"
+
+-#: ../cli.py:1028
+-#: ../yum/__init__.py:2800
++#: ../cli.py:1158 ../yum/__init__.py:3081
+ #, python-format
+ msgid "No group named %s exists"
+ msgstr "Коллекции с названием %s не существует"
+
+-#: ../cli.py:1034
++#: ../cli.py:1164
+ msgid "No packages to remove from groups"
+ msgstr "Нет пакетов для удаления из коллекций"
+
+-#: ../cli.py:1036
++#: ../cli.py:1166
+ #, python-format
+ msgid "%d Package(s) to remove"
+ msgstr "%d Пакет(ы) для удаления"
+
+-#: ../cli.py:1078
++#: ../cli.py:1208
+ #, python-format
+ msgid "Package %s is already installed, skipping"
+ msgstr "Пакет %s уже установлен, пропускаем"
+
+-#: ../cli.py:1089
++#: ../cli.py:1219
+ #, 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:1115
++#: ../cli.py:1245
+ #, python-format
+ msgid "No other %s installed, adding to list for potential install"
+ msgstr "Других %s не установлено, добавляем в список для возможной установки"
+
+-#: ../cli.py:1135
++#: ../cli.py:1265
+ msgid "Plugin Options"
+ msgstr "Опции модуля"
+
+-#: ../cli.py:1143
++#: ../cli.py:1273
+ #, python-format
+ msgid "Command line error: %s"
+ msgstr "Ошибка команды: %s"
+
+-#: ../cli.py:1156
++#: ../cli.py:1287
+ #, python-format
+ msgid ""
+ "\n"
+@@ -443,114 +417,118 @@ msgstr ""
+ "\n"
+ "%s: %s опцию необходимо указать с аргументом"
+
+-#: ../cli.py:1209
++#: ../cli.py:1340
+ msgid "--color takes one of: auto, always, never"
+ msgstr "--color возможное значение: auto, always, never"
+
+-#: ../cli.py:1319
++#: ../cli.py:1450
+ msgid "show this help message and exit"
+ msgstr "отобразить помощь и выйти"
+
+-#: ../cli.py:1323
++#: ../cli.py:1454
+ msgid "be tolerant of errors"
+ msgstr "игнорировать ошибки"
+
+-#: ../cli.py:1326
++#: ../cli.py:1457
+ msgid "run entirely from system cache, don't update cache"
+ msgstr "брать полностью из системного кэша, не обновлять его"
+
+-#: ../cli.py:1329
++#: ../cli.py:1460
+ msgid "config file location"
+ msgstr "расположение файла конфигурации"
+
+-#: ../cli.py:1332
++#: ../cli.py:1463
+ msgid "maximum command wait time"
+ msgstr "максимальное время ожидания команды"
+
+-#: ../cli.py:1334
++#: ../cli.py:1465
+ msgid "debugging output level"
+ msgstr "уровень отладочных сообщений"
+
+-#: ../cli.py:1338
++#: ../cli.py:1469
+ msgid "show duplicates, in repos, in list/search commands"
+ msgstr "показывать повторяющиеся в репозиториях пакеты, для команд list/search"
+
+-#: ../cli.py:1340
++#: ../cli.py:1471
+ msgid "error output level"
+ msgstr "уровень сообщений об ошибках"
+
+-#: ../cli.py:1343
++#: ../cli.py:1474
+ msgid "debugging output level for rpm"
+ msgstr "уровень отладочных сообщений для rpm"
+
+-#: ../cli.py:1346
++#: ../cli.py:1477
+ msgid "quiet operation"
+ msgstr "работать без вывода сообщений"
+
+-#: ../cli.py:1348
++#: ../cli.py:1479
+ msgid "verbose operation"
+ msgstr "подробно описывать действия"
+
+-#: ../cli.py:1350
++#: ../cli.py:1481
+ msgid "answer yes for all questions"
+ msgstr "Отвечать утвердительно на все вопросы"
+
+-#: ../cli.py:1352
++#: ../cli.py:1483
+ msgid "show Yum version and exit"
+ msgstr "показать версию Yum и выйти"
+
+-#: ../cli.py:1353
++#: ../cli.py:1484
+ msgid "set install root"
+ msgstr "настройка корневой папки"
+
+-#: ../cli.py:1357
++#: ../cli.py:1488
+ msgid "enable one or more repositories (wildcards allowed)"
+ msgstr "включение одного и более репозиториев (поиск по шаблону поддерживается)"
+
+-#: ../cli.py:1361
++#: ../cli.py:1492
+ msgid "disable one or more repositories (wildcards allowed)"
+ msgstr "выключение одного и более репозиториев (поиск по шаблону поддерживается)"
+
+-#: ../cli.py:1364
++#: ../cli.py:1495
+ msgid "exclude package(s) by name or glob"
+ msgstr "исключение пакета(ов) по имени или регулярному выражению"
+
+-#: ../cli.py:1366
++#: ../cli.py:1497
+ msgid "disable exclude from main, for a repo or for everything"
+ msgstr "отключает исключения для конкретного репозитория или для всех"
+
+-#: ../cli.py:1369
++#: ../cli.py:1500
+ msgid "enable obsoletes processing during updates"
+ msgstr "включить обработку устаревших во время обновления"
+
+-#: ../cli.py:1371
++#: ../cli.py:1502
+ msgid "disable Yum plugins"
+ msgstr "отключить модули Yum"
+
+-#: ../cli.py:1373
++#: ../cli.py:1504
+ msgid "disable gpg signature checking"
+ msgstr "отключить проверку подписи gpg"
+
+-#: ../cli.py:1375
++#: ../cli.py:1506
+ msgid "disable plugins by name"
+ msgstr "отключить модуль по названию"
+
+-#: ../cli.py:1378
++#: ../cli.py:1509
+ msgid "enable plugins by name"
+ msgstr "включить модуль по названию"
+
+-#: ../cli.py:1381
++#: ../cli.py:1512
+ msgid "skip packages with depsolving problems"
+ msgstr "пропускать пакеты, с проблемами в зависимостях"
+
+-#: ../cli.py:1383
++#: ../cli.py:1514
+ msgid "control whether color is used"
+ msgstr "Использовать ли цветовые схемы"
+
+-#: ../cli.py:1385
++#: ../cli.py:1516
+ msgid "set value of $releasever in yum config and repo files"
+ msgstr "установите значение $releasever в конфигурационном файле yum и в файлах репозиториев (repo)"
+
++#: ../cli.py:1518
++msgid "set arbitrary config and repo options"
++msgstr "другие настройки и свойства источников"
++
+ #: ../output.py:305
+ msgid "Jan"
+ msgstr "Янв"
+@@ -603,104 +581,114 @@ msgstr "Дек"
+ msgid "Trying other mirror."
+ msgstr "Пробуем другое зеркало."
+
+-#: ../output.py:534
++#: ../output.py:579
+ #, python-format
+-msgid "Name : %s%s%s"
+-msgstr "Имя : %s%s%s"
++msgid "Name : %s%s%s"
++msgstr "Название: %s%s%s"
+
+-#: ../output.py:535
++#: ../output.py:580
+ #, python-format
+-msgid "Arch : %s"
+-msgstr "Архитектура : %s"
++msgid "Arch : %s"
++msgstr "Архитектура: %s"
+
+-#: ../output.py:537
++#: ../output.py:582
+ #, python-format
+-msgid "Epoch : %s"
+-msgstr "Период : %s"
++msgid "Epoch : %s"
++msgstr "Период: %s"
+
+-#: ../output.py:538
++#: ../output.py:583
+ #, python-format
+-msgid "Version : %s"
+-msgstr "Версия : %s"
++msgid "Version : %s"
++msgstr "Версия: %s"
+
+-#: ../output.py:539
++#: ../output.py:584
+ #, python-format
+-msgid "Release : %s"
+-msgstr "Релиз : %s"
++msgid "Release : %s"
++msgstr "Выпуск: %s"
+
+-#: ../output.py:540
++#: ../output.py:585
+ #, python-format
+-msgid "Size : %s"
+-msgstr "Размер : %s"
++msgid "Size : %s"
++msgstr "Объем: %s"
+
+-#: ../output.py:541
++#: ../output.py:586 ../output.py:890
+ #, python-format
+-msgid "Repo : %s"
+-msgstr "Репозиторий : %s"
++msgid "Repo : %s"
++msgstr "Источник: %s"
+
+-#: ../output.py:543
++#: ../output.py:588
+ #, python-format
+-msgid "From repo : %s"
+-msgstr "Из репозитария : %s"
++msgid "From repo : %s"
++msgstr "Из источника: %s"
+
+-#: ../output.py:545
++#: ../output.py:590
+ #, python-format
+-msgid "Committer : %s"
+-msgstr "Создатель : %s"
++msgid "Committer : %s"
++msgstr "Создатель: %s"
+
+-#: ../output.py:546
++#: ../output.py:591
+ #, python-format
+-msgid "Committime : %s"
+-msgstr "Время создания : %s"
++msgid "Committime : %s"
++msgstr "Время создания: %s"
+
+-#: ../output.py:547
++#: ../output.py:592
+ #, python-format
+-msgid "Buildtime : %s"
+-msgstr "Время сборки : %s"
++msgid "Buildtime : %s"
++msgstr "Время сборки: %s"
+
+-#: ../output.py:549
++#: ../output.py:594
+ #, python-format
+-msgid "Installtime: %s"
++msgid "Install time: %s"
+ msgstr "Время установки: %s"
+
+-#: ../output.py:550
+-msgid "Summary : "
+-msgstr "Аннотация : "
++#: ../output.py:602
++#, python-format
++msgid "Installed by: %s"
++msgstr "Установил: %s"
+
+-#: ../output.py:552
++#: ../output.py:609
+ #, python-format
+-msgid "URL : %s"
+-msgstr "Ссылка : %s"
++msgid "Changed by : %s"
++msgstr "Изменил: %s"
+
+-#: ../output.py:553
+-msgid "License : "
+-msgstr "Лицензия : "
++#: ../output.py:610
++msgid "Summary : "
++msgstr "Аннотация: "
+
+-#: ../output.py:554
+-msgid "Description: "
+-msgstr "Описание : "
++#: ../output.py:612 ../output.py:903
++#, python-format
++msgid "URL : %s"
++msgstr "Ссылка: %s"
+
+-#: ../output.py:622
++#: ../output.py:613
++msgid "License : "
++msgstr "Лицензия: "
++
++#: ../output.py:614 ../output.py:900
++msgid "Description : "
++msgstr "Описание: "
++
++#: ../output.py:682
+ msgid "y"
+ msgstr "y"
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "yes"
+ msgstr "да"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "n"
+ msgstr "n"
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "no"
+ msgstr "нет"
+
+-#: ../output.py:627
++#: ../output.py:687
+ msgid "Is this ok [y/N]: "
+ msgstr "Продолжить? [y/N]: "
+
+-#: ../output.py:715
++#: ../output.py:775
+ #, python-format
+ msgid ""
+ "\n"
+@@ -709,152 +697,141 @@ msgstr ""
+ "\n"
+ "Коллекция: %s"
+
+-#: ../output.py:719
++#: ../output.py:779
+ #, python-format
+ msgid " Group-Id: %s"
+ msgstr " Код коллекции: %s"
+
+-#: ../output.py:724
++#: ../output.py:784
+ #, python-format
+ msgid " Description: %s"
+ msgstr " Описание: %s"
+
+-#: ../output.py:726
++#: ../output.py:786
+ msgid " Mandatory Packages:"
+ msgstr " Обязательные пакеты:"
+
+-#: ../output.py:727
++#: ../output.py:787
+ msgid " Default Packages:"
+ msgstr " Пакеты по умолчанию:"
+
+-#: ../output.py:728
++#: ../output.py:788
+ msgid " Optional Packages:"
+ msgstr " Опциональные пакеты:"
+
+-#: ../output.py:729
++#: ../output.py:789
+ msgid " Conditional Packages:"
+ msgstr " Зависимые пакеты:"
+
+-#: ../output.py:749
++#: ../output.py:809
+ #, python-format
+ msgid "package: %s"
+ msgstr "пакет: %s"
+
+-#: ../output.py:751
++#: ../output.py:811
+ msgid " No dependencies for this package"
+ msgstr " Нет зависимостей для данного пакета"
+
+-#: ../output.py:756
++#: ../output.py:816
+ #, python-format
+ msgid " dependency: %s"
+ msgstr " зависимость: %s"
+
+-#: ../output.py:758
++#: ../output.py:818
+ msgid " Unsatisfied dependency"
+ msgstr " Неудовлетворенная зависимость"
+
+-#: ../output.py:830
+-#, python-format
+-msgid "Repo : %s"
+-msgstr "Репозиторий : %s"
+-
+-#: ../output.py:831
++#: ../output.py:891
+ msgid "Matched from:"
+ msgstr "Совпадения с:"
+
+-#: ../output.py:840
+-msgid "Description : "
+-msgstr "Описание : "
+-
+-#: ../output.py:843
+-#, python-format
+-msgid "URL : %s"
+-msgstr "Ссылка : %s"
+-
+-#: ../output.py:846
++#: ../output.py:906
+ #, python-format
+ msgid "License : %s"
+ msgstr "Лицензия : %s"
+
+-#: ../output.py:849
++#: ../output.py:909
+ #, python-format
+ msgid "Filename : %s"
+ msgstr "Имя файла : %s"
+
+-#: ../output.py:853
++#: ../output.py:913
+ msgid "Other : "
+ msgstr "Другое : "
+
+-#: ../output.py:896
++#: ../output.py:956
+ msgid "There was an error calculating total download size"
+ msgstr "Произошла ошибка при подсчете общего объема загрузки"
+
+-#: ../output.py:901
++#: ../output.py:961
+ #, python-format
+ msgid "Total size: %s"
+ msgstr "Общий размер: %s"
+
+-#: ../output.py:904
++#: ../output.py:964
+ #, python-format
+ msgid "Total download size: %s"
+ msgstr "Объем загрузки: %s"
+
+-#: ../output.py:908
++#: ../output.py:968 ../output.py:988
+ #, python-format
+ msgid "Installed size: %s"
+ msgstr "Будет установлено: %s"
+
+-#: ../output.py:949
++#: ../output.py:984
++msgid "There was an error calculating installed size"
++msgstr "Ошибка при подсчете объема установки"
++
++#: ../output.py:1029
+ msgid "Reinstalling"
+ msgstr "Переустановка"
+
+-#: ../output.py:950
++#: ../output.py:1030
+ msgid "Downgrading"
+ msgstr "Откат версии"
+
+-#: ../output.py:951
++#: ../output.py:1031
+ msgid "Installing for dependencies"
+ msgstr "Установка зависимостей"
+
+-#: ../output.py:952
++#: ../output.py:1032
+ msgid "Updating for dependencies"
+ msgstr "Обновление зависимостей"
+
+-#: ../output.py:953
++#: ../output.py:1033
+ msgid "Removing for dependencies"
+ msgstr "Удаление зависимостей"
+
+-#: ../output.py:960
+-#: ../output.py:1072
++#: ../output.py:1040 ../output.py:1159
+ msgid "Skipped (dependency problems)"
+ msgstr "Пропущено (ошибка зависимостей)"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Package"
+ msgstr "Пакет"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Arch"
+ msgstr "Архитектура"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Version"
+ msgstr "Версия"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Repository"
+ msgstr "Репозиторий "
+
+-#: ../output.py:985
++#: ../output.py:1065
+ msgid "Size"
+ msgstr "Размер"
+
+-#: ../output.py:997
++#: ../output.py:1077
+ #, python-format
+ msgid " replacing %s%s%s.%s %s\n"
+ msgstr " замена %s%s%s.%s %s\n"
+
+-#: ../output.py:1006
++#: ../output.py:1086
+ #, python-format
+ msgid ""
+ "\n"
+@@ -865,52 +842,57 @@ msgstr ""
+ "Результат операции\n"
+ "%s\n"
+
+-#: ../output.py:1013
++#: ../output.py:1097
+ #, python-format
+-msgid ""
+-"Install %5.5s Package(s)\n"
+-"Upgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Установка %5.5s пакетов\n"
+-"Обновление %5.5s пакетов\n"
++msgid "Install %5.5s Package(s)\n"
++msgstr "Установить %5.5s пакет(а,ов)\n"
+
+-#: ../output.py:1022
++#: ../output.py:1101
+ #, python-format
+-msgid ""
+-"Remove %5.5s Package(s)\n"
+-"Reinstall %5.5s Package(s)\n"
+-"Downgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Удаление %5.5s пакет(ов)\n"
+-"Переустановка %5.5s пакет(ов)\n"
+-"Откат версии %5.5s пакет(ов)\n"
++msgid "Upgrade %5.5s Package(s)\n"
++msgstr "Обновить %5.5s пакет(а,ов)\n"
++
++#: ../output.py:1105
++#, python-format
++msgid "Remove %5.5s Package(s)\n"
++msgstr "Удалить %5.5s пакет(а,ов)\n"
+
+-#: ../output.py:1066
++#: ../output.py:1109
++#, python-format
++msgid "Reinstall %5.5s Package(s)\n"
++msgstr "Переустановить %5.5s пакет(а,ов)\n"
++
++#: ../output.py:1113
++#, python-format
++msgid "Downgrade %5.5s Package(s)\n"
++msgstr "Откатить %5.5s пакет(а,ов)\n"
++
++#: ../output.py:1153
+ msgid "Removed"
+ msgstr "Удалено"
+
+-#: ../output.py:1067
++#: ../output.py:1154
+ msgid "Dependency Removed"
+ msgstr "Зависимости удалены"
+
+-#: ../output.py:1069
++#: ../output.py:1156
+ msgid "Dependency Installed"
+ msgstr "Зависимости установлены"
+
+-#: ../output.py:1071
++#: ../output.py:1158
+ msgid "Dependency Updated"
+ msgstr "Зависимости обновлены"
+
+-#: ../output.py:1073
++#: ../output.py:1160
+ msgid "Replaced"
+ msgstr "Заменено"
+
+-#: ../output.py:1074
++#: ../output.py:1161
+ msgid "Failed"
+ msgstr "Неудача"
+
+ #. Delta between C-c's so we treat as exit
+-#: ../output.py:1140
++#: ../output.py:1245
+ msgid "two"
+ msgstr "два"
+
+@@ -918,7 +900,7 @@ msgstr "два"
+ #. Current download cancelled, interrupt (ctrl-c) again within two seconds
+ #. to exit.
+ #. Where "interupt (ctrl-c) again" and "two" are highlighted.
+-#: ../output.py:1151
++#: ../output.py:1256
+ #, python-format
+ msgid ""
+ "\n"
+@@ -929,280 +911,328 @@ msgstr ""
+ " Текущая закачка отменена, %sвызвано (ctrl-c) повторите%s в течении %s%s%s секунд\n"
+ "для выхода.\n"
+
+-#: ../output.py:1162
++#: ../output.py:1267
+ msgid "user interrupt"
+ msgstr "прервано пользователем"
+
+-#: ../output.py:1180
++#: ../output.py:1285
+ msgid "Total"
+ msgstr "Общий размер"
+
+-#: ../output.py:1202
++#: ../output.py:1307
+ msgid "I"
+ msgstr "I"
+
+-#: ../output.py:1203
++#: ../output.py:1308
+ msgid "O"
+ msgstr "O"
+
+-#: ../output.py:1204
++#: ../output.py:1309
+ msgid "E"
+ msgstr "E"
+
+-#: ../output.py:1205
++#: ../output.py:1310
+ msgid "R"
+ msgstr "R"
+
+-#: ../output.py:1206
++#: ../output.py:1311
+ msgid "D"
+ msgstr "D"
+
+-#: ../output.py:1207
++#: ../output.py:1312
+ msgid "U"
+ msgstr "U"
+
+-#: ../output.py:1217
++#: ../output.py:1323
+ msgid "<unset>"
+ msgstr "<unset>"
+
+-#: ../output.py:1218
++#: ../output.py:1324
+ msgid "System"
+ msgstr "Система"
+
+-#: ../output.py:1254
++#: ../output.py:1368
+ msgid "Bad transaction IDs, or package(s), given"
+ msgstr "Передан(ы) неверный код действий или пакет(ы)"
+
+-#: ../output.py:1266
++#: ../output.py:1380
+ msgid "ID"
+ msgstr "ID"
+
+-#: ../output.py:1267
+-#: ../output.py:1520
++#: ../output.py:1381 ../output.py:1699
+ msgid "Login user"
+ msgstr "Вход пользователя"
+
+-#: ../output.py:1268
++#: ../output.py:1382
+ msgid "Date and time"
+ msgstr "Дата и время"
+
+-#: ../output.py:1269
+-#: ../output.py:1522
++#: ../output.py:1383 ../output.py:1701
+ msgid "Action(s)"
+ msgstr "Действия"
+
+-#: ../output.py:1270
+-#: ../output.py:1523
++#: ../output.py:1384 ../output.py:1702
+ msgid "Altered"
+ msgstr "Изменено"
+
+-#: ../output.py:1310
++#: ../output.py:1431 ../output.py:1760
+ msgid "No transaction ID given"
+ msgstr "Код действия не задан"
+
+-#: ../output.py:1336
++#: ../output.py:1457
+ msgid "Bad transaction ID given"
+ msgstr "Код действия неверен"
+
+-#: ../output.py:1341
++#: ../output.py:1462
+ msgid "Not found given transaction ID"
+ msgstr "Указанный код действия не найден"
+
+-#: ../output.py:1349
++#: ../output.py:1470
+ msgid "Found more than one transaction ID!"
+ msgstr "Указано более одной операции!"
+
+-#: ../output.py:1370
++#: ../output.py:1491 ../output.py:1770
+ msgid "No transaction ID, or package, given"
+ msgstr "Не задан код действия или пакет"
+
+-#: ../output.py:1396
++#: ../output.py:1518 ../output.py:1645
++msgid "Downgraded"
++msgstr "Откачено"
++
++#: ../output.py:1519
++msgid "Not installed"
++msgstr "Не установлено"
++
++#: ../output.py:1520
++msgid "Older"
++msgstr "Старее"
++
++#: ../output.py:1520
++msgid "Newer"
++msgstr "Новее"
++
++#: ../output.py:1552
+ msgid "Transaction ID :"
+ msgstr "Код операции :"
+
+-#: ../output.py:1398
++#: ../output.py:1554
+ msgid "Begin time :"
+ msgstr "Время начала :"
+
+-#: ../output.py:1401
+-#: ../output.py:1403
++#: ../output.py:1557 ../output.py:1559
+ msgid "Begin rpmdb :"
+ msgstr "Начало rpmdb :"
+
+-#: ../output.py:1417
++#: ../output.py:1573
+ #, python-format
+ msgid "(%s seconds)"
+ msgstr "(%s секунд)"
+
+-#: ../output.py:1418
++#: ../output.py:1574
+ msgid "End time :"
+ msgstr "Конечное время :"
+
+-#: ../output.py:1421
+-#: ../output.py:1423
++#: ../output.py:1577 ../output.py:1579
+ msgid "End rpmdb :"
+ msgstr "Конец rpmdb :"
+
+-#: ../output.py:1424
++#: ../output.py:1580
+ msgid "User :"
+ msgstr "Пользователь :"
+
+-#: ../output.py:1426
+-#: ../output.py:1428
+-#: ../output.py:1430
++#: ../output.py:1582 ../output.py:1584 ../output.py:1586
+ msgid "Return-Code :"
+ msgstr "Код возврата :"
+
+-#: ../output.py:1426
++#: ../output.py:1582
+ msgid "Aborted"
+ msgstr "Прекращено"
+
+-#: ../output.py:1428
++#: ../output.py:1584
+ msgid "Failure:"
+ msgstr "Неудача:"
+
+-#: ../output.py:1430
++#: ../output.py:1586
+ msgid "Success"
+ msgstr "Успешно"
+
+-#: ../output.py:1431
+-msgid "Transaction performed with:"
+-msgstr "Действие выполнено:"
++#: ../output.py:1589
++msgid "Command Line :"
++msgstr "Команда:"
+
+-#: ../output.py:1444
+-#: ../output.py:1489
+-msgid "Downgraded"
+-msgstr "Откачено"
++#: ../output.py:1597
++#, python-format
++msgid "Additional non-default information stored: %d"
++msgstr "Имеется дополнительная информация: %d"
+
+-#. multiple versions installed, both older and newer
+-#: ../output.py:1446
+-msgid "Weird"
+-msgstr "Странный"
++#: ../output.py:1600
++msgid "Transaction performed with:"
++msgstr "Действие выполнено:"
+
+-#: ../output.py:1448
++#: ../output.py:1603
+ msgid "Packages Altered:"
+ msgstr "Пакеты изменены:"
+
+-#: ../output.py:1451
++#: ../output.py:1607
++msgid "Packages Skipped:"
++msgstr "Пропущены пакеты:"
++
++#: ../output.py:1612
++msgid "Rpmdb Problems:"
++msgstr "Ошибки в rpmdb:"
++
++#: ../output.py:1620
+ msgid "Scriptlet output:"
+ msgstr "Вывод сценария:"
+
+-#: ../output.py:1457
++#: ../output.py:1626
+ msgid "Errors:"
+ msgstr "Ошибки:"
+
+-#: ../output.py:1481
+-#: ../output.py:1482
++#. Note that these don't use _simple_pkg() because we are showing what
++#. happened to them in the transaction ... not the difference between the
++#. version in the transaction and now.
++#: ../output.py:1637 ../output.py:1638
+ msgid "Install"
+ msgstr "Установка "
+
+-#: ../output.py:1483
++#: ../output.py:1639
+ msgid "Dep-Install"
+ msgstr "Установка зависимостей"
+
+-#: ../output.py:1485
++#: ../output.py:1641
+ msgid "Obsoleting"
+ msgstr "Исключаем"
+
+-#: ../output.py:1486
++#: ../output.py:1642
+ msgid "Erase"
+ msgstr "Удаление"
+
+-#: ../output.py:1487
++#: ../output.py:1643
+ msgid "Reinstall"
+ msgstr "Переустановка"
+
+-#: ../output.py:1488
++#: ../output.py:1644
+ msgid "Downgrade"
+ msgstr "Откат версии"
+
+-#: ../output.py:1490
++#: ../output.py:1646
+ msgid "Update"
+ msgstr "Обновление"
+
+-#: ../output.py:1521
++#: ../output.py:1700
+ msgid "Time"
+ msgstr "Время"
+
+-#: ../output.py:1547
++#: ../output.py:1726
+ msgid "Last day"
+ msgstr "За последний день"
+
+-#: ../output.py:1548
++#: ../output.py:1727
+ msgid "Last week"
+ msgstr "За последнюю неделю"
+
+-#: ../output.py:1549
++#: ../output.py:1728
+ msgid "Last 2 weeks"
+ msgstr "За последние 2 недели"
+
+ #. US default :p
+-#: ../output.py:1550
++#: ../output.py:1729
+ msgid "Last 3 months"
+ msgstr "За последние 3 месяца"
+
+-#: ../output.py:1551
++#: ../output.py:1730
+ msgid "Last 6 months"
+ msgstr "За последние 6 месяцев"
+
+-#: ../output.py:1552
++#: ../output.py:1731
+ msgid "Last year"
+ msgstr "За последний год"
+
+-#: ../output.py:1553
++#: ../output.py:1732
+ msgid "Over a year ago"
+ msgstr "Более года назад"
+
+-#: ../output.py:1585
++#: ../output.py:1774
++#, python-format
++msgid "No Transaction %s found"
++msgstr "Действие %s не найдено"
++
++#: ../output.py:1780
++msgid "Transaction ID:"
++msgstr "Код операции:"
++
++#: ../output.py:1781
++msgid "Available additional history information:"
++msgstr "Имеется информация о ранних действиях:"
++
++#: ../output.py:1793
++#, python-format
++msgid "%s: No additional data found by this name"
++msgstr "%s: По этому названию других данных нет"
++
++#: ../output.py:1809
+ msgid "installed"
+ msgstr "для установки"
+
+-#: ../output.py:1586
++#: ../output.py:1810
+ msgid "updated"
+ msgstr "для обновления"
+
+-#: ../output.py:1587
++#: ../output.py:1811
+ msgid "obsoleted"
+ msgstr "как недействительный"
+
+-#: ../output.py:1588
++#: ../output.py:1812
+ msgid "erased"
+ msgstr "для удаления"
+
+-#: ../output.py:1592
++#: ../output.py:1813
++msgid "reinstalled"
++msgstr "для переустановки"
++
++#: ../output.py:1814
++msgid "downgraded"
++msgstr "для отката"
++
++#: ../output.py:1818
+ #, python-format
+ msgid "---> Package %s.%s %s:%s-%s set to be %s"
+ msgstr "---> Пакет %s.%s %s:%s-%s помечен %s"
+
+-#: ../output.py:1599
++#: ../output.py:1825
+ msgid "--> Running transaction check"
+ msgstr "--> Проверка сценария"
+
+-#: ../output.py:1604
++#: ../output.py:1830
+ msgid "--> Restarting Dependency Resolution with new changes."
+ msgstr "--> Перепроверка зависимостей с новыми параметрами."
+
+-#: ../output.py:1609
++#: ../output.py:1835
+ msgid "--> Finished Dependency Resolution"
+ msgstr "--> Проверка зависимостей окончена"
+
+-#: ../output.py:1614
+-#: ../output.py:1619
++#: ../output.py:1840 ../output.py:1845
+ #, python-format
+ msgid "--> Processing Dependency: %s for package: %s"
+ msgstr "--> Обработка зависимостей: %s для пакета: %s"
+
+-#: ../output.py:1623
++#: ../output.py:1850
++#, python-format
++msgid "---> Keeping package: %s"
++msgstr "---> Сохранен пакет: %s"
++
++#: ../output.py:1853
+ #, python-format
+ msgid "--> Unresolved Dependency: %s"
+ msgstr "--> Неразрешенная зависимость: %s"
+
+-#: ../output.py:1634
++#: ../output.py:1864
+ #, python-format
+ msgid "Package: %s"
+ msgstr "Пакет: %s"
+
+-#: ../output.py:1636
++#: ../output.py:1866
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1211,8 +1241,7 @@ msgstr ""
+ "\n"
+ " Необходимо: %s"
+
+-#: ../output.py:1649
+-#: ../output.py:1660
++#: ../output.py:1875
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1221,86 +1250,103 @@ msgstr ""
+ "\n"
+ " %s: %s (%s)"
+
+-#: ../output.py:1657
++#: ../output.py:1880
++#, python-format
++msgid ""
++"\n"
++" %s"
++msgstr ""
++"\n"
++" %s"
++
++#: ../output.py:1882
++msgid ""
++"\n"
++" Not found"
++msgstr ""
++"\n"
++" Не найдено"
++
++#. These should be the only three things we care about:
++#: ../output.py:1897
++msgid "Updated By"
++msgstr "Обновил"
++
++#: ../output.py:1898
++msgid "Downgraded By"
++msgstr "Откатил"
++
++#: ../output.py:1899
++msgid "Obsoleted By"
++msgstr "Заменил"
++
++#: ../output.py:1917
+ msgid "Available"
+ msgstr "Доступно"
+
+-#: ../output.py:1665
+-#: ../output.py:1670
++#: ../output.py:1944 ../output.py:1949
+ #, python-format
+ msgid "--> Processing Conflict: %s conflicts %s"
+ msgstr "--> Обработка конфликта: %s конфликтует с %s"
+
+-#: ../output.py:1674
++#: ../output.py:1953
+ msgid "--> Populating transaction set with selected packages. Please wait."
+ msgstr "--> Заполнение списка действий выбранными пакетами. Подождите, пожалуйста."
+
+-#: ../output.py:1678
++#: ../output.py:1957
+ #, python-format
+ msgid "---> Downloading header for %s to pack into transaction set."
+ msgstr "---> Загрузка заголовка %s для включения в список."
+
+-#: ../utils.py:93
++#: ../utils.py:94
+ msgid "Running"
+ msgstr "Запуск"
+
+-#: ../utils.py:94
++#: ../utils.py:95
+ msgid "Sleeping"
+ msgstr "Ожидание"
+
+-#: ../utils.py:95
++#: ../utils.py:96
+ msgid "Uninterruptible"
+ msgstr "Непрерываемый"
+
+-#: ../utils.py:96
++#: ../utils.py:97
+ msgid "Zombie"
+ msgstr "Зомби"
+
+-#: ../utils.py:97
++#: ../utils.py:98
+ msgid "Traced/Stopped"
+ msgstr "Трассировано/Остановлено"
+
+-#: ../utils.py:98
+-#: ../yumcommands.py:917
++#: ../utils.py:99 ../yumcommands.py:972
+ msgid "Unknown"
+ msgstr "Неизвестно"
+
+-#: ../utils.py:109
++#: ../utils.py:110
+ msgid " The other application is: PackageKit"
+ msgstr " Другое приложение: PackageKit"
+
+-#: ../utils.py:111
++#: ../utils.py:112
+ #, python-format
+ msgid " The other application is: %s"
+ msgstr " Другое приложение: %s"
+
+-#: ../utils.py:114
++#: ../utils.py:115
+ #, python-format
+ msgid " Memory : %5s RSS (%5sB VSZ)"
+ msgstr " Память : %5s RSS (%5sB VSZ)"
+
+-#: ../utils.py:119
++#: ../utils.py:120
+ #, python-format
+ msgid " Started: %s - %s ago"
+ msgstr " Запущено : %s — %s назад"
+
+-#: ../utils.py:121
++#: ../utils.py:122
+ #, python-format
+ msgid " State : %s, pid: %d"
+ msgstr " Статус : %s, pid: %d"
+
+-#: ../utils.py:199
+-#, python-format
+-msgid "PluginExit Error: %s"
+-msgstr "Ошибка PluginExit: %s"
+-
+-#: ../utils.py:202
+-#, python-format
+-msgid "Yum Error: %s"
+-msgstr "Ошибка Yum: %s"
+-
+-#: ../utils.py:235
+-#: ../yummain.py:42
++#: ../utils.py:143 ../yummain.py:42
+ msgid ""
+ "\n"
+ "\n"
+@@ -1310,8 +1356,7 @@ msgstr ""
+ "\n"
+ "Выход по запросу пользователя"
+
+-#: ../utils.py:241
+-#: ../yummain.py:48
++#: ../utils.py:149 ../yummain.py:48
+ msgid ""
+ "\n"
+ "\n"
+@@ -1321,8 +1366,7 @@ msgstr ""
+ "\n"
+ "Выход из-за разрыва связи"
+
+-#: ../utils.py:243
+-#: ../yummain.py:50
++#: ../utils.py:151 ../yummain.py:50
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1333,8 +1377,47 @@ msgstr ""
+ "\n"
+ "%s"
+
+-#: ../utils.py:282
+-#: ../yummain.py:211
++#: ../utils.py:201 ../yummain.py:107
++msgid "Another app is currently holding the yum lock; exiting as configured by exit_on_lock"
++msgstr "Другое приложение удерживает данные yum; выход согласно exit_on_lock"
++
++#: ../utils.py:260
++#, python-format
++msgid "PluginExit Error: %s"
++msgstr "Ошибка PluginExit: %s"
++
++#: ../utils.py:263
++#, python-format
++msgid "Yum Error: %s"
++msgstr "Ошибка Yum: %s"
++
++#: ../utils.py:315 ../yummain.py:134 ../yummain.py:173
++#, python-format
++msgid "Error: %s"
++msgstr "Ошибка: %s"
++
++#: ../utils.py:319 ../yummain.py:177
++msgid " You could try using --skip-broken to work around the problem"
++msgstr " Вы можете попробовать --skip-broken чтобы обойти проблему"
++
++#: ../utils.py:321 ../yummain.py:179 ../yummain.py:212
++msgid " You could try running: rpm -Va --nofiles --nodigest"
++msgstr " Вы можете попробовать запустить: rpm -Va --nofiles --nodigest"
++
++#: ../utils.py:328 ../yummain.py:144 ../yummain.py:186
++#, python-format
++msgid "Unknown Error(s): Exit Code: %d:"
++msgstr "Неизвестная ошибка(ошибки): Код выхода: %d:"
++
++#: ../utils.py:334 ../yummain.py:192
++msgid ""
++"\n"
++"Dependencies Resolved"
++msgstr ""
++"\n"
++"Зависимости разрешены"
++
++#: ../utils.py:349 ../yummain.py:215
+ msgid "Complete!"
+ msgstr "Готово!"
+
+@@ -1413,301 +1496,312 @@ msgstr "Файл %s переданный в качестве аргумента
+ msgid "Error: more than one file given as argument to shell."
+ msgstr "Ошибка: более чем один файл указан в качестве аргумента для командной оболочки."
+
+-#: ../yumcommands.py:170
++#: ../yumcommands.py:138
++msgid ""
++"There are no enabled repos.\n"
++" Run \"yum repolist all\" to see the repos you have.\n"
++" You can enable repos with yum-config-manager --enable <repo>"
++msgstr ""
++"Все источники пакетов отключены.\n"
++"Выполните «yum repolist all» для вывода списка доступных.\n"
++"Включение производится командой yum-config-manager --enable [источник]"
++
++#: ../yumcommands.py:189
+ msgid "PACKAGE..."
+ msgstr "ПАКЕТ..."
+
+-#: ../yumcommands.py:173
++#: ../yumcommands.py:192
+ msgid "Install a package or packages on your system"
+ msgstr "Установка пакета(ов) в систему"
+
+-#: ../yumcommands.py:181
++#: ../yumcommands.py:201
+ msgid "Setting up Install Process"
+ msgstr "Подготовка к установке"
+
+-#: ../yumcommands.py:192
++#: ../yumcommands.py:212 ../yumcommands.py:234
+ msgid "[PACKAGE...]"
+ msgstr "[ПАКЕТ...]"
+
+-#: ../yumcommands.py:195
++#: ../yumcommands.py:215
+ msgid "Update a package or packages on your system"
+ msgstr "Обновление пакета(ов) в системе"
+
+-#: ../yumcommands.py:202
++#: ../yumcommands.py:223
+ msgid "Setting up Update Process"
+ msgstr "Подготовка к обновлению"
+
+-#: ../yumcommands.py:244
++#: ../yumcommands.py:237
++msgid "Synchronize installed packages to the latest available versions"
++msgstr "Обновить установленные пакеты до новейших доступных версий"
++
++#: ../yumcommands.py:245
++msgid "Setting up Distribution Synchronization Process"
++msgstr "Подготовка к синхронизации"
++
++#: ../yumcommands.py:288
+ msgid "Display details about a package or group of packages"
+ msgstr "Отобразить информацию о пакете или о коллекции пакетов"
+
+-#: ../yumcommands.py:293
++#: ../yumcommands.py:337
+ msgid "Installed Packages"
+ msgstr "Установленные пакеты"
+
+-#: ../yumcommands.py:301
++#: ../yumcommands.py:345
+ msgid "Available Packages"
+ msgstr "Доступные пакеты"
+
+-#: ../yumcommands.py:305
++#: ../yumcommands.py:349
+ msgid "Extra Packages"
+ msgstr "Дополнительные пакеты"
+
+-#: ../yumcommands.py:309
++#: ../yumcommands.py:353
+ msgid "Updated Packages"
+ msgstr "Обновленные пакеты"
+
+ #. This only happens in verbose mode
+-#: ../yumcommands.py:317
+-#: ../yumcommands.py:324
+-#: ../yumcommands.py:601
++#: ../yumcommands.py:361 ../yumcommands.py:368 ../yumcommands.py:655
+ msgid "Obsoleting Packages"
+ msgstr "Исключенные пакеты"
+
+-#: ../yumcommands.py:326
++#: ../yumcommands.py:370
+ msgid "Recently Added Packages"
+ msgstr "Недавно добавленные пакеты"
+
+-#: ../yumcommands.py:333
++#: ../yumcommands.py:377
+ msgid "No matching Packages to list"
+ msgstr "Совпадений среди пакетов не найдено"
+
+-#: ../yumcommands.py:347
++#: ../yumcommands.py:391
+ msgid "List a package or groups of packages"
+ msgstr "Вывести список пакетов или коллекций пакетов"
+
+-#: ../yumcommands.py:359
++#: ../yumcommands.py:403
+ msgid "Remove a package or packages from your system"
+ msgstr "Удаление пакета(ов) из системы"
+
+-#: ../yumcommands.py:366
++#: ../yumcommands.py:410
+ msgid "Setting up Remove Process"
+ msgstr "Подготовка к удалению"
+
+-#: ../yumcommands.py:380
++#: ../yumcommands.py:424
+ msgid "Setting up Group Process"
+ msgstr "Подготовка к обработке коллекции"
+
+-#: ../yumcommands.py:386
++#: ../yumcommands.py:430
+ msgid "No Groups on which to run command"
+ msgstr "Коллекций пакетов к обработке нет"
+
+-#: ../yumcommands.py:399
++#: ../yumcommands.py:443
+ msgid "List available package groups"
+ msgstr "Список доступных коллекций пакетов"
+
+-#: ../yumcommands.py:416
++#: ../yumcommands.py:463
+ msgid "Install the packages in a group on your system"
+ msgstr "Установка коллекции пакетов в систему"
+
+-#: ../yumcommands.py:438
++#: ../yumcommands.py:486
+ msgid "Remove the packages in a group from your system"
+ msgstr "Удаление коллекции пакета(ов) из системы"
+
+-#: ../yumcommands.py:465
++#: ../yumcommands.py:514
+ msgid "Display details about a package group"
+ msgstr "Показать информацию о коллекции пакетов"
+
+-#: ../yumcommands.py:489
++#: ../yumcommands.py:539
+ msgid "Generate the metadata cache"
+ msgstr "Создание кэша метаданных"
+
+-#: ../yumcommands.py:495
++#: ../yumcommands.py:545
+ msgid "Making cache files for all metadata files."
+ msgstr "Создание кэша для всех метаданных файлов."
+
+-#: ../yumcommands.py:496
++#: ../yumcommands.py:546
+ msgid "This may take a while depending on the speed of this computer"
+ msgstr "Это займет немного времени, в зависимости от скорости компьютера"
+
+-#: ../yumcommands.py:517
++#: ../yumcommands.py:567
+ msgid "Metadata Cache Created"
+ msgstr "Кэш метаданных создан"
+
+-#: ../yumcommands.py:531
++#: ../yumcommands.py:581
+ msgid "Remove cached data"
+ msgstr "Удаление кэшированных данных"
+
+-#: ../yumcommands.py:551
++#: ../yumcommands.py:602
+ msgid "Find what package provides the given value"
+ msgstr "Найти пакет по заданному значению"
+
+-#: ../yumcommands.py:571
++#: ../yumcommands.py:622
+ msgid "Check for available package updates"
+ msgstr "Проверка доступных обновлений пакетов"
+
+-#: ../yumcommands.py:621
++#: ../yumcommands.py:675
+ msgid "Search package details for the given string"
+ msgstr "Поиск информации о пакете по заданной строке"
+
+-#: ../yumcommands.py:627
++#: ../yumcommands.py:681
+ msgid "Searching Packages: "
+ msgstr "Поиск пакетов:"
+
+-#: ../yumcommands.py:644
++#: ../yumcommands.py:698
+ msgid "Update packages taking obsoletes into account"
+ msgstr "Обновить пакеты, учитывая недействительные"
+
+-#: ../yumcommands.py:652
++#: ../yumcommands.py:707
+ msgid "Setting up Upgrade Process"
+ msgstr "Приготовления к процессу обновления"
+
+-#: ../yumcommands.py:666
++#: ../yumcommands.py:721
+ msgid "Install a local RPM"
+ msgstr "Установка локального пакета"
+
+-#: ../yumcommands.py:674
++#: ../yumcommands.py:729
+ msgid "Setting up Local Package Process"
+ msgstr "Подготовка действий с локальным пакетом"
+
+-#: ../yumcommands.py:693
++#: ../yumcommands.py:748
+ msgid "Determine which package provides the given dependency"
+ msgstr "Определяет какой пакет предоставляет данную зависимость"
+
+-#: ../yumcommands.py:696
++#: ../yumcommands.py:751
+ msgid "Searching Packages for Dependency:"
+ msgstr "Поиск зависимых пакетов"
+
+-#: ../yumcommands.py:710
++#: ../yumcommands.py:765
+ msgid "Run an interactive yum shell"
+ msgstr "Запуск интерактивной командной оболочки yum"
+
+-#: ../yumcommands.py:716
++#: ../yumcommands.py:771
+ msgid "Setting up Yum Shell"
+ msgstr "Настройка командной оболочки Yum"
+
+-#: ../yumcommands.py:734
++#: ../yumcommands.py:789
+ msgid "List a package's dependencies"
+ msgstr "Отображение зависимостей пакета(пакетов)"
+
+-#: ../yumcommands.py:740
++#: ../yumcommands.py:795
+ msgid "Finding dependencies: "
+ msgstr "Поиск зависимостей:"
+
+-#: ../yumcommands.py:756
++#: ../yumcommands.py:811
+ msgid "Display the configured software repositories"
+ msgstr "Отобразить сконфигурированные репозитории ПО"
+
+-#: ../yumcommands.py:822
+-#: ../yumcommands.py:823
++#: ../yumcommands.py:877 ../yumcommands.py:878
+ msgid "enabled"
+ msgstr "включено"
+
+-#: ../yumcommands.py:849
+-#: ../yumcommands.py:850
++#: ../yumcommands.py:904 ../yumcommands.py:905
+ msgid "disabled"
+ msgstr "отключено"
+
+-#: ../yumcommands.py:866
++#: ../yumcommands.py:921
+ msgid "Repo-id : "
+ msgstr "Код репозитория : "
+
+-#: ../yumcommands.py:867
++#: ../yumcommands.py:922
+ msgid "Repo-name : "
+ msgstr "Имя репозитория : "
+
+-#: ../yumcommands.py:870
++#: ../yumcommands.py:925
+ msgid "Repo-status : "
+ msgstr "Состояние репозитория: "
+
+-#: ../yumcommands.py:873
++#: ../yumcommands.py:928
+ msgid "Repo-revision: "
+ msgstr "Ревизия репозитория : "
+
+-#: ../yumcommands.py:877
++#: ../yumcommands.py:932
+ msgid "Repo-tags : "
+ msgstr "Метки репозитория : "
+
+-#: ../yumcommands.py:883
++#: ../yumcommands.py:938
+ msgid "Repo-distro-tags: "
+ msgstr "Метки дистрибутива : "
+
+-#: ../yumcommands.py:888
++#: ../yumcommands.py:943
+ msgid "Repo-updated : "
+ msgstr "Репозиторий обновлен : "
+
+-#: ../yumcommands.py:890
++#: ../yumcommands.py:945
+ msgid "Repo-pkgs : "
+ msgstr "Пакеты репозитория : "
+
+-#: ../yumcommands.py:891
++#: ../yumcommands.py:946
+ msgid "Repo-size : "
+ msgstr "Размер репозитория : "
+
+-#: ../yumcommands.py:898
++#: ../yumcommands.py:953
+ msgid "Repo-baseurl : "
+ msgstr "baseurl репозитория : "
+
+-#: ../yumcommands.py:906
++#: ../yumcommands.py:961
+ msgid "Repo-metalink: "
+ msgstr "metalink репозитория : "
+
+-#: ../yumcommands.py:910
++#: ../yumcommands.py:965
+ msgid " Updated : "
+ msgstr " Обновлено : "
+
+-#: ../yumcommands.py:913
++#: ../yumcommands.py:968
+ msgid "Repo-mirrors : "
+ msgstr "Зеркала репозитория : "
+
+-#: ../yumcommands.py:923
++#: ../yumcommands.py:978
+ #, python-format
+ msgid "Never (last: %s)"
+ msgstr "Никогда (последний: %s)"
+
+-#: ../yumcommands.py:925
++#: ../yumcommands.py:980
+ #, python-format
+ msgid "Instant (last: %s)"
+ msgstr "момент (осталось:%s)"
+
+-#: ../yumcommands.py:928
++#: ../yumcommands.py:983
+ #, python-format
+ msgid "%s second(s) (last: %s)"
+ msgstr "%s секунд(а) (осталось: %s)"
+
+-#: ../yumcommands.py:930
++#: ../yumcommands.py:985
+ msgid "Repo-expire : "
+ msgstr "Окончание срока репозитория: "
+
+-#: ../yumcommands.py:933
++#: ../yumcommands.py:988
+ msgid "Repo-exclude : "
+ msgstr "Исключения репозитория : "
+
+-#: ../yumcommands.py:937
++#: ../yumcommands.py:992
+ msgid "Repo-include : "
+ msgstr "Включено в репозиторий : "
+
+-#: ../yumcommands.py:941
++#: ../yumcommands.py:996
+ msgid "Repo-excluded: "
+ msgstr "Исключено из репозитория : "
+
+ #. Work out the first (id) and last (enabled/disalbed/count),
+ #. then chop the middle (name)...
+-#: ../yumcommands.py:951
+-#: ../yumcommands.py:980
++#: ../yumcommands.py:1006 ../yumcommands.py:1035
+ msgid "repo id"
+ msgstr "Идентификатор репозитория"
+
+-#: ../yumcommands.py:968
+-#: ../yumcommands.py:969
+-#: ../yumcommands.py:987
++#: ../yumcommands.py:1023 ../yumcommands.py:1024 ../yumcommands.py:1042
+ msgid "status"
+ msgstr "состояние"
+
+-#: ../yumcommands.py:981
++#: ../yumcommands.py:1036
+ msgid "repo name"
+ msgstr "репозиторий"
+
+-#: ../yumcommands.py:1018
++#: ../yumcommands.py:1073
+ msgid "Display a helpful usage message"
+ msgstr "Отобразить подсказку к использованию"
+
+-#: ../yumcommands.py:1052
++#: ../yumcommands.py:1107
+ #, python-format
+ msgid "No help available for %s"
+ msgstr "Помощь недоступна для %s"
+
+-#: ../yumcommands.py:1057
++#: ../yumcommands.py:1112
+ msgid ""
+ "\n"
+ "\n"
+@@ -1717,7 +1811,7 @@ msgstr ""
+ "\n"
+ "альтернативные названия: "
+
+-#: ../yumcommands.py:1059
++#: ../yumcommands.py:1114
+ msgid ""
+ "\n"
+ "\n"
+@@ -1727,106 +1821,81 @@ msgstr ""
+ "\n"
+ "альтернативное название: "
+
+-#: ../yumcommands.py:1087
++#: ../yumcommands.py:1143
+ msgid "Setting up Reinstall Process"
+ msgstr "Подготовка к повторной установке"
+
+-#: ../yumcommands.py:1095
++#: ../yumcommands.py:1151
+ msgid "reinstall a package"
+ msgstr "переустановка пакета"
+
+-#: ../yumcommands.py:1113
++#: ../yumcommands.py:1170
+ msgid "Setting up Downgrade Process"
+ msgstr "Подготовка к откату версии"
+
+-#: ../yumcommands.py:1120
++#: ../yumcommands.py:1177
+ msgid "downgrade a package"
+ msgstr "откат к предыдущей версии пакета"
+
+-#: ../yumcommands.py:1134
++#: ../yumcommands.py:1191
+ msgid "Display a version for the machine and/or available repos."
+ msgstr "Отображает версию для вашей архитектуры и/или доступные репозитории."
+
+-#: ../yumcommands.py:1173
++#: ../yumcommands.py:1230
+ msgid " Yum version groups:"
+ msgstr " Группы версий Yum:"
+
+-#: ../yumcommands.py:1183
++#: ../yumcommands.py:1240
+ msgid " Group :"
+ msgstr " Коллекция :"
+
+-#: ../yumcommands.py:1184
++#: ../yumcommands.py:1241
+ msgid " Packages:"
+ msgstr " Пакеты :"
+
+-#: ../yumcommands.py:1213
++#: ../yumcommands.py:1270
+ msgid "Installed:"
+ msgstr "Установлен(ы):"
+
+-#: ../yumcommands.py:1218
++#: ../yumcommands.py:1278
+ msgid "Group-Installed:"
+ msgstr "Установлены коллекции:"
+
+-#: ../yumcommands.py:1227
++#: ../yumcommands.py:1287
+ msgid "Available:"
+ msgstr "Доступен(ы):"
+
+-#: ../yumcommands.py:1233
++#: ../yumcommands.py:1296
+ msgid "Group-Available:"
+ msgstr "Доступны коллекции :"
+
+-#: ../yumcommands.py:1272
++#: ../yumcommands.py:1335
+ msgid "Display, or use, the transaction history"
+ msgstr "Отобразить (или использовать) журнал операций"
+
+-#: ../yumcommands.py:1300
++#: ../yumcommands.py:1363
+ #, python-format
+ msgid "Invalid history sub-command, use: %s."
+ msgstr "Неверная подкоманда журнала, используйте: %s."
+
+-#: ../yumcommands.py:1345
++#: ../yumcommands.py:1370
++msgid "You don't have access to the history DB."
++msgstr "Нет доступа к спискам предыдущих действий."
++
++#: ../yumcommands.py:1413
+ msgid "Check for problems in the rpmdb"
+ msgstr "Проверка проблем в базе данных RPM"
+
+-#: ../yummain.py:102
++#: ../yummain.py:103
+ msgid "Another app is currently holding the yum lock; waiting for it to exit..."
+ msgstr "Еще одно приложение, в настоящее время блокирует Yum. Подождите..."
+
+-#: ../yummain.py:130
+-#: ../yummain.py:169
+-#, python-format
+-msgid "Error: %s"
+-msgstr "Ошибка: %s"
+-
+-#: ../yummain.py:140
+-#: ../yummain.py:182
+-#, python-format
+-msgid "Unknown Error(s): Exit Code: %d:"
+-msgstr "Неизвестная ошибка(ошибки): Код выхода: %d:"
+-
+ #. Depsolve stage
+-#: ../yummain.py:147
++#: ../yummain.py:151
+ msgid "Resolving Dependencies"
+ msgstr "Разрешение зависимостей"
+
+-#: ../yummain.py:173
+-msgid " You could try using --skip-broken to work around the problem"
+-msgstr " Вы можете попробовать --skip-broken чтобы обойти проблему"
+-
+-#: ../yummain.py:175
+-#: ../yummain.py:208
+-msgid " You could try running: rpm -Va --nofiles --nodigest"
+-msgstr " Вы можете попробовать запустить: rpm -Va --nofiles --nodigest"
+-
+-#: ../yummain.py:188
+-msgid ""
+-"\n"
+-"Dependencies Resolved"
+-msgstr ""
+-"\n"
+-"Зависимости разрешены"
+-
+-#: ../yummain.py:265
++#: ../yummain.py:269
+ msgid ""
+ "\n"
+ "\n"
+@@ -1844,147 +1913,134 @@ msgstr "doTsSetup() будет устранен в следующей верси
+ msgid "Setting up TransactionSets before config class is up"
+ msgstr "Составление списка действий до включения класса конфигурации"
+
+-#: ../yum/depsolve.py:148
++#: ../yum/depsolve.py:151
+ #, python-format
+ msgid "Invalid tsflag in config file: %s"
+ msgstr "Неверный tsflag в конфигурационном файле: %s"
+
+-#: ../yum/depsolve.py:159
++#: ../yum/depsolve.py:162
+ #, python-format
+ msgid "Searching pkgSack for dep: %s"
+ msgstr "Поиск набора пакетов для зависимости: %s"
+
+-#: ../yum/depsolve.py:175
+-#, python-format
+-msgid "Potential match for %s from %s"
+-msgstr "Возможное совпадение для %s из %s"
+-
+-#: ../yum/depsolve.py:183
+-#, python-format
+-msgid "Matched %s to require for %s"
+-msgstr "%s подходит как требуемый для %s"
+-
+-#: ../yum/depsolve.py:225
++#: ../yum/depsolve.py:205
+ #, python-format
+ msgid "Member: %s"
+ msgstr "Член: %s"
+
+-#: ../yum/depsolve.py:239
+-#: ../yum/depsolve.py:754
++#: ../yum/depsolve.py:219 ../yum/depsolve.py:754
+ #, python-format
+ msgid "%s converted to install"
+ msgstr "%s преобразован для установки"
+
+-#: ../yum/depsolve.py:246
++#: ../yum/depsolve.py:226
+ #, python-format
+ msgid "Adding Package %s in mode %s"
+ msgstr "Добавление пакета %s в режиме %s"
+
+-#: ../yum/depsolve.py:256
++#: ../yum/depsolve.py:242
+ #, python-format
+ msgid "Removing Package %s"
+ msgstr "Удаление пакета %s"
+
+-#: ../yum/depsolve.py:278
++#: ../yum/depsolve.py:264
+ #, python-format
+ msgid "%s requires: %s"
+ msgstr "%s требуется: %s"
+
+-#: ../yum/depsolve.py:319
++#: ../yum/depsolve.py:305
+ #, python-format
+ msgid "%s requires %s"
+ msgstr "%s требуется %s"
+
+-#: ../yum/depsolve.py:346
++#: ../yum/depsolve.py:332
+ msgid "Needed Require has already been looked up, cheating"
+ msgstr "Необходимое требование уже было было уже найдено, сжульничаем"
+
+-#: ../yum/depsolve.py:356
++#: ../yum/depsolve.py:342
+ #, python-format
+ msgid "Needed Require is not a package name. Looking up: %s"
+ msgstr "Требуемая зависимость не является именем пакета. Поиск: %s"
+
+-#: ../yum/depsolve.py:363
++#: ../yum/depsolve.py:349
+ #, python-format
+ msgid "Potential Provider: %s"
+ msgstr "Возможный поставщик: %s"
+
+-#: ../yum/depsolve.py:386
++#: ../yum/depsolve.py:372
+ #, python-format
+ msgid "Mode is %s for provider of %s: %s"
+ msgstr "Режим %s для поставщика %s: %s"
+
+-#: ../yum/depsolve.py:390
++#: ../yum/depsolve.py:376
+ #, python-format
+ msgid "Mode for pkg providing %s: %s"
+ msgstr "Режим для пакета, предоставяющего %s: %s"
+
+-#: ../yum/depsolve.py:394
++#: ../yum/depsolve.py:380
+ #, python-format
+ msgid "TSINFO: %s package requiring %s marked as erase"
+ msgstr "TSINFO: %s пакет необходимый для %s был помечен для удаления"
+
+-#: ../yum/depsolve.py:407
++#: ../yum/depsolve.py:393
+ #, python-format
+ msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+ msgstr "TSINFO: Замена устаревшего %s пакета пакетом %s чтобы разрешить зависимости."
+
+-#: ../yum/depsolve.py:410
++#: ../yum/depsolve.py:396
+ #, python-format
+ msgid "TSINFO: Updating %s to resolve dep."
+ msgstr "TSINFO: Обновление %s для разрешения зависимостей."
+
+-#: ../yum/depsolve.py:418
++#: ../yum/depsolve.py:404
+ #, python-format
+ msgid "Cannot find an update path for dep for: %s"
+ msgstr "Не удается найти путь обновления зависимости для: %s"
+
+-#: ../yum/depsolve.py:449
++#: ../yum/depsolve.py:435
+ #, python-format
+ msgid "Quick matched %s to require for %s"
+ msgstr "Быстро подобран пакет %s в качестве требуемого для %s"
+
+ #. is it already installed?
+-#: ../yum/depsolve.py:491
++#: ../yum/depsolve.py:477
+ #, python-format
+ msgid "%s is in providing packages but it is already installed, removing."
+ msgstr "Зависимый пакет %s уже установлен и будет пропущен"
+
+-#: ../yum/depsolve.py:507
++#: ../yum/depsolve.py:493
+ #, python-format
+ msgid "Potential resolving package %s has newer instance in ts."
+ msgstr "Пакет %s в сценарии новее доступного"
+
+-#: ../yum/depsolve.py:518
++#: ../yum/depsolve.py:504
+ #, python-format
+ msgid "Potential resolving package %s has newer instance installed."
+ msgstr "Более новый пакет %s уже установлен в систему."
+
+-#: ../yum/depsolve.py:536
++#: ../yum/depsolve.py:522
+ #, python-format
+ msgid "%s already in ts, skipping this one"
+ msgstr "%s уже в списке к действию, пропускаем его"
+
+-#: ../yum/depsolve.py:578
++#: ../yum/depsolve.py:571
+ #, python-format
+ msgid "TSINFO: Marking %s as update for %s"
+ msgstr "TSINFO: %s отмечен как обновление для %s"
+
+-#: ../yum/depsolve.py:586
++#: ../yum/depsolve.py:580
+ #, python-format
+ msgid "TSINFO: Marking %s as install for %s"
+ msgstr "TSINFO: Отмечен %s чтобы установить %s"
+
+-#: ../yum/depsolve.py:690
+-#: ../yum/depsolve.py:781
++#: ../yum/depsolve.py:690 ../yum/depsolve.py:780
+ msgid "Success - empty transaction"
+ msgstr "Успешно — пустой сценарий"
+
+-#: ../yum/depsolve.py:729
+-#: ../yum/depsolve.py:744
++#: ../yum/depsolve.py:729 ../yum/depsolve.py:744
+ #, fuzzy
+ msgid "Restarting Loop"
+-msgstr "Перезапуск петли"
++msgstr "Цикл перезапуска"
+
+ #: ../yum/depsolve.py:760
+ msgid "Dependency Process ending"
+@@ -1995,176 +2051,200 @@ msgstr "Завершение процесса разрешения зависи
+ msgid "%s from %s has depsolving problems"
+ msgstr "%s из %s имеет проблемы с разрешением зависимостей"
+
+-#: ../yum/depsolve.py:782
++#: ../yum/depsolve.py:781
+ msgid "Success - deps resolved"
+ msgstr "Успешно — зависимости разрешены"
+
+-#: ../yum/depsolve.py:796
++#: ../yum/depsolve.py:802
+ #, python-format
+ msgid "Checking deps for %s"
+ msgstr "Проверка зависимостей для %s"
+
+-#: ../yum/depsolve.py:874
++#: ../yum/depsolve.py:888
+ #, python-format
+ msgid "looking for %s as a requirement of %s"
+ msgstr "поиск %s требуется для %s"
+
+-#: ../yum/depsolve.py:1090
++#: ../yum/depsolve.py:1119
+ #, python-format
+ msgid "Running compare_providers() for %s"
+ msgstr "Запуск compare_providers() для %s"
+
+-#: ../yum/depsolve.py:1117
+-#: ../yum/depsolve.py:1123
++#: ../yum/depsolve.py:1146 ../yum/depsolve.py:1152
+ #, python-format
+ msgid "better arch in po %s"
+ msgstr "Лучший архив в %s"
+
+-#: ../yum/depsolve.py:1218
++#: ../yum/depsolve.py:1244
+ #, python-format
+ msgid "%s obsoletes %s"
+ msgstr "%s исключает %s"
+
+-#: ../yum/depsolve.py:1230
+-#, fuzzy, python-format
++#: ../yum/depsolve.py:1256
++#, python-format
+ msgid ""
+ "archdist compared %s to %s on %s\n"
+ " Winner: %s"
+ msgstr ""
+-"archdist сравнение %s до %s в %s\n"
+-" Победитель: %s"
++"Сравнение archdist %s с %s в %s\n"
++" Лучший: %s"
+
+-#: ../yum/depsolve.py:1237
++#: ../yum/depsolve.py:1264
+ #, python-format
+ msgid "common sourcerpm %s and %s"
+ msgstr "общий источник RPM %s и %s"
+
+-#: ../yum/depsolve.py:1241
++#: ../yum/depsolve.py:1268
+ #, python-format
+ msgid "base package %s is installed for %s"
+ msgstr "базовый пакет %s установлен для %s"
+
+-#: ../yum/depsolve.py:1247
++#: ../yum/depsolve.py:1274
+ #, python-format
+ msgid "common prefix of %s between %s and %s"
+ msgstr "Общий префикс %s для %s и %s"
+
+-#: ../yum/depsolve.py:1256
++#: ../yum/depsolve.py:1305
++#, python-format
++msgid "requires minimal: %d"
++msgstr "минимально: %d"
++
++#: ../yum/depsolve.py:1309
++#, python-format
++msgid " Winner: %s"
++msgstr "Лучший: %s"
++
++#: ../yum/depsolve.py:1314
++#, python-format
++msgid " Loser(with %d): %s"
++msgstr "Худший (c %d): %s"
++
++#: ../yum/depsolve.py:1330
+ #, python-format
+ msgid "Best Order: %s"
+ msgstr "Лучший выбор: %s"
+
+-#: ../yum/__init__.py:192
++#: ../yum/__init__.py:214
+ msgid "doConfigSetup() will go away in a future version of Yum.\n"
+ msgstr "doConfigSetup() будет устранен в следующей версии Yum.\n"
+
+-#: ../yum/__init__.py:424
++#: ../yum/__init__.py:453
++#, python-format
++msgid "Repository %r: Error parsing config: %s"
++msgstr "Источник %r: Сбой обработки настроек: %s"
++
++#: ../yum/__init__.py:459
+ #, python-format
+ msgid "Repository %r is missing name in configuration, using id"
+ msgstr "Репозиторий %r не имеет названия в конфигурации, используется ID"
+
+-#: ../yum/__init__.py:462
++#: ../yum/__init__.py:497
+ msgid "plugins already initialised"
+ msgstr "модули уже загружены"
+
+-#: ../yum/__init__.py:469
++#: ../yum/__init__.py:504
+ msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+ msgstr "doRpmDBSetup() будет устранен в следующей версии Yum.\n"
+
+-#: ../yum/__init__.py:480
++#: ../yum/__init__.py:515
+ msgid "Reading Local RPMDB"
+ msgstr "Чтение локальной базы данных RPM"
+
+-#: ../yum/__init__.py:504
++#: ../yum/__init__.py:538
+ msgid "doRepoSetup() will go away in a future version of Yum.\n"
+ msgstr "doRepoSetup() будет устранен в следующей версии Yum.\n"
+
+-#: ../yum/__init__.py:524
++#: ../yum/__init__.py:577
+ msgid "doSackSetup() will go away in a future version of Yum.\n"
+ msgstr "doSackSetup() будет устранен в следующей версии Yum.\n"
+
+-#: ../yum/__init__.py:554
++#: ../yum/__init__.py:607
+ msgid "Setting up Package Sacks"
+ msgstr "Настройка набора пакетов"
+
+-#: ../yum/__init__.py:599
++#: ../yum/__init__.py:652
+ #, python-format
+ msgid "repo object for repo %s lacks a _resetSack method\n"
+ msgstr "Объект репозитория %s не имеет метода _resetSack\n"
+
+-#: ../yum/__init__.py:600
++#: ../yum/__init__.py:653
+ msgid "therefore this repo cannot be reset.\n"
+ msgstr "поэтому этот репозиторий не может быть сброшен.\n"
+
+-#: ../yum/__init__.py:605
++#: ../yum/__init__.py:658
+ msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+ msgstr "doUpdateSetup() будет устранен в следующей версии Yum.\n"
+
+-#: ../yum/__init__.py:617
++#: ../yum/__init__.py:670
+ msgid "Building updates object"
+ msgstr "Построение объекта обновлений"
+
+-#: ../yum/__init__.py:652
++#: ../yum/__init__.py:709
+ msgid "doGroupSetup() will go away in a future version of Yum.\n"
+ msgstr "doGroupSetup() будет устранен в следующей версии Yum.\n"
+
+-#: ../yum/__init__.py:677
++#: ../yum/__init__.py:734
+ msgid "Getting group metadata"
+ msgstr "Получение метаданных коллекции"
+
+-#: ../yum/__init__.py:703
++#: ../yum/__init__.py:760
+ #, python-format
+ msgid "Adding group file from repository: %s"
+ msgstr "Добавление файла коллекций из репозитория: %s"
+
+-#: ../yum/__init__.py:712
++#: ../yum/__init__.py:769
+ #, python-format
+ msgid "Failed to add groups file for repository: %s - %s"
+ msgstr "Ошибка добавления файла коллекций для репозитория: %s — %s"
+
+-#: ../yum/__init__.py:718
++#: ../yum/__init__.py:775
+ msgid "No Groups Available in any repository"
+ msgstr "Ни в одном репозитории нет доступных коллекций"
+
+-#: ../yum/__init__.py:730
++#: ../yum/__init__.py:787
+ msgid "Getting pkgtags metadata"
+ msgstr "Загрузка метаданных меток пакета"
+
+-#: ../yum/__init__.py:740
++#: ../yum/__init__.py:797
+ #, python-format
+ msgid "Adding tags from repository: %s"
+ msgstr "Добавление меток из репозитория: %s"
+
+-#: ../yum/__init__.py:749
++#: ../yum/__init__.py:806
+ #, python-format
+ msgid "Failed to add Pkg Tags for repository: %s - %s"
+ msgstr "Ошибка добавление меток пакета для репозитория: %s — %s"
+
+-#: ../yum/__init__.py:827
++#: ../yum/__init__.py:884
+ msgid "Importing additional filelist information"
+ msgstr "Импорт дополнительной информации о списке файлов"
+
+-#: ../yum/__init__.py:841
++#: ../yum/__init__.py:898
+ #, python-format
+ msgid "The program %s%s%s is found in the yum-utils package."
+ msgstr "Программа %s%s%s найдена в пакете yum-utils."
+
+-#: ../yum/__init__.py:849
++#: ../yum/__init__.py:906
+ msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them."
+ msgstr "Остались незавершенные действия. Возможно, сначала следует выполнить yum-complete-transaction для их завершения."
+
++#: ../yum/__init__.py:985
++#, python-format
++msgid "Trying to remove \"%s\", which is protected"
++msgstr "Попытка удаления защищенного «%s»"
++
+ #. Kind of hacky
+-#: ../yum/__init__.py:922
+-#, fuzzy, python-format
++#: ../yum/__init__.py:1044
++#, python-format
+ msgid "Skip-broken round %i"
+-msgstr "Пропуск сломанных, раунд %i"
++msgstr "Проход с пропуском нарушенных связей %i"
+
+-#: ../yum/__init__.py:975
+-#, fuzzy, python-format
++#: ../yum/__init__.py:1101
++#, python-format
+ msgid "Skip-broken took %i rounds "
+-msgstr "Разрушено %i связей"
++msgstr "Пропуск нарушенных связей завершен в %i проход(а,ов)"
+
+-#: ../yum/__init__.py:976
++#: ../yum/__init__.py:1102
+ msgid ""
+ "\n"
+ "Packages skipped because of dependency problems:"
+@@ -2172,90 +2252,110 @@ msgstr ""
+ "\n"
+ "Пакеты пропущены из-за проблем с зависимостями:"
+
+-#: ../yum/__init__.py:980
++#: ../yum/__init__.py:1106
+ #, python-format
+ msgid " %s from %s"
+ msgstr " %s из %s"
+
+-#: ../yum/__init__.py:1121
++#. FIXME: _N()
++#: ../yum/__init__.py:1251
++#, python-format
++msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:"
++msgstr "** Предварительно ошибок в rpmdb: %d, «yum check» выдает следующее:"
++
++#: ../yum/__init__.py:1255
+ msgid "Warning: RPMDB altered outside of yum."
+ msgstr "ПРЕДУПРЕЖДЕНИЕ: база данных RPM была изменена вне yum."
+
+-#: ../yum/__init__.py:1126
+-#, fuzzy
++#: ../yum/__init__.py:1267
+ msgid "missing requires"
+-msgstr "не требуется"
++msgstr "недостающие зависимости"
+
+-#: ../yum/__init__.py:1127
+-#, fuzzy
++#: ../yum/__init__.py:1268
+ msgid "installed conflict"
+-msgstr "установлен в конфликте"
++msgstr "установленный конфликтующий пакет"
+
+-#: ../yum/__init__.py:1180
++#: ../yum/__init__.py:1366
+ msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
+ msgstr "Внимание: в ходе операции возникли некоторые некритические ошибки."
+
+-#: ../yum/__init__.py:1198
++#: ../yum/__init__.py:1376
++msgid "Transaction couldn't start:"
++msgstr "Операция не начата:"
++
++#. should this be 'to_unicoded'?
++#: ../yum/__init__.py:1379
++msgid "Could not run transaction."
++msgstr "Невозможно выполнить действие."
++
++#: ../yum/__init__.py:1392
+ #, python-format
+ msgid "Failed to remove transaction file %s"
+ msgstr "Невозможно удалить файл сценария %s"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1227
++#: ../yum/__init__.py:1424
+ #, python-format
+ msgid "%s was supposed to be installed but is not!"
+ msgstr "%s должен был быть установлен, но не был установлен!"
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1266
++#: ../yum/__init__.py:1486
+ #, python-format
+ msgid "%s was supposed to be removed but is not!"
+ msgstr "%s должен был быть удален, но не был удален!"
+
++#: ../yum/__init__.py:1597
++#, python-format
++msgid "Could not open lock %s: %s"
++msgstr "Невозможно открыть блокировку %s: %s"
++
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1386
++#: ../yum/__init__.py:1614
+ #, python-format
+ msgid "Unable to check if PID %s is active"
+ msgstr "Невозможно проверить активен ли процесс %s"
+
+ #. Another copy seems to be running.
+-#: ../yum/__init__.py:1390
++#: ../yum/__init__.py:1618
+ #, python-format
+ msgid "Existing lock %s: another copy is running as pid %s."
+ msgstr "Заблокировано %s: другая копия запущена pid %s."
+
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1425
++#: ../yum/__init__.py:1653
+ #, python-format
+ msgid "Could not create lock at %s: %s "
+ msgstr "Вы не можете создать блокировку %s: %s "
+
+-#: ../yum/__init__.py:1470
+-msgid "Package does not match intended download. Suggestion: run yum clean metadata"
+-msgstr "Пакет не соответствует предназначенному для загрузки. Предложение: запустите yum clean metadata"
++#: ../yum/__init__.py:1698
++#, python-format
++msgid "Package does not match intended download. Suggestion: run yum --enablerepo=%s clean metadata"
++msgstr ""
++"Пакет не соответствует предложенному для загрузки.\r\n"
++"Предлагается запустить run yum --enablerepo=%s clean metadata"
+
+-#: ../yum/__init__.py:1486
++#: ../yum/__init__.py:1714
+ msgid "Could not perform checksum"
+ msgstr "Невозможно проверить контрольную сумму"
+
+-#: ../yum/__init__.py:1489
++#: ../yum/__init__.py:1717
+ msgid "Package does not match checksum"
+ msgstr "Пакет не совпадает с контрольной суммой"
+
+-#: ../yum/__init__.py:1531
++#: ../yum/__init__.py:1769
+ #, python-format
+ msgid "package fails checksum but caching is enabled for %s"
+ msgstr "проверка контрольной суммы неудачна, но кэширование включено для %s"
+
+-#: ../yum/__init__.py:1534
+-#: ../yum/__init__.py:1563
++#: ../yum/__init__.py:1772 ../yum/__init__.py:1801
+ #, python-format
+ msgid "using local copy of %s"
+ msgstr "использование локальной копии %s"
+
+-#: ../yum/__init__.py:1575
++#: ../yum/__init__.py:1813
+ #, python-format
+ msgid ""
+ "Insufficient space in download directory %s\n"
+@@ -2266,380 +2366,398 @@ msgstr ""
+ " * свободно %s\n"
+ " * необходимо %s"
+
+-#: ../yum/__init__.py:1624
++#: ../yum/__init__.py:1862
+ msgid "Header is not complete."
+ msgstr "Заголовок не полный."
+
+-#: ../yum/__init__.py:1661
++#: ../yum/__init__.py:1899
+ #, python-format
+ msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
+ msgstr "Заголовок не в локальном кэше. Включен режим только из кэша. Невозможно загрузить %s"
+
+-#: ../yum/__init__.py:1716
++#: ../yum/__init__.py:1954
+ #, python-format
+ msgid "Public key for %s is not installed"
+ msgstr "Публичный ключ для %s не установлен"
+
+-#: ../yum/__init__.py:1720
++#: ../yum/__init__.py:1958
+ #, python-format
+ msgid "Problem opening package %s"
+ msgstr "Проблема открытия пакета %s"
+
+-#: ../yum/__init__.py:1728
++#: ../yum/__init__.py:1966
+ #, python-format
+ msgid "Public key for %s is not trusted"
+ msgstr "Публичный ключ для %s не заслуживает доверия"
+
+-#: ../yum/__init__.py:1732
++#: ../yum/__init__.py:1970
+ #, python-format
+ msgid "Package %s is not signed"
+ msgstr "Пакет %s не подписан"
+
+-#: ../yum/__init__.py:1770
++#: ../yum/__init__.py:2008
+ #, python-format
+ msgid "Cannot remove %s"
+ msgstr "Невозможно удалить %s"
+
+-#: ../yum/__init__.py:1774
++#: ../yum/__init__.py:2012
+ #, python-format
+ msgid "%s removed"
+ msgstr "%s удален(ы)"
+
+-#: ../yum/__init__.py:1820
++#: ../yum/__init__.py:2058
+ #, python-format
+ msgid "Cannot remove %s file %s"
+ msgstr "Невозможно удалить %s файл %s"
+
+-#: ../yum/__init__.py:1824
++#: ../yum/__init__.py:2062
+ #, python-format
+ msgid "%s file %s removed"
+ msgstr "%s файл %s удален"
+
+-#: ../yum/__init__.py:1826
++#: ../yum/__init__.py:2064
+ #, python-format
+ msgid "%d %s files removed"
+ msgstr "%d %s файлы удалены"
+
+-#: ../yum/__init__.py:1895
++#: ../yum/__init__.py:2133
+ #, python-format
+ msgid "More than one identical match in sack for %s"
+ msgstr "Более одного идентичных совпадений найдено в наборе для %s"
+
+-#: ../yum/__init__.py:1901
++#: ../yum/__init__.py:2139
+ #, python-format
+ msgid "Nothing matches %s.%s %s:%s-%s from update"
+ msgstr "Совпадений не найдено %s.%s %s:%s-%s из обновлений"
+
+-#: ../yum/__init__.py:2180
++#: ../yum/__init__.py:2433
+ msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
+ msgstr "searchPackages() будет убрано в следующей версии Yum. Используйте searchGenerator() взамен. \n"
+
+-#: ../yum/__init__.py:2219
++#: ../yum/__init__.py:2472
+ #, python-format
+ msgid "Searching %d packages"
+ msgstr "Поиск %d пакетов"
+
+-#: ../yum/__init__.py:2223
++#: ../yum/__init__.py:2476
+ #, python-format
+ msgid "searching package %s"
+ msgstr "поиск пакета %s"
+
+-#: ../yum/__init__.py:2235
++#: ../yum/__init__.py:2488
+ msgid "searching in file entries"
+ msgstr "поиск среди файлов"
+
+-#: ../yum/__init__.py:2242
+-#, fuzzy
++#: ../yum/__init__.py:2495
+ msgid "searching in provides entries"
+-msgstr "Поиск среди предоставлений"
++msgstr "поиск по содержимому"
+
+-#: ../yum/__init__.py:2275
++#: ../yum/__init__.py:2528
+ #, python-format
+ msgid "Provides-match: %s"
+ msgstr "Результат совпадений: %s"
+
+-#: ../yum/__init__.py:2324
++#: ../yum/__init__.py:2577
+ msgid "No group data available for configured repositories"
+ msgstr "Для настроенных репозиториев данных коллекций нет"
+
+-#: ../yum/__init__.py:2355
+-#: ../yum/__init__.py:2374
+-#: ../yum/__init__.py:2405
+-#: ../yum/__init__.py:2411
+-#: ../yum/__init__.py:2493
+-#: ../yum/__init__.py:2497
+-#: ../yum/__init__.py:2814
++#: ../yum/__init__.py:2608 ../yum/__init__.py:2627 ../yum/__init__.py:2658
++#: ../yum/__init__.py:2664 ../yum/__init__.py:2746 ../yum/__init__.py:2750
++#: ../yum/__init__.py:3095
+ #, python-format
+ msgid "No Group named %s exists"
+ msgstr "Коллекции с названием %s не существует"
+
+-#: ../yum/__init__.py:2386
+-#: ../yum/__init__.py:2513
++#: ../yum/__init__.py:2639 ../yum/__init__.py:2766
+ #, python-format
+ msgid "package %s was not marked in group %s"
+ msgstr "пакет %s не отмечен в коллекции %s"
+
+-#: ../yum/__init__.py:2433
++#: ../yum/__init__.py:2686
+ #, python-format
+ msgid "Adding package %s from group %s"
+ msgstr "Добавление пакета %s из коллекции %s"
+
+-#: ../yum/__init__.py:2437
++#: ../yum/__init__.py:2690
+ #, python-format
+ msgid "No package named %s available to be installed"
+ msgstr "Пакет с именем %s не доступен для установки"
+
+-#: ../yum/__init__.py:2539
++#. This can happen due to excludes after .up has
++#. happened.
++#: ../yum/__init__.py:2794
+ #, python-format
+ msgid "Package tuple %s could not be found in packagesack"
+ msgstr "Кортеж пакетов %s не найден в наборе пакетов"
+
+-#: ../yum/__init__.py:2558
++#: ../yum/__init__.py:2813
+ #, python-format
+ msgid "Package tuple %s could not be found in rpmdb"
+ msgstr "Кортеж пакетов %s не найден в базе RPM"
+
+-#: ../yum/__init__.py:2614
+-#: ../yum/__init__.py:2664
+-msgid "Invalid version flag"
+-msgstr "Неверная версия флага"
+-
+-#: ../yum/__init__.py:2634
+-#: ../yum/__init__.py:2639
++#: ../yum/__init__.py:2868 ../yum/__init__.py:2873
+ #, python-format
+ msgid "No Package found for %s"
+ msgstr "Пакет %s не найден"
+
+-#: ../yum/__init__.py:2855
++#: ../yum/__init__.py:2901
++msgid "Invalid version flag"
++msgstr "Неверная версия флага"
++
++#: ../yum/__init__.py:3145
+ #, fuzzy
+ msgid "Package Object was not a package object instance"
+ msgstr "Объект пакета не являлся экземпляром объекта пакета"
+
+-#: ../yum/__init__.py:2859
++#: ../yum/__init__.py:3149
+ msgid "Nothing specified to install"
+ msgstr "Ничего не отмечено для установки"
+
+-#: ../yum/__init__.py:2875
+-#: ../yum/__init__.py:3652
++#: ../yum/__init__.py:3168 ../yum/__init__.py:3992
+ #, python-format
+ msgid "Checking for virtual provide or file-provide for %s"
+ msgstr "Проверка виртуального провайдера или файлового провайдера для %s"
+
+-#: ../yum/__init__.py:2881
+-#: ../yum/__init__.py:3197
+-#: ../yum/__init__.py:3365
+-#: ../yum/__init__.py:3658
++#: ../yum/__init__.py:3174 ../yum/__init__.py:3504 ../yum/__init__.py:3684
++#: ../yum/__init__.py:3998
+ #, python-format
+ msgid "No Match for argument: %s"
+ msgstr "Нет результатов для параметра: %s"
+
+-#: ../yum/__init__.py:2957
++#: ../yum/__init__.py:3250
+ #, python-format
+ msgid "Package %s installed and not available"
+ msgstr "Пакет %s уже установлен и недоступен"
+
+-#: ../yum/__init__.py:2960
++#: ../yum/__init__.py:3253
+ msgid "No package(s) available to install"
+ msgstr "Нет доступных для установки пакетов"
+
+-#: ../yum/__init__.py:2972
++#: ../yum/__init__.py:3265
+ #, python-format
+ msgid "Package: %s - already in transaction set"
+ msgstr "Пакет: %s — уже в списке к действию"
+
+-#: ../yum/__init__.py:2998
++#: ../yum/__init__.py:3291
+ #, python-format
+ msgid "Package %s is obsoleted by %s which is already installed"
+ msgstr "Пакет %s недействителен из-за установленного %s"
+
+-#: ../yum/__init__.py:3001
++#: ../yum/__init__.py:3296
++#, python-format
++msgid "Package %s is obsoleted by %s, but obsoleting package does not provide for requirements"
++msgstr "Пакет %s заменен %s, но последний не отвечает зависимостям"
++
++#: ../yum/__init__.py:3299
+ #, python-format
+ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+ msgstr "Пакет %s недействителен из-за %s, попытка установки %s взамен"
+
+-#: ../yum/__init__.py:3009
++#: ../yum/__init__.py:3307
+ #, python-format
+ msgid "Package %s already installed and latest version"
+ msgstr "Пакет %s уже установлен, и это последняя версия."
+
+-#: ../yum/__init__.py:3023
++#: ../yum/__init__.py:3321
+ #, python-format
+ msgid "Package matching %s already installed. Checking for update."
+ msgstr "Пакет %s уже установлен. Проверка обновлений."
+
+ #. update everything (the easy case)
+-#: ../yum/__init__.py:3126
++#: ../yum/__init__.py:3424
+ msgid "Updating Everything"
+ msgstr "Полное обновление"
+
+-#: ../yum/__init__.py:3147
+-#: ../yum/__init__.py:3262
+-#: ../yum/__init__.py:3289
+-#: ../yum/__init__.py:3315
++#: ../yum/__init__.py:3448 ../yum/__init__.py:3577 ../yum/__init__.py:3604
++#: ../yum/__init__.py:3630
+ #, python-format
+ msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+ msgstr "Устаревший и уже необновляемый пакет: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3182
+-#: ../yum/__init__.py:3362
++#: ../yum/__init__.py:3489 ../yum/__init__.py:3680
+ #, python-format
+ msgid "%s"
+ msgstr "%s"
+
+-#: ../yum/__init__.py:3253
++#: ../yum/__init__.py:3566
+ #, python-format
+ msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+ msgstr "Пакет уже устарел: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3284
++#: ../yum/__init__.py:3599
+ #, python-format
+ msgid "Not Updating Package that is obsoleted: %s"
+ msgstr "Устаревший необновляемый пакет: %s"
+
+-#: ../yum/__init__.py:3293
+-#: ../yum/__init__.py:3319
++#: ../yum/__init__.py:3608 ../yum/__init__.py:3634
+ #, python-format
+ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+ msgstr "Необновленный пакет, который был обновлен ранее: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3378
++#: ../yum/__init__.py:3697
+ msgid "No package matched to remove"
+ msgstr "Нет пакетов для удаления"
+
+-#: ../yum/__init__.py:3412
++#: ../yum/__init__.py:3703
++#, python-format
++msgid "Skipping the running kernel: %s"
++msgstr "Пропуск выполняющегося ядра: %s"
++
++#: ../yum/__init__.py:3709
++#, python-format
++msgid "Removing %s from the transaction"
++msgstr "Исключение %s из списка действий"
++
++#: ../yum/__init__.py:3744
+ #, python-format
+ msgid "Cannot open: %s. Skipping."
+ msgstr "Невозможно открыть: %s. Пропуск."
+
+-#: ../yum/__init__.py:3415
+-#: ../yum/__init__.py:3514
+-#: ../yum/__init__.py:3598
++#: ../yum/__init__.py:3747 ../yum/__init__.py:3859 ../yum/__init__.py:3935
+ #, python-format
+ msgid "Examining %s: %s"
+ msgstr "Проверка %s: %s"
+
+-#: ../yum/__init__.py:3423
+-#: ../yum/__init__.py:3517
+-#: ../yum/__init__.py:3601
++#: ../yum/__init__.py:3751
++#, python-format
++msgid "Cannot localinstall deltarpm: %s. Skipping."
++msgstr "Нельзя произвести localinstall deltarpm %s. Пропуск."
++
++#: ../yum/__init__.py:3760 ../yum/__init__.py:3862 ../yum/__init__.py:3938
+ #, python-format
+ msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+ msgstr "Невозможно добавить пакет %s в список действий. Несовместимая архитектура: %s"
+
+-#: ../yum/__init__.py:3431
++#: ../yum/__init__.py:3766
++#, python-format
++msgid "Cannot install package %s. It is obsoleted by installed package %s"
++msgstr "Установка пакета %s невозможна. Его заменил установленный пакет %s"
++
++#: ../yum/__init__.py:3774
+ #, python-format
+ msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
+ msgstr "Пакет %s не установлен, невозможно обновить его. Запустите yum install для его установки."
+
+-#: ../yum/__init__.py:3460
+-#: ../yum/__init__.py:3522
+-#: ../yum/__init__.py:3606
++#: ../yum/__init__.py:3803 ../yum/__init__.py:3867 ../yum/__init__.py:3943
+ #, python-format
+ msgid "Excluding %s"
+ msgstr "Исключаем %s"
+
+-#: ../yum/__init__.py:3465
++#: ../yum/__init__.py:3808
+ #, python-format
+ msgid "Marking %s to be installed"
+ msgstr "%s отмечен для установки"
+
+-#: ../yum/__init__.py:3471
++#: ../yum/__init__.py:3814
+ #, python-format
+ msgid "Marking %s as an update to %s"
+ msgstr "%s отмечен как обновление для %s"
+
+-#: ../yum/__init__.py:3478
++#: ../yum/__init__.py:3821
+ #, python-format
+ msgid "%s: does not update installed package."
+ msgstr "%s: не обновляет установленный пакет."
+
+-#: ../yum/__init__.py:3511
+-#: ../yum/__init__.py:3595
++#: ../yum/__init__.py:3856 ../yum/__init__.py:3932
+ #, python-format
+ msgid "Cannot open file: %s. Skipping."
+ msgstr "Невозможно открыть файл %s. Пропуск."
+
+-#: ../yum/__init__.py:3541
++#: ../yum/__init__.py:3886
+ msgid "Problem in reinstall: no package matched to remove"
+ msgstr "Проблема при переустановке: не найден пакет для удаления"
+
+-#: ../yum/__init__.py:3554
+-#: ../yum/__init__.py:3686
+-#, python-format
+-msgid "Package %s is allowed multiple installs, skipping"
+-msgstr "Пакет %s может быть повторно установлен, пропуск"
+-
+-#: ../yum/__init__.py:3575
++#: ../yum/__init__.py:3912
+ #, python-format
+ msgid "Problem in reinstall: no package %s matched to install"
+ msgstr "Проблема при переустановке: пакет %s не найден для установки"
+
+-#: ../yum/__init__.py:3678
++#: ../yum/__init__.py:4018
+ msgid "No package(s) available to downgrade"
+ msgstr "Пакеты для отката версии отсутствуют"
+
+-#: ../yum/__init__.py:3731
++#: ../yum/__init__.py:4026
++#, python-format
++msgid "Package %s is allowed multiple installs, skipping"
++msgstr "Пакет %s может быть повторно установлен, пропуск"
++
++#: ../yum/__init__.py:4072
+ #, python-format
+ msgid "No Match for available package: %s"
+ msgstr "Пакеты недоступны: %s"
+
+-#: ../yum/__init__.py:3738
++#: ../yum/__init__.py:4079
+ #, python-format
+ msgid "Only Upgrade available on package: %s"
+ msgstr "Только переход к следующей версии доступен для пакета: %s"
+
+-#: ../yum/__init__.py:3808
+-#: ../yum/__init__.py:3845
++#: ../yum/__init__.py:4149 ../yum/__init__.py:4186
+ #, python-format
+ msgid "Failed to downgrade: %s"
+ msgstr "Ошибка отката версии: %s"
+
+-#: ../yum/__init__.py:3877
++#: ../yum/__init__.py:4218
+ #, python-format
+ msgid "Retrieving GPG key from %s"
+ msgstr "Получение ключа GPG от %s"
+
+-#: ../yum/__init__.py:3897
++#: ../yum/__init__.py:4238
+ msgid "GPG key retrieval failed: "
+ msgstr "Неудача получения ключа GPG:"
+
+-#: ../yum/__init__.py:3903
++#: ../yum/__init__.py:4244
+ #, python-format
+ msgid "Invalid GPG Key from %s: %s"
+ msgstr "Неверный GPG ключ %s: %s"
+
+-#: ../yum/__init__.py:3912
++#: ../yum/__init__.py:4253
+ #, python-format
+ msgid "GPG key parsing failed: key does not have value %s"
+ msgstr "Ошибка обработки GPG ключа: ключ не имеет значения %s"
+
+-#: ../yum/__init__.py:3944
++#: ../yum/__init__.py:4267
+ #, python-format
+-msgid "GPG key at %s (0x%s) is already installed"
+-msgstr "GPG ключ %s (0x%s) уже установлен"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid : %s\n"
++" Package: %s (%s)\n"
++" From : %s"
++msgstr ""
++"Импорт ключа GPG 0x%s:\n"
++" Владелец: %s\n"
++" Пакет : %s (%s)\n"
++" Из : %s"
++
++#: ../yum/__init__.py:4275
++#, python-format
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid: \"%s\"\n"
++" From : %s"
++msgstr ""
++"Импорт ключа GPG 0x%s:\n"
++" Владелец: «%s»\n"
++" Из : %s"
+
+-#. Try installing/updating GPG key
+-#: ../yum/__init__.py:3949
+-#: ../yum/__init__.py:4011
++#: ../yum/__init__.py:4307
+ #, python-format
+-msgid "Importing GPG key 0x%s \"%s\" from %s"
+-msgstr "Импорт GPG ключа 0x%s \"%s\" из %s"
++msgid "GPG key at %s (0x%s) is already installed"
++msgstr "GPG ключ %s (0x%s) уже установлен"
+
+-#: ../yum/__init__.py:3966
++#: ../yum/__init__.py:4326
+ msgid "Not installing key"
+ msgstr "Не установлен ключ"
+
+-#: ../yum/__init__.py:3972
++#: ../yum/__init__.py:4332
+ #, python-format
+ msgid "Key import failed (code %d)"
+ msgstr "Неудача импорта ключа (code %d)"
+
+-#: ../yum/__init__.py:3973
+-#: ../yum/__init__.py:4032
++#: ../yum/__init__.py:4333 ../yum/__init__.py:4389
+ msgid "Key imported successfully"
+ msgstr "Импорт ключа успешно завершен"
+
+-#: ../yum/__init__.py:3978
+-#: ../yum/__init__.py:4037
++#: ../yum/__init__.py:4338
+ #, python-format
+ msgid ""
+ "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
+@@ -2648,118 +2766,136 @@ msgstr ""
+ "GPG ключи включены для репозитория \"%s\", но они не является правильными для данного пакета.\n"
+ "Пожалуйста, проверьте правильно ли настроены URL ключей для данного репозитория."
+
+-#: ../yum/__init__.py:3987
++#: ../yum/__init__.py:4347
+ msgid "Import of key(s) didn't help, wrong key(s)?"
+ msgstr "Импорт ключа(ключей) не помог, неверный ключ(ключи)?"
+
+-#: ../yum/__init__.py:4006
++#: ../yum/__init__.py:4366
+ #, python-format
+ msgid "GPG key at %s (0x%s) is already imported"
+ msgstr "GPG ключ из %s (0x%s) уже был импортирован"
+
+-#: ../yum/__init__.py:4026
++#: ../yum/__init__.py:4383
+ #, python-format
+ msgid "Not installing key for repo %s"
+ msgstr "Ключ для репозитория %s не установлен."
+
+-#: ../yum/__init__.py:4031
++#: ../yum/__init__.py:4388
+ msgid "Key import failed"
+ msgstr "Импорт ключа неудачен"
+
+-#: ../yum/__init__.py:4157
++#: ../yum/__init__.py:4394
++#, python-format
++msgid ""
++"The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n"
++"Check that the correct key URLs are configured for this repository."
++msgstr ""
++"Ключи подписей GPG для источника «%s» уже установлены, но они неверные.\n"
++"\r\n"
++"Убедитесь в правильности заданных URL с ключами для этого источника."
++
++#: ../yum/__init__.py:4521
+ msgid "Unable to find a suitable mirror."
+ msgstr "Не удается найти подходящее зеркало"
+
+-#: ../yum/__init__.py:4159
++#: ../yum/__init__.py:4523
+ msgid "Errors were encountered while downloading packages."
+ msgstr "Были обнаружены ошибки во время загрузки пакетов."
+
+-#: ../yum/__init__.py:4209
++#: ../yum/__init__.py:4573
+ #, python-format
+ msgid "Please report this error at %s"
+ msgstr "Пожалуйста, сообщите об этой ошибке в %s"
+
+-#: ../yum/__init__.py:4233
++#: ../yum/__init__.py:4597
+ msgid "Test Transaction Errors: "
+ msgstr "Ошибки проверки сценария:"
+
+-#: ../yum/__init__.py:4334
++#: ../yum/__init__.py:4700
+ #, python-format
+ msgid "Could not set cachedir: %s"
+ msgstr "Невозможно задать кэш-папку: %s"
+
+ #. Mostly copied from YumOutput._outKeyValFill()
+-#: ../yum/plugins.py:202
++#: ../yum/plugins.py:208
+ msgid "Loaded plugins: "
+ msgstr "Загружены модули: "
+
+-#: ../yum/plugins.py:216
+-#: ../yum/plugins.py:222
++#: ../yum/plugins.py:222 ../yum/plugins.py:228
+ #, python-format
+ msgid "No plugin match for: %s"
+ msgstr "Нет модуля: %s"
+
+-#: ../yum/plugins.py:252
++#: ../yum/plugins.py:258
+ #, python-format
+ msgid "Not loading \"%s\" plugin, as it is disabled"
+ msgstr "Модуль \"%s\" не был загружен, поскольку отключен"
+
+ #. Give full backtrace:
+-#: ../yum/plugins.py:264
++#: ../yum/plugins.py:270
+ #, python-format
+ msgid "Plugin \"%s\" can't be imported"
+ msgstr "Невозможен импорт модуля \"%s\""
+
+-#: ../yum/plugins.py:271
++#: ../yum/plugins.py:277
+ #, python-format
+ msgid "Plugin \"%s\" doesn't specify required API version"
+ msgstr "Модулем \"%s\" не указана требуемая версия API"
+
+-#: ../yum/plugins.py:276
++#: ../yum/plugins.py:282
+ #, python-format
+ msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+ msgstr "Модуль \"%s\" требует API %s. Поддерживаемая API — %s."
+
+-#: ../yum/plugins.py:309
++#: ../yum/plugins.py:315
+ #, python-format
+ msgid "Loading \"%s\" plugin"
+ msgstr "Загрузка модуля \"%s\""
+
+-#: ../yum/plugins.py:316
++#: ../yum/plugins.py:322
+ #, python-format
+ msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
+ msgstr "В каталоге модулей обнаружено два или более с названием \"%s\""
+
+-#: ../yum/plugins.py:336
++#: ../yum/plugins.py:342
+ #, python-format
+ msgid "Configuration file %s not found"
+ msgstr "Конфигурационный файл %s не найден"
+
+ #. for
+ #. Configuration files for the plugin not found
+-#: ../yum/plugins.py:339
++#: ../yum/plugins.py:345
+ #, python-format
+ msgid "Unable to find configuration file for plugin %s"
+ msgstr "Не найден файл настройки модуля %s"
+
+-#: ../yum/plugins.py:501
++#: ../yum/plugins.py:507
+ msgid "registration of commands not supported"
+ msgstr "регистрация команд не поддерживается"
+
+ #: ../yum/rpmsack.py:102
+-#, fuzzy
+ msgid "has missing requires of"
+-msgstr "не пройдены требования"
++msgstr "имеет недостающие зависимости от"
+
+ #: ../yum/rpmsack.py:105
+ msgid "has installed conflicts"
+-msgstr "конфликты были установлены"
++msgstr "конфликтует с установленными"
+
+ #: ../yum/rpmsack.py:114
+ #, python-format
+ msgid "%s is a duplicate with %s"
+ msgstr "%s совпадает с %s"
+
++#: ../yum/rpmsack.py:122
++#, python-format
++msgid "%s is obsoleted by %s"
++msgstr "%s заменен на %s"
++
++#: ../yum/rpmsack.py:130
++#, python-format
++msgid "%s provides %s but it cannot be found"
++msgstr "%s предоставляет %s, но он не найден"
++
+ #: ../yum/rpmtrans.py:79
+ msgid "Repackaging"
+ msgstr "Переупаковка"
+@@ -2782,10 +2918,8 @@ msgstr "Невозможно открыть базу RPM для чтения. В
+ msgid "Got an empty Header, something has gone wrong"
+ msgstr "Получен пустой заголовок, что-то не так"
+
+-#: ../rpmUtils/oldUtils.py:253
+-#: ../rpmUtils/oldUtils.py:260
+-#: ../rpmUtils/oldUtils.py:263
+-#: ../rpmUtils/oldUtils.py:266
++#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
++#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
+ #, python-format
+ msgid "Damaged Header %s"
+ msgstr "Поврежденный заголовок %s"
+@@ -2795,15 +2929,39 @@ msgstr "Поврежденный заголовок %s"
+ msgid "Error opening rpm %s - error %s"
+ msgstr "Невозможно открыть пакет %s — ошибка %s"
+
++#~ msgid "Repo : %s"
++#~ msgstr "Репозиторий : %s"
++
++#~ msgid "URL : %s"
++#~ msgstr "Ссылка : %s"
++
++#~ msgid "Description: "
++#~ msgstr "Описание : "
++
++#~ msgid ""
++#~ "Remove %5.5s Package(s)\n"
++#~ "Reinstall %5.5s Package(s)\n"
++#~ "Downgrade %5.5s Package(s)\n"
++#~ msgstr ""
++#~ "Удаление %5.5s пакет(ов)\n"
++#~ "Переустановка %5.5s пакет(ов)\n"
++#~ "Откат версии %5.5s пакет(ов)\n"
++
++#~ msgid "Weird"
++#~ msgstr "Странный"
++
++#~ msgid "Potential match for %s from %s"
++#~ msgstr "Возможное совпадение для %s из %s"
++
++#~ msgid "Matched %s to require for %s"
++#~ msgstr "%s подходит как требуемый для %s"
++
+ #~ msgid "Parsing package install arguments"
+ #~ msgstr "Ошибка при разборе параметров командной строки: %s"
+
+ #~ msgid "Reducing %s to included packages only"
+ #~ msgstr "Поиск устаревших пакетов"
+
+-#~ msgid "Keeping included package %s"
+-#~ msgstr "Поиск обновленных пакетов"
+-
+ #~ msgid "Removing unmatched package %s"
+ #~ msgstr "Поиск обновленных пакетов"
+
+@@ -3223,9 +3381,6 @@ msgstr "Невозможно открыть пакет %s — ошибка %s"
+ #~ msgid "depcheck: package %s needs %s"
+ #~ msgstr "зависимости: пакету %s необходим %s"
+
+-#~ msgid "Error - %s cannot be found"
+-#~ msgstr "Ошибка - %s не найден"
+-
+ #~ msgid "Erasing: %s %d/%d"
+ #~ msgstr "Удаление: - %s - %d/%d"
+
+diff --git a/po/yum.pot b/po/yum.pot
+index f9a1d35..c9d7199 100644
+--- a/po/yum.pot
++++ b/po/yum.pot
+@@ -8,15 +8,16 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-02-11 10:54-0500\n"
++"POT-Creation-Date: 2010-08-17 10:15-0400\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
++"Language: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=CHARSET\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72
++#: ../callback.py:48 ../output.py:1027 ../yum/rpmtrans.py:72
+ msgid "Updating"
+ msgstr ""
+
+@@ -24,26 +25,26 @@ msgstr ""
+ msgid "Erasing"
+ msgstr ""
+
+-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946
+-#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
++#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1026
++#: ../output.py:1919 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
+ #: ../yum/rpmtrans.py:77
+ msgid "Installing"
+ msgstr ""
+
+-#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76
++#: ../callback.py:52 ../callback.py:58 ../output.py:1640 ../yum/rpmtrans.py:76
+ msgid "Obsoleted"
+ msgstr ""
+
+-#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491
++#: ../callback.py:54 ../output.py:1157 ../output.py:1518 ../output.py:1647
+ msgid "Updated"
+ msgstr ""
+
+-#: ../callback.py:55 ../output.py:1438
++#: ../callback.py:55 ../output.py:1517
+ msgid "Erased"
+ msgstr ""
+
+-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068
+-#: ../output.py:1434 ../output.py:1646
++#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1155
++#: ../output.py:1517 ../output.py:1519 ../output.py:1891
+ msgid "Installed"
+ msgstr ""
+
+@@ -65,7 +66,7 @@ msgstr ""
+ msgid "Erased: %s"
+ msgstr ""
+
+-#: ../callback.py:217 ../output.py:948 ../output.py:1648
++#: ../callback.py:217 ../output.py:1028 ../output.py:1894
+ msgid "Removing"
+ msgstr ""
+
+@@ -73,316 +74,329 @@ msgstr ""
+ msgid "Cleanup"
+ msgstr ""
+
+-#: ../cli.py:107
++#: ../cli.py:108
+ #, python-format
+ msgid "Command \"%s\" already defined"
+ msgstr ""
+
+-#: ../cli.py:119
++#: ../cli.py:120
+ msgid "Setting up repositories"
+ msgstr ""
+
+-#: ../cli.py:130
++#: ../cli.py:131
+ msgid "Reading repository metadata in from local files"
+ msgstr ""
+
+-#: ../cli.py:194 ../utils.py:193
++#: ../cli.py:234 ../utils.py:254
+ #, python-format
+ msgid "Config Error: %s"
+ msgstr ""
+
+-#: ../cli.py:197 ../cli.py:1272 ../utils.py:196
++#: ../cli.py:237 ../cli.py:1403 ../utils.py:257
+ #, python-format
+ msgid "Options Error: %s"
+ msgstr ""
+
+-#: ../cli.py:227
++#: ../cli.py:267
+ #, python-format
+ msgid " Installed: %s-%s at %s"
+ msgstr ""
+
+-#: ../cli.py:229
++#: ../cli.py:269
+ #, python-format
+ msgid " Built : %s at %s"
+ msgstr ""
+
+-#: ../cli.py:231
++#: ../cli.py:271
+ #, python-format
+ msgid " Committed: %s at %s"
+ msgstr ""
+
+-#: ../cli.py:270
++#: ../cli.py:310
+ msgid "You need to give some command"
+ msgstr ""
+
+-#: ../cli.py:284
++#: ../cli.py:324
+ #, python-format
+ msgid "No such command: %s. Please use %s --help"
+ msgstr ""
+
+-#: ../cli.py:314
++#: ../cli.py:354
+ msgid "Disk Requirements:\n"
+ msgstr ""
+
+-#: ../cli.py:316
++#: ../cli.py:356
+ #, python-format
+ msgid " At least %dMB more space needed on the %s filesystem.\n"
+ msgstr ""
+
+ #. TODO: simplify the dependency errors?
+ #. Fixup the summary
+-#: ../cli.py:321
++#: ../cli.py:361
+ msgid ""
+ "Error Summary\n"
+ "-------------\n"
+ msgstr ""
+
+-#: ../cli.py:364
++#: ../cli.py:404
+ msgid "Trying to run the transaction but nothing to do. Exiting."
+ msgstr ""
+
+-#: ../cli.py:403
++#: ../cli.py:451
+ msgid "Exiting on user Command"
+ msgstr ""
+
+-#: ../cli.py:407
++#: ../cli.py:455
+ msgid "Downloading Packages:"
+ msgstr ""
+
+-#: ../cli.py:412
++#: ../cli.py:460
+ msgid "Error Downloading Packages:\n"
+ msgstr ""
+
+-#: ../cli.py:426 ../yum/__init__.py:4195
++#: ../cli.py:474 ../yum/__init__.py:4559
+ msgid "Running rpm_check_debug"
+ msgstr ""
+
+-#: ../cli.py:435 ../yum/__init__.py:4204
++#: ../cli.py:483 ../yum/__init__.py:4568
+ msgid "ERROR You need to update rpm to handle:"
+ msgstr ""
+
+-#: ../cli.py:437 ../yum/__init__.py:4207
++#: ../cli.py:485 ../yum/__init__.py:4571
+ msgid "ERROR with rpm_check_debug vs depsolve:"
+ msgstr ""
+
+-#: ../cli.py:443
++#: ../cli.py:491
+ msgid "RPM needs to be updated"
+ msgstr ""
+
+-#: ../cli.py:444
++#: ../cli.py:492
+ #, python-format
+ msgid "Please report this error in %s"
+ msgstr ""
+
+-#: ../cli.py:450
++#: ../cli.py:498
+ msgid "Running Transaction Test"
+ msgstr ""
+
+-#: ../cli.py:466
++#: ../cli.py:514
+ msgid "Transaction Check Error:\n"
+ msgstr ""
+
+-#: ../cli.py:473
++#: ../cli.py:521
+ msgid "Transaction Test Succeeded"
+ msgstr ""
+
+-#: ../cli.py:495
++#: ../cli.py:543
+ msgid "Running Transaction"
+ msgstr ""
+
+-#: ../cli.py:525
++#: ../cli.py:573
+ msgid ""
+ "Refusing to automatically import keys when running unattended.\n"
+ "Use \"-y\" to override."
+ msgstr ""
+
+-#: ../cli.py:544 ../cli.py:578
++#: ../cli.py:592 ../cli.py:626
+ msgid " * Maybe you meant: "
+ msgstr ""
+
+-#: ../cli.py:561 ../cli.py:569
++#: ../cli.py:609 ../cli.py:617
+ #, python-format
+ msgid "Package(s) %s%s%s available, but not installed."
+ msgstr ""
+
+-#: ../cli.py:575 ../cli.py:607 ../cli.py:687
++#: ../cli.py:623 ../cli.py:656 ../cli.py:810
+ #, python-format
+ msgid "No package %s%s%s available."
+ msgstr ""
+
+-#: ../cli.py:612 ../cli.py:748
++#: ../cli.py:663 ../cli.py:875
+ msgid "Package(s) to install"
+ msgstr ""
+
+-#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749
+-#: ../yumcommands.py:160
++#: ../cli.py:666 ../cli.py:667 ../cli.py:816 ../cli.py:850 ../cli.py:876
++#: ../yumcommands.py:179
+ msgid "Nothing to do"
+ msgstr ""
+
+-#: ../cli.py:647
++#: ../cli.py:701
+ #, python-format
+ msgid "%d packages marked for Update"
+ msgstr ""
+
+-#: ../cli.py:650
++#: ../cli.py:704
+ msgid "No Packages marked for Update"
+ msgstr ""
+
+-#: ../cli.py:664
++#: ../cli.py:770
++#, python-format
++msgid "%d packages marked for Distribution Synchronization"
++msgstr ""
++
++#: ../cli.py:773
++msgid "No Packages marked for Distribution Synchronization"
++msgstr ""
++
++#: ../cli.py:787
+ #, python-format
+ msgid "%d packages marked for removal"
+ msgstr ""
+
+-#: ../cli.py:667
++#: ../cli.py:790
+ msgid "No Packages marked for removal"
+ msgstr ""
+
+-#: ../cli.py:692
++#: ../cli.py:815
+ msgid "Package(s) to downgrade"
+ msgstr ""
+
+-#: ../cli.py:717
++#: ../cli.py:840
+ #, python-format
+ msgid " (from %s)"
+ msgstr ""
+
+-#: ../cli.py:719
++#: ../cli.py:841
+ #, python-format
+ msgid "Installed package %s%s%s%s not available."
+ msgstr ""
+
+-#: ../cli.py:726
++#: ../cli.py:849
+ msgid "Package(s) to reinstall"
+ msgstr ""
+
+-#: ../cli.py:739
++#: ../cli.py:862
+ msgid "No Packages Provided"
+ msgstr ""
+
+-#: ../cli.py:818
++#: ../cli.py:945
+ #, python-format
+ msgid "Matched: %s"
+ msgstr ""
+
+-#: ../cli.py:825
++#: ../cli.py:952
+ #, python-format
+ msgid "Warning: No matches found for: %s"
+ msgstr ""
+
+-#: ../cli.py:828
++#: ../cli.py:955
+ msgid "No Matches found"
+ msgstr ""
+
+-#: ../cli.py:868
++#: ../cli.py:995
+ #, python-format
+ msgid ""
+ "Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+ " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
+ msgstr ""
+
+-#: ../cli.py:884
++#: ../cli.py:1011
+ #, python-format
+ msgid "No Package Found for %s"
+ msgstr ""
+
+-#: ../cli.py:896
++#: ../cli.py:1021
++msgid "Cleaning repos: "
++msgstr ""
++
++#: ../cli.py:1026
+ msgid "Cleaning up Everything"
+ msgstr ""
+
+-#: ../cli.py:912
++#: ../cli.py:1042
+ msgid "Cleaning up Headers"
+ msgstr ""
+
+-#: ../cli.py:915
++#: ../cli.py:1045
+ msgid "Cleaning up Packages"
+ msgstr ""
+
+-#: ../cli.py:918
++#: ../cli.py:1048
+ msgid "Cleaning up xml metadata"
+ msgstr ""
+
+-#: ../cli.py:921
++#: ../cli.py:1051
+ msgid "Cleaning up database cache"
+ msgstr ""
+
+-#: ../cli.py:924
++#: ../cli.py:1054
+ msgid "Cleaning up expire-cache metadata"
+ msgstr ""
+
+-#: ../cli.py:927
++#: ../cli.py:1057
+ msgid "Cleaning up cached rpmdb data"
+ msgstr ""
+
+-#: ../cli.py:930
++#: ../cli.py:1060
+ msgid "Cleaning up plugins"
+ msgstr ""
+
+-#: ../cli.py:955
++#: ../cli.py:1085
+ msgid "Installed Groups:"
+ msgstr ""
+
+-#: ../cli.py:967
++#: ../cli.py:1097
+ msgid "Available Groups:"
+ msgstr ""
+
+-#: ../cli.py:977
++#: ../cli.py:1107
+ msgid "Done"
+ msgstr ""
+
+-#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788
++#: ../cli.py:1118 ../cli.py:1136 ../cli.py:1142 ../yum/__init__.py:3069
+ #, python-format
+ msgid "Warning: Group %s does not exist."
+ msgstr ""
+
+-#: ../cli.py:1016
++#: ../cli.py:1146
+ msgid "No packages in any requested group available to install or update"
+ msgstr ""
+
+-#: ../cli.py:1018
++#: ../cli.py:1148
+ #, python-format
+ msgid "%d Package(s) to Install"
+ msgstr ""
+
+-#: ../cli.py:1028 ../yum/__init__.py:2800
++#: ../cli.py:1158 ../yum/__init__.py:3081
+ #, python-format
+ msgid "No group named %s exists"
+ msgstr ""
+
+-#: ../cli.py:1034
++#: ../cli.py:1164
+ msgid "No packages to remove from groups"
+ msgstr ""
+
+-#: ../cli.py:1036
++#: ../cli.py:1166
+ #, python-format
+ msgid "%d Package(s) to remove"
+ msgstr ""
+
+-#: ../cli.py:1078
++#: ../cli.py:1208
+ #, python-format
+ msgid "Package %s is already installed, skipping"
+ msgstr ""
+
+-#: ../cli.py:1089
++#: ../cli.py:1219
+ #, python-format
+ msgid "Discarding non-comparable pkg %s.%s"
+ msgstr ""
+
+ #. we've not got any installed that match n or n+a
+-#: ../cli.py:1115
++#: ../cli.py:1245
+ #, python-format
+ msgid "No other %s installed, adding to list for potential install"
+ msgstr ""
+
+-#: ../cli.py:1135
++#: ../cli.py:1265
+ msgid "Plugin Options"
+ msgstr ""
+
+-#: ../cli.py:1143
++#: ../cli.py:1273
+ #, python-format
+ msgid "Command line error: %s"
+ msgstr ""
+
+-#: ../cli.py:1156
++#: ../cli.py:1287
+ #, python-format
+ msgid ""
+ "\n"
+@@ -390,114 +404,118 @@ msgid ""
+ "%s: %s option requires an argument"
+ msgstr ""
+
+-#: ../cli.py:1209
++#: ../cli.py:1340
+ msgid "--color takes one of: auto, always, never"
+ msgstr ""
+
+-#: ../cli.py:1319
++#: ../cli.py:1450
+ msgid "show this help message and exit"
+ msgstr ""
+
+-#: ../cli.py:1323
++#: ../cli.py:1454
+ msgid "be tolerant of errors"
+ msgstr ""
+
+-#: ../cli.py:1326
++#: ../cli.py:1457
+ msgid "run entirely from system cache, don't update cache"
+ msgstr ""
+
+-#: ../cli.py:1329
++#: ../cli.py:1460
+ msgid "config file location"
+ msgstr ""
+
+-#: ../cli.py:1332
++#: ../cli.py:1463
+ msgid "maximum command wait time"
+ msgstr ""
+
+-#: ../cli.py:1334
++#: ../cli.py:1465
+ msgid "debugging output level"
+ msgstr ""
+
+-#: ../cli.py:1338
++#: ../cli.py:1469
+ msgid "show duplicates, in repos, in list/search commands"
+ msgstr ""
+
+-#: ../cli.py:1340
++#: ../cli.py:1471
+ msgid "error output level"
+ msgstr ""
+
+-#: ../cli.py:1343
++#: ../cli.py:1474
+ msgid "debugging output level for rpm"
+ msgstr ""
+
+-#: ../cli.py:1346
++#: ../cli.py:1477
+ msgid "quiet operation"
+ msgstr ""
+
+-#: ../cli.py:1348
++#: ../cli.py:1479
+ msgid "verbose operation"
+ msgstr ""
+
+-#: ../cli.py:1350
++#: ../cli.py:1481
+ msgid "answer yes for all questions"
+ msgstr ""
+
+-#: ../cli.py:1352
++#: ../cli.py:1483
+ msgid "show Yum version and exit"
+ msgstr ""
+
+-#: ../cli.py:1353
++#: ../cli.py:1484
+ msgid "set install root"
+ msgstr ""
+
+-#: ../cli.py:1357
++#: ../cli.py:1488
+ msgid "enable one or more repositories (wildcards allowed)"
+ msgstr ""
+
+-#: ../cli.py:1361
++#: ../cli.py:1492
+ msgid "disable one or more repositories (wildcards allowed)"
+ msgstr ""
+
+-#: ../cli.py:1364
++#: ../cli.py:1495
+ msgid "exclude package(s) by name or glob"
+ msgstr ""
+
+-#: ../cli.py:1366
++#: ../cli.py:1497
+ msgid "disable exclude from main, for a repo or for everything"
+ msgstr ""
+
+-#: ../cli.py:1369
++#: ../cli.py:1500
+ msgid "enable obsoletes processing during updates"
+ msgstr ""
+
+-#: ../cli.py:1371
++#: ../cli.py:1502
+ msgid "disable Yum plugins"
+ msgstr ""
+
+-#: ../cli.py:1373
++#: ../cli.py:1504
+ msgid "disable gpg signature checking"
+ msgstr ""
+
+-#: ../cli.py:1375
++#: ../cli.py:1506
+ msgid "disable plugins by name"
+ msgstr ""
+
+-#: ../cli.py:1378
++#: ../cli.py:1509
+ msgid "enable plugins by name"
+ msgstr ""
+
+-#: ../cli.py:1381
++#: ../cli.py:1512
+ msgid "skip packages with depsolving problems"
+ msgstr ""
+
+-#: ../cli.py:1383
++#: ../cli.py:1514
+ msgid "control whether color is used"
+ msgstr ""
+
+-#: ../cli.py:1385
++#: ../cli.py:1516
+ msgid "set value of $releasever in yum config and repo files"
+ msgstr ""
+
++#: ../cli.py:1518
++msgid "set arbitrary config and repo options"
++msgstr ""
++
+ #: ../output.py:305
+ msgid "Jan"
+ msgstr ""
+@@ -550,255 +568,255 @@ msgstr ""
+ msgid "Trying other mirror."
+ msgstr ""
+
+-#: ../output.py:534
++#: ../output.py:579
++#, python-format
++msgid "Name : %s%s%s"
++msgstr ""
++
++#: ../output.py:580
++#, python-format
++msgid "Arch : %s"
++msgstr ""
++
++#: ../output.py:582
+ #, python-format
+-msgid "Name : %s%s%s"
++msgid "Epoch : %s"
+ msgstr ""
+
+-#: ../output.py:535
++#: ../output.py:583
+ #, python-format
+-msgid "Arch : %s"
++msgid "Version : %s"
+ msgstr ""
+
+-#: ../output.py:537
++#: ../output.py:584
+ #, python-format
+-msgid "Epoch : %s"
++msgid "Release : %s"
+ msgstr ""
+
+-#: ../output.py:538
++#: ../output.py:585
+ #, python-format
+-msgid "Version : %s"
++msgid "Size : %s"
+ msgstr ""
+
+-#: ../output.py:539
++#: ../output.py:586 ../output.py:890
+ #, python-format
+-msgid "Release : %s"
++msgid "Repo : %s"
+ msgstr ""
+
+-#: ../output.py:540
++#: ../output.py:588
+ #, python-format
+-msgid "Size : %s"
++msgid "From repo : %s"
+ msgstr ""
+
+-#: ../output.py:541
++#: ../output.py:590
+ #, python-format
+-msgid "Repo : %s"
++msgid "Committer : %s"
+ msgstr ""
+
+-#: ../output.py:543
++#: ../output.py:591
+ #, python-format
+-msgid "From repo : %s"
++msgid "Committime : %s"
+ msgstr ""
+
+-#: ../output.py:545
++#: ../output.py:592
+ #, python-format
+-msgid "Committer : %s"
++msgid "Buildtime : %s"
+ msgstr ""
+
+-#: ../output.py:546
++#: ../output.py:594
+ #, python-format
+-msgid "Committime : %s"
++msgid "Install time: %s"
+ msgstr ""
+
+-#: ../output.py:547
++#: ../output.py:602
+ #, python-format
+-msgid "Buildtime : %s"
++msgid "Installed by: %s"
+ msgstr ""
+
+-#: ../output.py:549
++#: ../output.py:609
+ #, python-format
+-msgid "Installtime: %s"
++msgid "Changed by : %s"
+ msgstr ""
+
+-#: ../output.py:550
+-msgid "Summary : "
++#: ../output.py:610
++msgid "Summary : "
+ msgstr ""
+
+-#: ../output.py:552
++#: ../output.py:612 ../output.py:903
+ #, python-format
+-msgid "URL : %s"
++msgid "URL : %s"
+ msgstr ""
+
+-#: ../output.py:553
+-msgid "License : "
++#: ../output.py:613
++msgid "License : "
+ msgstr ""
+
+-#: ../output.py:554
+-msgid "Description: "
++#: ../output.py:614 ../output.py:900
++msgid "Description : "
+ msgstr ""
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "y"
+ msgstr ""
+
+-#: ../output.py:622
++#: ../output.py:682
+ msgid "yes"
+ msgstr ""
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "n"
+ msgstr ""
+
+-#: ../output.py:623
++#: ../output.py:683
+ msgid "no"
+ msgstr ""
+
+-#: ../output.py:627
++#: ../output.py:687
+ msgid "Is this ok [y/N]: "
+ msgstr ""
+
+-#: ../output.py:715
++#: ../output.py:775
+ #, python-format
+ msgid ""
+ "\n"
+ "Group: %s"
+ msgstr ""
+
+-#: ../output.py:719
++#: ../output.py:779
+ #, python-format
+ msgid " Group-Id: %s"
+ msgstr ""
+
+-#: ../output.py:724
++#: ../output.py:784
+ #, python-format
+ msgid " Description: %s"
+ msgstr ""
+
+-#: ../output.py:726
++#: ../output.py:786
+ msgid " Mandatory Packages:"
+ msgstr ""
+
+-#: ../output.py:727
++#: ../output.py:787
+ msgid " Default Packages:"
+ msgstr ""
+
+-#: ../output.py:728
++#: ../output.py:788
+ msgid " Optional Packages:"
+ msgstr ""
+
+-#: ../output.py:729
++#: ../output.py:789
+ msgid " Conditional Packages:"
+ msgstr ""
+
+-#: ../output.py:749
++#: ../output.py:809
+ #, python-format
+ msgid "package: %s"
+ msgstr ""
+
+-#: ../output.py:751
++#: ../output.py:811
+ msgid " No dependencies for this package"
+ msgstr ""
+
+-#: ../output.py:756
++#: ../output.py:816
+ #, python-format
+ msgid " dependency: %s"
+ msgstr ""
+
+-#: ../output.py:758
++#: ../output.py:818
+ msgid " Unsatisfied dependency"
+ msgstr ""
+
+-#: ../output.py:830
+-#, python-format
+-msgid "Repo : %s"
+-msgstr ""
+-
+-#: ../output.py:831
++#: ../output.py:891
+ msgid "Matched from:"
+ msgstr ""
+
+-#: ../output.py:840
+-msgid "Description : "
+-msgstr ""
+-
+-#: ../output.py:843
+-#, python-format
+-msgid "URL : %s"
+-msgstr ""
+-
+-#: ../output.py:846
++#: ../output.py:906
+ #, python-format
+ msgid "License : %s"
+ msgstr ""
+
+-#: ../output.py:849
++#: ../output.py:909
+ #, python-format
+ msgid "Filename : %s"
+ msgstr ""
+
+-#: ../output.py:853
++#: ../output.py:913
+ msgid "Other : "
+ msgstr ""
+
+-#: ../output.py:896
++#: ../output.py:956
+ msgid "There was an error calculating total download size"
+ msgstr ""
+
+-#: ../output.py:901
++#: ../output.py:961
+ #, python-format
+ msgid "Total size: %s"
+ msgstr ""
+
+-#: ../output.py:904
++#: ../output.py:964
+ #, python-format
+ msgid "Total download size: %s"
+ msgstr ""
+
+-#: ../output.py:908
++#: ../output.py:968 ../output.py:988
+ #, python-format
+ msgid "Installed size: %s"
+ msgstr ""
+
+-#: ../output.py:949
++#: ../output.py:984
++msgid "There was an error calculating installed size"
++msgstr ""
++
++#: ../output.py:1029
+ msgid "Reinstalling"
+ msgstr ""
+
+-#: ../output.py:950
++#: ../output.py:1030
+ msgid "Downgrading"
+ msgstr ""
+
+-#: ../output.py:951
++#: ../output.py:1031
+ msgid "Installing for dependencies"
+ msgstr ""
+
+-#: ../output.py:952
++#: ../output.py:1032
+ msgid "Updating for dependencies"
+ msgstr ""
+
+-#: ../output.py:953
++#: ../output.py:1033
+ msgid "Removing for dependencies"
+ msgstr ""
+
+-#: ../output.py:960 ../output.py:1072
++#: ../output.py:1040 ../output.py:1159
+ msgid "Skipped (dependency problems)"
+ msgstr ""
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Package"
+ msgstr ""
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Arch"
+ msgstr ""
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Version"
+ msgstr ""
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Repository"
+ msgstr ""
+
+-#: ../output.py:985
++#: ../output.py:1065
+ msgid "Size"
+ msgstr ""
+
+-#: ../output.py:997
++#: ../output.py:1077
+ #, python-format
+ msgid " replacing %s%s%s.%s %s\n"
+ msgstr ""
+
+-#: ../output.py:1006
++#: ../output.py:1086
+ #, python-format
+ msgid ""
+ "\n"
+@@ -806,47 +824,57 @@ msgid ""
+ "%s\n"
+ msgstr ""
+
+-#: ../output.py:1013
++#: ../output.py:1097
+ #, python-format
+-msgid ""
+-"Install %5.5s Package(s)\n"
+-"Upgrade %5.5s Package(s)\n"
++msgid "Install %5.5s Package(s)\n"
+ msgstr ""
+
+-#: ../output.py:1022
++#: ../output.py:1101
+ #, python-format
+-msgid ""
+-"Remove %5.5s Package(s)\n"
+-"Reinstall %5.5s Package(s)\n"
+-"Downgrade %5.5s Package(s)\n"
++msgid "Upgrade %5.5s Package(s)\n"
++msgstr ""
++
++#: ../output.py:1105
++#, python-format
++msgid "Remove %5.5s Package(s)\n"
++msgstr ""
++
++#: ../output.py:1109
++#, python-format
++msgid "Reinstall %5.5s Package(s)\n"
+ msgstr ""
+
+-#: ../output.py:1066
++#: ../output.py:1113
++#, python-format
++msgid "Downgrade %5.5s Package(s)\n"
++msgstr ""
++
++#: ../output.py:1153
+ msgid "Removed"
+ msgstr ""
+
+-#: ../output.py:1067
++#: ../output.py:1154
+ msgid "Dependency Removed"
+ msgstr ""
+
+-#: ../output.py:1069
++#: ../output.py:1156
+ msgid "Dependency Installed"
+ msgstr ""
+
+-#: ../output.py:1071
++#: ../output.py:1158
+ msgid "Dependency Updated"
+ msgstr ""
+
+-#: ../output.py:1073
++#: ../output.py:1160
+ msgid "Replaced"
+ msgstr ""
+
+-#: ../output.py:1074
++#: ../output.py:1161
+ msgid "Failed"
+ msgstr ""
+
+ #. Delta between C-c's so we treat as exit
+-#: ../output.py:1140
++#: ../output.py:1245
+ msgid "two"
+ msgstr ""
+
+@@ -854,7 +882,7 @@ msgstr ""
+ #. Current download cancelled, interrupt (ctrl-c) again within two seconds
+ #. to exit.
+ #. Where "interupt (ctrl-c) again" and "two" are highlighted.
+-#: ../output.py:1151
++#: ../output.py:1256
+ #, python-format
+ msgid ""
+ "\n"
+@@ -863,374 +891,448 @@ msgid ""
+ "to exit.\n"
+ msgstr ""
+
+-#: ../output.py:1162
++#: ../output.py:1267
+ msgid "user interrupt"
+ msgstr ""
+
+-#: ../output.py:1180
++#: ../output.py:1285
+ msgid "Total"
+ msgstr ""
+
+-#: ../output.py:1202
++#: ../output.py:1307
+ msgid "I"
+ msgstr ""
+
+-#: ../output.py:1203
++#: ../output.py:1308
+ msgid "O"
+ msgstr ""
+
+-#: ../output.py:1204
++#: ../output.py:1309
+ msgid "E"
+ msgstr ""
+
+-#: ../output.py:1205
++#: ../output.py:1310
+ msgid "R"
+ msgstr ""
+
+-#: ../output.py:1206
++#: ../output.py:1311
+ msgid "D"
+ msgstr ""
+
+-#: ../output.py:1207
++#: ../output.py:1312
+ msgid "U"
+ msgstr ""
+
+-#: ../output.py:1217
++#: ../output.py:1323
+ msgid "<unset>"
+ msgstr ""
+
+-#: ../output.py:1218
++#: ../output.py:1324
+ msgid "System"
+ msgstr ""
+
+-#: ../output.py:1254
++#: ../output.py:1368
+ msgid "Bad transaction IDs, or package(s), given"
+ msgstr ""
+
+-#: ../output.py:1266
++#: ../output.py:1380
+ msgid "ID"
+ msgstr ""
+
+-#: ../output.py:1267 ../output.py:1520
++#: ../output.py:1381 ../output.py:1699
+ msgid "Login user"
+ msgstr ""
+
+-#: ../output.py:1268
++#: ../output.py:1382
+ msgid "Date and time"
+ msgstr ""
+
+-#: ../output.py:1269 ../output.py:1522
++#: ../output.py:1383 ../output.py:1701
+ msgid "Action(s)"
+ msgstr ""
+
+-#: ../output.py:1270 ../output.py:1523
++#: ../output.py:1384 ../output.py:1702
+ msgid "Altered"
+ msgstr ""
+
+-#: ../output.py:1310
++#: ../output.py:1431 ../output.py:1760
+ msgid "No transaction ID given"
+ msgstr ""
+
+-#: ../output.py:1336
++#: ../output.py:1457
+ msgid "Bad transaction ID given"
+ msgstr ""
+
+-#: ../output.py:1341
++#: ../output.py:1462
+ msgid "Not found given transaction ID"
+ msgstr ""
+
+-#: ../output.py:1349
++#: ../output.py:1470
+ msgid "Found more than one transaction ID!"
+ msgstr ""
+
+-#: ../output.py:1370
++#: ../output.py:1491 ../output.py:1770
+ msgid "No transaction ID, or package, given"
+ msgstr ""
+
+-#: ../output.py:1396
++#: ../output.py:1518 ../output.py:1645
++msgid "Downgraded"
++msgstr ""
++
++#: ../output.py:1519
++msgid "Not installed"
++msgstr ""
++
++#: ../output.py:1520
++msgid "Older"
++msgstr ""
++
++#: ../output.py:1520
++msgid "Newer"
++msgstr ""
++
++#: ../output.py:1552
+ msgid "Transaction ID :"
+ msgstr ""
+
+-#: ../output.py:1398
++#: ../output.py:1554
+ msgid "Begin time :"
+ msgstr ""
+
+-#: ../output.py:1401 ../output.py:1403
++#: ../output.py:1557 ../output.py:1559
+ msgid "Begin rpmdb :"
+ msgstr ""
+
+-#: ../output.py:1417
++#: ../output.py:1573
+ #, python-format
+ msgid "(%s seconds)"
+ msgstr ""
+
+-#: ../output.py:1418
++#: ../output.py:1574
+ msgid "End time :"
+ msgstr ""
+
+-#: ../output.py:1421 ../output.py:1423
++#: ../output.py:1577 ../output.py:1579
+ msgid "End rpmdb :"
+ msgstr ""
+
+-#: ../output.py:1424
++#: ../output.py:1580
+ msgid "User :"
+ msgstr ""
+
+-#: ../output.py:1426 ../output.py:1428 ../output.py:1430
++#: ../output.py:1582 ../output.py:1584 ../output.py:1586
+ msgid "Return-Code :"
+ msgstr ""
+
+-#: ../output.py:1426
++#: ../output.py:1582
+ msgid "Aborted"
+ msgstr ""
+
+-#: ../output.py:1428
++#: ../output.py:1584
+ msgid "Failure:"
+ msgstr ""
+
+-#: ../output.py:1430
++#: ../output.py:1586
+ msgid "Success"
+ msgstr ""
+
+-#: ../output.py:1431
+-msgid "Transaction performed with:"
++#: ../output.py:1589
++msgid "Command Line :"
+ msgstr ""
+
+-#: ../output.py:1444 ../output.py:1489
+-msgid "Downgraded"
++#: ../output.py:1597
++#, python-format
++msgid "Additional non-default information stored: %d"
+ msgstr ""
+
+-#. multiple versions installed, both older and newer
+-#: ../output.py:1446
+-msgid "Weird"
++#: ../output.py:1600
++msgid "Transaction performed with:"
+ msgstr ""
+
+-#: ../output.py:1448
++#: ../output.py:1603
+ msgid "Packages Altered:"
+ msgstr ""
+
+-#: ../output.py:1451
++#: ../output.py:1607
++msgid "Packages Skipped:"
++msgstr ""
++
++#: ../output.py:1612
++msgid "Rpmdb Problems:"
++msgstr ""
++
++#: ../output.py:1620
+ msgid "Scriptlet output:"
+ msgstr ""
+
+-#: ../output.py:1457
++#: ../output.py:1626
+ msgid "Errors:"
+ msgstr ""
+
+-#: ../output.py:1481 ../output.py:1482
++#. Note that these don't use _simple_pkg() because we are showing what
++#. happened to them in the transaction ... not the difference between the
++#. version in the transaction and now.
++#: ../output.py:1637 ../output.py:1638
+ msgid "Install"
+ msgstr ""
+
+-#: ../output.py:1483
++#: ../output.py:1639
+ msgid "Dep-Install"
+ msgstr ""
+
+-#: ../output.py:1485
++#: ../output.py:1641
+ msgid "Obsoleting"
+ msgstr ""
+
+-#: ../output.py:1486
++#: ../output.py:1642
+ msgid "Erase"
+ msgstr ""
+
+-#: ../output.py:1487
++#: ../output.py:1643
+ msgid "Reinstall"
+ msgstr ""
+
+-#: ../output.py:1488
++#: ../output.py:1644
+ msgid "Downgrade"
+ msgstr ""
+
+-#: ../output.py:1490
++#: ../output.py:1646
+ msgid "Update"
+ msgstr ""
+
+-#: ../output.py:1521
++#: ../output.py:1700
+ msgid "Time"
+ msgstr ""
+
+-#: ../output.py:1547
++#: ../output.py:1726
+ msgid "Last day"
+ msgstr ""
+
+-#: ../output.py:1548
++#: ../output.py:1727
+ msgid "Last week"
+ msgstr ""
+
+-#: ../output.py:1549
++#: ../output.py:1728
+ msgid "Last 2 weeks"
+ msgstr ""
+
+ #. US default :p
+-#: ../output.py:1550
++#: ../output.py:1729
+ msgid "Last 3 months"
+ msgstr ""
+
+-#: ../output.py:1551
++#: ../output.py:1730
+ msgid "Last 6 months"
+ msgstr ""
+
+-#: ../output.py:1552
++#: ../output.py:1731
+ msgid "Last year"
+ msgstr ""
+
+-#: ../output.py:1553
++#: ../output.py:1732
+ msgid "Over a year ago"
+ msgstr ""
+
+-#: ../output.py:1585
++#: ../output.py:1774
++#, python-format
++msgid "No Transaction %s found"
++msgstr ""
++
++#: ../output.py:1780
++msgid "Transaction ID:"
++msgstr ""
++
++#: ../output.py:1781
++msgid "Available additional history information:"
++msgstr ""
++
++#: ../output.py:1793
++#, python-format
++msgid "%s: No additional data found by this name"
++msgstr ""
++
++#: ../output.py:1809
+ msgid "installed"
+ msgstr ""
+
+-#: ../output.py:1586
++#: ../output.py:1810
+ msgid "updated"
+ msgstr ""
+
+-#: ../output.py:1587
++#: ../output.py:1811
+ msgid "obsoleted"
+ msgstr ""
+
+-#: ../output.py:1588
++#: ../output.py:1812
+ msgid "erased"
+ msgstr ""
+
+-#: ../output.py:1592
++#: ../output.py:1813
++msgid "reinstalled"
++msgstr ""
++
++#: ../output.py:1814
++msgid "downgraded"
++msgstr ""
++
++#: ../output.py:1818
+ #, python-format
+ msgid "---> Package %s.%s %s:%s-%s set to be %s"
+ msgstr ""
+
+-#: ../output.py:1599
++#: ../output.py:1825
+ msgid "--> Running transaction check"
+ msgstr ""
+
+-#: ../output.py:1604
++#: ../output.py:1830
+ msgid "--> Restarting Dependency Resolution with new changes."
+ msgstr ""
+
+-#: ../output.py:1609
++#: ../output.py:1835
+ msgid "--> Finished Dependency Resolution"
+ msgstr ""
+
+-#: ../output.py:1614 ../output.py:1619
++#: ../output.py:1840 ../output.py:1845
+ #, python-format
+ msgid "--> Processing Dependency: %s for package: %s"
+ msgstr ""
+
+-#: ../output.py:1623
++#: ../output.py:1850
++#, python-format
++msgid "---> Keeping package: %s"
++msgstr ""
++
++#: ../output.py:1853
+ #, python-format
+ msgid "--> Unresolved Dependency: %s"
+ msgstr ""
+
+-#: ../output.py:1634
++#: ../output.py:1864
+ #, python-format
+ msgid "Package: %s"
+ msgstr ""
+
+-#: ../output.py:1636
++#: ../output.py:1866
+ #, python-format
+ msgid ""
+ "\n"
+ " Requires: %s"
+ msgstr ""
+
+-#: ../output.py:1649 ../output.py:1660
++#: ../output.py:1875
+ #, python-format
+ msgid ""
+ "\n"
+ " %s: %s (%s)"
+ msgstr ""
+
+-#: ../output.py:1657
++#: ../output.py:1880
++#, python-format
++msgid ""
++"\n"
++" %s"
++msgstr ""
++
++#: ../output.py:1882
++msgid ""
++"\n"
++" Not found"
++msgstr ""
++
++#. These should be the only three things we care about:
++#: ../output.py:1897
++msgid "Updated By"
++msgstr ""
++
++#: ../output.py:1898
++msgid "Downgraded By"
++msgstr ""
++
++#: ../output.py:1899
++msgid "Obsoleted By"
++msgstr ""
++
++#: ../output.py:1917
+ msgid "Available"
+ msgstr ""
+
+-#: ../output.py:1665 ../output.py:1670
++#: ../output.py:1944 ../output.py:1949
+ #, python-format
+ msgid "--> Processing Conflict: %s conflicts %s"
+ msgstr ""
+
+-#: ../output.py:1674
++#: ../output.py:1953
+ msgid "--> Populating transaction set with selected packages. Please wait."
+ msgstr ""
+
+-#: ../output.py:1678
++#: ../output.py:1957
+ #, python-format
+ msgid "---> Downloading header for %s to pack into transaction set."
+ msgstr ""
+
+-#: ../utils.py:93
++#: ../utils.py:94
+ msgid "Running"
+ msgstr ""
+
+-#: ../utils.py:94
++#: ../utils.py:95
+ msgid "Sleeping"
+ msgstr ""
+
+-#: ../utils.py:95
++#: ../utils.py:96
+ msgid "Uninterruptible"
+ msgstr ""
+
+-#: ../utils.py:96
++#: ../utils.py:97
+ msgid "Zombie"
+ msgstr ""
+
+-#: ../utils.py:97
++#: ../utils.py:98
+ msgid "Traced/Stopped"
+ msgstr ""
+
+-#: ../utils.py:98 ../yumcommands.py:917
++#: ../utils.py:99 ../yumcommands.py:972
+ msgid "Unknown"
+ msgstr ""
+
+-#: ../utils.py:109
++#: ../utils.py:110
+ msgid " The other application is: PackageKit"
+ msgstr ""
+
+-#: ../utils.py:111
++#: ../utils.py:112
+ #, python-format
+ msgid " The other application is: %s"
+ msgstr ""
+
+-#: ../utils.py:114
++#: ../utils.py:115
+ #, python-format
+ msgid " Memory : %5s RSS (%5sB VSZ)"
+ msgstr ""
+
+-#: ../utils.py:119
++#: ../utils.py:120
+ #, python-format
+ msgid " Started: %s - %s ago"
+ msgstr ""
+
+-#: ../utils.py:121
++#: ../utils.py:122
+ #, python-format
+ msgid " State : %s, pid: %d"
+ msgstr ""
+
+-#: ../utils.py:199
+-#, python-format
+-msgid "PluginExit Error: %s"
+-msgstr ""
+-
+-#: ../utils.py:202
+-#, python-format
+-msgid "Yum Error: %s"
+-msgstr ""
+-
+-#: ../utils.py:235 ../yummain.py:42
++#: ../utils.py:143 ../yummain.py:42
+ msgid ""
+ "\n"
+ "\n"
+ "Exiting on user cancel"
+ msgstr ""
+
+-#: ../utils.py:241 ../yummain.py:48
++#: ../utils.py:149 ../yummain.py:48
+ msgid ""
+ "\n"
+ "\n"
+ "Exiting on Broken Pipe"
+ msgstr ""
+
+-#: ../utils.py:243 ../yummain.py:50
++#: ../utils.py:151 ../yummain.py:50
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1238,7 +1340,47 @@ msgid ""
+ "%s"
+ msgstr ""
+
+-#: ../utils.py:282 ../yummain.py:211
++#: ../utils.py:201 ../yummain.py:107
++msgid ""
++"Another app is currently holding the yum lock; exiting as configured by "
++"exit_on_lock"
++msgstr ""
++
++#: ../utils.py:260
++#, python-format
++msgid "PluginExit Error: %s"
++msgstr ""
++
++#: ../utils.py:263
++#, python-format
++msgid "Yum Error: %s"
++msgstr ""
++
++#: ../utils.py:315 ../yummain.py:134 ../yummain.py:173
++#, python-format
++msgid "Error: %s"
++msgstr ""
++
++#: ../utils.py:319 ../yummain.py:177
++msgid " You could try using --skip-broken to work around the problem"
++msgstr ""
++
++#: ../utils.py:321 ../yummain.py:179 ../yummain.py:212
++msgid " You could try running: rpm -Va --nofiles --nodigest"
++msgstr ""
++
++#: ../utils.py:328 ../yummain.py:144 ../yummain.py:186
++#, python-format
++msgid "Unknown Error(s): Exit Code: %d:"
++msgstr ""
++
++#: ../utils.py:334 ../yummain.py:192
++msgid ""
++"\n"
++"Dependencies Resolved"
++msgstr ""
++
++#: ../utils.py:349 ../yummain.py:215
+ msgid "Complete!"
+ msgstr ""
+
+@@ -1305,403 +1447,398 @@ msgstr ""
+ msgid "Error: more than one file given as argument to shell."
+ msgstr ""
+
+-#: ../yumcommands.py:170
++#: ../yumcommands.py:138
++msgid ""
++"There are no enabled repos.\n"
++" Run \"yum repolist all\" to see the repos you have.\n"
++" You can enable repos with yum-config-manager --enable <repo>"
++msgstr ""
++
++#: ../yumcommands.py:189
+ msgid "PACKAGE..."
+ msgstr ""
+
+-#: ../yumcommands.py:173
++#: ../yumcommands.py:192
+ msgid "Install a package or packages on your system"
+ msgstr ""
+
+-#: ../yumcommands.py:181
++#: ../yumcommands.py:201
+ msgid "Setting up Install Process"
+ msgstr ""
+
+-#: ../yumcommands.py:192
++#: ../yumcommands.py:212 ../yumcommands.py:234
+ msgid "[PACKAGE...]"
+ msgstr ""
+
+-#: ../yumcommands.py:195
++#: ../yumcommands.py:215
+ msgid "Update a package or packages on your system"
+ msgstr ""
+
+-#: ../yumcommands.py:202
++#: ../yumcommands.py:223
+ msgid "Setting up Update Process"
+ msgstr ""
+
+-#: ../yumcommands.py:244
++#: ../yumcommands.py:237
++msgid "Synchronize installed packages to the latest available versions"
++msgstr ""
++
++#: ../yumcommands.py:245
++msgid "Setting up Distribution Synchronization Process"
++msgstr ""
++
++#: ../yumcommands.py:288
+ msgid "Display details about a package or group of packages"
+ msgstr ""
+
+-#: ../yumcommands.py:293
++#: ../yumcommands.py:337
+ msgid "Installed Packages"
+ msgstr ""
+
+-#: ../yumcommands.py:301
++#: ../yumcommands.py:345
+ msgid "Available Packages"
+ msgstr ""
+
+-#: ../yumcommands.py:305
++#: ../yumcommands.py:349
+ msgid "Extra Packages"
+ msgstr ""
+
+-#: ../yumcommands.py:309
++#: ../yumcommands.py:353
+ msgid "Updated Packages"
+ msgstr ""
+
+ #. This only happens in verbose mode
+-#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601
++#: ../yumcommands.py:361 ../yumcommands.py:368 ../yumcommands.py:655
+ msgid "Obsoleting Packages"
+ msgstr ""
+
+-#: ../yumcommands.py:326
++#: ../yumcommands.py:370
+ msgid "Recently Added Packages"
+ msgstr ""
+
+-#: ../yumcommands.py:333
++#: ../yumcommands.py:377
+ msgid "No matching Packages to list"
+ msgstr ""
+
+-#: ../yumcommands.py:347
++#: ../yumcommands.py:391
+ msgid "List a package or groups of packages"
+ msgstr ""
+
+-#: ../yumcommands.py:359
++#: ../yumcommands.py:403
+ msgid "Remove a package or packages from your system"
+ msgstr ""
+
+-#: ../yumcommands.py:366
++#: ../yumcommands.py:410
+ msgid "Setting up Remove Process"
+ msgstr ""
+
+-#: ../yumcommands.py:380
++#: ../yumcommands.py:424
+ msgid "Setting up Group Process"
+ msgstr ""
+
+-#: ../yumcommands.py:386
++#: ../yumcommands.py:430
+ msgid "No Groups on which to run command"
+ msgstr ""
+
+-#: ../yumcommands.py:399
++#: ../yumcommands.py:443
+ msgid "List available package groups"
+ msgstr ""
+
+-#: ../yumcommands.py:416
++#: ../yumcommands.py:463
+ msgid "Install the packages in a group on your system"
+ msgstr ""
+
+-#: ../yumcommands.py:438
++#: ../yumcommands.py:486
+ msgid "Remove the packages in a group from your system"
+ msgstr ""
+
+-#: ../yumcommands.py:465
++#: ../yumcommands.py:514
+ msgid "Display details about a package group"
+ msgstr ""
+
+-#: ../yumcommands.py:489
++#: ../yumcommands.py:539
+ msgid "Generate the metadata cache"
+ msgstr ""
+
+-#: ../yumcommands.py:495
++#: ../yumcommands.py:545
+ msgid "Making cache files for all metadata files."
+ msgstr ""
+
+-#: ../yumcommands.py:496
++#: ../yumcommands.py:546
+ msgid "This may take a while depending on the speed of this computer"
+ msgstr ""
+
+-#: ../yumcommands.py:517
++#: ../yumcommands.py:567
+ msgid "Metadata Cache Created"
+ msgstr ""
+
+-#: ../yumcommands.py:531
++#: ../yumcommands.py:581
+ msgid "Remove cached data"
+ msgstr ""
+
+-#: ../yumcommands.py:551
++#: ../yumcommands.py:602
+ msgid "Find what package provides the given value"
+ msgstr ""
+
+-#: ../yumcommands.py:571
++#: ../yumcommands.py:622
+ msgid "Check for available package updates"
+ msgstr ""
+
+-#: ../yumcommands.py:621
++#: ../yumcommands.py:675
+ msgid "Search package details for the given string"
+ msgstr ""
+
+-#: ../yumcommands.py:627
++#: ../yumcommands.py:681
+ msgid "Searching Packages: "
+ msgstr ""
+
+-#: ../yumcommands.py:644
++#: ../yumcommands.py:698
+ msgid "Update packages taking obsoletes into account"
+ msgstr ""
+
+-#: ../yumcommands.py:652
++#: ../yumcommands.py:707
+ msgid "Setting up Upgrade Process"
+ msgstr ""
+
+-#: ../yumcommands.py:666
++#: ../yumcommands.py:721
+ msgid "Install a local RPM"
+ msgstr ""
+
+-#: ../yumcommands.py:674
++#: ../yumcommands.py:729
+ msgid "Setting up Local Package Process"
+ msgstr ""
+
+-#: ../yumcommands.py:693
++#: ../yumcommands.py:748
+ msgid "Determine which package provides the given dependency"
+ msgstr ""
+
+-#: ../yumcommands.py:696
++#: ../yumcommands.py:751
+ msgid "Searching Packages for Dependency:"
+ msgstr ""
+
+-#: ../yumcommands.py:710
++#: ../yumcommands.py:765
+ msgid "Run an interactive yum shell"
+ msgstr ""
+
+-#: ../yumcommands.py:716
++#: ../yumcommands.py:771
+ msgid "Setting up Yum Shell"
+ msgstr ""
+
+-#: ../yumcommands.py:734
++#: ../yumcommands.py:789
+ msgid "List a package's dependencies"
+ msgstr ""
+
+-#: ../yumcommands.py:740
++#: ../yumcommands.py:795
+ msgid "Finding dependencies: "
+ msgstr ""
+
+-#: ../yumcommands.py:756
++#: ../yumcommands.py:811
+ msgid "Display the configured software repositories"
+ msgstr ""
+
+-#: ../yumcommands.py:822 ../yumcommands.py:823
++#: ../yumcommands.py:877 ../yumcommands.py:878
+ msgid "enabled"
+ msgstr ""
+
+-#: ../yumcommands.py:849 ../yumcommands.py:850
++#: ../yumcommands.py:904 ../yumcommands.py:905
+ msgid "disabled"
+ msgstr ""
+
+-#: ../yumcommands.py:866
++#: ../yumcommands.py:921
+ msgid "Repo-id : "
+ msgstr ""
+
+-#: ../yumcommands.py:867
++#: ../yumcommands.py:922
+ msgid "Repo-name : "
+ msgstr ""
+
+-#: ../yumcommands.py:870
++#: ../yumcommands.py:925
+ msgid "Repo-status : "
+ msgstr ""
+
+-#: ../yumcommands.py:873
++#: ../yumcommands.py:928
+ msgid "Repo-revision: "
+ msgstr ""
+
+-#: ../yumcommands.py:877
++#: ../yumcommands.py:932
+ msgid "Repo-tags : "
+ msgstr ""
+
+-#: ../yumcommands.py:883
++#: ../yumcommands.py:938
+ msgid "Repo-distro-tags: "
+ msgstr ""
+
+-#: ../yumcommands.py:888
++#: ../yumcommands.py:943
+ msgid "Repo-updated : "
+ msgstr ""
+
+-#: ../yumcommands.py:890
++#: ../yumcommands.py:945
+ msgid "Repo-pkgs : "
+ msgstr ""
+
+-#: ../yumcommands.py:891
++#: ../yumcommands.py:946
+ msgid "Repo-size : "
+ msgstr ""
+
+-#: ../yumcommands.py:898
++#: ../yumcommands.py:953
+ msgid "Repo-baseurl : "
+ msgstr ""
+
+-#: ../yumcommands.py:906
++#: ../yumcommands.py:961
+ msgid "Repo-metalink: "
+ msgstr ""
+
+-#: ../yumcommands.py:910
++#: ../yumcommands.py:965
+ msgid " Updated : "
+ msgstr ""
+
+-#: ../yumcommands.py:913
++#: ../yumcommands.py:968
+ msgid "Repo-mirrors : "
+ msgstr ""
+
+-#: ../yumcommands.py:923
++#: ../yumcommands.py:978
+ #, python-format
+ msgid "Never (last: %s)"
+ msgstr ""
+
+-#: ../yumcommands.py:925
++#: ../yumcommands.py:980
+ #, python-format
+ msgid "Instant (last: %s)"
+ msgstr ""
+
+-#: ../yumcommands.py:928
++#: ../yumcommands.py:983
+ #, python-format
+ msgid "%s second(s) (last: %s)"
+ msgstr ""
+
+-#: ../yumcommands.py:930
++#: ../yumcommands.py:985
+ msgid "Repo-expire : "
+ msgstr ""
+
+-#: ../yumcommands.py:933
++#: ../yumcommands.py:988
+ msgid "Repo-exclude : "
+ msgstr ""
+
+-#: ../yumcommands.py:937
++#: ../yumcommands.py:992
+ msgid "Repo-include : "
+ msgstr ""
+
+-#: ../yumcommands.py:941
++#: ../yumcommands.py:996
+ msgid "Repo-excluded: "
+ msgstr ""
+
+ #. Work out the first (id) and last (enabled/disalbed/count),
+ #. then chop the middle (name)...
+-#: ../yumcommands.py:951 ../yumcommands.py:980
++#: ../yumcommands.py:1006 ../yumcommands.py:1035
+ msgid "repo id"
+ msgstr ""
+
+-#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987
++#: ../yumcommands.py:1023 ../yumcommands.py:1024 ../yumcommands.py:1042
+ msgid "status"
+ msgstr ""
+
+-#: ../yumcommands.py:981
++#: ../yumcommands.py:1036
+ msgid "repo name"
+ msgstr ""
+
+-#: ../yumcommands.py:1018
++#: ../yumcommands.py:1073
+ msgid "Display a helpful usage message"
+ msgstr ""
+
+-#: ../yumcommands.py:1052
++#: ../yumcommands.py:1107
+ #, python-format
+ msgid "No help available for %s"
+ msgstr ""
+
+-#: ../yumcommands.py:1057
++#: ../yumcommands.py:1112
+ msgid ""
+ "\n"
+ "\n"
+ "aliases: "
+ msgstr ""
+
+-#: ../yumcommands.py:1059
++#: ../yumcommands.py:1114
+ msgid ""
+ "\n"
+ "\n"
+ "alias: "
+ msgstr ""
+
+-#: ../yumcommands.py:1087
++#: ../yumcommands.py:1143
+ msgid "Setting up Reinstall Process"
+ msgstr ""
+
+-#: ../yumcommands.py:1095
++#: ../yumcommands.py:1151
+ msgid "reinstall a package"
+ msgstr ""
+
+-#: ../yumcommands.py:1113
++#: ../yumcommands.py:1170
+ msgid "Setting up Downgrade Process"
+ msgstr ""
+
+-#: ../yumcommands.py:1120
++#: ../yumcommands.py:1177
+ msgid "downgrade a package"
+ msgstr ""
+
+-#: ../yumcommands.py:1134
++#: ../yumcommands.py:1191
+ msgid "Display a version for the machine and/or available repos."
+ msgstr ""
+
+-#: ../yumcommands.py:1173
++#: ../yumcommands.py:1230
+ msgid " Yum version groups:"
+ msgstr ""
+
+-#: ../yumcommands.py:1183
++#: ../yumcommands.py:1240
+ msgid " Group :"
+ msgstr ""
+
+-#: ../yumcommands.py:1184
++#: ../yumcommands.py:1241
+ msgid " Packages:"
+ msgstr ""
+
+-#: ../yumcommands.py:1213
++#: ../yumcommands.py:1270
+ msgid "Installed:"
+ msgstr ""
+
+-#: ../yumcommands.py:1218
++#: ../yumcommands.py:1278
+ msgid "Group-Installed:"
+ msgstr ""
+
+-#: ../yumcommands.py:1227
++#: ../yumcommands.py:1287
+ msgid "Available:"
+ msgstr ""
+
+-#: ../yumcommands.py:1233
++#: ../yumcommands.py:1296
+ msgid "Group-Available:"
+ msgstr ""
+
+-#: ../yumcommands.py:1272
++#: ../yumcommands.py:1335
+ msgid "Display, or use, the transaction history"
+ msgstr ""
+
+-#: ../yumcommands.py:1300
++#: ../yumcommands.py:1363
+ #, python-format
+ msgid "Invalid history sub-command, use: %s."
+ msgstr ""
+
+-#: ../yumcommands.py:1345
++#: ../yumcommands.py:1370
++msgid "You don't have access to the history DB."
++msgstr ""
++
++#: ../yumcommands.py:1413
+ msgid "Check for problems in the rpmdb"
+ msgstr ""
+
+-#: ../yummain.py:102
++#: ../yummain.py:103
+ msgid ""
+ "Another app is currently holding the yum lock; waiting for it to exit..."
+ msgstr ""
+
+-#: ../yummain.py:130 ../yummain.py:169
+-#, python-format
+-msgid "Error: %s"
+-msgstr ""
+-
+-#: ../yummain.py:140 ../yummain.py:182
+-#, python-format
+-msgid "Unknown Error(s): Exit Code: %d:"
+-msgstr ""
+-
+ #. Depsolve stage
+-#: ../yummain.py:147
++#: ../yummain.py:151
+ msgid "Resolving Dependencies"
+ msgstr ""
+
+-#: ../yummain.py:173
+-msgid " You could try using --skip-broken to work around the problem"
+-msgstr ""
+-
+-#: ../yummain.py:175 ../yummain.py:208
+-msgid " You could try running: rpm -Va --nofiles --nodigest"
+-msgstr ""
+-
+-#: ../yummain.py:188
+-msgid ""
+-"\n"
+-"Dependencies Resolved"
+-msgstr ""
+-
+-#: ../yummain.py:265
++#: ../yummain.py:269
+ msgid ""
+ "\n"
+ "\n"
+@@ -1716,137 +1853,127 @@ msgstr ""
+ msgid "Setting up TransactionSets before config class is up"
+ msgstr ""
+
+-#: ../yum/depsolve.py:148
++#: ../yum/depsolve.py:151
+ #, python-format
+ msgid "Invalid tsflag in config file: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:159
++#: ../yum/depsolve.py:162
+ #, python-format
+ msgid "Searching pkgSack for dep: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:175
+-#, python-format
+-msgid "Potential match for %s from %s"
+-msgstr ""
+-
+-#: ../yum/depsolve.py:183
+-#, python-format
+-msgid "Matched %s to require for %s"
+-msgstr ""
+-
+-#: ../yum/depsolve.py:225
++#: ../yum/depsolve.py:205
+ #, python-format
+ msgid "Member: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:239 ../yum/depsolve.py:754
++#: ../yum/depsolve.py:219 ../yum/depsolve.py:754
+ #, python-format
+ msgid "%s converted to install"
+ msgstr ""
+
+-#: ../yum/depsolve.py:246
++#: ../yum/depsolve.py:226
+ #, python-format
+ msgid "Adding Package %s in mode %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:256
++#: ../yum/depsolve.py:242
+ #, python-format
+ msgid "Removing Package %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:278
++#: ../yum/depsolve.py:264
+ #, python-format
+ msgid "%s requires: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:319
++#: ../yum/depsolve.py:305
+ #, python-format
+ msgid "%s requires %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:346
++#: ../yum/depsolve.py:332
+ msgid "Needed Require has already been looked up, cheating"
+ msgstr ""
+
+-#: ../yum/depsolve.py:356
++#: ../yum/depsolve.py:342
+ #, python-format
+ msgid "Needed Require is not a package name. Looking up: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:363
++#: ../yum/depsolve.py:349
+ #, python-format
+ msgid "Potential Provider: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:386
++#: ../yum/depsolve.py:372
+ #, python-format
+ msgid "Mode is %s for provider of %s: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:390
++#: ../yum/depsolve.py:376
+ #, python-format
+ msgid "Mode for pkg providing %s: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:394
++#: ../yum/depsolve.py:380
+ #, python-format
+ msgid "TSINFO: %s package requiring %s marked as erase"
+ msgstr ""
+
+-#: ../yum/depsolve.py:407
++#: ../yum/depsolve.py:393
+ #, python-format
+ msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+ msgstr ""
+
+-#: ../yum/depsolve.py:410
++#: ../yum/depsolve.py:396
+ #, python-format
+ msgid "TSINFO: Updating %s to resolve dep."
+ msgstr ""
+
+-#: ../yum/depsolve.py:418
++#: ../yum/depsolve.py:404
+ #, python-format
+ msgid "Cannot find an update path for dep for: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:449
++#: ../yum/depsolve.py:435
+ #, python-format
+ msgid "Quick matched %s to require for %s"
+ msgstr ""
+
+ #. is it already installed?
+-#: ../yum/depsolve.py:491
++#: ../yum/depsolve.py:477
+ #, python-format
+ msgid "%s is in providing packages but it is already installed, removing."
+ msgstr ""
+
+-#: ../yum/depsolve.py:507
++#: ../yum/depsolve.py:493
+ #, python-format
+ msgid "Potential resolving package %s has newer instance in ts."
+ msgstr ""
+
+-#: ../yum/depsolve.py:518
++#: ../yum/depsolve.py:504
+ #, python-format
+ msgid "Potential resolving package %s has newer instance installed."
+ msgstr ""
+
+-#: ../yum/depsolve.py:536
++#: ../yum/depsolve.py:522
+ #, python-format
+ msgid "%s already in ts, skipping this one"
+ msgstr ""
+
+-#: ../yum/depsolve.py:578
++#: ../yum/depsolve.py:571
+ #, python-format
+ msgid "TSINFO: Marking %s as update for %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:586
++#: ../yum/depsolve.py:580
+ #, python-format
+ msgid "TSINFO: Marking %s as install for %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:690 ../yum/depsolve.py:781
++#: ../yum/depsolve.py:690 ../yum/depsolve.py:780
+ msgid "Success - empty transaction"
+ msgstr ""
+
+@@ -1863,263 +1990,310 @@ msgstr ""
+ msgid "%s from %s has depsolving problems"
+ msgstr ""
+
+-#: ../yum/depsolve.py:782
++#: ../yum/depsolve.py:781
+ msgid "Success - deps resolved"
+ msgstr ""
+
+-#: ../yum/depsolve.py:796
++#: ../yum/depsolve.py:802
+ #, python-format
+ msgid "Checking deps for %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:874
++#: ../yum/depsolve.py:888
+ #, python-format
+ msgid "looking for %s as a requirement of %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1090
++#: ../yum/depsolve.py:1119
+ #, python-format
+ msgid "Running compare_providers() for %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123
++#: ../yum/depsolve.py:1146 ../yum/depsolve.py:1152
+ #, python-format
+ msgid "better arch in po %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1218
++#: ../yum/depsolve.py:1244
+ #, python-format
+ msgid "%s obsoletes %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1230
++#: ../yum/depsolve.py:1256
+ #, python-format
+ msgid ""
+ "archdist compared %s to %s on %s\n"
+ " Winner: %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1237
++#: ../yum/depsolve.py:1264
+ #, python-format
+ msgid "common sourcerpm %s and %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1241
++#: ../yum/depsolve.py:1268
+ #, python-format
+ msgid "base package %s is installed for %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1247
++#: ../yum/depsolve.py:1274
+ #, python-format
+ msgid "common prefix of %s between %s and %s"
+ msgstr ""
+
+-#: ../yum/depsolve.py:1256
++#: ../yum/depsolve.py:1305
++#, python-format
++msgid "requires minimal: %d"
++msgstr ""
++
++#: ../yum/depsolve.py:1309
++#, python-format
++msgid " Winner: %s"
++msgstr ""
++
++#: ../yum/depsolve.py:1314
++#, python-format
++msgid " Loser(with %d): %s"
++msgstr ""
++
++#: ../yum/depsolve.py:1330
+ #, python-format
+ msgid "Best Order: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:192
++#: ../yum/__init__.py:214
+ msgid "doConfigSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:424
++#: ../yum/__init__.py:453
++#, python-format
++msgid "Repository %r: Error parsing config: %s"
++msgstr ""
++
++#: ../yum/__init__.py:459
+ #, python-format
+ msgid "Repository %r is missing name in configuration, using id"
+ msgstr ""
+
+-#: ../yum/__init__.py:462
++#: ../yum/__init__.py:497
+ msgid "plugins already initialised"
+ msgstr ""
+
+-#: ../yum/__init__.py:469
++#: ../yum/__init__.py:504
+ msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:480
++#: ../yum/__init__.py:515
+ msgid "Reading Local RPMDB"
+ msgstr ""
+
+-#: ../yum/__init__.py:504
++#: ../yum/__init__.py:538
+ msgid "doRepoSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:524
++#: ../yum/__init__.py:577
+ msgid "doSackSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:554
++#: ../yum/__init__.py:607
+ msgid "Setting up Package Sacks"
+ msgstr ""
+
+-#: ../yum/__init__.py:599
++#: ../yum/__init__.py:652
+ #, python-format
+ msgid "repo object for repo %s lacks a _resetSack method\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:600
++#: ../yum/__init__.py:653
+ msgid "therefore this repo cannot be reset.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:605
++#: ../yum/__init__.py:658
+ msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:617
++#: ../yum/__init__.py:670
+ msgid "Building updates object"
+ msgstr ""
+
+-#: ../yum/__init__.py:652
++#: ../yum/__init__.py:709
+ msgid "doGroupSetup() will go away in a future version of Yum.\n"
+ msgstr ""
+
+-#: ../yum/__init__.py:677
++#: ../yum/__init__.py:734
+ msgid "Getting group metadata"
+ msgstr ""
+
+-#: ../yum/__init__.py:703
++#: ../yum/__init__.py:760
+ #, python-format
+ msgid "Adding group file from repository: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:712
++#: ../yum/__init__.py:769
+ #, python-format
+ msgid "Failed to add groups file for repository: %s - %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:718
++#: ../yum/__init__.py:775
+ msgid "No Groups Available in any repository"
+ msgstr ""
+
+-#: ../yum/__init__.py:730
++#: ../yum/__init__.py:787
+ msgid "Getting pkgtags metadata"
+ msgstr ""
+
+-#: ../yum/__init__.py:740
++#: ../yum/__init__.py:797
+ #, python-format
+ msgid "Adding tags from repository: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:749
++#: ../yum/__init__.py:806
+ #, python-format
+ msgid "Failed to add Pkg Tags for repository: %s - %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:827
++#: ../yum/__init__.py:884
+ msgid "Importing additional filelist information"
+ msgstr ""
+
+-#: ../yum/__init__.py:841
++#: ../yum/__init__.py:898
+ #, python-format
+ msgid "The program %s%s%s is found in the yum-utils package."
+ msgstr ""
+
+-#: ../yum/__init__.py:849
++#: ../yum/__init__.py:906
+ msgid ""
+ "There are unfinished transactions remaining. You might consider running yum-"
+ "complete-transaction first to finish them."
+ msgstr ""
+
++#: ../yum/__init__.py:985
++#, python-format
++msgid "Trying to remove \"%s\", which is protected"
++msgstr ""
+
-+Note that because these are provides, and not just package names, kernel-devel
-+will also apply to kernel-debug-devel, etc.
+ #. Kind of hacky
+-#: ../yum/__init__.py:922
++#: ../yum/__init__.py:1044
+ #, python-format
+ msgid "Skip-broken round %i"
+ msgstr ""
- .IP
- \fBinstallonly_limit \fR
-diff --git a/output.py b/output.py
-index 3a90995..10c7442 100755
---- a/output.py
-+++ b/output.py
-@@ -1882,10 +1882,12 @@ class DepSolveProgressCallBack:
- msg += _('\n Not found')
- return msg
+-#: ../yum/__init__.py:975
++#: ../yum/__init__.py:1101
+ #, python-format
+ msgid "Skip-broken took %i rounds "
+ msgstr ""
-- ipkgs = set()
-- for pkg in sorted(yb.rpmdb.getProvides(needname)):
-+ def _run_inst_pkg(pkg, msg):
- nevr = (pkg.name, pkg.epoch, pkg.version, pkg.release)
-- ipkgs.add(nevr)
-+ if nevr in seen_pkgs or (pkg.verEQ(last) and pkg.arch == last.arch):
-+ return msg
+-#: ../yum/__init__.py:976
++#: ../yum/__init__.py:1102
+ msgid ""
+ "\n"
+ "Packages skipped because of dependency problems:"
+ msgstr ""
+
+-#: ../yum/__init__.py:980
++#: ../yum/__init__.py:1106
+ #, python-format
+ msgid " %s from %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1121
++#. FIXME: _N()
++#: ../yum/__init__.py:1251
++#, python-format
++msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:"
++msgstr ""
+
-+ seen_pkgs.add(nevr)
- action = _('Installed')
- rmed = yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_REMOVE_STATES)
- if rmed:
-@@ -1901,21 +1903,40 @@ class DepSolveProgressCallBack:
- if rtype not in relmap:
- continue
- nevr = (rpkg.name, rpkg.epoch, rpkg.version, rpkg.release)
-- ipkgs.add(nevr)
-+ seen_pkgs.add(nevr)
- msg += _msg_pkg(relmap[rtype], rpkg, needname)
-+ return msg
++#: ../yum/__init__.py:1255
+ msgid "Warning: RPMDB altered outside of yum."
+ msgstr ""
-- last = None
-- for pkg in sorted(yb.pkgSack.getProvides(needname)):
-+ def _run_avail_pkg(pkg, msg):
- # We don't want to see installed packages, or N packages of the
- # same version, from different repos.
- nevr = (pkg.name, pkg.epoch, pkg.version, pkg.release)
-- if nevr in ipkgs or (pkg.verEQ(last) and pkg.arch == last.arch):
-- continue
-- last = pkg
-+ if nevr in seen_pkgs or (pkg.verEQ(last) and pkg.arch == last.arch):
-+ return False, last, msg
-+ seen_pkgs.add(nevr)
- action = _('Available')
- if yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_INSTALL_STATES):
- action = _('Installing')
- msg += _msg_pkg(action, pkg, needname)
-+ return True, pkg, msg
+-#: ../yum/__init__.py:1126
++#: ../yum/__init__.py:1267
+ msgid "missing requires"
+ msgstr ""
+
+-#: ../yum/__init__.py:1127
++#: ../yum/__init__.py:1268
+ msgid "installed conflict"
+ msgstr ""
+
+-#: ../yum/__init__.py:1180
++#: ../yum/__init__.py:1366
+ msgid ""
+ "Warning: scriptlet or other non-fatal errors occurred during transaction."
+ msgstr ""
+
+-#: ../yum/__init__.py:1198
++#: ../yum/__init__.py:1376
++msgid "Transaction couldn't start:"
++msgstr ""
+
-+ last = None
-+ seen_pkgs = set()
-+ for pkg in sorted(yb.rpmdb.getProvides(needname)):
-+ msg = _run_inst_pkg(pkg, msg)
++#. should this be 'to_unicoded'?
++#: ../yum/__init__.py:1379
++msgid "Could not run transaction."
++msgstr ""
+
-+ available_names = set()
-+ for pkg in sorted(yb.pkgSack.getProvides(needname)):
-+ tst, last, msg = _run_avail_pkg(pkg, msg)
-+ if tst:
-+ available_names.add(pkg.name)
++#: ../yum/__init__.py:1392
+ #, python-format
+ msgid "Failed to remove transaction file %s"
+ msgstr ""
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1227
++#: ../yum/__init__.py:1424
+ #, python-format
+ msgid "%s was supposed to be installed but is not!"
+ msgstr ""
+
+ #. maybe a file log here, too
+ #. but raising an exception is not going to do any good
+-#: ../yum/__init__.py:1266
++#: ../yum/__init__.py:1486
+ #, python-format
+ msgid "%s was supposed to be removed but is not!"
+ msgstr ""
+
++#: ../yum/__init__.py:1597
++#, python-format
++msgid "Could not open lock %s: %s"
++msgstr ""
+
-+ last = None
-+ for pkg in sorted(yb.rpmdb.searchNames(available_names)):
-+ msg = _run_inst_pkg(pkg, msg)
-+ last = None
-+ for pkg in sorted(yb.pkgSack.searchNames(available_names)):
-+ tst, last, msg = _run_avail_pkg(pkg, msg)
- return msg
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1386
++#: ../yum/__init__.py:1614
+ #, python-format
+ msgid "Unable to check if PID %s is active"
+ msgstr ""
+
+ #. Another copy seems to be running.
+-#: ../yum/__init__.py:1390
++#: ../yum/__init__.py:1618
+ #, python-format
+ msgid "Existing lock %s: another copy is running as pid %s."
+ msgstr ""
+
+ #. Whoa. What the heck happened?
+-#: ../yum/__init__.py:1425
++#: ../yum/__init__.py:1653
+ #, python-format
+ msgid "Could not create lock at %s: %s "
+ msgstr ""
+
+-#: ../yum/__init__.py:1470
++#: ../yum/__init__.py:1698
++#, python-format
+ msgid ""
+-"Package does not match intended download. Suggestion: run yum clean metadata"
++"Package does not match intended download. Suggestion: run yum --enablerepo="
++"%s clean metadata"
+ msgstr ""
+
+-#: ../yum/__init__.py:1486
++#: ../yum/__init__.py:1714
+ msgid "Could not perform checksum"
+ msgstr ""
+
+-#: ../yum/__init__.py:1489
++#: ../yum/__init__.py:1717
+ msgid "Package does not match checksum"
+ msgstr ""
+
+-#: ../yum/__init__.py:1531
++#: ../yum/__init__.py:1769
+ #, python-format
+ msgid "package fails checksum but caching is enabled for %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1534 ../yum/__init__.py:1563
++#: ../yum/__init__.py:1772 ../yum/__init__.py:1801
+ #, python-format
+ msgid "using local copy of %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1575
++#: ../yum/__init__.py:1813
+ #, python-format
+ msgid ""
+ "Insufficient space in download directory %s\n"
+@@ -2127,357 +2301,397 @@ msgid ""
+ " * needed %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1624
++#: ../yum/__init__.py:1862
+ msgid "Header is not complete."
+ msgstr ""
+
+-#: ../yum/__init__.py:1661
++#: ../yum/__init__.py:1899
+ #, python-format
+ msgid ""
+ "Header not in local cache and caching-only mode enabled. Cannot download %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1716
++#: ../yum/__init__.py:1954
+ #, python-format
+ msgid "Public key for %s is not installed"
+ msgstr ""
+
+-#: ../yum/__init__.py:1720
++#: ../yum/__init__.py:1958
+ #, python-format
+ msgid "Problem opening package %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1728
++#: ../yum/__init__.py:1966
+ #, python-format
+ msgid "Public key for %s is not trusted"
+ msgstr ""
+
+-#: ../yum/__init__.py:1732
++#: ../yum/__init__.py:1970
+ #, python-format
+ msgid "Package %s is not signed"
+ msgstr ""
+
+-#: ../yum/__init__.py:1770
++#: ../yum/__init__.py:2008
+ #, python-format
+ msgid "Cannot remove %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1774
++#: ../yum/__init__.py:2012
+ #, python-format
+ msgid "%s removed"
+ msgstr ""
+
+-#: ../yum/__init__.py:1820
++#: ../yum/__init__.py:2058
+ #, python-format
+ msgid "Cannot remove %s file %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1824
++#: ../yum/__init__.py:2062
+ #, python-format
+ msgid "%s file %s removed"
+ msgstr ""
+
+-#: ../yum/__init__.py:1826
++#: ../yum/__init__.py:2064
+ #, python-format
+ msgid "%d %s files removed"
+ msgstr ""
+
+-#: ../yum/__init__.py:1895
++#: ../yum/__init__.py:2133
+ #, python-format
+ msgid "More than one identical match in sack for %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:1901
++#: ../yum/__init__.py:2139
+ #, python-format
+ msgid "Nothing matches %s.%s %s:%s-%s from update"
+ msgstr ""
+
+-#: ../yum/__init__.py:2180
++#: ../yum/__init__.py:2433
+ msgid ""
+ "searchPackages() will go away in a future version of "
+ "Yum. Use searchGenerator() instead. \n"
+ msgstr ""
+
+-#: ../yum/__init__.py:2219
++#: ../yum/__init__.py:2472
+ #, python-format
+ msgid "Searching %d packages"
+ msgstr ""
+
+-#: ../yum/__init__.py:2223
++#: ../yum/__init__.py:2476
+ #, python-format
+ msgid "searching package %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2235
++#: ../yum/__init__.py:2488
+ msgid "searching in file entries"
+ msgstr ""
+
+-#: ../yum/__init__.py:2242
++#: ../yum/__init__.py:2495
+ msgid "searching in provides entries"
+ msgstr ""
+
+-#: ../yum/__init__.py:2275
++#: ../yum/__init__.py:2528
+ #, python-format
+ msgid "Provides-match: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2324
++#: ../yum/__init__.py:2577
+ msgid "No group data available for configured repositories"
+ msgstr ""
+
+-#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405
+-#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497
+-#: ../yum/__init__.py:2814
++#: ../yum/__init__.py:2608 ../yum/__init__.py:2627 ../yum/__init__.py:2658
++#: ../yum/__init__.py:2664 ../yum/__init__.py:2746 ../yum/__init__.py:2750
++#: ../yum/__init__.py:3095
+ #, python-format
+ msgid "No Group named %s exists"
+ msgstr ""
+
+-#: ../yum/__init__.py:2386 ../yum/__init__.py:2513
++#: ../yum/__init__.py:2639 ../yum/__init__.py:2766
+ #, python-format
+ msgid "package %s was not marked in group %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2433
++#: ../yum/__init__.py:2686
+ #, python-format
+ msgid "Adding package %s from group %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2437
++#: ../yum/__init__.py:2690
+ #, python-format
+ msgid "No package named %s available to be installed"
+ msgstr ""
+
+-#: ../yum/__init__.py:2539
++#. This can happen due to excludes after .up has
++#. happened.
++#: ../yum/__init__.py:2794
+ #, python-format
+ msgid "Package tuple %s could not be found in packagesack"
+ msgstr ""
+
+-#: ../yum/__init__.py:2558
++#: ../yum/__init__.py:2813
+ #, python-format
+ msgid "Package tuple %s could not be found in rpmdb"
+ msgstr ""
+
+-#: ../yum/__init__.py:2614 ../yum/__init__.py:2664
+-msgid "Invalid version flag"
+-msgstr ""
+-
+-#: ../yum/__init__.py:2634 ../yum/__init__.py:2639
++#: ../yum/__init__.py:2868 ../yum/__init__.py:2873
+ #, python-format
+ msgid "No Package found for %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2855
++#: ../yum/__init__.py:2901
++msgid "Invalid version flag"
++msgstr ""
++
++#: ../yum/__init__.py:3145
+ msgid "Package Object was not a package object instance"
+ msgstr ""
+
+-#: ../yum/__init__.py:2859
++#: ../yum/__init__.py:3149
+ msgid "Nothing specified to install"
+ msgstr ""
+
+-#: ../yum/__init__.py:2875 ../yum/__init__.py:3652
++#: ../yum/__init__.py:3168 ../yum/__init__.py:3992
+ #, python-format
+ msgid "Checking for virtual provide or file-provide for %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365
+-#: ../yum/__init__.py:3658
++#: ../yum/__init__.py:3174 ../yum/__init__.py:3504 ../yum/__init__.py:3684
++#: ../yum/__init__.py:3998
+ #, python-format
+ msgid "No Match for argument: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:2957
++#: ../yum/__init__.py:3250
+ #, python-format
+ msgid "Package %s installed and not available"
+ msgstr ""
+
+-#: ../yum/__init__.py:2960
++#: ../yum/__init__.py:3253
+ msgid "No package(s) available to install"
+ msgstr ""
+
+-#: ../yum/__init__.py:2972
++#: ../yum/__init__.py:3265
+ #, python-format
+ msgid "Package: %s - already in transaction set"
+ msgstr ""
+
+-#: ../yum/__init__.py:2998
++#: ../yum/__init__.py:3291
+ #, python-format
+ msgid "Package %s is obsoleted by %s which is already installed"
+ msgstr ""
+
+-#: ../yum/__init__.py:3001
++#: ../yum/__init__.py:3296
++#, python-format
++msgid ""
++"Package %s is obsoleted by %s, but obsoleting package does not provide for "
++"requirements"
++msgstr ""
++
++#: ../yum/__init__.py:3299
+ #, python-format
+ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+ msgstr ""
+
+-#: ../yum/__init__.py:3009
++#: ../yum/__init__.py:3307
+ #, python-format
+ msgid "Package %s already installed and latest version"
+ msgstr ""
+
+-#: ../yum/__init__.py:3023
++#: ../yum/__init__.py:3321
+ #, python-format
+ msgid "Package matching %s already installed. Checking for update."
+ msgstr ""
+
+ #. update everything (the easy case)
+-#: ../yum/__init__.py:3126
++#: ../yum/__init__.py:3424
+ msgid "Updating Everything"
+ msgstr ""
+
+-#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289
+-#: ../yum/__init__.py:3315
++#: ../yum/__init__.py:3448 ../yum/__init__.py:3577 ../yum/__init__.py:3604
++#: ../yum/__init__.py:3630
+ #, python-format
+ msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3182 ../yum/__init__.py:3362
++#: ../yum/__init__.py:3489 ../yum/__init__.py:3680
+ #, python-format
+ msgid "%s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3253
++#: ../yum/__init__.py:3566
+ #, python-format
+ msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3284
++#: ../yum/__init__.py:3599
+ #, python-format
+ msgid "Not Updating Package that is obsoleted: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3293 ../yum/__init__.py:3319
++#: ../yum/__init__.py:3608 ../yum/__init__.py:3634
+ #, python-format
+ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3378
++#: ../yum/__init__.py:3697
+ msgid "No package matched to remove"
+ msgstr ""
+
+-#: ../yum/__init__.py:3412
++#: ../yum/__init__.py:3703
++#, python-format
++msgid "Skipping the running kernel: %s"
++msgstr ""
++
++#: ../yum/__init__.py:3709
++#, python-format
++msgid "Removing %s from the transaction"
++msgstr ""
++
++#: ../yum/__init__.py:3744
+ #, python-format
+ msgid "Cannot open: %s. Skipping."
+ msgstr ""
+
+-#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598
++#: ../yum/__init__.py:3747 ../yum/__init__.py:3859 ../yum/__init__.py:3935
+ #, python-format
+ msgid "Examining %s: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601
++#: ../yum/__init__.py:3751
++#, python-format
++msgid "Cannot localinstall deltarpm: %s. Skipping."
++msgstr ""
++
++#: ../yum/__init__.py:3760 ../yum/__init__.py:3862 ../yum/__init__.py:3938
+ #, python-format
+ msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3431
++#: ../yum/__init__.py:3766
++#, python-format
++msgid "Cannot install package %s. It is obsoleted by installed package %s"
++msgstr ""
++
++#: ../yum/__init__.py:3774
+ #, python-format
+ msgid ""
+ "Package %s not installed, cannot update it. Run yum install to install it "
+ "instead."
+ msgstr ""
+
+-#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606
++#: ../yum/__init__.py:3803 ../yum/__init__.py:3867 ../yum/__init__.py:3943
+ #, python-format
+ msgid "Excluding %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3465
++#: ../yum/__init__.py:3808
+ #, python-format
+ msgid "Marking %s to be installed"
+ msgstr ""
+
+-#: ../yum/__init__.py:3471
++#: ../yum/__init__.py:3814
+ #, python-format
+ msgid "Marking %s as an update to %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3478
++#: ../yum/__init__.py:3821
+ #, python-format
+ msgid "%s: does not update installed package."
+ msgstr ""
+
+-#: ../yum/__init__.py:3511 ../yum/__init__.py:3595
++#: ../yum/__init__.py:3856 ../yum/__init__.py:3932
+ #, python-format
+ msgid "Cannot open file: %s. Skipping."
+ msgstr ""
+
+-#: ../yum/__init__.py:3541
++#: ../yum/__init__.py:3886
+ msgid "Problem in reinstall: no package matched to remove"
+ msgstr ""
+
+-#: ../yum/__init__.py:3554 ../yum/__init__.py:3686
+-#, python-format
+-msgid "Package %s is allowed multiple installs, skipping"
+-msgstr ""
+-
+-#: ../yum/__init__.py:3575
++#: ../yum/__init__.py:3912
+ #, python-format
+ msgid "Problem in reinstall: no package %s matched to install"
+ msgstr ""
+
+-#: ../yum/__init__.py:3678
++#: ../yum/__init__.py:4018
+ msgid "No package(s) available to downgrade"
+ msgstr ""
+
+-#: ../yum/__init__.py:3731
++#: ../yum/__init__.py:4026
++#, python-format
++msgid "Package %s is allowed multiple installs, skipping"
++msgstr ""
++
++#: ../yum/__init__.py:4072
+ #, python-format
+ msgid "No Match for available package: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3738
++#: ../yum/__init__.py:4079
+ #, python-format
+ msgid "Only Upgrade available on package: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3808 ../yum/__init__.py:3845
++#: ../yum/__init__.py:4149 ../yum/__init__.py:4186
+ #, python-format
+ msgid "Failed to downgrade: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3877
++#: ../yum/__init__.py:4218
+ #, python-format
+ msgid "Retrieving GPG key from %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3897
++#: ../yum/__init__.py:4238
+ msgid "GPG key retrieval failed: "
+ msgstr ""
+
+-#: ../yum/__init__.py:3903
++#: ../yum/__init__.py:4244
+ #, python-format
+ msgid "Invalid GPG Key from %s: %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3912
++#: ../yum/__init__.py:4253
+ #, python-format
+ msgid "GPG key parsing failed: key does not have value %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3944
++#: ../yum/__init__.py:4267
+ #, python-format
+-msgid "GPG key at %s (0x%s) is already installed"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid : %s\n"
++" Package: %s (%s)\n"
++" From : %s"
+ msgstr ""
+
+-#. Try installing/updating GPG key
+-#: ../yum/__init__.py:3949 ../yum/__init__.py:4011
++#: ../yum/__init__.py:4275
+ #, python-format
+-msgid "Importing GPG key 0x%s \"%s\" from %s"
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid: \"%s\"\n"
++" From : %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:3966
++#: ../yum/__init__.py:4307
++#, python-format
++msgid "GPG key at %s (0x%s) is already installed"
++msgstr ""
++
++#: ../yum/__init__.py:4326
+ msgid "Not installing key"
+ msgstr ""
+
+-#: ../yum/__init__.py:3972
++#: ../yum/__init__.py:4332
+ #, python-format
+ msgid "Key import failed (code %d)"
+ msgstr ""
+
+-#: ../yum/__init__.py:3973 ../yum/__init__.py:4032
++#: ../yum/__init__.py:4333 ../yum/__init__.py:4389
+ msgid "Key imported successfully"
+ msgstr ""
+
+-#: ../yum/__init__.py:3978 ../yum/__init__.py:4037
++#: ../yum/__init__.py:4338
+ #, python-format
+ msgid ""
+ "The GPG keys listed for the \"%s\" repository are already installed but they "
+@@ -2485,101 +2699,109 @@ msgid ""
+ "Check that the correct key URLs are configured for this repository."
+ msgstr ""
+
+-#: ../yum/__init__.py:3987
++#: ../yum/__init__.py:4347
+ msgid "Import of key(s) didn't help, wrong key(s)?"
+ msgstr ""
+
+-#: ../yum/__init__.py:4006
++#: ../yum/__init__.py:4366
+ #, python-format
+ msgid "GPG key at %s (0x%s) is already imported"
+ msgstr ""
+
+-#: ../yum/__init__.py:4026
++#: ../yum/__init__.py:4383
+ #, python-format
+ msgid "Not installing key for repo %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:4031
++#: ../yum/__init__.py:4388
+ msgid "Key import failed"
+ msgstr ""
+
+-#: ../yum/__init__.py:4157
++#: ../yum/__init__.py:4394
++#, python-format
++msgid ""
++"The GPG keys listed for the \"%s\" repository are already installed but they "
++"are not correct.\n"
++"Check that the correct key URLs are configured for this repository."
++msgstr ""
++
++#: ../yum/__init__.py:4521
+ msgid "Unable to find a suitable mirror."
+ msgstr ""
+
+-#: ../yum/__init__.py:4159
++#: ../yum/__init__.py:4523
+ msgid "Errors were encountered while downloading packages."
+ msgstr ""
+
+-#: ../yum/__init__.py:4209
++#: ../yum/__init__.py:4573
+ #, python-format
+ msgid "Please report this error at %s"
+ msgstr ""
+
+-#: ../yum/__init__.py:4233
++#: ../yum/__init__.py:4597
+ msgid "Test Transaction Errors: "
+ msgstr ""
+
+-#: ../yum/__init__.py:4334
++#: ../yum/__init__.py:4700
+ #, python-format
+ msgid "Could not set cachedir: %s"
+ msgstr ""
+
+ #. Mostly copied from YumOutput._outKeyValFill()
+-#: ../yum/plugins.py:202
++#: ../yum/plugins.py:208
+ msgid "Loaded plugins: "
+ msgstr ""
+
+-#: ../yum/plugins.py:216 ../yum/plugins.py:222
++#: ../yum/plugins.py:222 ../yum/plugins.py:228
+ #, python-format
+ msgid "No plugin match for: %s"
+ msgstr ""
+
+-#: ../yum/plugins.py:252
++#: ../yum/plugins.py:258
+ #, python-format
+ msgid "Not loading \"%s\" plugin, as it is disabled"
+ msgstr ""
+
+ #. Give full backtrace:
+-#: ../yum/plugins.py:264
++#: ../yum/plugins.py:270
+ #, python-format
+ msgid "Plugin \"%s\" can't be imported"
+ msgstr ""
+
+-#: ../yum/plugins.py:271
++#: ../yum/plugins.py:277
+ #, python-format
+ msgid "Plugin \"%s\" doesn't specify required API version"
+ msgstr ""
+
+-#: ../yum/plugins.py:276
++#: ../yum/plugins.py:282
+ #, python-format
+ msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+ msgstr ""
+
+-#: ../yum/plugins.py:309
++#: ../yum/plugins.py:315
+ #, python-format
+ msgid "Loading \"%s\" plugin"
+ msgstr ""
+
+-#: ../yum/plugins.py:316
++#: ../yum/plugins.py:322
+ #, python-format
+ msgid ""
+ "Two or more plugins with the name \"%s\" exist in the plugin search path"
+ msgstr ""
+
+-#: ../yum/plugins.py:336
++#: ../yum/plugins.py:342
+ #, python-format
+ msgid "Configuration file %s not found"
+ msgstr ""
+
+ #. for
+ #. Configuration files for the plugin not found
+-#: ../yum/plugins.py:339
++#: ../yum/plugins.py:345
+ #, python-format
+ msgid "Unable to find configuration file for plugin %s"
+ msgstr ""
+
+-#: ../yum/plugins.py:501
++#: ../yum/plugins.py:507
+ msgid "registration of commands not supported"
+ msgstr ""
+
+@@ -2596,6 +2818,16 @@ msgstr ""
+ msgid "%s is a duplicate with %s"
+ msgstr ""
+
++#: ../yum/rpmsack.py:122
++#, python-format
++msgid "%s is obsoleted by %s"
++msgstr ""
++
++#: ../yum/rpmsack.py:130
++#, python-format
++msgid "%s provides %s but it cannot be found"
++msgstr ""
++
+ #: ../yum/rpmtrans.py:79
+ msgid "Repackaging"
+ msgstr ""
+diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
+index 5512ea6..72cba60 100644
+--- a/rpmUtils/arch.py
++++ b/rpmUtils/arch.py
+@@ -5,8 +5,8 @@ import os
+
+ # dict mapping arch -> ( multicompat, best personality, biarch personality )
+ multilibArches = { "x86_64": ( "athlon", "x86_64", "athlon" ),
+- "sparc64v": ( "sparc", "sparcv9v", "sparc64v" ),
+- "sparc64": ( "sparc", "sparcv9", "sparc64" ),
++ "sparc64v": ( "sparcv9v", "sparcv9v", "sparc64v" ),
++ "sparc64": ( "sparcv9", "sparcv9", "sparc64" ),
+ "ppc64": ( "ppc", "ppc", "ppc64" ),
+ "s390x": ( "s390", "s390x", "s390" ),
+ }
+@@ -36,7 +36,6 @@ arches = {
+ "s390": "noarch",
- def procConflict(self, name, confname):
+ # sparc
+- "sparc64v": "sparc64",
+ "sparc64v": "sparcv9v",
+ "sparc64": "sparcv9",
+ "sparcv9v": "sparcv9",
+diff --git a/rpmUtils/tests/updates-test.py b/rpmUtils/tests/updates-test.py
+index 524db82..889353e 100644
+--- a/rpmUtils/tests/updates-test.py
++++ b/rpmUtils/tests/updates-test.py
+@@ -1,5 +1,6 @@
+
+ import rpmUtils.updates
++import rpmUtils.arch
+
+ instlist = [('foo', 'i386', '0', '1', '1'),
+ ('do', 'i386', '0', '2', '3'),
+@@ -7,7 +8,8 @@ instlist = [('foo', 'i386', '0', '1', '1'),
+ ('bar', 'noarch', '0', '2', '1'),
+ ('baz', 'i686', '0', '2', '3'),
+ ('baz', 'x86_64', '0','1','4'),
+- ('foo', 'i686', '0', '1', '1')]
++ ('foo', 'i686', '0', '1', '1'),
++ ('cyrus-sasl','sparcv9', '0', '1', '1')]
+
+ availlist = [('foo', 'i686', '0', '1', '3'),
+ ('do', 'noarch', '0', '3', '3'),
+@@ -20,7 +22,9 @@ availlist = [('foo', 'i686', '0', '1', '3'),
+ ('baz', 'noarch', '0', '2', '4'),
+ ('baz', 'i686', '0', '2', '4'),
+ ('baz', 'x86_64', '0', '1', '5'),
+- ('baz', 'ppc', '0', '1', '5')]
++ ('baz', 'ppc', '0', '1', '5'),
++ ('cyrus-sasl','sparcv9', '0', '1', '2'),
++ ('cyrus-sasl','sparc64', '0', '1', '2'),]
+
+ obslist = {('quux', 'noarch', '0', '1', '3'): [('bar', None, (None, None, None))],
+
+@@ -30,9 +34,12 @@ obslist = {('quux', 'noarch', '0', '1', '3'): [('bar', None, (None, None, None))
+
+ up = rpmUtils.updates.Updates(instlist, availlist)
+ up.debug=1
+-up.exactarch=0
+-up.exactarchlist.append('foo')
+-#up.myarch = 'x86_64'
++up.exactarch=1
++#up.myarch = 'sparc64'
++up._is_multilib = rpmUtils.arch.isMultiLibArch(up.myarch)
++up._archlist = rpmUtils.arch.getArchList(up.myarch)
++print up._archlist
++up._multilib_compat_arches = rpmUtils.arch.getMultiArchInfo(up.myarch)
+ up.doUpdates()
+ up.condenseUpdates()
+
+diff --git a/shell.py b/shell.py
+index f1c82a3..a32e880 100644
+--- a/shell.py
++++ b/shell.py
+@@ -50,6 +50,14 @@ class YumShell(cmd.Cmd):
+ self.logger = logging.getLogger("yum.cli")
+ self.verbose_logger = logging.getLogger("yum.verbose.cli")
+
++ # NOTE: This is shared with self.base ... so don't reassign.
++ self._shell_history_cmds = []
++
++ def _shell_history_add_cmds(self, cmds):
++ if not self.base.conf.history_record:
++ return
++
++ self._shell_history_cmds.append(cmds)
+
+ def _shlex_split(self, input_string):
+ """split the input using shlex rules, and error or exit accordingly"""
+@@ -98,6 +106,8 @@ class YumShell(cmd.Cmd):
+ self.base.cmds = self._shlex_split(self.base.cmdstring)
+ self.base.plugins.run('args', args=self.base.cmds)
+
++ self._shell_history_add_cmds(self.base.cmds)
++
+ try:
+ self.base.parseCommands()
+ except Errors.YumBaseError:
+@@ -266,6 +276,8 @@ class YumShell(cmd.Cmd):
+ cmds.insert(0, 'repolist')
+ self.base.cmds = cmds
+
++ self._shell_history_add_cmds(self.base.cmds)
++
+ try:
+ self.base.parseCommands()
+ except Errors.YumBaseError:
+diff --git a/test/packagetests.py b/test/packagetests.py
+index dac8abd..1e3302b 100644
+--- a/test/packagetests.py
++++ b/test/packagetests.py
+@@ -8,7 +8,6 @@ class InPrcoRangePackageTests(unittest.TestCase):
+
+ def setUp(self):
+ self.po = packages.RpmBase()
+- self.po.rel = 10
+ self.po.prco['provides'].append(("seth", "EQ", (1, 2, 3)))
+ self.po.prco['requires'].append(("foo", "GE", (4, 5, None)))
+
+diff --git a/utils.py b/utils.py
+index 9335112..aad1b73 100644
+--- a/utils.py
++++ b/utils.py
+@@ -101,12 +101,12 @@ def get_process_info(pid):
+ return ps
+
+ def show_lock_owner(pid, logger):
+- if not pid:
+- return
+-
+ ps = get_process_info(pid)
++ if not ps:
++ return None
++
+ # This yumBackend isn't very friendly, so...
+- if ps is not None and ps['name'] == 'yumBackend.py':
++ if ps['name'] == 'yumBackend.py':
+ nmsg = _(" The other application is: PackageKit")
+ else:
+ nmsg = _(" The other application is: %s") % ps['name']
+@@ -121,6 +121,7 @@ def show_lock_owner(pid, logger):
+ (time.ctime(ps['start_time']), ago))
+ logger.critical(_(" State : %s, pid: %d") % (ps['state'], pid))
+
++ return ps
+
+
+ class YumUtilBase(YumBaseCli):
+diff --git a/yum.spec b/yum.spec
+index c3c7133..fc05aa6 100644
+--- a/yum.spec
++++ b/yum.spec
+@@ -15,7 +15,7 @@ BuildRequires: intltool
+ Requires: python >= 2.4
+ Requires: rpm-python, rpm >= 0:4.4.2
+ Requires: python-sqlite
+-Requires: urlgrabber >= 3.9.0
++Requires: urlgrabber >= 3.9.2
+ Requires: yum-metadata-parser >= 1.1.0
+ Requires: python-iniparse
+ Requires: pygpgme
diff --git a/yum/__init__.py b/yum/__init__.py
-index 2ea9f20..3a9ef88 100644
+index 2ea9f20..b5e9213 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -294,6 +294,11 @@ class YumBase(depsolve.Depsolve):
@@ -115,7 +28616,16 @@ index 2ea9f20..3a9ef88 100644
# Ensure that the repo name is set
if not repo.name:
-@@ -1403,7 +1412,8 @@ class YumBase(depsolve.Depsolve):
+@@ -1334,6 +1343,8 @@ class YumBase(depsolve.Depsolve):
+ self.skipped_packages, rpmdb_problems, cmdline)
+ # write out our config and repo data to additional history info
+ self._store_config_in_history()
++ if hasattr(self, '_shell_history_write'): # Only in cli...
++ self._shell_history_write()
+
+ self.plugins.run('historybegin')
+ # Just before we update the transaction, update what we think the
+@@ -1403,7 +1414,8 @@ class YumBase(depsolve.Depsolve):
# that there is not also an install of this pkg in the tsInfo (reinstall)
# for any kind of install add from_repo to the yumdb, and the cmdline
# and the install reason
@@ -125,7 +28635,7 @@ index 2ea9f20..3a9ef88 100644
self.rpmdb.dropCachedData()
self.plugins.run('preverifytrans')
for txmbr in self.tsInfo:
-@@ -1489,6 +1499,7 @@ class YumBase(depsolve.Depsolve):
+@@ -1489,6 +1501,7 @@ class YumBase(depsolve.Depsolve):
self.plugins.run('historyend')
self.history.end(self.rpmdb.simpleVersion(main_only=True)[0], ret)
self.rpmdb.dropCachedData()
@@ -133,15 +28643,45 @@ index 2ea9f20..3a9ef88 100644
def costExcludePackages(self):
""" Create an excluder for repos. with higher cost. Eg.
-@@ -3669,6 +3680,7 @@ class YumBase(depsolve.Depsolve):
+@@ -3100,6 +3113,9 @@ class YumBase(depsolve.Depsolve):
+
+ def _find_obsoletees(self, po):
+ """ Return the pkgs. that are obsoleted by the po we pass in. """
++ if not self.conf.obsoletes:
++ return
++
+ if not isinstance(po, YumLocalPackage):
+ for (obstup, inst_tup) in self.up.getObsoletersTuples(name=po.name):
+ if po.pkgtup == obstup:
+@@ -3160,7 +3176,7 @@ class YumBase(depsolve.Depsolve):
+ try:
+ mypkgs = self.returnPackagesByDep(arg)
+ except yum.Errors.YumBaseError, e:
+- self.logger.critical(_('No Match for argument: %s') % arg)
++ self.logger.critical(_('No Match for argument: %s') % to_unicode(arg))
+ else:
+ # install MTA* == fail, because provides don't do globs
+ # install /usr/kerberos/bin/* == success (and we want
+@@ -3490,7 +3506,7 @@ class YumBase(depsolve.Depsolve):
+ availpkgs.extend(m)
+
+ if not availpkgs and not instpkgs:
+- self.logger.critical(_('No Match for argument: %s') % arg)
++ self.logger.critical(_('No Match for argument: %s') % to_unicode(arg))
+
+ else: # we have kwargs, sort them out.
+ nevra_dict = self._nevra_kwarg_parse(kwargs)
+@@ -3669,7 +3685,8 @@ class YumBase(depsolve.Depsolve):
self.logger.critical(_('%s') % e)
if not depmatches:
+- self.logger.critical(_('No Match for argument: %s') % arg)
+ arg = to_unicode(arg)
- self.logger.critical(_('No Match for argument: %s') % arg)
++ self.logger.critical(_('No Match for argument: %s') % to_unicode(arg))
else:
pkgs.extend(depmatches)
-@@ -3690,6 +3702,14 @@ class YumBase(depsolve.Depsolve):
+
+@@ -3690,6 +3707,14 @@ class YumBase(depsolve.Depsolve):
if self.conf.protected_packages and po.pkgtup == kern_pkgtup:
self.logger.warning(_("Skipping the running kernel: %s") % po)
continue
@@ -156,8 +28696,54 @@ index 2ea9f20..3a9ef88 100644
txmbr = self.tsInfo.addErase(po)
tx_return.append(txmbr)
+@@ -3975,7 +4000,7 @@ class YumBase(depsolve.Depsolve):
+ try:
+ apkgs = self.returnPackagesByDep(arg)
+ except yum.Errors.YumBaseError, e:
+- self.logger.critical(_('No Match for argument: %s') % arg)
++ self.logger.critical(_('No Match for argument: %s') % to_unicode(arg))
+
+ else:
+ nevra_dict = self._nevra_kwarg_parse(kwargs)
+diff --git a/yum/config.py b/yum/config.py
+index 650d7b9..49411e3 100644
+--- a/yum/config.py
++++ b/yum/config.py
+@@ -645,6 +645,8 @@ class YumConf(StartupConf):
+ proxy = UrlOption(schemes=('http', 'ftp', 'https'), allow_none=True)
+ proxy_username = Option()
+ proxy_password = Option()
++ username = Option()
++ password = Option()
+ installonlypkgs = ListOption(['kernel', 'kernel-bigmem',
+ 'kernel-enterprise','kernel-smp', 'kernel-modules', 'kernel-debug',
+ 'kernel-unsupported', 'kernel-source', 'kernel-devel', 'kernel-PAE',
+@@ -794,6 +796,8 @@ class RepoConf(BaseConfig):
+ proxy_password = Inherit(YumConf.proxy_password)
+ retries = Inherit(YumConf.retries)
+ failovermethod = Inherit(YumConf.failovermethod)
++ username = Inherit(YumConf.username)
++ password = Inherit(YumConf.password)
+
+ # FIXME: rename gpgcheck to pkgs_gpgcheck
+ gpgcheck = Inherit(YumConf.gpgcheck)
+diff --git a/yum/depsolve.py b/yum/depsolve.py
+index e9b3fa7..886cca8 100644
+--- a/yum/depsolve.py
++++ b/yum/depsolve.py
+@@ -1195,6 +1195,10 @@ class Depsolve(object):
+ # We get here from bestPackagesFromList(), give a giant
+ # bump to stuff that is already installed.
+ pkgresults[pkg] += 1000
++ elif newest.verGT(pkg):
++ # if the version we're looking at is older than what we have installed
++ # score it down like we would an obsoleted pkg
++ pkgresults[pkg] -= 1024
+ else:
+ # just b/c they're not installed pkgs doesn't mean they should
+ # be ignored entirely. Just not preferred
diff --git a/yum/history.py b/yum/history.py
-index 502b908..014bdab 100644
+index 502b908..332a3e9 100644
--- a/yum/history.py
+++ b/yum/history.py
@@ -27,7 +27,7 @@ import yum.misc as misc
@@ -169,7 +28755,17 @@ index 502b908..014bdab 100644
_history_dir = '/var/lib/yum/history'
-@@ -425,12 +425,15 @@ class YumHistory:
+@@ -112,6 +112,9 @@ class YumHistoryPackage(PackageObject):
+ chk = checksum.split(':')
+ self._checksums = [(chk[0], chk[1], 0)] # (type, checksum, id(0,1))
+
++ self.repoid = '<history>'
++
++
+ class YumHistoryRpmdbProblem(PackageObject):
+ """ Class representing an rpmdb problem that existed at the time of the
+ transaction. """
+@@ -425,12 +428,15 @@ class YumHistory:
cur = self._get_cursor()
if cur is None or not self._update_db_file_2():
return None
@@ -186,7 +28782,7 @@ index 502b908..014bdab 100644
rpid = cur.lastrowid
if not rpid:
-@@ -467,7 +470,7 @@ class YumHistory:
+@@ -467,7 +473,7 @@ class YumHistory:
res = executeSQL(cur,
"""INSERT INTO trans_cmdline
(tid, cmdline)
@@ -195,7 +28791,7 @@ index 502b908..014bdab 100644
return cur.lastrowid
def beg(self, rpmdb_version, using_pkgs, txmbrs, skip_packages=[],
-@@ -610,7 +613,7 @@ class YumHistory:
+@@ -610,7 +616,7 @@ class YumHistory:
# open file in append
fo = open(data_fn, 'w+')
# write data
@@ -204,7 +28800,7 @@ index 502b908..014bdab 100644
# flush data
fo.flush()
fo.close()
-@@ -914,17 +917,19 @@ class YumHistory:
+@@ -914,17 +920,19 @@ class YumHistory:
version || '-' || release || '.' || arch AS nevra
FROM trans_skip_pkgs JOIN pkgtups USING(pkgtupid)
ORDER BY name;
@@ -230,6 +28826,22 @@ index 502b908..014bdab 100644
ORDER BY name;
''']
+diff --git a/yum/packages.py b/yum/packages.py
+index b5a7d40..e83c0d5 100644
+--- a/yum/packages.py
++++ b/yum/packages.py
+@@ -290,8 +290,9 @@ class PackageObject(object):
+ return False
+ if self.pkgtup != other.pkgtup:
+ return False
+- if self.repoid != other.repoid:
+- return False
++ if hasattr(self, 'repoid') and hasattr(other, 'repoid'):
++ if self.repoid != other.repoid:
++ return False
+ return True
+ def __ne__(self, other):
+ if not (self == other):
diff --git a/yum/pgpmsg.py b/yum/pgpmsg.py
index 9cf8217..b23eabc 100644
--- a/yum/pgpmsg.py
@@ -270,8 +28882,177 @@ index 9cf8217..b23eabc 100644
if thesecerts:
certs.extend(thesecerts)
block = ''
+diff --git a/yum/update_md.py b/yum/update_md.py
+index 9e492ba..3d05d19 100644
+--- a/yum/update_md.py
++++ b/yum/update_md.py
+@@ -56,6 +56,9 @@ class UpdateNotice(object):
+ 'issued' : '',
+ 'updated' : '',
+ 'description' : '',
++ 'rights' : '',
++ 'summary' : '',
++ 'solution' : '',
+ 'references' : [],
+ 'pkglist' : [],
+ 'reboot_suggested' : False
+@@ -71,7 +74,7 @@ class UpdateNotice(object):
+ def __setitem__(self, item, val):
+ self._md[item] = val
+
+- def __str__(self):
++ def text(self, skip_data=('files',)):
+ head = """
+ ===============================================================================
+ %(title)s
+@@ -88,7 +91,7 @@ class UpdateNotice(object):
+
+ # Add our bugzilla references
+ bzs = filter(lambda r: r['type'] == 'bugzilla', self._md['references'])
+- if len(bzs):
++ if len(bzs) and 'bugs' not in skip_data:
+ buglist = " Bugs :"
+ for bz in bzs:
+ buglist += " %s%s\n\t :" % (bz['id'], 'title' in bz
+@@ -97,17 +100,35 @@ class UpdateNotice(object):
+
+ # Add our CVE references
+ cves = filter(lambda r: r['type'] == 'cve', self._md['references'])
+- if len(cves):
++ if len(cves) and 'cves' not in skip_data:
+ cvelist = " CVEs :"
+ for cve in cves:
+ cvelist += " %s\n\t :" % cve['id']
+ head += cvelist[: - 1].rstrip() + '\n'
+
+- if self._md['description'] is not None:
++ if self._md['summary'] and 'summary' not in skip_data:
++ data = utf8_text_wrap(self._md['summary'], width=64,
++ subsequent_indent=' ' * 12 + ': ')
++ head += " Summary : %s\n" % '\n'.join(data)
++
++ if self._md['description'] and 'description' not in skip_data:
+ desc = utf8_text_wrap(self._md['description'], width=64,
+ subsequent_indent=' ' * 12 + ': ')
+ head += "Description : %s\n" % '\n'.join(desc)
+
++ if self._md['solution'] and 'solution' not in skip_data:
++ data = utf8_text_wrap(self._md['solution'], width=64,
++ subsequent_indent=' ' * 12 + ': ')
++ head += " Solution : %s\n" % '\n'.join(data)
++
++ if self._md['rights'] and 'rights' not in skip_data:
++ data = utf8_text_wrap(self._md['rights'], width=64,
++ subsequent_indent=' ' * 12 + ': ')
++ head += " Rights : %s\n" % '\n'.join(data)
++
++ if 'files' in skip_data:
++ return head[:-1] # chop the last '\n'
++
+ # Get a list of arches we care about:
+ #XXX ARCH CHANGE - what happens here if we set the arch - we need to
+ # pass this in, perhaps
+@@ -123,6 +144,9 @@ class UpdateNotice(object):
+
+ return head
+
++ def __str__(self):
++ return to_utf8(self.text())
++
+ def get_metadata(self):
+ """ Return the metadata dict. """
+ return self._md
+@@ -132,7 +156,7 @@ class UpdateNotice(object):
+ Parse an update element::
+
+ <!ELEMENT update (id, synopsis?, issued, updated,
+- references, description, pkglist)>
++ references, description, rights?, summary?, solution?, pkglist)>
+ <!ATTLIST update type (errata|security) "errata">
+ <!ATTLIST update status (final|testing) "final">
+ <!ATTLIST update version CDATA #REQUIRED>
+@@ -156,6 +180,12 @@ class UpdateNotice(object):
+ self._parse_references(child)
+ elif child.tag == 'description':
+ self._md['description'] = child.text
++ elif child.tag == 'rights':
++ self._md['rights'] = child.text
++ elif child.tag == 'summary':
++ self._md['summary'] = child.text
++ elif child.tag == 'solution':
++ self._md['solution'] = child.text
+ elif child.tag == 'pkglist':
+ self._parse_pkglist(child)
+ elif child.tag == 'title':
+@@ -172,7 +202,7 @@ class UpdateNotice(object):
+ <!ELEMENT references (reference*)>
+ <!ELEMENT reference>
+ <!ATTLIST reference href CDATA #REQUIRED>
+- <!ATTLIST reference type (self|cve|bugzilla) "self">
++ <!ATTLIST reference type (self|other|cve|bugzilla) "self">
+ <!ATTLIST reference id CDATA #IMPLIED>
+ <!ATTLIST reference title CDATA #IMPLIED>
+ """
+@@ -225,6 +255,12 @@ class UpdateNotice(object):
+ package = {}
+ for pkgfield in ('arch', 'epoch', 'name', 'version', 'release', 'src'):
+ package[pkgfield] = elem.attrib.get(pkgfield)
++
++ # Bad epoch and arch data is the most common (missed) screwups.
++ # Deal with bad epoch data.
++ if not package['epoch'] or package['epoch'][0] not in '0123456789':
++ package['epoch'] = None
++
+ for child in elem:
+ if child.tag == 'filename':
+ package['filename'] = child.text
+@@ -248,7 +284,13 @@ class UpdateNotice(object):
+ to_xml(self._md['title']), to_xml(self._md['release']),
+ to_xml(self._md['issued'], attrib=True),
+ to_xml(self._md['description']))
+-
++
++ if self._md['summary']:
++ msg += """ <summary>%s</summary>\n""" % (to_xml(self._md['summary']))
++ if self._md['solution']:
++ msg += """ <solution>%s</solution>\n""" % (to_xml(self._md['solution']))
++ if self._md['rights']:
++ msg += """ <rights>%s</rights>\n""" % (to_xml(self._md['rights']))
+ if self._md['references']:
+ msg += """ <references>\n"""
+ for ref in self._md['references']:
+diff --git a/yum/yumRepo.py b/yum/yumRepo.py
+index dd595f0..b501d61 100644
+--- a/yum/yumRepo.py
++++ b/yum/yumRepo.py
+@@ -501,6 +501,8 @@ class YumRepository(Repository, config.RepoConf):
+ 'ssl_cert': self.sslclientcert,
+ 'ssl_key': self.sslclientkey,
+ 'user_agent': default_grabber.opts.user_agent,
++ 'username': self.username,
++ 'password': self.password,
+ }
+ return opts
+
+@@ -1312,6 +1314,16 @@ class YumRepository(Repository, config.RepoConf):
+ os.rename(local, local + '.old.tmp')
+ reverts.append(local)
+
++ # This is the super easy way. We just to see if a generated
++ # file is there for all files, but it should always work.
++ # And anyone who is giving us MD with blah and blah.sqlite
++ # which are different types, can play a game I like to call
++ # "come here, ouch".
++ gen_local = local + '.sqlite'
++ if os.path.exists(gen_local):
++ os.rename(gen_local, gen_local + '.old.tmp')
++ reverts.append(gen_local)
++
+ if ndata is None: # Doesn't exist in this repo
+ continue
+
diff --git a/yumcommands.py b/yumcommands.py
-index a7f5d9e..9c6fc75 100644
+index a7f5d9e..517e6b9 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -122,6 +122,25 @@ def checkShellArg(base, basecmd, extcmds):
@@ -409,3 +29190,63 @@ index a7f5d9e..9c6fc75 100644
def doCommand(self, base, basecmd, extcmds):
self.doneCommand(base, _("Setting up Downgrade Process"))
+@@ -1294,7 +1329,7 @@ class HistoryCommand(YumCommand):
+ return ['history']
+
+ def getUsage(self):
+- return "[info|list|summary|redo|undo|new]"
++ return "[info|list|summary|addon-info|package-list|redo|undo|new]"
+
+ def getSummary(self):
+ return _("Display, or use, the transaction history")
+@@ -1323,7 +1358,10 @@ class HistoryCommand(YumCommand):
+ base.history._create_db_file()
+
+ def doCheck(self, base, basecmd, extcmds):
+- cmds = ('list', 'info', 'summary', 'repeat', 'redo', 'undo', 'new', 'addon-info')
++ cmds = ('list', 'info', 'summary', 'repeat', 'redo', 'undo', 'new',
++ 'addon', 'addon-info',
++ 'pkg', 'pkgs', 'pkg-list', 'pkgs-list',
++ 'package', 'package-list', 'packages', 'packages-list')
+ if extcmds and extcmds[0] not in cmds:
+ base.logger.critical(_('Invalid history sub-command, use: %s.'),
+ ", ".join(cmds))
+@@ -1347,8 +1385,11 @@ class HistoryCommand(YumCommand):
+ ret = base.historyInfoCmd(extcmds)
+ elif vcmd == 'summary':
+ ret = base.historySummaryCmd(extcmds)
+- elif vcmd == 'addon-info':
++ elif vcmd in ('addon', 'addon-info'):
+ ret = base.historyAddonInfoCmd(extcmds)
++ elif vcmd in ('pkg', 'pkgs', 'pkg-list', 'pkgs-list',
++ 'package', 'package-list', 'packages', 'packages-list'):
++ ret = base.historyPackageListCmd(extcmds)
+ elif vcmd == 'undo':
+ ret = self._hcmd_undo(base, extcmds)
+ elif vcmd in ('redo', 'repeat'):
+@@ -1383,7 +1424,7 @@ class CheckRpmdbCommand(YumCommand):
+ chkcmd = extcmds
+
+ def _out(x):
+- print x
++ print to_unicode(x.__str__())
+
+ rc = 0
+ if base._rpmdb_warn_checks(out=_out, warn=False, chkcmd=chkcmd,
+diff --git a/yummain.py b/yummain.py
+index 95c7462..2892c34 100755
+--- a/yummain.py
++++ b/yummain.py
+@@ -101,8 +101,10 @@ def main(args):
+ logger.critical(lockerr)
+ if not base.conf.exit_on_lock:
+ logger.critical(_("Another app is currently holding the yum lock; waiting for it to exit..."))
+- show_lock_owner(e.pid, logger)
+- time.sleep(2)
++ tm = 0.1
++ if show_lock_owner(e.pid, logger):
++ tm = 2
++ time.sleep(tm)
+ else:
+ logger.critical(_("Another app is currently holding the yum lock; exiting as configured by exit_on_lock"))
+ return 1
diff --git a/yum.spec b/yum.spec
index ee324af..308d0d3 100644
--- a/yum.spec
+++ b/yum.spec
@@ -3,7 +3,7 @@
Summary: RPM installer/updater
Name: yum
Version: 3.2.28
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@ Requires: yum-metadata-parser >= 1.1.0
Requires: pygpgme
Obsoletes: yum-skip-broken <= 1.1.18
Obsoletes: yum-basearchonly <= 1.1.9
+Obsoletes: yum-plugin-basearchonly <= 1.1.9
Obsoletes: yum-allow-downgrade < 1.1.20-0
Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0
Obsoletes: yum-plugin-protect-packages < 1.1.27-0
@@ -134,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /usr/lib/yum-plugins
%changelog
+* Fri Sep 10 2010 Seth Vidal <skvidal at fedoraproject.org>
+- latest head
+
* Fri Aug 27 2010 Seth Vidal <skvidal at fedoraproject.org>
- obsoleted yum-plugin-download-order
More information about the scm-commits
mailing list