[yum] Latest HEAD.
James Antill
james at fedoraproject.org
Thu Oct 7 19:17:28 UTC 2010
commit 0f9a1db8298f8959e80171ad7f467fc154b4c950
Author: James Antill <james at and.org>
Date: Thu Oct 7 15:17:34 2010 -0400
Latest HEAD.
yum-HEAD.patch | 4694 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
yum.spec | 8 +-
2 files changed, 4313 insertions(+), 389 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 12ca604..2203f48 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -12,10 +12,20 @@ index 8065899..20f5629 100644
test-skipbroken:
diff --git a/cli.py b/cli.py
-index 9542b7a..0accd35 100644
+index 9542b7a..a2a05bd 100644
--- a/cli.py
+++ b/cli.py
-@@ -327,14 +327,34 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+@@ -139,7 +139,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+ names and summary usages.
+ """
+ usage = 'yum [options] COMMAND\n\nList of Commands:\n\n'
+- commands = yum.misc.unique(self.yum_cli_commands.values())
++ commands = yum.misc.unique([x for x in self.yum_cli_commands.values()
++ if not (hasattr(x, 'hidden') and x.hidden)])
+ commands.sort(key=lambda x: x.getNames()[0])
+ for command in commands:
+ # XXX Remove this when getSummary is common in plugins
+@@ -327,14 +328,34 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
self.yum_cli_commands[self.basecmd].doCheck(self, self.basecmd, self.extcmds)
@@ -50,7 +60,7 @@ index 9542b7a..0accd35 100644
return yumshell.result, yumshell.resultmsgs
def errorSummary(self, errstring):
-@@ -931,22 +951,71 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+@@ -931,22 +952,71 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
searchlist = ['name', 'summary', 'description', 'url']
dups = self.conf.showdupesfromrepos
args = map(to_unicode, args)
@@ -127,8 +137,43 @@ index 9542b7a..0accd35 100644
for arg in args:
if arg not in akeys:
self.logger.warning(_('Warning: No matches found for: %s'), arg)
+@@ -1327,6 +1397,7 @@ class YumOptionParser(OptionParser):
+ self.base.conf.obsoletes = 1
+
+ if opts.installroot:
++ self._checkAbsInstallRoot(opts)
+ self.base.conf.installroot = opts.installroot
+
+ if opts.skipbroken:
+@@ -1395,6 +1466,7 @@ class YumOptionParser(OptionParser):
+ if opts.nogpgcheck:
+ self.base.conf.gpgcheck = False
+ self.base.conf.repo_gpgcheck = False
++ self.base.conf.localpkg_gpgcheck = False
+ for repo in self.base.repos.listEnabled():
+ repo.gpgcheck = False
+ repo.repo_gpgcheck = False
+@@ -1406,7 +1478,18 @@ class YumOptionParser(OptionParser):
+
+ return opts, cmds
+
++ def _checkAbsInstallRoot(self, opts):
++ if not opts.installroot:
++ return
++ if opts.installroot[0] == '/':
++ return
++ # We have a relative installroot ... haha
++ self.logger.critical(_('--installroot must be an absolute path: %s'),
++ opts.installroot)
++ sys.exit(1)
++
+ def getRoot(self,opts):
++ self._checkAbsInstallRoot(opts)
+ # If the conf file is inside the installroot - use that.
+ # otherwise look for it in the normal root
+ if opts.installroot:
diff --git a/docs/yum.8 b/docs/yum.8
-index 281bf17..b5b7295 100644
+index 281bf17..111cda6 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
@@ -163,7 +208,18 @@ index 281bf17..b5b7295 100644
.IP
.IP "\fBhelp\fP"
Produces help, either for all commands or if given a command name then the help
-@@ -549,11 +561,6 @@ Eliminate the sqlite cache used for faster access to metadata.
+@@ -379,7 +391,9 @@ Configuration Option: \fBrpmverbosity\fP
+ Sets the maximum amount of time yum will wait before performing a command \- it randomizes over the time.
+ .IP "\fB\-C, \-\-cacheonly\fP"
+ Tells yum to run entirely from system cache - does not download or
+-update any headers unless it has to to perform the requested action.
++update any headers unless it has to to perform the requested action. If you're
++using this as a user yum will not use the tempcache for the user but will only
++use the system cache in the system cachedir.
+ .IP "\fB\-\-version\fP"
+ Reports the \fByum\fP version number and installed package versions for
+ everything in history_record_packages (can be added to by plugins).
+@@ -549,11 +563,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.
@@ -176,10 +232,27 @@ index 281bf17..b5b7295 100644
Eliminate any cached data from the local rpmdb.
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
-index 49d98c6..20a6e67 100644
+index 49d98c6..b48bdf6 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'.
+@@ -80,9 +80,13 @@ Full directory and file name for where yum should write its log file.
+ \fBgpgcheck\fR
+ Either `1' or `0'. This tells yum whether or not it should perform a GPG
+ signature check on packages. When this is set in the [main] section it sets the
+-default for all repositories. This option also determines whether or not an
+-install of a package from a local RPM file will be GPG signature checked. The
+-default is `0'.
++default for all repositories.
++The default is `0'.
++
++\fBlocalpkg_gpgcheck\fR
++Either `1' or `0'. This tells yum whether or not it should perform a GPG
++signature check on local packages (packages in a file, not in a repositoy).
++The default is `0'.
+
+ .IP
+ \fBrepo_gpgcheck\fR
+@@ -134,9 +138,13 @@ an i686 package to update an i386 package. Default is `1'.
.IP
\fBinstallonlypkgs \fR
@@ -196,7 +269,7 @@ index 49d98c6..20a6e67 100644
.IP
\fBinstallonly_limit \fR
-@@ -217,8 +221,7 @@ diskspace before a RPM transaction is run. Default is `1' (perform the check).
+@@ -217,8 +225,7 @@ diskspace before a RPM transaction is run. Default is `1' (perform the check).
.IP
\fBtsflags\fR
Comma or space separated list of transaction flags to pass to the rpm
@@ -206,7 +279,20 @@ index 49d98c6..20a6e67 100644
with newer rpm versions.
You can set all/any of them. However, if you don't know what these do in the
context of an rpm transaction set you're best leaving it alone. Default is
-@@ -361,6 +364,14 @@ username to use for proxy
+@@ -290,7 +297,11 @@ default
+
+ .IP
+ \fBsslverify \fR
+-Boolean - should yum verify SSL certificates/hosts at all. Defaults to True
++Boolean - should yum verify SSL certificates/hosts at all. Defaults to True.
++
++Note that the plugin yum-rhn-plugin will force this value to true, and may
++alter other ssl settings (like hostname checking), even if it the machine
++is not registered.
+
+ .IP
+ \fBsslclientcert \fR
+@@ -361,6 +372,14 @@ username to use for proxy
password for this proxy
.IP
@@ -221,7 +307,7 @@ index 49d98c6..20a6e67 100644
\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 +745,17 @@ If this is unset it inherits it from the global setting
+@@ -734,6 +753,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
@@ -240,32 +326,66 @@ index 49d98c6..20a6e67 100644
\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..8ca00fd 100644
+index 3e6e243..25d3cc6 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
-@@ -81,16 +81,16 @@ _yum()
+@@ -79,18 +79,20 @@ _yum()
+ local cur
+ type _get_cword &>/dev/null && cur=`_get_cword` || cur=$2
local prev=$3
- local cmds=( check check-update clean deplist downgrade groupinfo
- groupinstall grouplist groupremove help history info install list
+- local cmds=( check check-update clean deplist downgrade groupinfo
+- groupinstall grouplist groupremove help history info install list
- localinstall localupdate makecache provides reinstall remove repolist resolvedep
- search shell update upgrade version distro-sync )
-+ localinstall localupdate makecache provides reinstall remove repolist
-+ resolvedep search shell update upgrade version distro-sync )
-
+-
- local i c cmd
- for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
+- for c in ${cmds[@]} check-rpmdb erase groupupdate grouperase \
+- whatprovides distribution-synchronization ; do
++ # Commands offered as completions
++ local cmds=( check check-update clean deplist distro-sync downgrade
++ groupinfo groupinstall grouplist groupremove help history info install
++ list makecache provides reinstall remove repolist resolvedep search
++ shell update upgrade version )
++
+ local i c cmd subcmd
+ for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
+ [[ -n $cmd ]] && subcmd=${COMP_WORDS[i]} && break
- for c in ${cmds[@]} check-rpmdb erase groupupdate grouperase \
- whatprovides distribution-synchronization ; do
++ # Recognize additional commands and aliases
++ for c in ${cmds[@]} check-rpmdb distribution-synchronization erase \
++ groupupdate grouperase localinstall localupdate whatprovides ; do
[ ${COMP_WORDS[i]} = $c ] && cmd=$c && break
done
- [ -z $cmd ] || break
done
case $cmd in
-@@ -153,15 +153,21 @@ _yum()
+@@ -115,20 +117,14 @@ _yum()
+ ;;
+
+ deplist)
+- if [[ "$cur" == */* ]] ; then
+- _yum_binrpmfiles "$cur"
+- else
+- _yum_list all "$cur"
+- fi
++ COMPREPLY=( $( compgen -f -o plusdirs -X '!*.[rs]pm' -- "$cur" ) )
++ [[ "$cur" == */* ]] || _yum_list all "$cur"
+ return 0
+ ;;
+
+ downgrade|reinstall)
+- if [[ "$cur" == */* ]] ; then
+- _yum_binrpmfiles "$cur"
+- else
+- _yum_list installed "$cur"
+- fi
++ _yum_binrpmfiles "$cur"
++ [[ "$cur" == */* ]] || _yum_list installed "$cur"
+ return 0
+ ;;
+
+@@ -153,15 +149,21 @@ _yum()
case $prev in
history)
COMPREPLY=( $( compgen -W 'info list summary undo redo
@@ -289,6 +409,34 @@ index 3e6e243..8ca00fd 100644
return 0
;;
+@@ -171,11 +173,8 @@ _yum()
+ ;;
+
+ install)
+- if [[ "$cur" == */* ]] ; then
+- _yum_binrpmfiles "$cur"
+- else
+- _yum_list available "$cur"
+- fi
++ _yum_binrpmfiles "$cur"
++ [[ "$cur" == */* ]] || _yum_list available "$cur"
+ return 0
+ ;;
+
+@@ -207,11 +206,8 @@ _yum()
+ ;;
+
+ update|upgrade)
+- if [[ "$cur" == */* ]] ; then
+- _yum_binrpmfiles "$cur"
+- else
+- _yum_list updates "$cur"
+- fi
++ _yum_binrpmfiles "$cur"
++ [[ "$cur" == */* ]] || _yum_list updates "$cur"
+ return 0
+ ;;
+ version)
diff --git a/output.py b/output.py
index 3a90995..cfca45f 100755
--- a/output.py
@@ -21921,187 +22069,179 @@ index b7b128c..1c5f272 100644
#: ../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
-+#
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index 91cea8f..2afd5d9 100644
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -2,13 +2,14 @@
+ # This file is distributed under the same license as the Yum package.
+ # Igor Pires Soares <igor at projetofedora.org>, 2007,2008,2009.
+ # Taylon Silmer <taylonsilva at gmail.com>, 2010.
++# Walmer Bittencourt Junior <junior.walmer at gmail.com>, 2010.
msgid ""
msgstr ""
- "Project-Id-Version: yum\n"
+ "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"
+-"PO-Revision-Date: 2010-04-28 19:15-0300\n"
+-"Last-Translator: Taylon Silmer <taylonsilva 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"
++"PO-Revision-Date: 2010-09-29 17:03-0300\n"
++"Last-Translator: walmer bittencourt junior <walmer at colmeia.udesc.br>\n"
+ "Language-Team: Brazilian Portuguese <trans-pt_br at lists.fedoraproject.org>\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"
+@@ -17,34 +18,54 @@ msgstr ""
+ "X-Poedit-Language: Portuguese\n"
+ "X-Poedit-Country: BRAZIL\n"
--#: ../callback.py:48
--#: ../output.py:947
--#: ../yum/rpmtrans.py:72
-+#: ../callback.py:48 ../output.py:1027 ../yum/rpmtrans.py:72
+-#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72
++#: ../callback.py:48
++#: ../output.py:1027
++#: ../yum/rpmtrans.py:72
msgid "Updating"
- msgstr "Обновление"
+ msgstr "Atualizando"
--#: ../callback.py:49
--#: ../yum/rpmtrans.py:73
-+#: ../callback.py:49 ../yum/rpmtrans.py:73
+-#: ../callback.py:49 ../yum/rpmtrans.py:73
++#: ../callback.py:49
++#: ../yum/rpmtrans.py:73
msgid "Erasing"
- msgstr "Удаление"
+ msgstr "Apagando"
--#: ../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
+-#: ../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 "Установка"
+ msgstr "Instalando"
--#: ../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
+-#: ../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 "Obsoletos"
--#: ../callback.py:54
--#: ../output.py:1070
--#: ../output.py:1442
--#: ../output.py:1491
-+#: ../callback.py:54 ../output.py:1157 ../output.py:1518 ../output.py:1647
+-#: ../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 "Atualizados"
--#: ../callback.py:55
--#: ../output.py:1438
-+#: ../callback.py:55 ../output.py:1517
+-#: ../callback.py:55 ../output.py:1438
++#: ../callback.py:55
++#: ../output.py:1517
msgid "Erased"
- msgstr "Удалено"
+ msgstr "Removidos"
--#: ../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
+-#: ../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 "Instalados"
-@@ -85,81 +67,75 @@ msgstr "Ошибка: неверный выходной статус: %s для
- #: ../callback.py:212
- #, python-format
+@@ -66,73 +87,79 @@ msgstr "Erro: estado de saída inválido: %s de %s"
msgid "Erased: %s"
--msgstr "Удалено: %s"
-+msgstr "Удален: %s"
+ msgstr "Removidos: %s"
--#: ../callback.py:217
--#: ../output.py:948
--#: ../output.py:1648
-+#: ../callback.py:217 ../output.py:1028 ../output.py:1894
+-#: ../callback.py:217 ../output.py:948 ../output.py:1648
++#: ../callback.py:217
++#: ../output.py:1028
++#: ../output.py:1894
msgid "Removing"
- msgstr "Удаление"
+ msgstr "Removendo"
--#: ../callback.py:219
--#: ../yum/rpmtrans.py:78
-+#: ../callback.py:219 ../yum/rpmtrans.py:78
+-#: ../callback.py:219 ../yum/rpmtrans.py:78
++#: ../callback.py:219
++#: ../yum/rpmtrans.py:78
msgid "Cleanup"
- msgstr "Очистка"
+ msgstr "Limpeza"
-#: ../cli.py:107
+#: ../cli.py:108
#, python-format
msgid "Command \"%s\" already defined"
- msgstr "Команда \"%s\" уже используется"
+ msgstr "Comando \"%s\" já definido"
-#: ../cli.py:119
+#: ../cli.py:120
msgid "Setting up repositories"
- msgstr "Настройка репозиториев"
+ msgstr "Configurando repositórios"
-#: ../cli.py:130
+#: ../cli.py:131
msgid "Reading repository metadata in from local files"
- msgstr "Чтение локальных метаданных для репозиториев"
+ msgstr "Lendo metadados do repositório a partir dos arquivos locais"
--#: ../cli.py:194
--#: ../utils.py:193
-+#: ../cli.py:234 ../utils.py:254
+-#: ../cli.py:194 ../utils.py:193
++#: ../cli.py:234
++#: ../utils.py:254
#, python-format
msgid "Config Error: %s"
- msgstr "Ошибка конфигурации: %s"
+ msgstr "Erro de configuração: %s"
--#: ../cli.py:197
--#: ../cli.py:1272
--#: ../utils.py:196
-+#: ../cli.py:237 ../cli.py:1403 ../utils.py:257
+-#: ../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"
+ msgstr "Erro nas opções: %s"
-#: ../cli.py:227
+#: ../cli.py:267
#, python-format
msgid " Installed: %s-%s at %s"
- msgstr " Установлено: %s-%s из %s"
+ msgstr " Instalados: %s-%s em %s"
-#: ../cli.py:229
+#: ../cli.py:269
#, python-format
msgid " Built : %s at %s"
- msgstr " Собрано : %s из %s"
+ msgstr " Construídos : %s em %s"
-#: ../cli.py:231
+#: ../cli.py:271
#, python-format
msgid " Committed: %s at %s"
- msgstr " Передано : %s из %s"
+ msgstr " Enviados: %s em %s"
-#: ../cli.py:270
+#: ../cli.py:310
msgid "You need to give some command"
- msgstr "Необходимо задать команду"
+ msgstr "Você precisa dar algum comando"
-#: ../cli.py:284
+#: ../cli.py:324
#, python-format
msgid "No such command: %s. Please use %s --help"
- msgstr "Не найдена команда: %s Пожалуйста используйте для справки %s --help"
+ msgstr "Comando não encontrado: %s. Por favor, utilize %s --help"
-#: ../cli.py:314
+#: ../cli.py:354
msgid "Disk Requirements:\n"
- msgstr "Необходимо места на диске:\n"
+ msgstr "Requisitos de disco:\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"
+ msgstr " Pelo menos mais %dMB são necessários no sistema de arquivos %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
@@ -22110,641 +22250,665 @@ index f1cbc2f..922be6f 100644
msgid ""
"Error Summary\n"
"-------------\n"
-@@ -167,63 +143,60 @@ msgstr ""
- "Обзор ошибок \n"
+@@ -140,262 +167,287 @@ msgstr ""
+ "Sumário de erros\n"
"-------------\n"
-#: ../cli.py:364
+#: ../cli.py:404
msgid "Trying to run the transaction but nothing to do. Exiting."
- msgstr "Попытка предпринята, делать нечего. Завершение."
+ msgstr "Tentando executar a transação, mas não há nada a ser feito. Saindo."
-#: ../cli.py:403
+#: ../cli.py:451
msgid "Exiting on user Command"
- msgstr "Выход по запросу пользователя"
+ msgstr "Saindo pelo comando do usuário"
-#: ../cli.py:407
+#: ../cli.py:455
msgid "Downloading Packages:"
- msgstr "Загрузка пакетов:"
+ msgstr "Baixando pacotes:"
-#: ../cli.py:412
+#: ../cli.py:460
msgid "Error Downloading Packages:\n"
- msgstr "Ошибка загрузки пакетов:\n"
+ msgstr "Erro ao baixar pacotes:\n"
--#: ../cli.py:426
--#: ../yum/__init__.py:4195
-+#: ../cli.py:474 ../yum/__init__.py:4559
+-#: ../cli.py:426 ../yum/__init__.py:4195
++#: ../cli.py:474
++#: ../yum/__init__.py:4559
msgid "Running rpm_check_debug"
- msgstr "Запуск rpm_check_debug"
+ msgstr "Executando o rpm_check_debug"
--#: ../cli.py:435
--#: ../yum/__init__.py:4204
-+#: ../cli.py:483 ../yum/__init__.py:4568
+-#: ../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:"
+ msgstr "ERRO. Você precisa atualizar o rpm para manipular:"
--#: ../cli.py:437
--#: ../yum/__init__.py:4207
-+#: ../cli.py:485 ../yum/__init__.py:4571
+-#: ../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 и разрешении зависимостей:"
+ msgstr "Erro com o rpm_check_debug vs depsolve:"
-#: ../cli.py:443
+#: ../cli.py:491
msgid "RPM needs to be updated"
- msgstr "менеджер пакетов RPM должен быть обновлен"
+ msgstr "O RPM precisa ser atualizado"
-#: ../cli.py:444
+#: ../cli.py:492
#, python-format
msgid "Please report this error in %s"
- msgstr "Пожалуйста, сообщите об ошибке в %s"
+ msgstr "Por favor, relate esse erro em %s"
-#: ../cli.py:450
+#: ../cli.py:498
msgid "Running Transaction Test"
- msgstr "Проверяем сценарий"
+ msgstr "Executando teste de transação"
-#: ../cli.py:466
+#: ../cli.py:514
msgid "Transaction Check Error:\n"
- msgstr "Проверка сценария завершена с ошибкой:\n"
+ msgstr "Erro na verificação da transação:\n"
-#: ../cli.py:473
+#: ../cli.py:521
msgid "Transaction Test Succeeded"
- msgstr "Проверка сценария прошла успешно"
+ msgstr "Teste de transação completo"
-#: ../cli.py:495
+#: ../cli.py:543
msgid "Running Transaction"
- msgstr "Запускается сценарий"
+ msgstr "Executando a transação"
-#: ../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\" для игнорирования."
+ msgstr ""
+-"Recusa de importação automática das chaves ao executar de forma não "
+-"assistida.\n"
++"Recusa de importação automática das chaves ao executar de forma não assistida.\n"
+ "Use \"-y\" para sobrescrever."
--#: ../cli.py:544
--#: ../cli.py:578
-+#: ../cli.py:592 ../cli.py:626
+-#: ../cli.py:544 ../cli.py:578
++#: ../cli.py:592
++#: ../cli.py:626
msgid " * Maybe you meant: "
--msgstr " * Возможно вы имели в виду: "
-+msgstr " * Возможно, вы имели в виду: "
+ msgstr " * Talvez você queira dizer: "
--#: ../cli.py:561
--#: ../cli.py:569
-+#: ../cli.py:609 ../cli.py:617
+-#: ../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 доступны, но не установлены."
+ msgstr "Pacotes %s%s%s disponíveis, mas já instalados."
--#: ../cli.py:575
--#: ../cli.py:607
--#: ../cli.py:687
-+#: ../cli.py:623 ../cli.py:656 ../cli.py:810
+-#: ../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 "Nenhum pacote %s%s%s disponível."
--#: ../cli.py:612
--#: ../cli.py:748
-+#: ../cli.py:663 ../cli.py:875
+-#: ../cli.py:612 ../cli.py:748
++#: ../cli.py:663
++#: ../cli.py:875
msgid "Package(s) to install"
- msgstr "Пакет(ы) для установки"
+ msgstr "Pacotes a serem instalados"
--#: ../cli.py:613
--#: ../cli.py:693
--#: ../cli.py:727
--#: ../cli.py:749
+-#: ../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
++#: ../cli.py:666
++#: ../cli.py:667
++#: ../cli.py:816
++#: ../cli.py:850
++#: ../cli.py:876
+#: ../yumcommands.py:179
msgid "Nothing to do"
- msgstr "Выполнять нечего"
+ msgstr "Nada a ser feito"
-#: ../cli.py:647
+#: ../cli.py:701
#, python-format
msgid "%d packages marked for Update"
- msgstr "%d пакеты отмечены для обновления"
+ msgstr "%d pacotes marcados para atualização"
-#: ../cli.py:650
+#: ../cli.py:704
msgid "No Packages marked for Update"
- msgstr "Нет пакетов, отмеченных для обновления"
+ msgstr "Nenhum pacote marcado para atualização"
-#: ../cli.py:664
+#: ../cli.py:770
-+#, python-format
++#, fuzzy, python-format
+msgid "%d packages marked for Distribution Synchronization"
-+msgstr "Отмечено пакетов для синхронизации: %d"
++msgstr "%d pacotes marcados para remoção"
+
+#: ../cli.py:773
++#, fuzzy
+msgid "No Packages marked for Distribution Synchronization"
-+msgstr "Пакетов, отмеченных для синхронизации, нет"
++msgstr "Nenhum pacote marcado para remoção"
+
+#: ../cli.py:787
#, python-format
msgid "%d packages marked for removal"
- msgstr "%d пакеты отмечены для удаления"
+ msgstr "%d pacotes marcados para remoção"
-#: ../cli.py:667
+#: ../cli.py:790
msgid "No Packages marked for removal"
- msgstr "Нет пакетов, отмеченных для удаления"
+ msgstr "Nenhum pacote marcado para remoção"
-#: ../cli.py:692
+#: ../cli.py:815
msgid "Package(s) to downgrade"
- msgstr "Пакет(ы) для отката версии"
+ msgstr "Pacote(s) a ser(em) retrocedido(s)"
-#: ../cli.py:717
+#: ../cli.py:840
#, python-format
msgid " (from %s)"
- msgstr " (из %s)"
+ msgstr " (a partir de %s)"
-#: ../cli.py:719
+#: ../cli.py:841
#, python-format
msgid "Installed package %s%s%s%s not available."
- msgstr "Установленный пакет %s%s%s%s недоступен."
+ msgstr "O pacote instalado %s%s%s%s não está disponível."
-#: ../cli.py:726
+#: ../cli.py:849
msgid "Package(s) to reinstall"
- msgstr "Пакет(ы) для переустановки"
+ msgstr "Pacote(s) a ser(em) reinstalado(s)"
-#: ../cli.py:739
+#: ../cli.py:862
msgid "No Packages Provided"
- msgstr "Пакеты не предоставлены"
+ msgstr "Nenhum pacote fornecido"
-#: ../cli.py:818
+#: ../cli.py:945
#, python-format
msgid "Matched: %s"
- msgstr "Совпадений: %s"
+ msgstr "Encontrado: %s"
-#: ../cli.py:825
+#: ../cli.py:952
#, python-format
msgid "Warning: No matches found for: %s"
- msgstr "Внимание: совпадений для %s не найдено"
+ msgstr "Aviso: nenhum resultado para: %s"
-#: ../cli.py:828
+#: ../cli.py:955
msgid "No Matches found"
- msgstr "Совпадений не найдено"
+ msgstr "Nenhum pacote localizado"
-#: ../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"
- " чтобы получить соответствующее поведение"
+ " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
+ msgstr ""
+-"Aviso: as versões 3.0.x do yum iriam corresponder erroneamente pelos nomes "
+-"de arquivos.\n"
+-" Você pode usar \"%s*/%s%s\" e/ou \"%s*bin/%s%s\" para obter esse "
+-"comportamento."
++"Aviso: as versões 3.0.x do yum iriam corresponder erroneamente pelos nomes de arquivos.\n"
++" Você pode usar \"%s*/%s%s\" e/ou \"%s*bin/%s%s\" para obter esse comportamento."
-#: ../cli.py:884
+#: ../cli.py:1011
#, python-format
msgid "No Package Found for %s"
- msgstr "Пакет для %s не найден"
+ msgstr "Nenhum pacote localizado para %s"
-#: ../cli.py:896
+#: ../cli.py:1021
++#, fuzzy
+msgid "Cleaning repos: "
-+msgstr "Сброс источников:"
++msgstr "Limpando cabeçalhos"
+
+#: ../cli.py:1026
msgid "Cleaning up Everything"
- msgstr "Очистка всего"
+ msgstr "Limpando tudo"
-#: ../cli.py:912
+#: ../cli.py:1042
msgid "Cleaning up Headers"
- msgstr "Очистка заголовков"
+ msgstr "Limpando cabeçalhos"
-#: ../cli.py:915
+#: ../cli.py:1045
msgid "Cleaning up Packages"
- msgstr "Очистка пакетов"
+ msgstr "Limpando pacotes"
-#: ../cli.py:918
+#: ../cli.py:1048
msgid "Cleaning up xml metadata"
- msgstr "Очистка xml метаданных"
+ msgstr "Limpando metadados em xml"
-#: ../cli.py:921
+#: ../cli.py:1051
msgid "Cleaning up database cache"
- msgstr "Очистка кэша данных"
+ msgstr "Limpando cache do banco de dados"
-#: ../cli.py:924
+#: ../cli.py:1054
msgid "Cleaning up expire-cache metadata"
- msgstr "Очистка устаревшего кэша"
+ msgstr "Limpando metadados expirados do cache"
-#: ../cli.py:927
+#: ../cli.py:1057
msgid "Cleaning up cached rpmdb data"
- msgstr "Очистка кэша данных базы RPM"
+ msgstr "Limpando dados rpmdb em cache"
-#: ../cli.py:930
+#: ../cli.py:1060
msgid "Cleaning up plugins"
- msgstr "Сброс модулей"
+ msgstr "Limpando plugins"
-#: ../cli.py:955
+#: ../cli.py:1085
msgid "Installed Groups:"
- msgstr "Установлены коллекции:"
+ msgstr "Grupos instalados:"
-#: ../cli.py:967
+#: ../cli.py:1097
msgid "Available Groups:"
- msgstr "Доступные коллекции:"
+ msgstr "Grupos disponíveis:"
-#: ../cli.py:977
+#: ../cli.py:1107
msgid "Done"
- msgstr "Выполнено"
+ msgstr "Concluído"
--#: ../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
+-#: ../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 не существует."
+ msgstr "Aviso: O grupo %s não existe."
-#: ../cli.py:1016
+#: ../cli.py:1146
msgid "No packages in any requested group available to install or update"
- msgstr "Во всех указанных коллекциях пакеты для установки или обновления отсутствуют"
+-msgstr ""
+-"Nenhum pacote disponível para instalação ou atualização nos grupos "
+-"requisitados"
++msgstr "Nenhum pacote disponível para instalação ou atualização nos grupos requisitados"
-#: ../cli.py:1018
+#: ../cli.py:1148
#, python-format
msgid "%d Package(s) to Install"
- msgstr "%d Пакет(ы) для установки"
+ msgstr "%d pacote(s) a ser(em) instalado(s)"
--#: ../cli.py:1028
--#: ../yum/__init__.py:2800
-+#: ../cli.py:1158 ../yum/__init__.py:3081
+-#: ../cli.py:1028 ../yum/__init__.py:2800
++#: ../cli.py:1158
++#: ../yum/__init__.py:3081
#, python-format
msgid "No group named %s exists"
- msgstr "Коллекции с названием %s не существует"
+ msgstr "Nenhum grupo de nome %s existe"
-#: ../cli.py:1034
+#: ../cli.py:1164
msgid "No packages to remove from groups"
- msgstr "Нет пакетов для удаления из коллекций"
+ msgstr "Nenhum pacote a ser removido a partir dos grupos"
-#: ../cli.py:1036
+#: ../cli.py:1166
#, python-format
msgid "%d Package(s) to remove"
- msgstr "%d Пакет(ы) для удаления"
+ msgstr "%d pacote(s) a ser(em) removido(s)"
-#: ../cli.py:1078
+#: ../cli.py:1208
#, python-format
msgid "Package %s is already installed, skipping"
- msgstr "Пакет %s уже установлен, пропускаем"
+ msgstr "O pacote %s já está instalado, ignorando"
-#: ../cli.py:1089
+#: ../cli.py:1219
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
- msgstr "Исключение несовместимого пакета %s.%s"
+ msgstr "Descartando pacote não comparável %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1115
+#: ../cli.py:1245
#, python-format
msgid "No other %s installed, adding to list for potential install"
- msgstr "Других %s не установлено, добавляем в список для возможной установки"
+-msgstr ""
+-"Nenhum outro %s instalado, adicionado à lista para potencial instalação"
++msgstr "Nenhum outro %s instalado, adicionado à lista para potencial instalação"
-#: ../cli.py:1135
+#: ../cli.py:1265
msgid "Plugin Options"
- msgstr "Опции модуля"
+ msgstr "Opções do plugin"
-#: ../cli.py:1143
+#: ../cli.py:1273
#, python-format
msgid "Command line error: %s"
- msgstr "Ошибка команды: %s"
+ msgstr "Erro na linha de comando: %s"
-#: ../cli.py:1156
+#: ../cli.py:1287
#, python-format
msgid ""
"\n"
-@@ -443,114 +417,118 @@ msgstr ""
+@@ -406,117 +458,119 @@ msgstr ""
"\n"
- "%s: %s опцию необходимо указать с аргументом"
+ "%s: a opção %s requer um argumento"
-#: ../cli.py:1209
+#: ../cli.py:1340
msgid "--color takes one of: auto, always, never"
- msgstr "--color возможное значение: auto, always, never"
+ msgstr "--color aceita uma destas opções: auto, always, never"
-#: ../cli.py:1319
+#: ../cli.py:1450
msgid "show this help message and exit"
- msgstr "отобразить помощь и выйти"
+ msgstr "mostrar essa mensagem ajuda e sai"
-#: ../cli.py:1323
+#: ../cli.py:1454
msgid "be tolerant of errors"
- msgstr "игнорировать ошибки"
+ msgstr "ser tolerante com os erros"
-#: ../cli.py:1326
+#: ../cli.py:1457
msgid "run entirely from system cache, don't update cache"
- msgstr "брать полностью из системного кэша, не обновлять его"
+-msgstr ""
+-"executar por completo a partir do cache do sistema, não atualiza o cache"
++msgstr "executar por completo a partir do cache do sistema, não atualiza o cache"
-#: ../cli.py:1329
+#: ../cli.py:1460
msgid "config file location"
- msgstr "расположение файла конфигурации"
+ msgstr "configurar localização do arquivo"
-#: ../cli.py:1332
+#: ../cli.py:1463
msgid "maximum command wait time"
- msgstr "максимальное время ожидания команды"
+ msgstr "Tempo máximo de espera do comando"
-#: ../cli.py:1334
+#: ../cli.py:1465
msgid "debugging output level"
- msgstr "уровень отладочных сообщений"
+ msgstr "nível de depuração na saída"
-#: ../cli.py:1338
+#: ../cli.py:1469
msgid "show duplicates, in repos, in list/search commands"
- msgstr "показывать повторяющиеся в репозиториях пакеты, для команд list/search"
+ msgstr "mostrar duplicados em repos e em comandos de pesquisa/listagem"
-#: ../cli.py:1340
+#: ../cli.py:1471
msgid "error output level"
- msgstr "уровень сообщений об ошибках"
+ msgstr "nível de erro na saída"
-#: ../cli.py:1343
+#: ../cli.py:1474
msgid "debugging output level for rpm"
- msgstr "уровень отладочных сообщений для rpm"
+ msgstr "nível de depuração na saída para o rpm"
-#: ../cli.py:1346
+#: ../cli.py:1477
msgid "quiet operation"
- msgstr "работать без вывода сообщений"
+ msgstr "operação discreta"
-#: ../cli.py:1348
+#: ../cli.py:1479
msgid "verbose operation"
- msgstr "подробно описывать действия"
+ msgstr "operação detalhada"
-#: ../cli.py:1350
+#: ../cli.py:1481
msgid "answer yes for all questions"
- msgstr "Отвечать утвердительно на все вопросы"
+ msgstr "responder sim para todas as perguntas"
-#: ../cli.py:1352
+#: ../cli.py:1483
msgid "show Yum version and exit"
- msgstr "показать версию Yum и выйти"
+ msgstr "mostrar versão do Yum ao sair"
-#: ../cli.py:1353
+#: ../cli.py:1484
msgid "set install root"
- msgstr "настройка корневой папки"
+ msgstr "definir raiz de instalação"
-#: ../cli.py:1357
+#: ../cli.py:1488
msgid "enable one or more repositories (wildcards allowed)"
- msgstr "включение одного и более репозиториев (поиск по шаблону поддерживается)"
+ msgstr "habilitar um ou mais repositórios (curingas são permitidos)"
-#: ../cli.py:1361
+#: ../cli.py:1492
msgid "disable one or more repositories (wildcards allowed)"
- msgstr "выключение одного и более репозиториев (поиск по шаблону поддерживается)"
+ msgstr "desabilitar um ou mais repositórios (curingas são permitidos)"
-#: ../cli.py:1364
+#: ../cli.py:1495
msgid "exclude package(s) by name or glob"
- msgstr "исключение пакета(ов) по имени или регулярному выражению"
+ msgstr "excluir pacote(s) por nome ou glob"
-#: ../cli.py:1366
+#: ../cli.py:1497
msgid "disable exclude from main, for a repo or for everything"
- msgstr "отключает исключения для конкретного репозитория или для всех"
+-msgstr ""
+-"desabilitar a exclusão a partir do principal, para um repositório ou para "
+-"tudo"
++msgstr "desabilitar a exclusão a partir do principal, para um repositório ou para tudo"
-#: ../cli.py:1369
+#: ../cli.py:1500
msgid "enable obsoletes processing during updates"
- msgstr "включить обработку устаревших во время обновления"
+ msgstr "Habilitar processo de obsolescência durante as atualizações"
-#: ../cli.py:1371
+#: ../cli.py:1502
msgid "disable Yum plugins"
- msgstr "отключить модули Yum"
+ msgstr "desabilitar plugins do Yum"
-#: ../cli.py:1373
+#: ../cli.py:1504
msgid "disable gpg signature checking"
- msgstr "отключить проверку подписи gpg"
+ msgstr "desabilitar verificação de assinaturas gpg"
-#: ../cli.py:1375
+#: ../cli.py:1506
msgid "disable plugins by name"
- msgstr "отключить модуль по названию"
+ msgstr "desabilitar plugins pelo nome"
-#: ../cli.py:1378
+#: ../cli.py:1509
msgid "enable plugins by name"
- msgstr "включить модуль по названию"
+ msgstr "habilita plugins pelo nome"
-#: ../cli.py:1381
+#: ../cli.py:1512
msgid "skip packages with depsolving problems"
- msgstr "пропускать пакеты, с проблемами в зависимостях"
+ msgstr "ignorar pacotes com problemas de solução de dependências"
-#: ../cli.py:1383
+#: ../cli.py:1514
msgid "control whether color is used"
- msgstr "Использовать ли цветовые схемы"
+ msgstr "controla o uso da cor"
-#: ../cli.py:1385
+#: ../cli.py:1516
msgid "set value of $releasever in yum config and repo files"
- msgstr "установите значение $releasever в конфигурационном файле yum и в файлах репозиториев (repo)"
+ msgstr "defina o valor de $releasever nos arquivos repo e yum config"
+#: ../cli.py:1518
++#, fuzzy
+msgid "set arbitrary config and repo options"
-+msgstr "другие настройки и свойства источников"
++msgstr "defina o valor de $releasever nos arquivos repo e yum config"
+
#: ../output.py:305
msgid "Jan"
- msgstr "Янв"
-@@ -603,104 +581,114 @@ msgstr "Дек"
+ msgstr "Jan"
+@@ -569,104 +623,119 @@ msgstr "Dez"
msgid "Trying other mirror."
- msgstr "Пробуем другое зеркало."
+ msgstr "Tentando outro espelho."
-#: ../output.py:534
-+#: ../output.py:579
- #, python-format
+-#, python-format
-msgid "Name : %s%s%s"
--msgstr "Имя : %s%s%s"
++#: ../output.py:579
++#, fuzzy, python-format
+msgid "Name : %s%s%s"
-+msgstr "Название: %s%s%s"
+ msgstr "Nome : %s%s%s"
-#: ../output.py:535
-+#: ../output.py:580
- #, python-format
+-#, python-format
-msgid "Arch : %s"
--msgstr "Архитектура : %s"
++#: ../output.py:580
++#, fuzzy, python-format
+msgid "Arch : %s"
-+msgstr "Архитектура: %s"
+ msgstr "Arq. : %s"
-#: ../output.py:537
-+#: ../output.py:582
- #, python-format
+-#, python-format
-msgid "Epoch : %s"
--msgstr "Период : %s"
++#: ../output.py:582
++#, fuzzy, python-format
+msgid "Epoch : %s"
-+msgstr "Период: %s"
+ msgstr "Período : %s"
-#: ../output.py:538
-+#: ../output.py:583
- #, python-format
+-#, python-format
-msgid "Version : %s"
--msgstr "Версия : %s"
++#: ../output.py:583
++#, fuzzy, python-format
+msgid "Version : %s"
-+msgstr "Версия: %s"
+ msgstr "Versão : %s"
-#: ../output.py:539
-+#: ../output.py:584
- #, python-format
+-#, python-format
-msgid "Release : %s"
--msgstr "Релиз : %s"
++#: ../output.py:584
++#, fuzzy, python-format
+msgid "Release : %s"
-+msgstr "Выпуск: %s"
+ msgstr "Lançamento : %s"
-#: ../output.py:540
-+#: ../output.py:585
- #, python-format
+-#, python-format
-msgid "Size : %s"
--msgstr "Размер : %s"
++#: ../output.py:585
++#, fuzzy, python-format
+msgid "Size : %s"
-+msgstr "Объем: %s"
+ msgstr "Tamanho : %s"
-#: ../output.py:541
-+#: ../output.py:586 ../output.py:890
++#: ../output.py:586
++#: ../output.py:890
#, python-format
-msgid "Repo : %s"
--msgstr "Репозиторий : %s"
+-msgstr "Repo : %s"
+msgid "Repo : %s"
-+msgstr "Источник: %s"
++msgstr "Repo : %s"
-#: ../output.py:543
-+#: ../output.py:588
- #, python-format
+-#, python-format
-msgid "From repo : %s"
--msgstr "Из репозитария : %s"
++#: ../output.py:588
++#, fuzzy, python-format
+msgid "From repo : %s"
-+msgstr "Из источника: %s"
+ msgstr "Do repositório: %s"
-#: ../output.py:545
-+#: ../output.py:590
- #, python-format
+-#, python-format
-msgid "Committer : %s"
--msgstr "Создатель : %s"
++#: ../output.py:590
++#, fuzzy, python-format
+msgid "Committer : %s"
-+msgstr "Создатель: %s"
+ msgstr "Enviado por : %s"
-#: ../output.py:546
-+#: ../output.py:591
- #, python-format
+-#, python-format
-msgid "Committime : %s"
--msgstr "Время создания : %s"
++#: ../output.py:591
++#, fuzzy, python-format
+msgid "Committime : %s"
-+msgstr "Время создания: %s"
+ msgstr "Horário do envio : %s"
-#: ../output.py:547
-+#: ../output.py:592
- #, python-format
+-#, python-format
-msgid "Buildtime : %s"
--msgstr "Время сборки : %s"
++#: ../output.py:592
++#, fuzzy, python-format
+msgid "Buildtime : %s"
-+msgstr "Время сборки: %s"
+ msgstr "Horário da construção : %s"
-#: ../output.py:549
-+#: ../output.py:594
- #, python-format
+-#, python-format
-msgid "Installtime: %s"
++#: ../output.py:594
++#, fuzzy, python-format
+msgid "Install time: %s"
- msgstr "Время установки: %s"
+ msgstr "Horário da instalação: %s"
-#: ../output.py:550
-msgid "Summary : "
--msgstr "Аннотация : "
+#: ../output.py:602
-+#, python-format
++#, fuzzy, python-format
+msgid "Installed by: %s"
-+msgstr "Установил: %s"
++msgstr "Tamanho depois de instalado: %s"
++
++#: ../output.py:609
++#, python-format
++msgid "Changed by : %s"
++msgstr "Alterado por : %s"
++
++#: ../output.py:610
++#, fuzzy
++msgid "Summary : "
+ msgstr "Sumário : "
-#: ../output.py:552
-+#: ../output.py:609
++#: ../output.py:612
++#: ../output.py:903
#, python-format
-msgid "URL : %s"
--msgstr "Ссылка : %s"
-+msgid "Changed by : %s"
-+msgstr "Изменил: %s"
+-msgstr "URL : %s"
++msgid "URL : %s"
++msgstr "URL : %s"
-#: ../output.py:553
-msgid "License : "
--msgstr "Лицензия : "
-+#: ../output.py:610
-+msgid "Summary : "
-+msgstr "Аннотация: "
++#: ../output.py:613
++#, fuzzy
++msgid "License : "
+ msgstr "Licença : "
-#: ../output.py:554
-msgid "Description: "
--msgstr "Описание : "
-+#: ../output.py:612 ../output.py:903
-+#, python-format
-+msgid "URL : %s"
-+msgstr "Ссылка: %s"
+-msgstr "Descrição: "
++#: ../output.py:614
++#: ../output.py:900
++msgid "Description : "
++msgstr "Descrição : "
-#: ../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"
+ msgstr "s"
-#: ../output.py:622
+#: ../output.py:682
msgid "yes"
- msgstr "да"
+ msgstr "sim"
-#: ../output.py:623
+#: ../output.py:683
@@ -22754,143 +22918,3813 @@ index f1cbc2f..922be6f 100644
-#: ../output.py:623
+#: ../output.py:683
msgid "no"
- msgstr "нет"
+ msgstr "não"
-#: ../output.py:627
+#: ../output.py:687
msgid "Is this ok [y/N]: "
- msgstr "Продолжить? [y/N]: "
+ msgstr "Correto? [s/N]:"
-#: ../output.py:715
+#: ../output.py:775
#, python-format
msgid ""
"\n"
-@@ -709,152 +697,141 @@ msgstr ""
+@@ -675,151 +744,144 @@ msgstr ""
"\n"
- "Коллекция: %s"
+ "Grupo: %s"
-#: ../output.py:719
+#: ../output.py:779
#, python-format
msgid " Group-Id: %s"
- msgstr " Код коллекции: %s"
+ msgstr " Group-Id: %s"
-#: ../output.py:724
+#: ../output.py:784
#, python-format
msgid " Description: %s"
- msgstr " Описание: %s"
+ msgstr " Descrição: %s"
-#: ../output.py:726
+#: ../output.py:786
msgid " Mandatory Packages:"
- msgstr " Обязательные пакеты:"
+ msgstr " Pacotes obrigatórios:"
-#: ../output.py:727
+#: ../output.py:787
msgid " Default Packages:"
- msgstr " Пакеты по умолчанию:"
+ msgstr " Pacotes padrão:"
-#: ../output.py:728
+#: ../output.py:788
msgid " Optional Packages:"
- msgstr " Опциональные пакеты:"
+ msgstr " Pacotes opcionais:"
-#: ../output.py:729
+#: ../output.py:789
msgid " Conditional Packages:"
- msgstr " Зависимые пакеты:"
+ msgstr " Pacotes condicionais:"
-#: ../output.py:749
+#: ../output.py:809
#, python-format
msgid "package: %s"
- msgstr "пакет: %s"
+ msgstr "pacote: %s"
-#: ../output.py:751
+#: ../output.py:811
msgid " No dependencies for this package"
- msgstr " Нет зависимостей для данного пакета"
+ msgstr " Nenhuma dependência para este pacote"
-#: ../output.py:756
+#: ../output.py:816
#, python-format
msgid " dependency: %s"
- msgstr " зависимость: %s"
+ msgstr " dependência: %s"
-#: ../output.py:758
+#: ../output.py:818
msgid " Unsatisfied dependency"
- msgstr " Неудовлетворенная зависимость"
+ msgstr " Dependência não satisfeita"
-#: ../output.py:830
-#, python-format
-msgid "Repo : %s"
--msgstr "Репозиторий : %s"
+-msgstr "Repo : %s"
-
-#: ../output.py:831
+#: ../output.py:891
msgid "Matched from:"
- msgstr "Совпадения с:"
+ msgstr "Resultado a partir de:"
-#: ../output.py:840
-msgid "Description : "
--msgstr "Описание : "
+-msgstr "Descrição : "
-
-#: ../output.py:843
-#, python-format
-msgid "URL : %s"
--msgstr "Ссылка : %s"
+-msgstr "URL : %s"
-
-#: ../output.py:846
+#: ../output.py:906
#, python-format
msgid "License : %s"
- msgstr "Лицензия : %s"
+ msgstr "Licença : %s"
-#: ../output.py:849
+#: ../output.py:909
#, python-format
msgid "Filename : %s"
- msgstr "Имя файла : %s"
+ msgstr "Nome de arquivo : %s"
-#: ../output.py:853
+#: ../output.py:913
msgid "Other : "
- msgstr "Другое : "
+ msgstr "Outro : "
-#: ../output.py:896
+#: ../output.py:956
msgid "There was an error calculating total download size"
- msgstr "Произошла ошибка при подсчете общего объема загрузки"
+ msgstr "Houve um erro no cálculo do tamanho total do download"
-#: ../output.py:901
+#: ../output.py:961
#, python-format
msgid "Total size: %s"
- msgstr "Общий размер: %s"
+ msgstr "Tamanho total: %s"
-#: ../output.py:904
+#: ../output.py:964
#, python-format
msgid "Total download size: %s"
- msgstr "Объем загрузки: %s"
+ msgstr "Tamanho total do download: %s"
-#: ../output.py:908
-+#: ../output.py:968 ../output.py:988
++#: ../output.py:968
++#: ../output.py:988
#, python-format
msgid "Installed size: %s"
- msgstr "Будет установлено: %s"
+ msgstr "Tamanho depois de instalado: %s"
-#: ../output.py:949
+#: ../output.py:984
++#, fuzzy
+msgid "There was an error calculating installed size"
-+msgstr "Ошибка при подсчете объема установки"
++msgstr "Houve um erro no cálculo do tamanho total do download"
+
+#: ../output.py:1029
msgid "Reinstalling"
- msgstr "Переустановка"
+ msgstr "Reinstalando"
+
+-#: ../output.py:950
++#: ../output.py:1030
+ msgid "Downgrading"
+ msgstr "Desatualizando"
+
+-#: ../output.py:951
++#: ../output.py:1031
+ msgid "Installing for dependencies"
+ msgstr "Instalando para as dependências"
+
+-#: ../output.py:952
++#: ../output.py:1032
+ msgid "Updating for dependencies"
+ msgstr "Atualizando para as dependências"
+
+-#: ../output.py:953
++#: ../output.py:1033
+ msgid "Removing for dependencies"
+ msgstr "Removendo para as dependências"
+
+-#: ../output.py:960 ../output.py:1072
++#: ../output.py:1040
++#: ../output.py:1159
+ msgid "Skipped (dependency problems)"
+ msgstr "Ignorado (problemas de dependências)"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Package"
+ msgstr "Pacote"
+
+-#: ../output.py:983
++#: ../output.py:1063
+ msgid "Arch"
+ msgstr "Arq."
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Version"
+ msgstr "Versão"
+
+-#: ../output.py:984
++#: ../output.py:1064
+ msgid "Repository"
+ msgstr "Repo"
+
+-#: ../output.py:985
++#: ../output.py:1065
+ msgid "Size"
+ msgstr "Tam."
+
+-#: ../output.py:997
++#: ../output.py:1077
+ #, python-format
+ msgid " replacing %s%s%s.%s %s\n"
+ msgstr " substituindo %s%s%s.%s %s\n"
+
+-#: ../output.py:1006
++#: ../output.py:1086
+ #, python-format
+ msgid ""
+ "\n"
+@@ -830,52 +892,59 @@ msgstr ""
+ "Resumo da transação\n"
+ "%s\n"
+
+-#: ../output.py:1013
+-#, python-format
+-msgid ""
+-"Install %5.5s Package(s)\n"
+-"Upgrade %5.5s Package(s)\n"
++#: ../output.py:1097
++#, fuzzy, python-format
++msgid "Install %5.5s Package(s)\n"
++msgstr "Pacotes instalados"
++
++#: ../output.py:1101
++#, fuzzy, python-format
++msgid "Upgrade %5.5s Package(s)\n"
+ msgstr ""
+ "Instalar %5.5s Pacote(s)\n"
+ "Atualizar %5.5s Pacote(s)\n"
+
+-#: ../output.py:1022
+-#, python-format
+-msgid ""
+-"Remove %5.5s Package(s)\n"
+-"Reinstall %5.5s Package(s)\n"
+-"Downgrade %5.5s Package(s)\n"
+-msgstr ""
+-"Remover %5.5s Pacote(s)\n"
+-"Reinstalar %5.5s Pacote(s)\n"
+-"Desatualizar %5.5s Pacote(s)\n"
++#: ../output.py:1105
++#, fuzzy, python-format
++msgid "Remove %5.5s Package(s)\n"
++msgstr "Removendo pacote %s"
+
+-#: ../output.py:1066
++#: ../output.py:1109
++#, fuzzy, python-format
++msgid "Reinstall %5.5s Package(s)\n"
++msgstr "reinstala um pacote"
++
++#: ../output.py:1113
++#, fuzzy, python-format
++msgid "Downgrade %5.5s Package(s)\n"
++msgstr "retrocedendo um pacote"
++
++#: ../output.py:1153
+ msgid "Removed"
+ msgstr "Removido(s)"
+
+-#: ../output.py:1067
++#: ../output.py:1154
+ msgid "Dependency Removed"
+ msgstr "Dependência(s) removida(s)"
+
+-#: ../output.py:1069
++#: ../output.py:1156
+ msgid "Dependency Installed"
+ msgstr "Dependência(s) instalada(s)"
+
+-#: ../output.py:1071
++#: ../output.py:1158
+ msgid "Dependency Updated"
+ msgstr "Dependência(s) atualizada(s)"
+
+-#: ../output.py:1073
++#: ../output.py:1160
+ msgid "Replaced"
+ msgstr "Substituído(s)"
+
+-#: ../output.py:1074
++#: ../output.py:1161
+ msgid "Failed"
+ msgstr "Falhou"
+
+ #. Delta between C-c's so we treat as exit
+-#: ../output.py:1140
++#: ../output.py:1245
+ msgid "two"
+ msgstr "dois"
+
+@@ -883,284 +952,360 @@ msgstr "dois"
+ #. Current download cancelled, interrupt (ctrl-c) again within two seconds
+ #. to exit.
+ #. Where "interupt (ctrl-c) again" and "two" are highlighted.
+-#: ../output.py: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"
+-" Download atual cancelado, %sinterrompa com (ctrl-c) novamente%s dentro de %s"
+-"%s%s segundos\n"
++" Download atual cancelado, %sinterrompa com (ctrl-c) novamente%s dentro de %s%s%s segundos\n"
+ "para sair.\n"
+
+-#: ../output.py:1162
++#: ../output.py:1267
+ msgid "user interrupt"
+ msgstr "interrupção do usuário"
+
+-#: ../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 "<indefinido>"
+
+-#: ../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 "IDs de transação ou pacote(s) fornecido(s) inválido(s)"
+
+-#: ../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 "Usuário de login"
+
+-#: ../output.py:1268
++#: ../output.py:1382
+ msgid "Date and time"
+ msgstr "Data e hora"
+
+-#: ../output.py:1269 ../output.py:1522
++#: ../output.py:1383
++#: ../output.py:1701
+ msgid "Action(s)"
+ msgstr "Ação(ões)"
+
+-#: ../output.py:1270 ../output.py:1523
++#: ../output.py:1384
++#: ../output.py:1702
+ msgid "Altered"
+ msgstr "Alterado"
+
+-#: ../output.py:1310
++#: ../output.py:1431
++#: ../output.py:1760
+ msgid "No transaction ID given"
+ msgstr "Nenhum ID de transação fornecido"
+
+-#: ../output.py:1336
++#: ../output.py:1457
+ msgid "Bad transaction ID given"
+ msgstr "O ID de transação fornecido é inválido"
+
+-#: ../output.py:1341
++#: ../output.py:1462
+ msgid "Not found given transaction ID"
+ msgstr "O ID de transação dado não foi localizado"
+
+-#: ../output.py:1349
++#: ../output.py:1470
+ msgid "Found more than one transaction ID!"
+ msgstr "Foi localizado mais de um ID de transação!"
+
+-#: ../output.py:1370
++#: ../output.py:1491
++#: ../output.py:1770
+ msgid "No transaction ID, or package, given"
+ msgstr "Nenhum ID de transação ou pacote fornecido"
+
+-#: ../output.py:1396
++#: ../output.py:1518
++#: ../output.py:1645
++msgid "Downgraded"
++msgstr "Desatualizados"
++
++#: ../output.py:1519
++#, fuzzy
++msgid "Not installed"
++msgstr "instalado"
++
++#: ../output.py:1520
++#, fuzzy
++msgid "Older"
++msgstr "Antigo"
++
++#: ../output.py:1520
++msgid "Newer"
++msgstr "Recente"
++
++#: ../output.py:1552
+ msgid "Transaction ID :"
+ msgstr "ID de transação:"
+
+-#: ../output.py:1398
++#: ../output.py:1554
+ msgid "Begin time :"
+ msgstr "Horário de início:"
+
+-#: ../output.py:1401 ../output.py:1403
++#: ../output.py:1557
++#: ../output.py:1559
+ msgid "Begin rpmdb :"
+ msgstr "Início do rpmdb:"
+
+-#: ../output.py:1417
++#: ../output.py:1573
+ #, python-format
+ msgid "(%s seconds)"
+ msgstr "(%s segundos)"
+
+-#: ../output.py:1418
++#: ../output.py:1574
+ msgid "End time :"
+ msgstr "Horário do fim:"
+
+-#: ../output.py:1421 ../output.py:1423
++#: ../output.py:1577
++#: ../output.py:1579
+ msgid "End rpmdb :"
+ msgstr "Fim do rpmdb:"
+
+-#: ../output.py:1424
++#: ../output.py:1580
+ msgid "User :"
+ msgstr "Usuário:"
+
+-#: ../output.py:1426 ../output.py:1428 ../output.py:1430
++#: ../output.py:1582
++#: ../output.py:1584
++#: ../output.py:1586
+ msgid "Return-Code :"
+ msgstr "Código de retorno:"
+
+-#: ../output.py:1426
++#: ../output.py:1582
+ msgid "Aborted"
+ msgstr "Interrompido"
+
+-#: ../output.py:1428
++#: ../output.py:1584
+ msgid "Failure:"
+ msgstr "Falha:"
+
+-#: ../output.py:1430
++#: ../output.py:1586
+ msgid "Success"
+ msgstr "Sucesso"
+
+-#: ../output.py:1431
+-msgid "Transaction performed with:"
+-msgstr "Transação realizada com:"
++#: ../output.py:1589
++#, fuzzy
++msgid "Command Line :"
++msgstr "Erro na linha de comando: %s"
+
+-#: ../output.py:1444 ../output.py:1489
+-msgid "Downgraded"
+-msgstr "Desatualizados"
++#: ../output.py:1597
++#, python-format
++msgid "Additional non-default information stored: %d"
++msgstr "informações não-padrão adicionais armazenadas: %d"
+
+-#. multiple versions installed, both older and newer
+-#: ../output.py:1446
+-msgid "Weird"
+-msgstr "Estranho"
++#: ../output.py:1600
++msgid "Transaction performed with:"
++msgstr "Transação realizada com:"
+
+-#: ../output.py:1448
++#: ../output.py:1603
+ msgid "Packages Altered:"
+ msgstr "Pacotes alterados:"
+
+-#: ../output.py:1451
++#: ../output.py:1607
++#, fuzzy
++msgid "Packages Skipped:"
++msgstr "Pacotes alterados:"
++
++#: ../output.py:1612
++msgid "Rpmdb Problems:"
++msgstr "Problemas com Rpmdb:"
++
++#: ../output.py:1620
+ msgid "Scriptlet output:"
+ msgstr "Saída do scriptlet:"
+
+-#: ../output.py:1457
++#: ../output.py:1626
+ msgid "Errors:"
+ msgstr "Erros:"
+
+-#: ../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 "Dep-Install"
+
+-#: ../output.py:1485
++#: ../output.py:1641
+ msgid "Obsoleting"
+ msgstr "Obsoletos"
+
+-#: ../output.py:1486
++#: ../output.py:1642
+ msgid "Erase"
+ msgstr "Apagar"
+
+-#: ../output.py:1487
++#: ../output.py:1643
+ msgid "Reinstall"
+ msgstr "Reinstalar"
+
+-#: ../output.py:1488
++#: ../output.py:1644
+ #, fuzzy
+ msgid "Downgrade"
+ msgstr "Regredir"
+
+-#: ../output.py:1490
++#: ../output.py:1646
+ msgid "Update"
+ msgstr "Atualizar"
+
+-#: ../output.py:1521
++#: ../output.py:1700
+ msgid "Time"
+ msgstr "Hora"
+
+-#: ../output.py:1547
++#: ../output.py:1726
+ msgid "Last day"
+ msgstr "Ontem"
+
+-#: ../output.py:1548
++#: ../output.py:1727
+ msgid "Last week"
+ msgstr "Uma semana atrás"
+
+-#: ../output.py:1549
++#: ../output.py:1728
+ msgid "Last 2 weeks"
+ msgstr "2 semanas atrás"
+
+ #. US default :p
+-#: ../output.py:1550
++#: ../output.py:1729
+ msgid "Last 3 months"
+ msgstr "3 meses atrás"
+
+-#: ../output.py:1551
++#: ../output.py:1730
+ msgid "Last 6 months"
+ msgstr "6 meses atrás"
+
+-#: ../output.py:1552
++#: ../output.py:1731
+ msgid "Last year"
+ msgstr "Ano passado"
+
+-#: ../output.py:1553
++#: ../output.py:1732
+ msgid "Over a year ago"
+ msgstr "Há mais de um ano"
+
+-#: ../output.py:1585
++#: ../output.py:1774
++#, fuzzy, python-format
++msgid "No Transaction %s found"
++msgstr "Nenhum ID de transação fornecido"
++
++#: ../output.py:1780
++#, fuzzy
++msgid "Transaction ID:"
++msgstr "ID de transação:"
++
++#: ../output.py:1781
++#, fuzzy
++msgid "Available additional history information:"
++msgstr "Importando informações adicionais da lista de arquivos"
++
++#: ../output.py:1793
++#, python-format
++msgid "%s: No additional data found by this name"
++msgstr "%s: Não há dados adicionais encontrados por este nome"
++
++#: ../output.py:1809
+ msgid "installed"
+ msgstr "instalado"
+
+-#: ../output.py:1586
++#: ../output.py:1810
+ msgid "updated"
+ msgstr "atualizado"
+
+-#: ../output.py:1587
++#: ../output.py:1811
+ msgid "obsoleted"
+ msgstr "obsoleto"
+
+-#: ../output.py:1588
++#: ../output.py:1812
+ msgid "erased"
+ msgstr "removido"
+
+-#: ../output.py:1592
++#: ../output.py:1813
++#, fuzzy
++msgid "reinstalled"
++msgstr "instalado"
++
++#: ../output.py:1814
++#, fuzzy
++msgid "downgraded"
++msgstr "Desatualizados"
++
++#: ../output.py:1818
+ #, python-format
+ msgid "---> Package %s.%s %s:%s-%s set to be %s"
+ msgstr "---> Pacote %s.%s %s:%s-%s definido para ser %s"
+
+-#: ../output.py:1599
++#: ../output.py:1825
+ msgid "--> Running transaction check"
+ msgstr "--> Executando verificação da transação"
+
+-#: ../output.py:1604
++#: ../output.py:1830
+ msgid "--> Restarting Dependency Resolution with new changes."
+ msgstr "--> Reiniciando resolução de dependências com as novas alterações."
+
+-#: ../output.py:1609
++#: ../output.py:1835
+ msgid "--> Finished Dependency Resolution"
+ msgstr "--> Resolução de dependências finalizada"
+
+-#: ../output.py:1614 ../output.py:1619
++#: ../output.py:1840
++#: ../output.py:1845
+ #, python-format
+ msgid "--> Processing Dependency: %s for package: %s"
+ msgstr "--> Processando dependência: %s para o pacote: %s"
+
+-#: ../output.py:1623
++#: ../output.py:1850
++#, fuzzy, python-format
++msgid "---> Keeping package: %s"
++msgstr "Mantendo o pacote incluso %s"
++
++#: ../output.py:1853
+ #, python-format
+ msgid "--> Unresolved Dependency: %s"
+ msgstr "--> Dependência não resolvida: %s"
+
+-#: ../output.py:1634
++#: ../output.py:1864
+ #, python-format
+ msgid "Package: %s"
+ msgstr "Pacote: %s"
+
+-#: ../output.py:1636
++#: ../output.py:1866
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1169,7 +1314,7 @@ msgstr ""
+ "\n"
+ " Requer: %s"
+
+-#: ../output.py:1649 ../output.py:1660
++#: ../output.py:1875
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1178,85 +1323,107 @@ msgstr ""
+ "\n"
+ " %s: %s (%s)"
+
+-#: ../output.py:1657
++#: ../output.py:1880
++#, fuzzy, python-format
++msgid ""
++"\n"
++" %s"
++msgstr "Arq. : %s"
++
++#: ../output.py:1882
++msgid ""
++"\n"
++" Not found"
++msgstr ""
++"\n"
++" Não encontrado"
++
++#. These should be the only three things we care about:
++#: ../output.py:1897
++#, fuzzy
++msgid "Updated By"
++msgstr "Atualizados"
++
++#: ../output.py:1898
++#, fuzzy
++msgid "Downgraded By"
++msgstr "Desatualizados"
++
++#: ../output.py:1899
++#, fuzzy
++msgid "Obsoleted By"
++msgstr "Obsoletos"
++
++#: ../output.py:1917
+ msgid "Available"
+ msgstr "Disponível"
+
+-#: ../output.py:1665 ../output.py:1670
++#: ../output.py:1944
++#: ../output.py:1949
+ #, python-format
+ msgid "--> Processing Conflict: %s conflicts %s"
+ msgstr "--> Processando conflito: %s conflita com %s"
+
+-#: ../output.py:1674
++#: ../output.py:1953
+ msgid "--> Populating transaction set with selected packages. Please wait."
+-msgstr ""
+-"--> Construindo conjunto de transações com os pacotes selecionados. Por "
+-"favor aguarde."
++msgstr "--> Construindo conjunto de transações com os pacotes selecionados. Por favor aguarde."
+
+-#: ../output.py:1678
++#: ../output.py:1957
+ #, python-format
+ msgid "---> Downloading header for %s to pack into transaction set."
+ msgstr "--> Baixando cabeçalho do %s para inclusão no conjunto de transações."
+
+-#: ../utils.py:93
++#: ../utils.py:94
+ msgid "Running"
+ msgstr "Executando"
+
+-#: ../utils.py:94
++#: ../utils.py:95
+ msgid "Sleeping"
+ msgstr "Dormindo"
+
+-#: ../utils.py:95
++#: ../utils.py:96
+ msgid "Uninterruptible"
+ msgstr "Ininterrompível"
+
+-#: ../utils.py:96
++#: ../utils.py:97
+ msgid "Zombie"
+ msgstr "Zumbi"
+
+-#: ../utils.py:97
++#: ../utils.py:98
+ msgid "Traced/Stopped"
+ msgstr "Rastreado/Parado"
+
+-#: ../utils.py:98 ../yumcommands.py:917
++#: ../utils.py:99
++#: ../yumcommands.py:972
+ msgid "Unknown"
+ msgstr "Desconhecido"
+
+-#: ../utils.py:109
++#: ../utils.py:110
+ msgid " The other application is: PackageKit"
+ msgstr " O outro aplicativo é: PackageKit"
+
+-#: ../utils.py:111
++#: ../utils.py:112
+ #, python-format
+ msgid " The other application is: %s"
+ msgstr " O outro aplicativo é: %s"
+
+-#: ../utils.py:114
++#: ../utils.py:115
+ #, python-format
+ msgid " Memory : %5s RSS (%5sB VSZ)"
+ msgstr " Memória: %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 "Erro PluginExit: %s"
+-
+-#: ../utils.py:202
+-#, python-format
+-msgid "Yum Error: %s"
+-msgstr "Error do Yum: %s"
+-
+-#: ../utils.py:235 ../yummain.py:42
++#: ../utils.py:143
++#: ../yummain.py:42
+ msgid ""
+ "\n"
+ "\n"
+@@ -1266,7 +1433,8 @@ msgstr ""
+ "\n"
+ "Saindo pelo cancelamento do usuário"
+
+-#: ../utils.py:241 ../yummain.py:48
++#: ../utils.py:149
++#: ../yummain.py:48
+ msgid ""
+ "\n"
+ "\n"
+@@ -1276,7 +1444,8 @@ msgstr ""
+ "\n"
+ "Saindo por um pipe defeituoso"
+
+-#: ../utils.py:243 ../yummain.py:50
++#: ../utils.py:151
++#: ../yummain.py:50
+ #, python-format
+ msgid ""
+ "\n"
+@@ -1287,7 +1456,58 @@ msgstr ""
+ "\n"
+ "%s"
+
+-#: ../utils.py:282 ../yummain.py:211
++#: ../utils.py:201
++#: ../yummain.py:107
++#, fuzzy
++msgid "Another app is currently holding the yum lock; exiting as configured by exit_on_lock"
++msgstr "Outro aplicativo está retendo o bloqueio do yum; esperando por ele para sair..."
++
++#: ../utils.py:260
++#, python-format
++msgid "PluginExit Error: %s"
++msgstr "Erro PluginExit: %s"
++
++#: ../utils.py:263
++#, python-format
++msgid "Yum Error: %s"
++msgstr "Error do 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 " Você pode tentar usar o parâmetro --skip-broken para contornar o problema"
++
++#: ../utils.py:321
++#: ../yummain.py:179
++#: ../yummain.py:212
++msgid " You could try running: rpm -Va --nofiles --nodigest"
++msgstr " Você pode tentar executar: rpm -Va --nofiles --nodigest"
++
++#: ../utils.py:328
++#: ../yummain.py:144
++#: ../yummain.py:186
++#, python-format
++msgid "Unknown Error(s): Exit Code: %d:"
++msgstr "Erro(s) desconhecido(s): código de saída: %d:"
++
++#: ../utils.py:334
++#: ../yummain.py:192
++msgid ""
++"\n"
++"Dependencies Resolved"
++msgstr ""
++"\n"
++"Dependências resolvidas"
++
++#: ../utils.py:349
++#: ../yummain.py:215
+ msgid "Complete!"
+ msgstr "Concluído!"
+
+@@ -1299,8 +1519,7 @@ msgstr "Você precisa ser root para executar este comando."
+ 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"
+@@ -1313,10 +1532,8 @@ msgid ""
+ "For more information contact your distribution or package provider.\n"
+ msgstr ""
+ "\n"
+-"Você habilitou a verificação de pacotes através de chaves GPG. Isso é uma "
+-"boa coisa.\n"
+-"Entretanto, você não tem nenhuma chave GPG pública instalada. Você precisa "
+-"baixar\n"
++"Você habilitou a verificação de pacotes através de chaves GPG. Isso é uma boa coisa.\n"
++"Entretanto, você não tem nenhuma chave GPG pública instalada. Você precisa baixar\n"
+ "e instalar essas chaves para os pacotes que deseja instalar.\n"
+ "Você pode fazer isso executando o comando:\n"
+ " rpm --import public.gpg.key\n"
+@@ -1326,8 +1543,7 @@ msgstr ""
+ " do repositório, a url da chave que você gostaria de usar\n"
+ "para ele e o yum irá instalá-la para você.\n"
+ "\n"
+-"Para mais informações contate o fornecedor da sua distribuição ou do "
+-"pacote.\n"
++"Para mais informações contate o fornecedor da sua distribuição ou do pacote.\n"
+
+ #: ../yumcommands.py:70
+ #, python-format
+@@ -1370,294 +1586,321 @@ msgstr "O arquivo %s, passado como um argumento para o shell, não existe."
+ msgid "Error: more than one file given as argument to shell."
+ msgstr "Erro: mais de um arquivo passado como argumento para o 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 ""
++"Não há repositórios habilitados.\n"
++"Execute \"yum repolist all\" para ver os repositórios que você tem.\n"
++"Você pode habilitar repositórios com yum-config-manager --enable <repositório>"
++
++#: ../yumcommands.py:189
+ msgid "PACKAGE..."
+ msgstr "PACOTE..."
+
+-#: ../yumcommands.py:173
++#: ../yumcommands.py:192
+ msgid "Install a package or packages on your system"
+ msgstr "Instala um ou mais pacotes no seu sistema"
+
+-#: ../yumcommands.py:181
++#: ../yumcommands.py:201
+ msgid "Setting up Install Process"
+ msgstr "Configurando o processo de instalação"
+
+-#: ../yumcommands.py:192
++#: ../yumcommands.py:212
++#: ../yumcommands.py:234
+ msgid "[PACKAGE...]"
+ msgstr "[PACOTE...]"
+
+-#: ../yumcommands.py:195
++#: ../yumcommands.py:215
+ msgid "Update a package or packages on your system"
+ msgstr "Atualiza um ou mais pacotes do seu sistema"
+
+-#: ../yumcommands.py:202
++#: ../yumcommands.py:223
+ msgid "Setting up Update Process"
+ msgstr "Configurando o processo de atualização"
+
+-#: ../yumcommands.py:244
++#: ../yumcommands.py:237
++msgid "Synchronize installed packages to the latest available versions"
++msgstr "Sincronizar os pacotes instalados para as últimas versões disponíveis"
++
++#: ../yumcommands.py:245
++#, fuzzy
++msgid "Setting up Distribution Synchronization Process"
++msgstr "Configurando o processo de retrocesso"
++
++#: ../yumcommands.py:288
+ msgid "Display details about a package or group of packages"
+ msgstr "Mostra detalhes sobre um pacote ou grupos de pacotes"
+
+-#: ../yumcommands.py:293
++#: ../yumcommands.py:337
+ msgid "Installed Packages"
+ msgstr "Pacotes instalados"
+
+-#: ../yumcommands.py:301
++#: ../yumcommands.py:345
+ msgid "Available Packages"
+ msgstr "Pacotes disponíveis"
+
+-#: ../yumcommands.py:305
++#: ../yumcommands.py:349
+ msgid "Extra Packages"
+ msgstr "Pacotes extras"
+
+-#: ../yumcommands.py:309
++#: ../yumcommands.py:353
+ msgid "Updated Packages"
+ msgstr "Pacotes atualizados"
+
+ #. 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 "Tornando pacotes obsoletos"
+
+-#: ../yumcommands.py:326
++#: ../yumcommands.py:370
+ msgid "Recently Added Packages"
+ msgstr "Pacotes adicionados recentemente"
+
+-#: ../yumcommands.py:333
++#: ../yumcommands.py:377
+ msgid "No matching Packages to list"
+ msgstr "Nenhum pacote correspondente a ser listado"
+
+-#: ../yumcommands.py:347
++#: ../yumcommands.py:391
+ msgid "List a package or groups of packages"
+ msgstr "Lista um pacote ou grupos de pacotes"
+
+-#: ../yumcommands.py:359
++#: ../yumcommands.py:403
+ msgid "Remove a package or packages from your system"
+ msgstr "Remove um ou mais pacotes do seu sistema"
+
+-#: ../yumcommands.py:366
++#: ../yumcommands.py:410
+ msgid "Setting up Remove Process"
+ msgstr "Configurando o processo de remoção"
+
+-#: ../yumcommands.py:380
++#: ../yumcommands.py:424
+ msgid "Setting up Group Process"
+ msgstr "Configurando o processo de grupos"
+
+-#: ../yumcommands.py:386
++#: ../yumcommands.py:430
+ msgid "No Groups on which to run command"
+ msgstr "Não há grupos nos quais executar o comando"
+
+-#: ../yumcommands.py:399
++#: ../yumcommands.py:443
+ msgid "List available package groups"
+ msgstr "Lista os grupos de pacotes disponíveis"
+
+-#: ../yumcommands.py:416
++#: ../yumcommands.py:463
+ msgid "Install the packages in a group on your system"
+ msgstr "Instala pacotes em um grupo ou no seu sistema"
+
+-#: ../yumcommands.py:438
++#: ../yumcommands.py:486
+ msgid "Remove the packages in a group from your system"
+ msgstr "Remove pacotes de um grupo ou do seu sistema"
+
+-#: ../yumcommands.py:465
++#: ../yumcommands.py:514
+ msgid "Display details about a package group"
+ msgstr "Mostra detalhes sobre um grupo de pacotes"
+
+-#: ../yumcommands.py:489
++#: ../yumcommands.py:539
+ msgid "Generate the metadata cache"
+ msgstr "Gera o cache de metadados"
+
+-#: ../yumcommands.py:495
++#: ../yumcommands.py:545
+ msgid "Making cache files for all metadata files."
+ msgstr "Realizando cache de arquivos para todos os metadados."
+
+-#: ../yumcommands.py:496
++#: ../yumcommands.py:546
+ msgid "This may take a while depending on the speed of this computer"
+ msgstr "Isso pode demorar um pouco, dependendo da velocidade deste computador"
+
+-#: ../yumcommands.py:517
++#: ../yumcommands.py:567
+ msgid "Metadata Cache Created"
+ msgstr "Cache de metadados criado"
+
+-#: ../yumcommands.py:531
++#: ../yumcommands.py:581
+ msgid "Remove cached data"
+ msgstr "Remove os dados do cache"
+
+-#: ../yumcommands.py:551
++#: ../yumcommands.py:602
+ msgid "Find what package provides the given value"
+ msgstr "Localiza qual pacote fornece o valor dado"
+
+-#: ../yumcommands.py:571
++#: ../yumcommands.py:622
+ msgid "Check for available package updates"
+ msgstr "Verifica por atualizações de pacotes disponíveis"
+
+-#: ../yumcommands.py:621
++#: ../yumcommands.py:675
+ msgid "Search package details for the given string"
+ msgstr "Pesquisa detalhes do pacote para a string fornecida"
+
+-#: ../yumcommands.py:627
++#: ../yumcommands.py:681
+ msgid "Searching Packages: "
+ msgstr "Pesquisando por pacotes:"
+
+-#: ../yumcommands.py:644
++#: ../yumcommands.py:698
+ msgid "Update packages taking obsoletes into account"
+ msgstr "Atualiza pacotes levando em conta os obsoletos"
+
+-#: ../yumcommands.py:652
++#: ../yumcommands.py:707
+ msgid "Setting up Upgrade Process"
+ msgstr "Configurando o processo de atualização"
+
+-#: ../yumcommands.py:666
++#: ../yumcommands.py:721
+ msgid "Install a local RPM"
+ msgstr "Instala um RPM local"
+
+-#: ../yumcommands.py:674
++#: ../yumcommands.py:729
+ msgid "Setting up Local Package Process"
+ msgstr "Configurando o processo de pacote local"
+
+-#: ../yumcommands.py:693
++#: ../yumcommands.py:748
+ msgid "Determine which package provides the given dependency"
+ msgstr "Determina qual pacote fornece a dependência dada"
+
+-#: ../yumcommands.py:696
++#: ../yumcommands.py:751
+ msgid "Searching Packages for Dependency:"
+ msgstr "Pesquisando pacotes por dependência:"
+
+-#: ../yumcommands.py:710
++#: ../yumcommands.py:765
+ msgid "Run an interactive yum shell"
+ msgstr "Executa um shell interativo do yum"
+
+-#: ../yumcommands.py:716
++#: ../yumcommands.py:771
+ msgid "Setting up Yum Shell"
+ msgstr "Configurando o shell do Yum"
+
+-#: ../yumcommands.py:734
++#: ../yumcommands.py:789
+ msgid "List a package's dependencies"
+ msgstr "Lista as dependências de um pacote"
+
+-#: ../yumcommands.py:740
++#: ../yumcommands.py:795
+ msgid "Finding dependencies: "
+ msgstr "Localizando dependências:"
+
+-#: ../yumcommands.py:756
++#: ../yumcommands.py:811
+ msgid "Display the configured software repositories"
+ msgstr "Exibe os repositórios 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 "desabilitado"
+
+-#: ../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 " Atualizados :"
+
+-#: ../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 "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 do repo"
+
+-#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987
++#: ../yumcommands.py:1023
++#: ../yumcommands.py:1024
++#: ../yumcommands.py:1042
+ msgid "status"
+ msgstr "status"
+
+-#: ../yumcommands.py:981
++#: ../yumcommands.py:1036
+ msgid "repo name"
+ msgstr "nome do repo"
+
+-#: ../yumcommands.py:1018
++#: ../yumcommands.py:1073
+ msgid "Display a helpful usage message"
+ msgstr "Exibe uma mensagem de uso para ajuda"
+
+-#: ../yumcommands.py:1052
++#: ../yumcommands.py:1107
+ #, python-format
+ msgid "No help available for %s"
+ msgstr "Nenhuma ajuda disponível para %s"
+
+-#: ../yumcommands.py:1057
++#: ../yumcommands.py:1112
+ msgid ""
+ "\n"
+ "\n"
+@@ -1667,7 +1910,7 @@ msgstr ""
+ "\n"
+ "apelidos: "
+
+-#: ../yumcommands.py:1059
++#: ../yumcommands.py:1114
+ msgid ""
+ "\n"
+ "\n"
+@@ -1677,107 +1920,82 @@ msgstr ""
+ "\n"
+ "apelido: "
+
+-#: ../yumcommands.py:1087
++#: ../yumcommands.py:1143
+ msgid "Setting up Reinstall Process"
+ msgstr "Configurando o processo de reinstalação"
+
+-#: ../yumcommands.py:1095
++#: ../yumcommands.py:1151
+ msgid "reinstall a package"
+ msgstr "reinstala um pacote"
+
+-#: ../yumcommands.py:1113
++#: ../yumcommands.py:1170
+ msgid "Setting up Downgrade Process"
+ msgstr "Configurando o processo de retrocesso"
+
+-#: ../yumcommands.py:1120
++#: ../yumcommands.py:1177
+ msgid "downgrade a package"
+ msgstr "retrocedendo um pacote"
+
+-#: ../yumcommands.py:1134
++#: ../yumcommands.py:1191
+ msgid "Display a version for the machine and/or available repos."
+ msgstr "Exibe uma versão para a máquina e/ou os repositórios disponíveis."
+
+-#: ../yumcommands.py:1173
++#: ../yumcommands.py:1230
+ msgid " Yum version groups:"
+ msgstr " Grupos da versão do Yum:"
+
+-#: ../yumcommands.py:1183
++#: ../yumcommands.py:1240
+ msgid " Group :"
+ msgstr " Grupo:"
+
+-#: ../yumcommands.py:1184
++#: ../yumcommands.py:1241
+ msgid " Packages:"
+ msgstr " Pacotes:"
+
+-#: ../yumcommands.py:1213
++#: ../yumcommands.py:1270
+ msgid "Installed:"
+ msgstr "Instalados:"
+
+-#: ../yumcommands.py:1218
++#: ../yumcommands.py:1278
+ msgid "Group-Installed:"
+ msgstr "Grupos instalados:"
+
+-#: ../yumcommands.py:1227
++#: ../yumcommands.py:1287
+ msgid "Available:"
+ msgstr "Disponíveis:"
+
+-#: ../yumcommands.py:1233
++#: ../yumcommands.py:1296
+ msgid "Group-Available:"
+ msgstr "Grupos disponíveis:"
+
+-#: ../yumcommands.py:1272
++#: ../yumcommands.py:1335
+ msgid "Display, or use, the transaction history"
+ msgstr "Exibir ou usar o histórico de transações"
+
+-#: ../yumcommands.py:1300
++#: ../yumcommands.py:1363
+ #, python-format
+ msgid "Invalid history sub-command, use: %s."
+ msgstr "Subcomando de histórico inválido, use: %s."
+
+-#: ../yumcommands.py:1345
++#: ../yumcommands.py:1370
++#, fuzzy
++msgid "You don't have access to the history DB."
++msgstr "Você não tem acesso ao BD de históricos"
++
++#: ../yumcommands.py:1413
+ msgid "Check for problems in the rpmdb"
+ msgstr "Procurar por problemas no rpmdb"
+
+-#: ../yummain.py:102
+-msgid ""
+-"Another app is currently holding the yum lock; waiting for it to exit..."
+-msgstr ""
+-"Outro aplicativo está retendo o bloqueio do yum; esperando por ele para "
+-"sair..."
+-
+-#: ../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 "Erro(s) desconhecido(s): código de saída: %d:"
++#: ../yummain.py:103
++msgid "Another app is currently holding the yum lock; waiting for it to exit..."
++msgstr "Outro aplicativo está retendo o bloqueio do yum; esperando por ele para sair..."
+
+ #. Depsolve stage
+-#: ../yummain.py:147
++#: ../yummain.py:151
+ msgid "Resolving Dependencies"
+ msgstr "Resolvendo dependências"
+
+-#: ../yummain.py:173
+-msgid " You could try using --skip-broken to work around the problem"
+-msgstr ""
+-" Você pode tentar usar o parâmetro --skip-broken para contornar o problema"
+-
+-#: ../yummain.py:175 ../yummain.py:208
+-msgid " You could try running: rpm -Va --nofiles --nodigest"
+-msgstr " Você pode tentar executar: rpm -Va --nofiles --nodigest"
+-
+-#: ../yummain.py:188
+-msgid ""
+-"\n"
+-"Dependencies Resolved"
+-msgstr ""
+-"\n"
+-"Dependências resolvidas"
+-
+-#: ../yummain.py:265
++#: ../yummain.py:269
+ msgid ""
+ "\n"
+ "\n"
+@@ -1793,146 +2011,136 @@ msgstr "doTsSetup() será removida em uma futura versão do Yum.\n"
+
+ #: ../yum/depsolve.py:97
+ msgid "Setting up TransactionSets before config class is up"
+-msgstr ""
+-"Configurando TransactionSets antes da ativação da classe de configuração"
++msgstr "Configurando TransactionSets antes da ativação da classe de configuração"
+
+-#: ../yum/depsolve.py:148
++#: ../yum/depsolve.py:151
+ #, python-format
+ msgid "Invalid tsflag in config file: %s"
+ msgstr "tsflag inválido no arquivo de configuração: %s"
+
+-#: ../yum/depsolve.py:159
++#: ../yum/depsolve.py:162
+ #, python-format
+ msgid "Searching pkgSack for dep: %s"
+ msgstr "Pesquisando pkgSack para a dep.: %s"
+
+-#: ../yum/depsolve.py:175
+-#, python-format
+-msgid "Potential match for %s from %s"
+-msgstr "Correspondência potencial para o %s a partir de %s"
+-
+-#: ../yum/depsolve.py:183
+-#, python-format
+-msgid "Matched %s to require for %s"
+-msgstr "%s encontrado para solicitar o %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 convertido para instalar"
+
+-#: ../yum/depsolve.py:246
++#: ../yum/depsolve.py:226
+ #, python-format
+ msgid "Adding Package %s in mode %s"
+ msgstr "Adicionando pacote %s no modo %s"
+
+-#: ../yum/depsolve.py:256
++#: ../yum/depsolve.py:242
+ #, python-format
+ msgid "Removing Package %s"
+ msgstr "Removendo pacote %s"
+
+-#: ../yum/depsolve.py:278
++#: ../yum/depsolve.py:264
+ #, python-format
+ msgid "%s requires: %s"
+ msgstr "%s requer: %s"
+
+-#: ../yum/depsolve.py:319
++#: ../yum/depsolve.py:305
+ #, python-format
+ msgid "%s requires %s"
+ msgstr "%s requer %s"
+
+-#: ../yum/depsolve.py:346
++#: ../yum/depsolve.py:332
+ msgid "Needed Require has already been looked up, cheating"
+ msgstr "O requerimento necessário já foi localizado, enganando"
+
+-#: ../yum/depsolve.py:356
++#: ../yum/depsolve.py:342
+ #, python-format
+ msgid "Needed Require is not a package name. Looking up: %s"
+ msgstr "O requerimento necessário não é o nome de um pacote. Localizando: %s"
+
+-#: ../yum/depsolve.py:363
++#: ../yum/depsolve.py:349
+ #, python-format
+ msgid "Potential Provider: %s"
+ msgstr "Fornecedor em potencial: %s"
+
+-#: ../yum/depsolve.py:386
++#: ../yum/depsolve.py:372
+ #, python-format
+ msgid "Mode is %s for provider of %s: %s"
+ msgstr "O modo é %s para o fornecedor do %s: %s"
+
+-#: ../yum/depsolve.py:390
++#: ../yum/depsolve.py:376
+ #, python-format
+ msgid "Mode for pkg providing %s: %s"
+ msgstr "Modo para o pacote que fornece o %s: %s"
+
+-#: ../yum/depsolve.py:394
++#: ../yum/depsolve.py:380
+ #, python-format
+ msgid "TSINFO: %s package requiring %s marked as erase"
+ msgstr "TSINFO: o pacote %s que requer o %s foi marcado para remoção"
+
+-#: ../yum/depsolve.py:407
++#: ../yum/depsolve.py:393
+ #, python-format
+ msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+ msgstr "TSINFO: Tornando %s obsoleto com o %s para resolver a dependência."
+
+-#: ../yum/depsolve.py:410
++#: ../yum/depsolve.py:396
+ #, python-format
+ msgid "TSINFO: Updating %s to resolve dep."
+ msgstr "TSINFO: Atualizando %s para resolver a dependência."
+
+-#: ../yum/depsolve.py:418
++#: ../yum/depsolve.py:404
+ #, python-format
+ msgid "Cannot find an update path for dep for: %s"
+-msgstr ""
+-"Não foi possível encontrar um caminho de atualização para a dep. para: %s"
++msgstr "Não foi possível encontrar um caminho de atualização para a dep. para: %s"
+
+-#: ../yum/depsolve.py:449
++#: ../yum/depsolve.py:435
+ #, python-format
+ msgid "Quick matched %s to require for %s"
+ msgstr "%s localizado rapidamente a ser requerido por %s"
+
+ #. is it already installed?
+-#: ../yum/depsolve.py:491
++#: ../yum/depsolve.py:477
+ #, python-format
+ msgid "%s is in providing packages but it is already installed, removing."
+ msgstr "%s está nos pacotes fornecedores mas já está instalado, removendo."
+
+-#: ../yum/depsolve.py:507
++#: ../yum/depsolve.py:493
+ #, python-format
+ msgid "Potential resolving package %s has newer instance in ts."
+ msgstr "O pacote de solução em potencial %s tem uma instância mais nova no ct."
+
+-#: ../yum/depsolve.py:518
++#: ../yum/depsolve.py:504
+ #, python-format
+ msgid "Potential resolving package %s has newer instance installed."
+-msgstr ""
+-"O pacote de solução em potencial %s tem uma instância mais nova instalada."
++msgstr "O pacote de solução em potencial %s tem uma instância mais nova instalada."
+
+-#: ../yum/depsolve.py:536
++#: ../yum/depsolve.py:522
+ #, python-format
+ msgid "%s already in ts, skipping this one"
+ msgstr "%s já está no ct, pulando esse"
+
+-#: ../yum/depsolve.py:578
++#: ../yum/depsolve.py:571
+ #, python-format
+ msgid "TSINFO: Marking %s as update for %s"
+ msgstr "TSINFO: Marcando %s como uma atualização para o %s"
+
+-#: ../yum/depsolve.py:586
++#: ../yum/depsolve.py:580
+ #, python-format
+ msgid "TSINFO: Marking %s as install for %s"
+ msgstr "TSINFO: Marcando %s como uma instalação para o %s"
+
+-#: ../yum/depsolve.py:690 ../yum/depsolve.py:781
++#: ../yum/depsolve.py:690
++#: ../yum/depsolve.py:780
+ msgid "Success - empty transaction"
+ msgstr "Sucesso - transação vazia"
+
+-#: ../yum/depsolve.py:729 ../yum/depsolve.py:744
++#: ../yum/depsolve.py:729
++#: ../yum/depsolve.py:744
+ msgid "Restarting Loop"
+ msgstr "Reiniciando o loop"
+
+@@ -1945,36 +2153,37 @@ msgstr "Término do processo de dependências"
+ msgid "%s from %s has depsolving problems"
+ msgstr "%s a partir de %s tem problemas de resolução de dependências"
+
+-#: ../yum/depsolve.py:782
++#: ../yum/depsolve.py:781
+ msgid "Success - deps resolved"
+ msgstr "Sucesso - dependências resolvidas"
+
+-#: ../yum/depsolve.py:796
++#: ../yum/depsolve.py:802
+ #, python-format
+ msgid "Checking deps for %s"
+ msgstr "Verificando dependências para %s"
+
+-#: ../yum/depsolve.py:874
++#: ../yum/depsolve.py:888
+ #, python-format
+ msgid "looking for %s as a requirement of %s"
+ msgstr "procurando por %s como um requerimento do %s"
+
+-#: ../yum/depsolve.py:1090
++#: ../yum/depsolve.py:1119
+ #, python-format
+ msgid "Running compare_providers() for %s"
+ msgstr "Executando 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 "melhor arquitetura no po %s"
+
+-#: ../yum/depsolve.py:1218
++#: ../yum/depsolve.py:1244
+ #, python-format
+ msgid "%s obsoletes %s"
+ msgstr "%s torna %s obsoleto"
+
+-#: ../yum/depsolve.py:1230
++#: ../yum/depsolve.py:1256
+ #, python-format
+ msgid ""
+ "archdist compared %s to %s on %s\n"
+@@ -1983,141 +2192,162 @@ msgstr ""
+ "archdist comparou %s com %s em %s\n"
+ " Vencedor: %s"
+
+-#: ../yum/depsolve.py:1237
++#: ../yum/depsolve.py:1264
+ #, python-format
+ msgid "common sourcerpm %s and %s"
+ msgstr "Sourcerpm comum %s e %s"
+
+-#: ../yum/depsolve.py:1241
++#: ../yum/depsolve.py:1268
+ #, python-format
+ msgid "base package %s is installed for %s"
+ msgstr "o pacote base %s está instalado para o %s"
+
+-#: ../yum/depsolve.py:1247
++#: ../yum/depsolve.py:1274
+ #, python-format
+ msgid "common prefix of %s between %s and %s"
+ msgstr "prefixo comum de %s entre %s e %s"
+
+-#: ../yum/depsolve.py:1256
++#: ../yum/depsolve.py:1305
++#, fuzzy, python-format
++msgid "requires minimal: %d"
++msgstr "%s requer: %s"
++
++#: ../yum/depsolve.py:1309
++#, python-format
++msgid " Winner: %s"
++msgstr "Vencedor: %s"
++
++#: ../yum/depsolve.py:1314
++#, python-format
++msgid " Loser(with %d): %s"
++msgstr "Perdedor(com %d): %s"
++
++#: ../yum/depsolve.py:1330
+ #, python-format
+ msgid "Best Order: %s"
+ msgstr "Melhor ordem: %s"
+
+-#: ../yum/__init__.py:192
++#: ../yum/__init__.py:214
+ msgid "doConfigSetup() will go away in a future version of Yum.\n"
+ msgstr "doConfigSetup() será removida em uma futura versão do Yum.\n"
+
+-#: ../yum/__init__.py:424
++#: ../yum/__init__.py:453
++#, python-format
++msgid "Repository %r: Error parsing config: %s"
++msgstr "Repositório %r: Erro ao analisar a configuração: %s"
++
++#: ../yum/__init__.py:459
+ #, python-format
+ msgid "Repository %r is missing name in configuration, using id"
+ msgstr "O repositório %r não tem nome na configuração, usando o id"
+
+-#: ../yum/__init__.py:462
++#: ../yum/__init__.py:497
+ msgid "plugins already initialised"
+ msgstr "plugins já inicializados"
+
+-#: ../yum/__init__.py:469
++#: ../yum/__init__.py:504
+ msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+ msgstr "doRpmDBSetup() será removida em uma futura versão do Yum.\n"
+
+-#: ../yum/__init__.py:480
++#: ../yum/__init__.py:515
+ msgid "Reading Local RPMDB"
+ msgstr "Lendo RPMDB local"
+
+-#: ../yum/__init__.py:504
++#: ../yum/__init__.py:538
+ msgid "doRepoSetup() will go away in a future version of Yum.\n"
+ msgstr "doRepoSetup() será removida em uma futura versão do Yum.\n"
+
+-#: ../yum/__init__.py:524
++#: ../yum/__init__.py:577
+ msgid "doSackSetup() will go away in a future version of Yum.\n"
+ msgstr "doSackSetup() será removida em uma futura versão do Yum.\n"
+
+-#: ../yum/__init__.py:554
++#: ../yum/__init__.py:607
+ msgid "Setting up Package Sacks"
+ msgstr "Configurando sacos de pacotes"
+
+-#: ../yum/__init__.py:599
++#: ../yum/__init__.py:652
+ #, python-format
+ msgid "repo object for repo %s lacks a _resetSack method\n"
+ msgstr "o objeto de repositório para o %s necessita de um método _resetSack\n"
+
+-#: ../yum/__init__.py:600
++#: ../yum/__init__.py:653
+ msgid "therefore this repo cannot be reset.\n"
+ msgstr "conseqüentemente este repo não pode 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() será removida em uma futura versão do Yum.\n"
+
+-#: ../yum/__init__.py:617
++#: ../yum/__init__.py:670
+ msgid "Building updates object"
+ msgstr "Construindo objeto de atualizações"
+
+-#: ../yum/__init__.py:652
++#: ../yum/__init__.py:709
+ msgid "doGroupSetup() will go away in a future version of Yum.\n"
+ msgstr "doGroupSetup() será removida em uma futura versão do Yum.\n"
+
+-#: ../yum/__init__.py:677
++#: ../yum/__init__.py:734
+ msgid "Getting group metadata"
+ msgstr "Obtendo metadados do grupo"
+
+-#: ../yum/__init__.py:703
++#: ../yum/__init__.py:760
+ #, python-format
+ msgid "Adding group file from repository: %s"
+ msgstr "Adicionando arquivo de grupo a partir do repositório: %s"
+
+-#: ../yum/__init__.py:712
++#: ../yum/__init__.py:769
+ #, python-format
+ msgid "Failed to add groups file for repository: %s - %s"
+ msgstr "Falha ao adicionar o arquivo de grupos para o repositório: %s - %s"
+
+-#: ../yum/__init__.py:718
++#: ../yum/__init__.py:775
+ msgid "No Groups Available in any repository"
+ msgstr "Nenhum grupo disponível em nenhum repositório"
+
+-#: ../yum/__init__.py:730
++#: ../yum/__init__.py:787
+ msgid "Getting pkgtags metadata"
+ msgstr "Obtendo metadados do pkgtags"
+
+-#: ../yum/__init__.py:740
++#: ../yum/__init__.py:797
+ #, python-format
+ msgid "Adding tags from repository: %s"
+ msgstr "Adicionando tags do repositório: %s"
+
+-#: ../yum/__init__.py:749
++#: ../yum/__init__.py:806
+ #, python-format
+ msgid "Failed to add Pkg Tags for repository: %s - %s"
+ msgstr "Falha ao adicionar as Pkg Tags para o repositório: %s - %s"
+
+-#: ../yum/__init__.py:827
++#: ../yum/__init__.py:884
+ msgid "Importing additional filelist information"
+ msgstr "Importando informações adicionais da lista de arquivos"
+
+-#: ../yum/__init__.py:841
++#: ../yum/__init__.py:898
+ #, python-format
+ msgid "The program %s%s%s is found in the yum-utils package."
+ msgstr "O programa %s%s%s está localizado no pacote yum-utils."
+
+-#: ../yum/__init__.py:849
+-msgid ""
+-"There are unfinished transactions remaining. You might consider running yum-"
+-"complete-transaction first to finish them."
+-msgstr ""
+-"Há transações não finalizadas restantes. Você pode considerar executar o yum-"
+-"complete-transaction primeiro para finalizá-las."
++#: ../yum/__init__.py:906
++msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them."
++msgstr "Há transações não finalizadas restantes. Você pode considerar executar o yum-complete-transaction primeiro para finalizá-las."
++
++#: ../yum/__init__.py:985
++#, fuzzy, python-format
++msgid "Trying to remove \"%s\", which is protected"
++msgstr "Tentando remover \"%s\", que é protegido"
+
+ #. Kind of hacky
+-#: ../yum/__init__.py:922
++#: ../yum/__init__.py:1044
+ #, python-format
+ msgid "Skip-broken round %i"
+ msgstr "Rodada de ignoração de dependências quebradas %i"
+
+-#: ../yum/__init__.py:975
++#: ../yum/__init__.py:1101
+ #, python-format
+ msgid "Skip-broken took %i rounds "
+ msgstr "A ignoração de dependências quebradas levou %i rodadas"
+
+-#: ../yum/__init__.py:976
++#: ../yum/__init__.py:1102
+ msgid ""
+ "\n"
+ "Packages skipped because of dependency problems:"
+@@ -2125,93 +2355,111 @@ msgstr ""
+ "\n"
+ "Pacotes ignorados devido a problemas de dependências:"
+
+-#: ../yum/__init__.py:980
++#: ../yum/__init__.py:1106
+ #, python-format
+ msgid " %s from %s"
+ msgstr " %s a partir de %s"
+
+-#: ../yum/__init__.py:1121
++#. FIXME: _N()
++#: ../yum/__init__.py:1251
++#, fuzzy, python-format
++msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:"
++msgstr "** Encontrados %d problema(s) pré-existentes no rpmdb, segue saída do'yum check':"
++
++#: ../yum/__init__.py:1255
+ msgid "Warning: RPMDB altered outside of yum."
+ msgstr "Aviso: o RPMDB foi alterado de fora do yum."
+
+-#: ../yum/__init__.py:1126
++#: ../yum/__init__.py:1267
+ msgid "missing requires"
+ msgstr "faltando exigências"
+
+-#: ../yum/__init__.py:1127
++#: ../yum/__init__.py:1268
+ msgid "installed conflict"
+ msgstr "conflito instalado"
+
+-#: ../yum/__init__.py:1180
+-msgid ""
+-"Warning: scriptlet or other non-fatal errors occurred during transaction."
+-msgstr ""
+-"Aviso: scriptlet ou outros erros não fatais ocorreram durante a transação."
++#: ../yum/__init__.py:1366
++msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
++msgstr "Aviso: scriptlet ou outros erros não fatais ocorreram durante a transação."
++
++#: ../yum/__init__.py:1376
++#, fuzzy
++msgid "Transaction couldn't start:"
++msgstr "ID de transação:"
+
+-#: ../yum/__init__.py:1198
++#. should this be 'to_unicoded'?
++#: ../yum/__init__.py:1379
++#, fuzzy
++msgid "Could not run transaction."
++msgstr "Foi localizado mais de um ID de transação!"
++
++#: ../yum/__init__.py:1392
+ #, python-format
+ msgid "Failed to remove transaction file %s"
+ msgstr "Falha ao remover o arquivo de transação %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 deveria ter sido instalado mas não foi!"
+
+ #. 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 deveria ter sido removido mas não foi!"
+
++#: ../yum/__init__.py:1597
++#, fuzzy, python-format
++msgid "Could not open lock %s: %s"
++msgstr "Não foi possível criar um bloqueio em %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 "Não foi possível verificar se o PID %s está ativo"
+
+ #. 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 "Bloqueio existente em %s: outra cópia está em execução com o 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 "Não foi possível criar um bloqueio em %s: %s"
+
+-#: ../yum/__init__.py:1470
+-msgid ""
+-"Package does not match intended download. Suggestion: run yum clean metadata"
+-msgstr ""
+-"O pacote não corresponde ao download pretendido. Sugestão: execute yum clean "
+-"metadata"
++#: ../yum/__init__.py:1698
++#, fuzzy, python-format
++msgid "Package does not match intended download. Suggestion: run yum --enablerepo=%s clean metadata"
++msgstr "O pacote não corresponde ao download pretendido. Sugestão: execute yum clean metadata"
+
+-#: ../yum/__init__.py:1486
++#: ../yum/__init__.py:1714
+ msgid "Could not perform checksum"
+ msgstr "Não foi possível realizar a soma de verificação"
+
+-#: ../yum/__init__.py:1489
++#: ../yum/__init__.py:1717
+ msgid "Package does not match checksum"
+ msgstr "O pacote não corresponde à soma de verificação"
+
+-#: ../yum/__init__.py:1531
++#: ../yum/__init__.py:1769
+ #, python-format
+ msgid "package fails checksum but caching is enabled for %s"
+-msgstr ""
+-"o pacote falhou na soma de verificação mas o cache está habilitado para o %s"
++msgstr "o pacote falhou na soma de verificação mas o cache está habilitado para o %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 "usando cópia local do %s"
+
+-#: ../yum/__init__.py:1575
++#: ../yum/__init__.py:1813
+ #, python-format
+ msgid ""
+ "Insufficient space in download directory %s\n"
+@@ -2222,473 +2470,524 @@ msgstr ""
+ " * livre %s\n"
+ " * necessário %s"
+
+-#: ../yum/__init__.py:1624
++#: ../yum/__init__.py:1862
+ msgid "Header is not complete."
+ msgstr "O cabeçalho não 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 ""
+-"O cabeçalho não está no cache local e o modo de somente cache está "
+-"habilitado. Não foi possível baixar o %s."
++msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
++msgstr "O cabeçalho não está no cache local e o modo de somente cache está habilitado. Não foi possível baixar o %s."
+
+-#: ../yum/__init__.py:1716
++#: ../yum/__init__.py:1954
+ #, python-format
+ msgid "Public key for %s is not installed"
+ msgstr "A chave pública para o %s não está instalada"
+
+-#: ../yum/__init__.py:1720
++#: ../yum/__init__.py:1958
+ #, python-format
+ msgid "Problem opening package %s"
+ msgstr "Problema ao abrir o pacote %s"
+
+-#: ../yum/__init__.py:1728
++#: ../yum/__init__.py:1966
+ #, python-format
+ msgid "Public key for %s is not trusted"
+ msgstr "A chave pública para o %s não é confiável"
+
+-#: ../yum/__init__.py:1732
++#: ../yum/__init__.py:1970
+ #, python-format
+ msgid "Package %s is not signed"
+ msgstr "O pacote %s não está assinado"
+
+-#: ../yum/__init__.py:1770
++#: ../yum/__init__.py:2008
+ #, python-format
+ msgid "Cannot remove %s"
+ msgstr "Não foi possível remover %s"
+
+-#: ../yum/__init__.py:1774
++#: ../yum/__init__.py:2012
+ #, python-format
+ msgid "%s removed"
+ msgstr "%s removido"
+
+-#: ../yum/__init__.py:1820
++#: ../yum/__init__.py:2058
+ #, python-format
+ msgid "Cannot remove %s file %s"
+ msgstr "Não foi possível remover %s arquivo %s"
+
+-#: ../yum/__init__.py:1824
++#: ../yum/__init__.py:2062
+ #, python-format
+ msgid "%s file %s removed"
+ msgstr "%s arquivo %s removido"
+
+-#: ../yum/__init__.py:1826
++#: ../yum/__init__.py:2064
+ #, python-format
+ msgid "%d %s files removed"
+ msgstr "%d %s arquivos removidos"
+
+-#: ../yum/__init__.py:1895
++#: ../yum/__init__.py:2133
+ #, python-format
+ msgid "More than one identical match in sack for %s"
+ msgstr "Mais de uma correspondência idêntica no saco para %s"
+
+-#: ../yum/__init__.py:1901
++#: ../yum/__init__.py:2139
+ #, python-format
+ msgid "Nothing matches %s.%s %s:%s-%s from update"
+ msgstr "Nada corresponde ao %s.%s %s:%s-%s a partir da atualização"
+
+-#: ../yum/__init__.py:2180
+-msgid ""
+-"searchPackages() will go away in a future version of "
+-"Yum. Use searchGenerator() instead. \n"
+-msgstr ""
+-"searchPackages() será removida em uma futura versão do Yum. Ao invés disso, "
+-"use a searchGenerator().\n"
++#: ../yum/__init__.py:2433
++msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
++msgstr "searchPackages() será removida em uma futura versão do Yum. Ao invés disso, use a searchGenerator().\n"
+
+-#: ../yum/__init__.py:2219
++#: ../yum/__init__.py:2472
+ #, python-format
+ msgid "Searching %d packages"
+ msgstr "Pesquisando por %d pacotes"
+
+-#: ../yum/__init__.py:2223
++#: ../yum/__init__.py:2476
+ #, python-format
+ msgid "searching package %s"
+ msgstr "pesquisando pelo pacote %s"
+
+-#: ../yum/__init__.py:2235
++#: ../yum/__init__.py:2488
+ msgid "searching in file entries"
+ msgstr "pesquisando nas entradas do arquivo"
+
+-#: ../yum/__init__.py:2242
++#: ../yum/__init__.py:2495
+ msgid "searching in provides entries"
+ msgstr "pesquisando nas entradas dos fornecimentos"
+
+-#: ../yum/__init__.py:2275
++#: ../yum/__init__.py:2528
+ #, python-format
+ msgid "Provides-match: %s"
+ msgstr "Fornecimento combina com: %s"
+
+-#: ../yum/__init__.py:2324
++#: ../yum/__init__.py:2577
+ msgid "No group data available for configured repositories"
+ msgstr "Nenhum dado de grupos disponível para os repositório 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 "Não existe nenhum grupo de nome %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 "o pacote %s não foi marcado no grupo %s"
+
+-#: ../yum/__init__.py:2433
++#: ../yum/__init__.py:2686
+ #, python-format
+ msgid "Adding package %s from group %s"
+ msgstr "Adicionando o pacote %s do grupo %s"
+
+-#: ../yum/__init__.py:2437
++#: ../yum/__init__.py:2690
+ #, python-format
+ msgid "No package named %s available to be installed"
+ msgstr "Nenhum pacote de nome %s disponível para ser instalado"
+
+-#: ../yum/__init__.py: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 "A tupla %s do pacote não pôde ser encontrada no packagesack"
+
+-#: ../yum/__init__.py:2558
++#: ../yum/__init__.py:2813
+ #, python-format
+ msgid "Package tuple %s could not be found in rpmdb"
+ msgstr "A tupla %s do pacote não pôde ser localizada no rpmdb"
+
+-#: ../yum/__init__.py:2614 ../yum/__init__.py:2664
+-msgid "Invalid version flag"
+-msgstr "Sinalizador de versão inválido"
+-
+-#: ../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 "Nenhum pacote encontrado para %s"
+
+-#: ../yum/__init__.py:2855
++#: ../yum/__init__.py:2901
++msgid "Invalid version flag"
++msgstr "Sinalizador de versão inválido"
++
++#: ../yum/__init__.py:3145
+ msgid "Package Object was not a package object instance"
+ msgstr "O pacote de objeto não era uma instância de pacote de objeto"
+
+-#: ../yum/__init__.py:2859
++#: ../yum/__init__.py:3149
+ msgid "Nothing specified to install"
+ msgstr "Nada especificado 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 por fornecimento virtual ou de arquivo para %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 "Nenhuma correspondência para o argumento: %s"
+
+-#: ../yum/__init__.py:2957
++#: ../yum/__init__.py:3250
+ #, python-format
+ msgid "Package %s installed and not available"
+ msgstr "Pacote %s instalado, mas não disponível"
+
+-#: ../yum/__init__.py:2960
++#: ../yum/__init__.py:3253
+ msgid "No package(s) available to install"
+ msgstr "Nenhum pacote disponível para instalar"
+
+-#: ../yum/__init__.py:2972
++#: ../yum/__init__.py:3265
+ #, python-format
+ msgid "Package: %s - already in transaction set"
+ msgstr "Pacote: %s - já está no conjunto de transações"
+
+-#: ../yum/__init__.py:2998
++#: ../yum/__init__.py:3291
+ #, python-format
+ msgid "Package %s is obsoleted by %s which is already installed"
+ msgstr "O pacote %s foi tornado obsoleto pelo %s, o qual já está instalado"
+
+-#: ../yum/__init__.py:3001
++#: ../yum/__init__.py:3296
++#, fuzzy, python-format
++msgid "Package %s is obsoleted by %s, but obsoleting package does not provide for requirements"
++msgstr "O pacote %s foi tornado obsoleto por %s, tentando instalar %s ao invés disso"
++
++#: ../yum/__init__.py:3299
+ #, python-format
+ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+-msgstr ""
+-"O pacote %s foi tornado obsoleto por %s, tentando instalar %s ao invés disso"
++msgstr "O pacote %s foi tornado obsoleto por %s, tentando instalar %s ao invés disso"
+
+-#: ../yum/__init__.py:3009
++#: ../yum/__init__.py:3307
+ #, python-format
+ msgid "Package %s already installed and latest version"
+ msgstr "O pacote %s já está instalado em sua última versão"
+
+-#: ../yum/__init__.py:3023
++#: ../yum/__init__.py:3321
+ #, python-format
+ msgid "Package matching %s already installed. Checking for update."
+ msgstr "O pacote %s já está instalado. Verificando por uma atualização."
+
+ #. update everything (the easy case)
+-#: ../yum/__init__.py:3126
++#: ../yum/__init__.py:3424
+ msgid "Updating Everything"
+ msgstr "Atualizando tudo"
+
+-#: ../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 "Pacote já obsoleto não será atualizado: %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 "O pacote já está 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 "Não atualizando o pacote que está 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 "Pacote já atualizado não será atualizado novamente: %s.%s %s:%s-%s"
+
+-#: ../yum/__init__.py:3378
++#: ../yum/__init__.py:3697
+ msgid "No package matched to remove"
+ msgstr "Nenhum pacote encontrado para remoção"
+
+-#: ../yum/__init__.py:3412
++#: ../yum/__init__.py:3703
++#, python-format
++msgid "Skipping the running kernel: %s"
++msgstr "Ignorando o kernel em execução: %s"
++
++#: ../yum/__init__.py:3709
++#, python-format
++msgid "Removing %s from the transaction"
++msgstr "Removendo %s da transação"
++
++#: ../yum/__init__.py:3744
+ #, python-format
+ msgid "Cannot open: %s. Skipping."
+ msgstr "Não foi possível 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
++#, fuzzy, python-format
++msgid "Cannot localinstall deltarpm: %s. Skipping."
++msgstr "Não foi possível abrir o arquivo: %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 ""
+-"Não foi possível adicionar o pacote %s à transação. %s não é uma arquitetura "
+-"compatível."
++msgstr "Não foi possível adicionar o pacote %s à transação. %s não é uma arquitetura compatível."
+
+-#: ../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."
+-msgstr ""
+-"O pacote %s não está instalado, não é possível atualizá-lo. Execute o yum "
+-"install para instalá-lo."
++msgid "Cannot install package %s. It is obsoleted by installed package %s"
++msgstr "Não é possível instalar o pacote % s. É obsoleto pelo pacote instalado %s"
++
++#: ../yum/__init__.py:3774
++#, python-format
++msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
++msgstr "O pacote %s não está instalado, não é possível atualizá-lo. Execute o yum install para instalá-lo."
+
+-#: ../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 "Excluindo %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 uma atualização do %s"
+
+-#: ../yum/__init__.py:3478
++#: ../yum/__init__.py:3821
+ #, python-format
+ msgid "%s: does not update installed package."
+ msgstr "%s: não atualiza o pacote 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 "Não foi possível abrir o arquivo: %s. Ignorando."
+
+-#: ../yum/__init__.py:3541
++#: ../yum/__init__.py:3886
+ msgid "Problem in reinstall: no package matched to remove"
+ msgstr "Problema na reinstalação: nenhum pacote encontrado para remoção"
+
+-#: ../yum/__init__.py:3554 ../yum/__init__.py:3686
+-#, python-format
+-msgid "Package %s is allowed multiple installs, skipping"
+-msgstr "O pacote %s permite múltiplas instalações, ignorando"
+-
+-#: ../yum/__init__.py:3575
++#: ../yum/__init__.py:3912
+ #, python-format
+ msgid "Problem in reinstall: no package %s matched to install"
+ msgstr "Problema na reinstalação: nenhum pacote %s encontrado para instalação"
+
+-#: ../yum/__init__.py:3678
++#: ../yum/__init__.py:4018
+ msgid "No package(s) available to downgrade"
+ msgstr "Nenhum pacote disponível para ser retrocedido"
+
+-#: ../yum/__init__.py:3731
++#: ../yum/__init__.py:4026
++#, python-format
++msgid "Package %s is allowed multiple installs, skipping"
++msgstr "O pacote %s permite múltiplas instalações, ignorando"
++
++#: ../yum/__init__.py:4072
+ #, python-format
+ msgid "No Match for available package: %s"
+ msgstr "Nenhuma correspondência disponível para o pacote: %s"
+
+-#: ../yum/__init__.py:3738
++#: ../yum/__init__.py:4079
+ #, python-format
+ msgid "Only Upgrade available on package: %s"
+ msgstr "Somente a atualização está disponível para o pacote: %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 "Falha ao desatualizar: %s"
+
+-#: ../yum/__init__.py:3877
++#: ../yum/__init__.py:4218
+ #, python-format
+ msgid "Retrieving GPG key from %s"
+ msgstr "Obtendo a chave GPG a partir de %s"
+
+-#: ../yum/__init__.py:3897
++#: ../yum/__init__.py:4238
+ msgid "GPG key retrieval failed: "
+ msgstr "A obtenção da chave GPG falhou:"
+
+-#: ../yum/__init__.py:3903
++#: ../yum/__init__.py:4244
+ #, python-format
+ msgid "Invalid GPG Key from %s: %s"
+ msgstr "A chave GPG de %s é inválida: %s"
+
+-#: ../yum/__init__.py:3912
++#: ../yum/__init__.py:4253
+ #, python-format
+ msgid "GPG key parsing failed: key does not have value %s"
+ msgstr "Falha na análise da chave GPG: ela não tem o valor %s"
+
+-#: ../yum/__init__.py:3944
++#: ../yum/__init__.py:4267
++#, fuzzy, python-format
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid : %s\n"
++" Package: %s (%s)\n"
++" From : %s"
++msgstr "Importando chave GPG 0x%s \"%s\" a partir de %s"
++
++#: ../yum/__init__.py:4275
++#, fuzzy, python-format
++msgid ""
++"Importing GPG key 0x%s:\n"
++" Userid: \"%s\"\n"
++" From : %s"
++msgstr "Importando chave GPG 0x%s \"%s\" a partir de %s"
++
++#: ../yum/__init__.py:4307
+ #, python-format
+ msgid "GPG key at %s (0x%s) is already installed"
+ msgstr "A chave GPG em %s (0x%s) já está instalada"
+
+-#. Try installing/updating GPG key
+-#: ../yum/__init__.py:3949 ../yum/__init__.py:4011
+-#, python-format
+-msgid "Importing GPG key 0x%s \"%s\" from %s"
+-msgstr "Importando chave GPG 0x%s \"%s\" a partir de %s"
+-
+-#: ../yum/__init__.py:3966
++#: ../yum/__init__.py:4326
+ msgid "Not installing key"
+ msgstr "Não está instalando a chave"
+
+-#: ../yum/__init__.py:3972
++#: ../yum/__init__.py:4332
+ #, python-format
+ msgid "Key import failed (code %d)"
+ msgstr "Falha na importação da chave (código %d)"
+
+-#: ../yum/__init__.py:3973 ../yum/__init__.py:4032
++#: ../yum/__init__.py:4333
++#: ../yum/__init__.py:4389
+ msgid "Key imported successfully"
+ msgstr "Chave importada com sucesso"
+
+-#: ../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 ""
+-"As chaves GPG listadas para o repositório \"%s\" já estão instaladas, mas "
+-"não estão corretas para este pacote.\n"
+-"Verifique se as URLs corretas das chaves estão configuradas para esse "
+-"repositório."
++"As chaves GPG listadas para o repositório \"%s\" já estão instaladas, mas não estão corretas para este pacote.\n"
++"Verifique se as URLs corretas das chaves estão configuradas para esse repositório."
+
+-#: ../yum/__init__.py:3987
++#: ../yum/__init__.py:4347
+ msgid "Import of key(s) didn't help, wrong key(s)?"
+ msgstr "A importação da(s) chave(s) não ajudou, chave(s) errada(s)?"
+
+-#: ../yum/__init__.py:4006
++#: ../yum/__init__.py:4366
+ #, python-format
+ msgid "GPG key at %s (0x%s) is already imported"
+ msgstr "A chave GPG em %s (0x%s) já foi importada"
+
+-#: ../yum/__init__.py:4026
++#: ../yum/__init__.py:4383
+ #, python-format
+ msgid "Not installing key for repo %s"
+ msgstr "A chave para o repositório %s não será instalada"
+
+-#: ../yum/__init__.py:4031
++#: ../yum/__init__.py:4388
+ msgid "Key import failed"
+ msgstr "Falha na importação da chave"
+
+-#: ../yum/__init__.py:4157
++#: ../yum/__init__.py:4394
++#, fuzzy, 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 ""
++"As chaves GPG listadas para o repositório \"%s\" já estão instaladas, mas não estão corretas para este pacote.\n"
++"Verifique se as URLs corretas das chaves estão configuradas para esse repositório."
++
++#: ../yum/__init__.py:4521
+ msgid "Unable to find a suitable mirror."
+ msgstr "Não foi possível encontrar um espelho apropriado."
+
+-#: ../yum/__init__.py:4159
++#: ../yum/__init__.py:4523
+ msgid "Errors were encountered while downloading packages."
+ msgstr "Foram encontrados erros ao baixar os pacotes."
+
+-#: ../yum/__init__.py:4209
++#: ../yum/__init__.py:4573
+ #, python-format
+ msgid "Please report this error at %s"
+ msgstr "Por favor, relate esse erro em %s"
+
+-#: ../yum/__init__.py:4233
++#: ../yum/__init__.py:4597
+ msgid "Test Transaction Errors: "
+ msgstr "Erros do teste de transação:"
+
+-#: ../yum/__init__.py:4334
++#: ../yum/__init__.py:4700
+ #, python-format
+ msgid "Could not set cachedir: %s"
+ msgstr "Não foi possível definir a cachedir: %s"
+
+ #. Mostly copied from YumOutput._outKeyValFill()
+-#: ../yum/plugins.py:202
++#: ../yum/plugins.py:208
+ msgid "Loaded plugins: "
+ msgstr "Plugins carregados: "
+
+-#: ../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 "Nenhum plugin correspondente para: %s"
+
+-#: ../yum/plugins.py:252
++#: ../yum/plugins.py:258
+ #, python-format
+ msgid "Not loading \"%s\" plugin, as it is disabled"
+ msgstr "O plugin \"%s\" não será carregado, pois está desabilitado"
+
+ #. Give full backtrace:
+-#: ../yum/plugins.py:264
++#: ../yum/plugins.py:270
+ #, python-format
+ msgid "Plugin \"%s\" can't be imported"
+ msgstr "O plugin \"%s\" não pôde ser importado"
+
+-#: ../yum/plugins.py:271
++#: ../yum/plugins.py:277
+ #, python-format
+ msgid "Plugin \"%s\" doesn't specify required API version"
+ msgstr "O plugin \"%s\" não especifica a versão requerida da API"
+
+-#: ../yum/plugins.py:276
++#: ../yum/plugins.py:282
+ #, python-format
+ msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+ msgstr "O plugin \"%s\" requer a API %s. A API suportada é a %s."
+
+-#: ../yum/plugins.py:309
++#: ../yum/plugins.py:315
+ #, python-format
+ msgid "Loading \"%s\" plugin"
+ msgstr "Carregando o 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 ""
+-"Dois ou mais plugins com o nome \"%s\" existem no caminho de pesquisa plugins"
++msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
++msgstr "Dois ou mais plugins com o nome \"%s\" existem no caminho de pesquisa plugins"
+
+-#: ../yum/plugins.py:336
++#: ../yum/plugins.py:342
+ #, python-format
+ msgid "Configuration file %s not found"
+ msgstr "Arquivos de configuração %s não encontrado"
+
+ #. 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 "Não foi possível encontrar o arquivo de configuração para o plugin %s"
+
+-#: ../yum/plugins.py:501
++#: ../yum/plugins.py:507
+ msgid "registration of commands not supported"
+ msgstr "O registro de comandos não é suportado"
+
+@@ -2705,6 +3004,16 @@ msgstr "tem conflitos instalados"
+ msgid "%s is a duplicate with %s"
+ msgstr "%s é uma duplicação do %s"
+
++#: ../yum/rpmsack.py:122
++#, fuzzy, python-format
++msgid "%s is obsoleted by %s"
++msgstr "%s torna %s obsoleto"
++
++#: ../yum/rpmsack.py:130
++#, fuzzy, python-format
++msgid "%s provides %s but it cannot be found"
++msgstr "Erro - %s não pôde ser encontrado"
++
+ #: ../yum/rpmtrans.py:79
+ msgid "Repackaging"
+ msgstr "Reempacotando"
+@@ -2721,16 +3030,16 @@ msgstr "O RPM %s não passou na verificação md5"
+
+ #: ../rpmUtils/oldUtils.py:151
+ msgid "Could not open RPM database for reading. Perhaps it is already in use?"
+-msgstr ""
+-"Não foi possível abrir o banco de dados RPM para leitura. Talvez por que ele "
+-"já esteja em uso?"
++msgstr "Não foi possível abrir o banco de dados RPM para leitura. Talvez por que ele já esteja em uso?"
+
+ #: ../rpmUtils/oldUtils.py:183
+ msgid "Got an empty Header, something has gone wrong"
+ msgstr "Um cabeçalho vazio foi obtido, algo deu errado"
+
+-#: ../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 "Cabeçalho %s danificado"
+@@ -2740,6 +3049,33 @@ msgstr "Cabeçalho %s danificado"
+ msgid "Error opening rpm %s - error %s"
+ msgstr "Erro ao abrir o rpm %s - erro %s"
+
++#~ msgid "Repo : %s"
++#~ msgstr "Repo : %s"
++
++#~ msgid "URL : %s"
++#~ msgstr "URL : %s"
++
++#~ msgid "Description: "
++#~ msgstr "Descrição: "
++
++#~ msgid ""
++#~ "Remove %5.5s Package(s)\n"
++#~ "Reinstall %5.5s Package(s)\n"
++#~ "Downgrade %5.5s Package(s)\n"
++#~ msgstr ""
++#~ "Remover %5.5s Pacote(s)\n"
++#~ "Reinstalar %5.5s Pacote(s)\n"
++#~ "Desatualizar %5.5s Pacote(s)\n"
++
++#~ msgid "Weird"
++#~ msgstr "Estranho"
++
++#~ msgid "Potential match for %s from %s"
++#~ msgstr "Correspondência potencial para o %s a partir de %s"
++
++#~ msgid "Matched %s to require for %s"
++#~ msgstr "%s encontrado para solicitar o %s"
++
+ #~ msgid "Finished Transaction Test"
+ #~ msgstr "Teste de transação finalizado"
+
+@@ -2805,9 +3141,6 @@ msgstr "Erro ao abrir o rpm %s - erro %s"
+ #~ msgid "Reducing %s to included packages only"
+ #~ msgstr "Reduzindo %s apenas aos pacotes inclusos"
+
+-#~ msgid "Keeping included package %s"
+-#~ msgstr "Mantendo o pacote incluso %s"
+-
+ #~ msgid "Removing unmatched package %s"
+ #~ msgstr "Removendo pacote não encontrado %s"
+
+@@ -3315,9 +3648,6 @@ msgstr "Erro ao abrir o rpm %s - erro %s"
+ #~ msgid "depcheck: package %s needs %s"
+ #~ msgstr "verificação de dependências: o pacote %s precisa do %s"
+
+-#~ msgid "Error - %s cannot be found"
+-#~ msgstr "Erro - %s não pôde ser encontrado"
+-
+ #~ msgid "Erasing: %s %d/%d"
+ #~ msgstr "Apagando: %s %d/%d"
+
+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
@@ -29753,10 +33587,22 @@ index dac8abd..1e3302b 100644
self.po.prco['requires'].append(("foo", "GE", (4, 5, None)))
diff --git a/utils.py b/utils.py
-index 9335112..aad1b73 100644
+index 9335112..837c9b6 100644
--- a/utils.py
+++ b/utils.py
-@@ -101,12 +101,12 @@ def get_process_info(pid):
+@@ -58,6 +58,11 @@ def get_process_info(pid):
+ if not pid:
+ return
+
++ try:
++ pid = int(pid)
++ except ValueError, e:
++ return
++
+ # Maybe true if /proc isn't mounted, or not Linux ... or something.
+ if (not os.path.exists("/proc/%d/status" % pid) or
+ not os.path.exists("/proc/stat") or
+@@ -101,12 +106,12 @@ def get_process_info(pid):
return ps
def show_lock_owner(pid, logger):
@@ -29773,7 +33619,7 @@ index 9335112..aad1b73 100644
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):
+@@ -121,6 +126,7 @@ def show_lock_owner(pid, logger):
(time.ctime(ps['start_time']), ago))
logger.critical(_(" State : %s, pid: %d") % (ps['state'], pid))
@@ -29795,7 +33641,7 @@ index c3c7133..fc05aa6 100644
Requires: python-iniparse
Requires: pygpgme
diff --git a/yum/__init__.py b/yum/__init__.py
-index 2ea9f20..afe5354 100644
+index 2ea9f20..7445f9e 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -294,6 +294,11 @@ class YumBase(depsolve.Depsolve):
@@ -29925,6 +33771,15 @@ index 2ea9f20..afe5354 100644
def costExcludePackages(self):
""" Create an excluder for repos. with higher cost. Eg.
+@@ -1919,7 +1937,7 @@ class YumBase(depsolve.Depsolve):
+ - 2 - Fatal GPG verification error, give up.
+ '''
+ if hasattr(po, 'pkgtype') and po.pkgtype == 'local':
+- check = self.conf.gpgcheck
++ check = self.conf.localpkg_gpgcheck
+ hasgpgkey = 0
+ else:
+ repo = self.repos.getRepo(po.repoid)
@@ -3100,6 +3118,9 @@ class YumBase(depsolve.Depsolve):
def _find_obsoletees(self, po):
@@ -29978,6 +33833,15 @@ index 2ea9f20..afe5354 100644
txmbr = self.tsInfo.addErase(po)
tx_return.append(txmbr)
+@@ -3952,7 +3982,7 @@ class YumBase(depsolve.Depsolve):
+ EOL """
+
+ if not po and not kwargs:
+- raise Errors.DowngradeError, 'Nothing specified to remove'
++ raise Errors.DowngradeError, 'Nothing specified to downgrade'
+
+ doing_group_pkgs = False
+ if po:
@@ -3975,7 +4005,7 @@ class YumBase(depsolve.Depsolve):
try:
apkgs = self.returnPackagesByDep(arg)
@@ -30019,7 +33883,7 @@ index 5ccfba2..408bb1c 100755
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
diff --git a/yum/config.py b/yum/config.py
-index 650d7b9..49411e3 100644
+index 650d7b9..2118792 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -645,6 +645,8 @@ class YumConf(StartupConf):
@@ -30031,7 +33895,15 @@ index 650d7b9..49411e3 100644
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):
+@@ -671,6 +673,7 @@ class YumConf(StartupConf):
+ # FIXME: rename gpgcheck to pkgs_gpgcheck
+ gpgcheck = BoolOption(__pkgs_gpgcheck_default__)
+ repo_gpgcheck = BoolOption(__repo_gpgcheck_default__)
++ localpkg_gpgcheck = BoolOption(__pkgs_gpgcheck_default__)
+ obsoletes = BoolOption(True)
+ showdupesfromrepos = BoolOption(False)
+ enabled = BoolOption(True)
+@@ -794,6 +797,8 @@ class RepoConf(BaseConfig):
proxy_password = Inherit(YumConf.proxy_password)
retries = Inherit(YumConf.retries)
failovermethod = Inherit(YumConf.failovermethod)
@@ -30763,10 +34635,10 @@ index 9cd2040..bfc49b7 100644
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
-index ae73c32..52e771b 100644
+index ae73c32..1f44706 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
-@@ -195,7 +195,9 @@ class RPMDBPackageSack(PackageSackBase):
+@@ -195,13 +195,20 @@ class RPMDBPackageSack(PackageSackBase):
}
addldb_path = os.path.normpath(self._persistdir + '/yumdb')
@@ -30777,7 +34649,18 @@ index ae73c32..52e771b 100644
def _get_pkglist(self):
'''Getter for the pkglist property.
-@@ -210,6 +212,10 @@ class RPMDBPackageSack(PackageSackBase):
+ Returns a list of package tuples.
+ '''
+ if not self._simple_pkgtup_list:
++ csumpkgtups = self.preloadPackageChecksums(load_packages=False)
++ if csumpkgtups is not None:
++ self._simple_pkgtup_list = csumpkgtups.keys()
++
++ if not self._simple_pkgtup_list:
+ for (hdr, mi) in self._all_packages():
+ self._simple_pkgtup_list.append(self._hdr2pkgTuple(hdr))
+
+@@ -210,6 +217,10 @@ class RPMDBPackageSack(PackageSackBase):
pkglist = property(_get_pkglist, None)
def dropCachedData(self):
@@ -30788,7 +34671,7 @@ index ae73c32..52e771b 100644
self._idx2pkg = {}
self._name2pkg = {}
self._pkgnames_loaded = set()
-@@ -236,6 +242,73 @@ class RPMDBPackageSack(PackageSackBase):
+@@ -236,6 +247,73 @@ class RPMDBPackageSack(PackageSackBase):
self.transactionReset() # Should do nothing, but meh...
self._cached_rpmdb_mtime = None
@@ -30862,7 +34745,7 @@ index ae73c32..52e771b 100644
def setCacheDir(self, cachedir):
""" Sets the internal cachedir value for the rpmdb, to be the
"rpmdb-indexes" directory in the persisent yum storage. """
-@@ -244,6 +317,10 @@ class RPMDBPackageSack(PackageSackBase):
+@@ -244,6 +322,10 @@ class RPMDBPackageSack(PackageSackBase):
else:
self._cachedir = '/' + cachedir
@@ -30873,7 +34756,26 @@ index ae73c32..52e771b 100644
def readOnlyTS(self):
if not self.ts:
self.ts = initReadOnlyTransaction(root=self.root)
-@@ -1422,9 +1499,10 @@ class RPMDBAdditionalData(object):
+@@ -803,7 +885,7 @@ class RPMDBPackageSack(PackageSackBase):
+ os.rename(self._cachedir + '/file-requires.tmp',
+ self._cachedir + '/file-requires')
+
+- def preloadPackageChecksums(self):
++ def preloadPackageChecksums(self, load_packages=True):
+ """ As simpleVersion() et. al. requires it, we "cache" this yumdb data
+ as part of our rpmdb cache. We cache it with rpmdb data, even
+ though someone _could_ use yumdb to alter it without changing the
+@@ -845,6 +927,9 @@ class RPMDBPackageSack(PackageSackBase):
+ self._deal_with_bad_rpmdbcache("pkg checksums")
+ return
+
++ if not load_packages:
++ return checksum_data
++
+ for pkgtup in checksum_data:
+ (n, a, e, v, r) = pkgtup
+ pkg = self.searchNevra(n, e, v, r, a)
+@@ -1422,9 +1507,10 @@ class RPMDBAdditionalData(object):
# dirs have files per piece of info we're keeping
# repoid, install reason, status, blah, (group installed for?), notes?
@@ -30885,7 +34787,7 @@ index ae73c32..52e771b 100644
self.conf.writable = False
self._packages = {} # pkgid = dir
-@@ -1566,7 +1644,6 @@ class RPMDBAdditionalDataPackage(object):
+@@ -1566,7 +1652,6 @@ class RPMDBAdditionalDataPackage(object):
self._yumdb_cache['attr'][value][2].add(fn)
self._yumdb_cache[fn] = value
@@ -30893,7 +34795,7 @@ index ae73c32..52e771b 100644
return True
-@@ -1587,6 +1664,11 @@ class RPMDBAdditionalDataPackage(object):
+@@ -1587,6 +1672,11 @@ class RPMDBAdditionalDataPackage(object):
if attr.endswith('.tmp'):
raise AttributeError, "Cannot set attribute %s on %s" % (attr, self)
@@ -31178,10 +35080,10 @@ index dd595f0..b0e23c6 100644
continue
diff --git a/yumcommands.py b/yumcommands.py
-index a7f5d9e..517e6b9 100644
+index a7f5d9e..3c009f8 100644
--- a/yumcommands.py
+++ b/yumcommands.py
-@@ -122,6 +122,25 @@ def checkShellArg(base, basecmd, extcmds):
+@@ -122,10 +122,30 @@ def checkShellArg(base, basecmd, extcmds):
base.usage()
raise cli.CliError
@@ -31207,7 +35109,12 @@ index a7f5d9e..517e6b9 100644
class YumCommand:
def __init__(self):
-@@ -176,6 +195,7 @@ class InstallCommand(YumCommand):
+ self.done_command_once = False
++ self.hidden = False
+
+ def doneCommand(self, base, msg, *args):
+ if not self.done_command_once:
+@@ -176,6 +196,7 @@ class InstallCommand(YumCommand):
checkRootUID(base)
checkGPGKey(base)
checkPackageArg(base, basecmd, extcmds)
@@ -31215,7 +35122,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
self.doneCommand(base, _("Setting up Install Process"))
-@@ -197,6 +217,7 @@ class UpdateCommand(YumCommand):
+@@ -197,6 +218,7 @@ class UpdateCommand(YumCommand):
def doCheck(self, base, basecmd, extcmds):
checkRootUID(base)
checkGPGKey(base)
@@ -31223,7 +35130,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
self.doneCommand(base, _("Setting up Update Process"))
-@@ -218,6 +239,7 @@ class DistroSyncCommand(YumCommand):
+@@ -218,6 +240,7 @@ class DistroSyncCommand(YumCommand):
def doCheck(self, base, basecmd, extcmds):
checkRootUID(base)
checkGPGKey(base)
@@ -31231,7 +35138,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
self.doneCommand(base, _("Setting up Distribution Synchronization Process"))
-@@ -420,6 +442,9 @@ class GroupListCommand(GroupCommand):
+@@ -420,6 +443,9 @@ class GroupListCommand(GroupCommand):
def getSummary(self):
return _("List available package groups")
@@ -31241,7 +35148,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
GroupCommand.doCommand(self, base, basecmd, extcmds)
return base.returnGroupLists(extcmds)
-@@ -441,6 +466,7 @@ class GroupInstallCommand(GroupCommand):
+@@ -441,6 +467,7 @@ class GroupInstallCommand(GroupCommand):
checkRootUID(base)
checkGPGKey(base)
checkGroupArg(base, basecmd, extcmds)
@@ -31249,7 +35156,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
GroupCommand.doCommand(self, base, basecmd, extcmds)
-@@ -462,6 +488,7 @@ class GroupRemoveCommand(GroupCommand):
+@@ -462,6 +489,7 @@ class GroupRemoveCommand(GroupCommand):
def doCheck(self, base, basecmd, extcmds):
checkRootUID(base)
checkGroupArg(base, basecmd, extcmds)
@@ -31257,7 +35164,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
GroupCommand.doCommand(self, base, basecmd, extcmds)
-@@ -488,6 +515,7 @@ class GroupInfoCommand(GroupCommand):
+@@ -488,6 +516,7 @@ class GroupInfoCommand(GroupCommand):
def doCheck(self, base, basecmd, extcmds):
checkGroupArg(base, basecmd, extcmds)
@@ -31265,7 +35172,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
GroupCommand.doCommand(self, base, basecmd, extcmds)
-@@ -511,7 +539,7 @@ class MakeCacheCommand(YumCommand):
+@@ -511,7 +540,7 @@ class MakeCacheCommand(YumCommand):
return _("Generate the metadata cache")
def doCheck(self, base, basecmd, extcmds):
@@ -31274,7 +35181,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
base.logger.debug(_("Making cache files for all metadata files."))
-@@ -554,6 +582,7 @@ class CleanCommand(YumCommand):
+@@ -554,6 +583,7 @@ class CleanCommand(YumCommand):
def doCheck(self, base, basecmd, extcmds):
checkCleanArg(base, basecmd, extcmds)
@@ -31282,7 +35189,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
base.conf.cache = 1
-@@ -592,6 +621,9 @@ class CheckUpdateCommand(YumCommand):
+@@ -592,6 +622,9 @@ class CheckUpdateCommand(YumCommand):
def getSummary(self):
return _("Check for available package updates")
@@ -31292,7 +35199,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
base.extcmds.insert(0, 'updates')
result = 0
-@@ -668,6 +700,7 @@ class UpgradeCommand(YumCommand):
+@@ -668,6 +701,7 @@ class UpgradeCommand(YumCommand):
def doCheck(self, base, basecmd, extcmds):
checkRootUID(base)
checkGPGKey(base)
@@ -31300,7 +35207,18 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
base.conf.obsoletes = 1
-@@ -1104,6 +1137,7 @@ class ReInstallCommand(YumCommand):
+@@ -678,6 +712,10 @@ class UpgradeCommand(YumCommand):
+ return 1, [str(e)]
+
+ class LocalInstallCommand(YumCommand):
++ def __init__(self):
++ YumCommand.__init__(self)
++ self.hidden = True
++
+ def getNames(self):
+ return ['localinstall', 'localupdate']
+
+@@ -1104,6 +1142,7 @@ class ReInstallCommand(YumCommand):
checkRootUID(base)
checkGPGKey(base)
checkPackageArg(base, basecmd, extcmds)
@@ -31308,7 +35226,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
self.doneCommand(base, _("Setting up Reinstall Process"))
-@@ -1130,6 +1164,7 @@ class DowngradeCommand(YumCommand):
+@@ -1130,6 +1169,7 @@ class DowngradeCommand(YumCommand):
checkRootUID(base)
checkGPGKey(base)
checkPackageArg(base, basecmd, extcmds)
@@ -31316,7 +35234,7 @@ index a7f5d9e..517e6b9 100644
def doCommand(self, base, basecmd, extcmds):
self.doneCommand(base, _("Setting up Downgrade Process"))
-@@ -1294,7 +1329,7 @@ class HistoryCommand(YumCommand):
+@@ -1294,7 +1334,7 @@ class HistoryCommand(YumCommand):
return ['history']
def getUsage(self):
@@ -31325,7 +35243,7 @@ index a7f5d9e..517e6b9 100644
def getSummary(self):
return _("Display, or use, the transaction history")
-@@ -1323,7 +1358,10 @@ class HistoryCommand(YumCommand):
+@@ -1323,7 +1363,10 @@ class HistoryCommand(YumCommand):
base.history._create_db_file()
def doCheck(self, base, basecmd, extcmds):
@@ -31337,7 +35255,7 @@ index a7f5d9e..517e6b9 100644
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):
+@@ -1347,8 +1390,11 @@ class HistoryCommand(YumCommand):
ret = base.historyInfoCmd(extcmds)
elif vcmd == 'summary':
ret = base.historySummaryCmd(extcmds)
@@ -31350,7 +35268,7 @@ index a7f5d9e..517e6b9 100644
elif vcmd == 'undo':
ret = self._hcmd_undo(base, extcmds)
elif vcmd in ('redo', 'repeat'):
-@@ -1383,7 +1424,7 @@ class CheckRpmdbCommand(YumCommand):
+@@ -1383,7 +1429,7 @@ class CheckRpmdbCommand(YumCommand):
chkcmd = extcmds
def _out(x):
diff --git a/yum.spec b/yum.spec
index 7eed0a1..6037c77 100644
--- a/yum.spec
+++ b/yum.spec
@@ -5,7 +5,7 @@
Summary: RPM installer/updater
Name: yum
Version: 3.2.28
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -156,6 +156,12 @@ rm -rf $RPM_BUILD_ROOT
%dir %{yum_pluginslib}
%changelog
+* Sat Sep 25 2010 James Antill <james at fedoraproject.org> - 3.2.28-9
+- latest head
+- Add localpkg_gpgcheck option.
+- Speedup "list updates"
+- Doc fixes.
+
* Sat Sep 25 2010 James Antill <james at fedoraproject.org> - 3.2.28-8
- latest head
- Speedup install/remove/etc a lot.
More information about the scm-commits
mailing list