[yum-commits] Branch 'yum-3_2_X' - po/ca.po po/da.po po/de.po po/fr.po po/it.po po/POTFILES.in po/pt_BR.po po/sr at latin.po po/sr.po po/zh_CN.po

Tim Lauridsen timlau at osuosl.org
Sun Oct 19 13:58:12 UTC 2008


 po/POTFILES.in |    1 
 po/ca.po       |  126 ++-
 po/da.po       |    9 
 po/de.po       | 1186 ++++++++++++++--------------
 po/fr.po       |  993 ++++++++++++-----------
 po/it.po       |    6 
 po/pt_BR.po    |  360 +++++---
 po/sr.po       |  957 ++++++++++++----------
 po/sr at latin.po |  971 ++++++++++++-----------
 po/zh_CN.po    | 2386 +++++++++++++++++++++++++++++++++++----------------------
 10 files changed, 3965 insertions(+), 3030 deletions(-)

New commits:
commit 79188c0f945b2b40bf5e88de90304abd218baf39
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Sun Oct 19 15:57:49 2008 +0200

    rebuild POTFILES.in and *.po files

diff --git a/po/POTFILES.in b/po/POTFILES.in
index c7b02c9..081d601 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -18,6 +18,7 @@ yum/i18n.py
 yum/__init__.py
 yum/logginglevels.py
 yum/mdparser.py
+yum/metalink.py
 yum/misc.py
 yum/packageSack.py
 yum/packages.py
diff --git a/po/ca.po b/po/ca.po
index 0e21ad5..c2deee6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../callback.py:48 ../output.py:512
 msgid "Updating"
@@ -125,12 +125,14 @@ msgstr "  Es necessiten almenys %dMB al sistema de fitxers %s.\n"
 msgid ""
 "Error Summary\n"
 "-------------\n"
-msgstr "Resum d'errors\n"
+msgstr ""
+"Resum d'errors\n"
 "-------------\n"
 
 #: ../cli.py:317
 msgid "Trying to run the transaction but nothing to do. Exiting."
-msgstr "S'ha intentat executar la transacció però no hi ha res a fer. S'està sortint."
+msgstr ""
+"S'ha intentat executar la transacció però no hi ha res a fer. S'està sortint."
 
 #: ../cli.py:347
 msgid "Exiting on user Command"
@@ -180,7 +182,8 @@ msgstr "S'està executant la transacció"
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
-msgstr "No s'importaran automàticament les claus en una execució desatesa.\n"
+msgstr ""
+"No s'importaran automàticament les claus en una execució desatesa.\n"
 "Feu servir \"-y\" per a importar les claus."
 
 #: ../cli.py:491
@@ -235,7 +238,9 @@ msgstr "No s'ha proporcionat cap paquet"
 
 #: ../cli.py:654
 msgid "Matching packages for package list to user args"
-msgstr "S'està comparant els paquets per a la llista de paquets amb els arguments de l'usuari"
+msgstr ""
+"S'està comparant els paquets per a la llista de paquets amb els arguments de "
+"l'usuari"
 
 #: ../cli.py:701
 #, python-format
@@ -298,7 +303,9 @@ msgstr "Avís: El grup %s no existeix"
 
 #: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
-msgstr "No hi ha cap paquet disponible per a instal·lar o actualitzar en els grups sol·licitats"
+msgstr ""
+"No hi ha cap paquet disponible per a instal·lar o actualitzar en els grups "
+"sol·licitats"
 
 #: ../cli.py:855
 #, python-format
@@ -333,7 +340,9 @@ msgstr "S'està descartant el paquet no comparable %s.%s"
 #: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
-msgstr "No hi ha cap altre %s instal·lat, s'afegeix a la llista per a una possible instal·lació"
+msgstr ""
+"No hi ha cap altre %s instal·lat, s'afegeix a la llista per a una possible "
+"instal·lació"
 
 #: ../cli.py:971
 #, python-format
@@ -390,7 +399,8 @@ msgstr "habilita un o més repositoris (es permeten caràcters de reemplaçament
 
 #: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
-msgstr "deshabilita un o més repositoris (es permeten caràcters de reemplaçament)"
+msgstr ""
+"deshabilita un o més repositoris (es permeten caràcters de reemplaçament)"
 
 #: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
@@ -530,8 +540,8 @@ msgstr "Llicència    : %s"
 msgid "Description: "
 msgstr "Descripció: "
 
-#: ../output.py:351
 # REMEMBER to Translate [Y/N] to the current locale
+#: ../output.py:351
 msgid "Is this ok [y/N]: "
 msgstr "És correcte [s/N]: "
 
@@ -674,7 +684,6 @@ msgstr ""
 "Instal·la  %5.5s paquets\n"
 "Actualitza %5.5s paquets\n"
 "Esborra    %5.5s paquets\n"
-""
 
 #: ../output.py:554
 msgid "Removed"
@@ -704,8 +713,8 @@ msgid ""
 "seconds to exit.\n"
 msgstr ""
 "\n"
-"S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%s "
-"segons per a sortir.\n"
+"S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%"
+"s segons per a sortir.\n"
 
 #: ../output.py:628
 msgid "user interrupt"
@@ -738,7 +747,8 @@ msgstr "--> S'està executant la transacció de prova"
 
 #: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
-msgstr "--> Tornant a calcular la resolució de dependències amb els nous canvis."
+msgstr ""
+"--> Tornant a calcular la resolució de dependències amb els nous canvis."
 
 #: ../output.py:663
 msgid "--> Finished Dependency Resolution"
@@ -761,12 +771,16 @@ msgstr "--> S'està processant el conflicte: %s té un conflicte amb %s"
 
 #: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
-msgstr "--> S'està poblant la transacció amb els paquets sel·leccionats. Si us plau, espereu."
+msgstr ""
+"--> S'està poblant la transacció amb els paquets sel·leccionats. Si us plau, "
+"espereu."
 
 #: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
-msgstr "---> S'està descarregant la capçalera per a %s per a empaquetar dins de la transacció de prova."
+msgstr ""
+"---> S'està descarregant la capçalera per a %s per a empaquetar dins de la "
+"transacció de prova."
 
 #: ../yumcommands.py:36
 msgid "You need to be root to perform this command."
@@ -790,7 +804,8 @@ msgid ""
 "For more information contact your distribution or package provider.\n"
 msgstr ""
 "\n"
-"Heu habilitat la comprovació de paquets utilitzant claus GPG. És una bona opció. \n"
+"Heu habilitat la comprovació de paquets utilitzant claus GPG. És una bona "
+"opció. \n"
 "No obstant, no teniu cap clau pública GPG instal·lada. Necessiteu "
 "descarregar\n"
 "les claus per als paquets paquets que desitdeu instal·lar i instal·lar-les.\n"
@@ -802,7 +817,8 @@ msgstr ""
 "per a un repositori en l'opció 'gpgkey' en la secció d'un repositori i yum \n"
 "la instal·larà per vosaltres.\n"
 "\n"
-"Per a més informació contacteu el vostre distribuidor o proveïdor de paquets.\n"
+"Per a més informació contacteu el vostre distribuidor o proveïdor de "
+"paquets.\n"
 
 #: ../yumcommands.py:63
 #, python-format
@@ -843,7 +859,8 @@ msgstr "El fitxer %s donat com a argument a l'intèrpret d'ordres no existeix."
 
 #: ../yumcommands.py:115
 msgid "Error: more than one file given as argument to shell."
-msgstr "Error: s'ha donat més d'un fitxer com a arguments per a l'intèrpret d'ordres."
+msgstr ""
+"Error: s'ha donat més d'un fitxer com a arguments per a l'intèrpret d'ordres."
 
 #: ../yumcommands.py:156
 msgid "PACKAGE..."
@@ -943,7 +960,8 @@ msgstr "Genera les metadades de la memòria cau"
 
 #: ../yumcommands.py:390
 msgid "Making cache files for all metadata files."
-msgstr "S'estan fent els fitxers de memòria cau per a tots els fitxers de metadades."
+msgstr ""
+"S'estan fent els fitxers de memòria cau per a tots els fitxers de metadades."
 
 #: ../yumcommands.py:391
 msgid "This may take a while depending on the speed of this computer"
@@ -1143,7 +1161,8 @@ msgstr "doTsSetup() desapareixerà en una futura versió de Yum.\n"
 
 #: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
-msgstr "S'està configurant TransactionSets abans que la classe de configuració "
+msgstr ""
+"S'està configurant TransactionSets abans que la classe de configuració "
 "estigui iniciada"
 
 #: ../yum/depsolve.py:136
@@ -1193,7 +1212,8 @@ msgstr "%s requereix: %s"
 
 #: ../yum/depsolve.py:312
 msgid "Needed Require has already been looked up, cheating"
-msgstr "El requeriment necessari ja s'ha buscat anteriorment, s'estan fent trampes"
+msgstr ""
+"El requeriment necessari ja s'ha buscat anteriorment, s'estan fent trampes"
 
 #: ../yum/depsolve.py:322
 #, python-format
@@ -1223,7 +1243,8 @@ msgstr "TSINFO: el paquet %s requereix %s marcat per a esborrar"
 #: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
-msgstr "TSINFO: S'està marcant com a obsolet %s amb %s per resoldre dependències."
+msgstr ""
+"TSINFO: S'està marcant com a obsolet %s amb %s per resoldre dependències."
 
 #: ../yum/depsolve.py:375
 #, python-format
@@ -1244,17 +1265,22 @@ msgstr "No es pot resoldre el requeriment %s per a %s"
 #: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
-msgstr "%s es troba en els paquets proporcionats però ja es troba instal·lat, s'està esborrant."
+msgstr ""
+"%s es troba en els paquets proporcionats però ja es troba instal·lat, s'està "
+"esborrant."
 
 #: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
-msgstr "El paquet potencial que resol dependències %s té una instància nova a ts"
+msgstr ""
+"El paquet potencial que resol dependències %s té una instància nova a ts"
 
 #: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
-msgstr "El paquet potencial que resol dependències %s té una nova instància insta·lada."
+msgstr ""
+"El paquet potencial que resol dependències %s té una nova instància "
+"insta·lada."
 
 #: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
@@ -1271,7 +1297,8 @@ msgstr "%s ja es troba en ts, s'està ometent"
 msgid ""
 "Failure finding best provider of %s for %s, exceeded maximum loop length"
 msgstr ""
-"S'ha produït un error trobant el millor proveïdor de %s per a %s, el bucle ha excedit la longitud màxima"
+"S'ha produït un error trobant el millor proveïdor de %s per a %s, el bucle "
+"ha excedit la longitud màxima"
 
 #: ../yum/depsolve.py:537
 #, python-format
@@ -1528,7 +1555,9 @@ msgstr "No coincideix la suma de verificació del paquet"
 #: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
-msgstr "la suma de verificació del paquet falla però l'ús de memòria cau està habilitat per a %s"
+msgstr ""
+"la suma de verificació del paquet falla però l'ús de memòria cau està "
+"habilitat per a %s"
 
 #: ../yum/__init__.py:1042
 #, python-format
@@ -1538,7 +1567,8 @@ msgstr "s'està utilitzant la còpia local de %s"
 #: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
-msgstr "No hi ha espai suficient al directori de descàrregues %s per a descarregar"
+msgstr ""
+"No hi ha espai suficient al directori de descàrregues %s per a descarregar"
 
 #: ../yum/__init__.py:1094
 msgid "Header is not complete."
@@ -1549,7 +1579,8 @@ msgstr "La capçalera no està completa."
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
 msgstr ""
-"La capçalera no es troba en la memòria cau local i està habilitat el mode de només memòria cau. No es pot descarregar %s"
+"La capçalera no es troba en la memòria cau local i està habilitat el mode de "
+"només memòria cau. No es pot descarregar %s"
 
 #: ../yum/__init__.py:1189
 #, python-format
@@ -1665,7 +1696,8 @@ msgstr "No s'ha pogut trobar la tupla de paquets %s al sac de paquets"
 
 #: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
-msgstr "La cadena de versió de dependència és invàlida, proveu-ho entre cometes."
+msgstr ""
+"La cadena de versió de dependència és invàlida, proveu-ho entre cometes."
 
 #: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
@@ -1688,7 +1720,9 @@ msgstr "No hi ha res especificat per a instal·lar"
 #: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
-msgstr "S'està verificant si hi ha un proveïdor virtual o un fitxer proveïdor per a %s"
+msgstr ""
+"S'està verificant si hi ha un proveïdor virtual o un fitxer proveïdor per a %"
+"s"
 
 #: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
@@ -1714,7 +1748,9 @@ msgstr "El paquet %s ja es troba instal·lat i en l'última versió."
 #: ../yum/__init__.py:2178
 #, python-format
 msgid "Package matching %s already installed. Checking for update."
-msgstr "El paquet coincident %s ja es troba instal·lat. S'està buscant una actualització."
+msgstr ""
+"El paquet coincident %s ja es troba instal·lat. S'està buscant una "
+"actualització."
 
 #. update everything (the easy case)
 #: ../yum/__init__.py:2220
@@ -1750,7 +1786,9 @@ msgstr "S'està examinant %s: %s"
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
 "instead."
-msgstr "El paquet %s no està instal·lat; no es pot actualitzar. Executa yum install per a instal·lar-lo."
+msgstr ""
+"El paquet %s no està instal·lat; no es pot actualitzar. Executa yum install "
+"per a instal·lar-lo."
 
 #: ../yum/__init__.py:2468
 #, python-format
@@ -1774,7 +1812,8 @@ msgstr "%s no actualitza el paquet instal·lat."
 
 #: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
-msgstr "Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a esborrar"
+msgstr ""
+"Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a esborrar"
 
 #: ../yum/__init__.py:2515
 #, python-format
@@ -1783,7 +1822,9 @@ msgstr "El paquet %s permet múltiples instal·lacions, s'està ometent"
 
 #: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
-msgstr "Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a instal·lar"
+msgstr ""
+"Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a "
+"instal·lar"
 
 #: ../yum/__init__.py:2570
 #, python-format
@@ -1829,9 +1870,10 @@ msgid ""
 "are not correct for this package.\n"
 "Check that the correct key URLs are configured for this repository."
 msgstr ""
-"Les claus GPG llistades pel repositori \"%s\" ja estan instal·lades però "
-"no són correctes per a aquest paquet.\n"
-"Comproveu que les URL de clau correctes estan configurades per a aquest repositori."
+"Les claus GPG llistades pel repositori \"%s\" ja estan instal·lades però no "
+"són correctes per a aquest paquet.\n"
+"Comproveu que les URL de clau correctes estan configurades per a aquest "
+"repositori."
 
 #: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
@@ -1884,7 +1926,8 @@ msgstr "S'està carregant el connector \"%s\""
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
 msgstr ""
-"Existeixen dos o més connectors amb el mateix nom \"%s\" en el camí de cerca de connectors"
+"Existeixen dos o més connectors amb el mateix nom \"%s\" en el camí de cerca "
+"de connectors"
 
 #: ../yum/plugins.py:291
 #, python-format
@@ -1914,7 +1957,9 @@ msgstr "falla la comprobació md5 per al RPM %s"
 
 #: ../rpmUtils/oldUtils.py:144
 msgid "Could not open RPM database for reading. Perhaps it is already in use?"
-msgstr "No s'ha pogut obrir la base de dades RPM per a llegir-la. Potser ja està en ús?"
+msgstr ""
+"No s'ha pogut obrir la base de dades RPM per a llegir-la. Potser ja està en "
+"ús?"
 
 #: ../rpmUtils/oldUtils.py:174
 msgid "Got an empty Header, something has gone wrong"
@@ -1930,4 +1975,3 @@ msgstr "Capçalera danyada %s"
 #, python-format
 msgid "Error opening rpm %s - error %s"
 msgstr "Error en obrir rpm %s - error %s"
-
diff --git a/po/da.po b/po/da.po
index 38d0e7a..2e81805 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,8 +4,8 @@
 # tim <timlau at fedoraproject.org>, 2008.
 # , fuzzy
 # tim <timlau at fedoraproject.org>, 2008.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: yum 3.2.10\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Language-Team: Danish <dansk at klid.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../callback.py:48 ../output.py:512
 msgid "Updating"
@@ -1773,7 +1773,8 @@ msgstr "Problem med geninstallation, ingen pakke fundet til at blive slettet"
 #: ../yum/__init__.py:2515
 #, python-format
 msgid "Package %s is allowed multiple installs, skipping"
-msgstr "Springer pakken %s over, da den er tilladt til installering i flere verisoner"
+msgstr ""
+"Springer pakken %s over, da den er tilladt til installering i flere verisoner"
 
 #: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
diff --git a/po/de.po b/po/de.po
index adc5e06..411eedf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 21:26+0000\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-09-11 15:51+0100\n"
 "Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
 "Language-Team: German <fedora-trans-de at redhat.com>\n"
@@ -15,35 +15,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../callback.py:48
-#: ../output.py:516
-#: ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Aktualisieren"
 
 #: ../callback.py:49
-#: ../yum/rpmtrans.py:72
 msgid "Erasing"
 msgstr "Löschen"
 
-#: ../callback.py:50
-#: ../callback.py:51
-#: ../callback.py:53
-#: ../output.py:515
-#: ../yum/rpmtrans.py:73
-#: ../yum/rpmtrans.py:74
-#: ../yum/rpmtrans.py:76
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Installieren"
 
-#: ../callback.py:52
-#: ../callback.py:58
-#: ../yum/rpmtrans.py:75
+#: ../callback.py:52 ../callback.py:58
 msgid "Obsoleted"
 msgstr "Veraltet"
 
-#: ../callback.py:54
-#: ../output.py:562
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Aktualisiert"
 
@@ -51,10 +39,7 @@ msgstr "Aktualisiert"
 msgid "Erased"
 msgstr "Gelöscht"
 
-#: ../callback.py:56
-#: ../callback.py:57
-#: ../callback.py:59
-#: ../output.py:560
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "Installiert"
 
@@ -77,58 +62,53 @@ msgstr "Fehler: Ungültiger Ausgabe-Zustand: %s for %s"
 msgid "Erased: %s"
 msgstr "Gelöscht: %s"
 
-#: ../callback.py:217
-#: ../output.py:517
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Entfernen"
 
 #: ../callback.py:219
-#: ../yum/rpmtrans.py:77
 msgid "Cleanup"
 msgstr "Aufräumen"
 
-#: ../cli.py:105
+#: ../cli.py:103
 #, python-format
 msgid "Command \"%s\" already defined"
 msgstr "Befehl \"%s\" ist bereits definiert"
 
-#: ../cli.py:117
+#: ../cli.py:115
 msgid "Setting up repositories"
 msgstr "Repositories werden eingerichtet"
 
-#: ../cli.py:128
+#: ../cli.py:126
 msgid "Reading repository metadata in from local files"
 msgstr "Lese Repository-Metadaten aus lokalen Dateien ein"
 
-#: ../cli.py:186
-#: ../utils.py:71
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "Konfigurationsfehler: %s"
 
-#: ../cli.py:189
-#: ../cli.py:1081
-#: ../utils.py:74
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Optionenfehler: %s"
 
-#: ../cli.py:232
+#: ../cli.py:229
 msgid "You need to give some command"
 msgstr "Sie müssen ein paar Befehle eingeben"
 
-#: ../cli.py:274
+#: ../cli.py:271
 msgid "Disk Requirements:\n"
 msgstr "Festplattenplatz-Anforderungen:\n"
 
-#: ../cli.py:276
+#: ../cli.py:273
 #, python-format
 msgid "  At least %dMB needed on the %s filesystem.\n"
 msgstr "  Mindestens %d MB werden auf dem Dateisystem %s benötigt.\n"
 
 #. TODO: simplify the dependency errors?
 #. Fixup the summary
-#: ../cli.py:281
+#: ../cli.py:278
 msgid ""
 "Error Summary\n"
 "-------------\n"
@@ -136,380 +116,355 @@ msgstr ""
 "Fehlerzusammenfassung\n"
 "-------------\n"
 
-#: ../cli.py:320
+#: ../cli.py:317
 msgid "Trying to run the transaction but nothing to do. Exiting."
 msgstr "Versuche Transaktion auzuführen, aber es ist nichts zu tun. Beende."
 
-#: ../cli.py:350
+#: ../cli.py:347
 msgid "Exiting on user Command"
 msgstr "Beende auf Benutzer-Befehl hin"
 
-#: ../cli.py:354
+#: ../cli.py:351
 msgid "Downloading Packages:"
 msgstr "Lade Pakete herunter:"
 
-#: ../cli.py:359
+#: ../cli.py:356
 msgid "Error Downloading Packages:\n"
 msgstr "Fehler beim Herunterladen der Pakete:\n"
 
-#: ../cli.py:373
-#: ../yum/__init__.py:2826
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "Führe rpm_check_debug durch"
 
-#: ../cli.py:376
-#: ../yum/__init__.py:2829
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr "FEHLER mit rpm_check_debug gegen depsolve:"
 
-#: ../cli.py:380
-#: ../yum/__init__.py:2831
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Bitte melden Sie diesen Fehler in Bugzilla"
 
-#: ../cli.py:386
+#: ../cli.py:383
 msgid "Running Transaction Test"
 msgstr "Führe Verarbeitungsstest durch"
 
-#: ../cli.py:402
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr "Verarbeitungstest beendet"
 
-#: ../cli.py:404
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr "Prüffehler bei Verarbeitung:\n"
 
-#: ../cli.py:411
+#: ../cli.py:408
 msgid "Transaction Test Succeeded"
 msgstr "Verarbeitungstest erfolgreich"
 
-#: ../cli.py:432
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr "Führe Verarbeitung durch"
 
-#: ../cli.py:462
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
 msgstr ""
-"Verweigere automatischen Import der Schlüssel, wenn unbeaufsichtigt ausgeführt.\n"
+"Verweigere automatischen Import der Schlüssel, wenn unbeaufsichtigt "
+"ausgeführt.\n"
 "Benutze \"-y\" zum Ãœberschreiben."
 
-#: ../cli.py:494
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr "Analysiere Installationsargumente des Pakets"
 
-#: ../cli.py:504
+#: ../cli.py:501
 #, python-format
 msgid "No package %s available."
 msgstr "Kein Paket %s verfügbar."
 
-#: ../cli.py:508
-#: ../cli.py:626
-#: ../yumcommands.py:790
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Paket(e) zum Installieren"
 
-#: ../cli.py:509
-#: ../cli.py:627
-#: ../yumcommands.py:147
-#: ../yumcommands.py:791
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr "Nichts zu tun"
 
-#: ../cli.py:539
-#: ../yum/__init__.py:2275
-#: ../yum/__init__.py:2375
-#: ../yum/__init__.py:2387
+#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
+#: ../yum/__init__.py:2340
 #, python-format
 msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Aktualisiere Paket nicht, da es bereits veraltet ist: %s.%s %s:%s-%s"
 
-#: ../cli.py:571
+#: ../cli.py:568
 #, python-format
 msgid "Could not find update match for %s"
 msgstr "Kann keine Aktualisierungsübereinstimmung finden für %s"
 
-#: ../cli.py:583
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr "%d Pakete zur Aktualisierung markiert"
 
-#: ../cli.py:586
+#: ../cli.py:583
 msgid "No Packages marked for Update"
 msgstr "Keine Pakete für die Aktualisierung angegeben"
 
-#: ../cli.py:602
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr "%d Pakete für die Entfernung angegeben"
 
-#: ../cli.py:605
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr "Keine Pakete für die Entfernung angegeben"
 
-#: ../cli.py:617
+#: ../cli.py:614
 msgid "No Packages Provided"
 msgstr "Keine Pakete bereitgestellt"
 
-#: ../cli.py:657
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr "Übereinstimmende Pakete für Paket-Liste nach Benutzer-Argument"
 
-#: ../cli.py:705
+#: ../cli.py:701
 #, python-format
 msgid "Warning: No matches found for: %s"
 msgstr "Warnung: Keine Übereinstimmung gefunden für: %s"
 
-#: ../cli.py:708
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Keine Ãœbereinstimmungen gefunden"
 
-#: ../cli.py:749
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Kein Paket gefunden für %s"
 
 # Räume auf, säubere...weiss jemand eine Übersetzung, welche nicht an den Staubsauger erinnert. Fabian
-#: ../cli.py:761
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "Räume alles auf"
 
-#: ../cli.py:775
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "Räume Header auf"
 
-#: ../cli.py:778
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "Räume Pakete auf"
 
-#: ../cli.py:781
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "Räume XML-Metadaten auf"
 
-#: ../cli.py:784
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "Räume Datenbank-Speicher auf"
 
-#: ../cli.py:787
+#: ../cli.py:783
 msgid "Cleaning up expire-cache metadata"
 msgstr "Räume Metadaten für abgelaufene Caches auf"
 
-#: ../cli.py:790
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "Räume Plugins auf"
 
-#: ../cli.py:812
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Installierte Gruppen:"
 
-#: ../cli.py:819
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "Verfügbare Gruppen:"
 
-#: ../cli.py:825
+#: ../cli.py:820
 msgid "Done"
 msgstr "Fertig"
 
-#: ../cli.py:836
-#: ../cli.py:854
-#: ../cli.py:860
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "Warnung: Gruppe %s existiert nicht."
 
-#: ../cli.py:864
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
-msgstr "Keine Pakete in irgendeiner Gruppe verfügbar zum Installieren oder Aktualisieren"
+msgstr ""
+"Keine Pakete in irgendeiner Gruppe verfügbar zum Installieren oder "
+"Aktualisieren"
 
-#: ../cli.py:866
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d Paket(e) zum Installieren"
 
-#: ../cli.py:876
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Keine Gruppe existiert mit dem Namen %s"
 
-#: ../cli.py:882
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Keine Pakete zum Entfernen aus dem Gruppen gefunden"
 
-#: ../cli.py:884
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d Paket(e) zum Entfernen"
 
-#: ../cli.py:926
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "Paket %s ist bereits installiert, überspringe"
 
-#: ../cli.py:937
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr "Verwerfe nicht vergleichbare Pakete %s.%s"
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:963
+#: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
-msgstr "Kein anderes %s installiert, füge es zur Liste für eine potentielle Installation hinzu"
+msgstr ""
+"Kein anderes %s installiert, füge es zur Liste für eine potentielle "
+"Installation hinzu"
 
-#: ../cli.py:982
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "Kommandozeilen-Fehler: %s"
 
-#: ../cli.py:994
-#, python-format
-msgid ""
-"\n"
-"\n"
-"%s: %s option requires an argument"
-msgstr ""
-"\n"
-"\n"
-"%s: %s Option benötigt ein Argument"
-
-#: ../cli.py:1123
-msgid "show this help message and exit"
-msgstr "Hilfeinformation anzeigen und beenden"
-
-#: ../cli.py:1127
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "fehlertolerant sein"
 
-#: ../cli.py:1129
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
-msgstr "laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischenspeicher nicht"
+msgstr ""
+"laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischenspeicher nicht"
 
-#: ../cli.py:1131
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "Ort der Konfigurationsdatei"
 
-#: ../cli.py:1133
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "maximale Befehlswartezeit"
 
-#: ../cli.py:1135
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "Debugging-Ausgabe-Stufe"
 
-#: ../cli.py:1139
+#: ../cli.py:1113
 msgid "show duplicates, in repos, in list/search commands"
 msgstr "Zeige Duplikate, in Repos, in Listen/Suchen-Befehlen"
 
-#: ../cli.py:1141
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "Fehler-Ausgabe-Stufe"
 
-#: ../cli.py:1144
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "Stiller Betrieb"
 
-#: ../cli.py:1146
-msgid "verbose operation"
-msgstr "Wortreicher Betrieb"
-
-#: ../cli.py:1148
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "Beantworte alle Fragen mit 'ja'"
 
-#: ../cli.py:1150
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "Versionsinformationen anzeigen und Programm beenden"
 
-#: ../cli.py:1151
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "Wurzel-Installationsverzeichnis setzen"
 
-#: ../cli.py:1155
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "aktiviere eines oder mehrere Repositories (Wildcards erlaubt)"
 
-#: ../cli.py:1159
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr "deaktiviere eines oder mehrere Repositories (Wildcards erlaubt)"
 
-#: ../cli.py:1162
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr "schliesse Paket(e) nach Namen oder global aus"
 
-#: ../cli.py:1164
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
 msgstr "deaktiviere Ausschluss von 'main', einem Repository oder allem"
 
-#: ../cli.py:1167
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr "aktiviere veraltetes Verarbeiten während Aktualisierung"
 
-#: ../cli.py:1169
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "deaktiviere Yum-Plugins"
 
-#: ../cli.py:1171
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "deaktiviere GPG-Signatur-Prüfung"
 
-#: ../cli.py:1173
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "deaktiviere Plugins nach Namen"
 
-#: ../cli.py:1176
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "überspringe Pakete mit Abhängigkeitsauflösungsproblemen"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Jan"
 msgstr "Jan"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Feb"
 msgstr "Feb"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Mar"
 msgstr "Mär"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Apr"
 msgstr "Apr"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "May"
 msgstr "Mai"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Jun"
 msgstr "Jun"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Jul"
 msgstr "Jul"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Aug"
 msgstr "Aug"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Sep"
 msgstr "Sep"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Oct"
 msgstr "Okt"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Nov"
 msgstr "Nov"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Dec"
 msgstr "Dez"
 
-#: ../output.py:239
+#: ../output.py:240
 msgid "Trying other mirror."
 msgstr "Versuche anderen Spiegel-Server."
 
@@ -575,25 +530,23 @@ msgstr "Beschreibung:"
 msgid "Is this ok [y/N]: "
 msgstr "Ist dies in Ordnung? [j/N] :"
 
-#: ../output.py:359
-#: ../output.py:362
+#: ../output.py:357 ../output.py:360
 msgid "y"
 msgstr "j"
 
-#: ../output.py:359
+#: ../output.py:357
 msgid "n"
 msgstr "n"
 
-#: ../output.py:359
-#: ../output.py:362
+#: ../output.py:357 ../output.py:360
 msgid "yes"
 msgstr "ja"
 
-#: ../output.py:359
+#: ../output.py:357
 msgid "no"
 msgstr "nein"
 
-#: ../output.py:370
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -602,96 +555,96 @@ msgstr ""
 "\n"
 "Gruppe: %s"
 
-#: ../output.py:372
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " Beschreibung: %s"
 
-#: ../output.py:374
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr " Obligatorische Pakete:"
 
-#: ../output.py:379
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr " Standard-Pakete:"
 
-#: ../output.py:384
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr " Optionale Pakete:"
 
-#: ../output.py:389
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr " Zwangsbedingte Pakete:"
 
-#: ../output.py:398
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "Paket: %s"
 
-#: ../output.py:400
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr "  Keine Abhängigkeiten für dieses Paket"
 
-#: ../output.py:405
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr "  Abhängigkeit: %s"
 
-#: ../output.py:407
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr "   Nicht erfüllte Abhängigkeit"
 
-#: ../output.py:465
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Ãœbereinstimmung von:"
 
-#: ../output.py:491
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr "Fehler beim Berechnen der Gesamtgrösse der Downloads"
 
-#: ../output.py:496
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "Gesamtgrösse: %s"
 
-#: ../output.py:499
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "Gesamte Downloadgrösse: %s"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Package"
 msgstr "Paket"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Arch"
 msgstr "Arch"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Version"
 msgstr "Version"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Repository"
 msgstr "Repository"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Size"
 msgstr "Grösse"
 
-#: ../output.py:518
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Installiert für Abhängigkeiten"
 
-#: ../output.py:519
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Aktualisiert für Abhängigkeiten"
 
-#: ../output.py:520
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Entfernt für Abhängigkeiten"
 
-#: ../output.py:532
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
@@ -700,7 +653,7 @@ msgstr ""
 "     ersetze  %s.%s %s\n"
 "\n"
 
-#: ../output.py:540
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -717,106 +670,109 @@ msgstr ""
 "Aktualisieren     %5.5s Paket(e)         \n"
 "Enfernen          %5.5s Paket(e)         \n"
 
-#: ../output.py:558
+#: ../output.py:554
 msgid "Removed"
 msgstr "Entfernt"
 
-#: ../output.py:559
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "Abhängigkeiten entfernt"
 
-#: ../output.py:561
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "Abhängigkeit installiert"
 
-#: ../output.py:563
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "Abhängigkeit aktualisiert"
 
-#: ../output.py:564
+#: ../output.py:560
 msgid "Replaced"
 msgstr "Ersetzt       "
 
-#: ../output.py:622
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
-" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds to exit.\n"
+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
+"seconds to exit.\n"
 msgstr ""
 "\n"
-" Aktueller Download abgebrochen, %s unterbreche (ctrl-c) erneut %s innerhalb %s%s%s Sekunden bis Verlassen.\n"
+" Aktueller Download abgebrochen, %s unterbreche (ctrl-c) erneut %s innerhalb "
+"%s%s%s Sekunden bis Verlassen.\n"
 
-#: ../output.py:632
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "Benutzer-Unterbrechung"
 
-#: ../output.py:643
+#: ../output.py:639
 msgid "installed"
 msgstr "installiert"
 
-#: ../output.py:644
+#: ../output.py:640
 msgid "updated"
 msgstr "aktualisiert"
 
-#: ../output.py:645
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "veraltet"
 
-#: ../output.py:646
+#: ../output.py:642
 msgid "erased"
 msgstr "gelöscht"
 
 # Dies ist das Sorgenkind. So weit ich weiss, werden die Verben von oben bezogen. Eventuell könnte auch eine radikale Änderung eine Lösung sein. Fabian
-#: ../output.py:650
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> Paket %s.%s %s:%s-%s gesetzt, um %s zu werden"
 
-#: ../output.py:657
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> Führe Transaktionsprüfung aus"
 
-#: ../output.py:662
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr "--> Starte Abhängigkeitsauflösung mit den neuen Änderungen neu."
 
-#: ../output.py:667
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> Abhängigkeitsauflösung beendet"
 
-#: ../output.py:672
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr "--> Verarbeite Abhängigkeiten: %s für Paket: %s"
 
-#: ../output.py:677
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> Nicht aufgelöste Abhängigkeit: %s"
 
-#: ../output.py:683
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Verarbeite Konflikt: %s kollidiert mit %s"
 
-#: ../output.py:686
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr "--> Fülle Verarbeitungsset mit ausgewählten Paketen. Bitte warten."
 
-#: ../output.py:690
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr "---> Lade Header für %s herunter, um ins Verarbeitungsset zu packen."
 
-#: ../yumcommands.py:37
+#: ../yumcommands.py:36
 msgid "You need to be root to perform this command."
 msgstr "Sie müssen root sein, um diesen Befehl ausführen zu können."
 
-#: ../yumcommands.py:44
+#: ../yumcommands.py:43
 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"
@@ -829,8 +785,10 @@ msgid ""
 "For more information contact your distribution or package provider.\n"
 msgstr ""
 "\n"
-"Sie haben das Überprüfen der Pakete via GPG-Schlüssel aktiviert. Dies ist eine gute Sache. \n"
-"Allerdings haben Sie nicht alle öffentlichen GPG-Schlüssel installiert. Sie müssen die\n"
+"Sie haben das Überprüfen der Pakete via GPG-Schlüssel aktiviert. Dies ist "
+"eine gute Sache. \n"
+"Allerdings haben Sie nicht alle öffentlichen GPG-Schlüssel installiert. Sie "
+"müssen die\n"
 "gewünschten Schlüssel für die Pakete herunterladen und installieren.\n"
 "Sie können dies mit folgendem Befehl machen:\n"
 "    rpm --import public.gpg.key\n"
@@ -840,268 +798,254 @@ msgstr ""
 "für ein Repository, durch die 'gpgkey'-Option in einem Repository-Bereich\n"
 "angeben und yum wird ihn für Sie installieren.\n"
 "\n"
-"Für weitere Informationen kontaktieren Sie Ihre Distribution oder Ihren Paket-Bereitsteller.\n"
+"Für weitere Informationen kontaktieren Sie Ihre Distribution oder Ihren "
+"Paket-Bereitsteller.\n"
 
-#: ../yumcommands.py:64
+#: ../yumcommands.py:63
 #, python-format
 msgid "Error: Need to pass a list of pkgs to %s"
 msgstr "Fehler: Muss eine Liste von Paketen an %s übergeben"
 
-#: ../yumcommands.py:70
+#: ../yumcommands.py:69
 msgid "Error: Need an item to match"
 msgstr "Fehler: Brauche einen Begriff, der passt"
 
-#: ../yumcommands.py:76
+#: ../yumcommands.py:75
 msgid "Error: Need a group or list of groups"
 msgstr "Fehler: Brauche eine Gruppe oder eine Liste von Gruppen"
 
-#: ../yumcommands.py:85
+#: ../yumcommands.py:84
 #, python-format
 msgid "Error: clean requires an option: %s"
 msgstr "Fehler: Aufräumen benötigt eine Option: %s"
 
-#: ../yumcommands.py:90
+#: ../yumcommands.py:89
 #, python-format
 msgid "Error: invalid clean argument: %r"
 msgstr "Fehler: Ungültiges Argument für Aufräumen: %r"
 
-#: ../yumcommands.py:103
+#: ../yumcommands.py:102
 msgid "No argument to shell"
 msgstr "Kein Argument für Shell"
 
-#: ../yumcommands.py:106
+#: ../yumcommands.py:105
 #, python-format
 msgid "Filename passed to shell: %s"
 msgstr "Dateinamen an Shell übergeben: %s"
 
-#: ../yumcommands.py:110
+#: ../yumcommands.py:109
 #, python-format
 msgid "File %s given as argument to shell does not exist."
 msgstr "Datei %s, angegeben als Argument für Shell, existiert nicht."
 
-#: ../yumcommands.py:116
+#: ../yumcommands.py:115
 msgid "Error: more than one file given as argument to shell."
 msgstr "Fehler: mehr als eine Datei als Argument an die Shell übergeben."
 
-#: ../yumcommands.py:157
+#: ../yumcommands.py:156
 msgid "PACKAGE..."
 msgstr "PAKET..."
 
-#: ../yumcommands.py:160
+#: ../yumcommands.py:159
 msgid "Install a package or packages on your system"
 msgstr "Installiere ein Paket oder Pakete auf Ihrem System"
 
-#: ../yumcommands.py:169
+#: ../yumcommands.py:168
 msgid "Setting up Install Process"
 msgstr "Einrichten des Installationsprozess"
 
-#: ../yumcommands.py:180
+#: ../yumcommands.py:179
 msgid "[PACKAGE...]"
 msgstr "[PAKET...]"
 
-#: ../yumcommands.py:183
+#: ../yumcommands.py:182
 msgid "Update a package or packages on your system"
 msgstr "Aktualisiere ein Paket oder Pakete auf Ihrem System"
 
-#: ../yumcommands.py:191
+#: ../yumcommands.py:190
 msgid "Setting up Update Process"
 msgstr "Einrichten des Aktualisierungsprozess"
 
-#: ../yumcommands.py:205
+#: ../yumcommands.py:204
 msgid "Display details about a package or group of packages"
 msgstr "Zeige Details über ein Paket oder einer Gruppe von Pakete an"
 
-#: ../yumcommands.py:213
+#: ../yumcommands.py:212
 msgid "Installed Packages"
 msgstr "Installierte Pakete"
 
-#: ../yumcommands.py:214
+#: ../yumcommands.py:213
 msgid "Available Packages"
 msgstr "Verfügbare Pakete"
 
-#: ../yumcommands.py:215
+#: ../yumcommands.py:214
 msgid "Extra Packages"
 msgstr "Extra-Pakete"
 
-#: ../yumcommands.py:216
+#: ../yumcommands.py:215
 msgid "Updated Packages"
 msgstr "Aktualisierte Pakete"
 
-#: ../yumcommands.py:222
-#: ../yumcommands.py:228
+#: ../yumcommands.py:221 ../yumcommands.py:225
 msgid "Obsoleting Packages"
 msgstr "Veraltete Pakete"
 
-#: ../yumcommands.py:229
+#: ../yumcommands.py:226
 msgid "Recently Added Packages"
 msgstr "Kürzlich hinzugefügte Pakete"
 
-#: ../yumcommands.py:235
+#: ../yumcommands.py:232
 msgid "No matching Packages to list"
 msgstr "Keine übereinstimmenden Pakete zum Auflisten"
 
-#: ../yumcommands.py:249
+#: ../yumcommands.py:246
 msgid "List a package or groups of packages"
 msgstr "Liste von Pakete oder Gruppen von Paketen"
 
-#: ../yumcommands.py:261
+#: ../yumcommands.py:258
 msgid "Remove a package or packages from your system"
 msgstr "Entferne ein Paket oder Pakete auf Ihrem System"
 
-#: ../yumcommands.py:269
+#: ../yumcommands.py:266
 msgid "Setting up Remove Process"
 msgstr "Einrichten des Entfernungsprozess"
 
-#: ../yumcommands.py:281
+#: ../yumcommands.py:278
 msgid "Setting up Group Process"
 msgstr "Einrichten des Gruppenprozess"
 
-#: ../yumcommands.py:287
+#: ../yumcommands.py:284
 msgid "No Groups on which to run command"
 msgstr "Keine Gruppe, auf welcher der Befehl ausgeführt werden kann"
 
-#: ../yumcommands.py:300
+#: ../yumcommands.py:297
 msgid "List available package groups"
 msgstr "Verfügbare Gruppen anzeigen"
 
-#: ../yumcommands.py:317
+#: ../yumcommands.py:314
 msgid "Install the packages in a group on your system"
 msgstr "Installiere die Pakete in einer Gruppe auf Ihrem System"
 
-#: ../yumcommands.py:339
+#: ../yumcommands.py:336
 msgid "Remove the packages in a group from your system"
 msgstr "Entferne die Pakete in einer Gruppe von Ihrem System"
 
-#: ../yumcommands.py:363
+#: ../yumcommands.py:360
 msgid "Display details about a package group"
 msgstr "Zeigt Details über eine Paket-Gruppe an"
 
-#: ../yumcommands.py:387
+#: ../yumcommands.py:384
 msgid "Generate the metadata cache"
 msgstr "Generiere den Metadaten-Zwischenspeicher"
 
-#: ../yumcommands.py:393
+#: ../yumcommands.py:390
 msgid "Making cache files for all metadata files."
 msgstr "Erstelle Zwischenspeicherungsdatei für alle Metadaten-Dateien."
 
-#: ../yumcommands.py:394
+#: ../yumcommands.py:391
 msgid "This may take a while depending on the speed of this computer"
-msgstr "Dies kann eine Weile dauert, abhängig von der Geschwindigkeit dieses Computers"
+msgstr ""
+"Dies kann eine Weile dauert, abhängig von der Geschwindigkeit dieses "
+"Computers"
 
-#: ../yumcommands.py:415
+#: ../yumcommands.py:412
 msgid "Metadata Cache Created"
 msgstr "Metadaten-Zwischenspeicher erstellt"
 
-#: ../yumcommands.py:429
+#: ../yumcommands.py:426
 msgid "Remove cached data"
 msgstr "Entferne gespeicherte Daten"
 
-#: ../yumcommands.py:450
+#: ../yumcommands.py:447
 msgid "Find what package provides the given value"
 msgstr "Suche welches Paket den gegebenen Wert bereitstellen"
 
-#: ../yumcommands.py:470
+#: ../yumcommands.py:467
 msgid "Check for available package updates"
 msgstr "Überprüfe auf verfügbare Paket-Aktualisierungen"
 
-#: ../yumcommands.py:493
+#: ../yumcommands.py:490
 msgid "Search package details for the given string"
 msgstr "Suche nach Paket-Details nach der gegebenen Zeichenkette"
 
-#: ../yumcommands.py:499
+#: ../yumcommands.py:496
 msgid "Searching Packages: "
 msgstr "Suche Pakete:"
 
-#: ../yumcommands.py:516
+#: ../yumcommands.py:513
 msgid "Update packages taking obsoletes into account"
 msgstr "Aktualisiere Pakete, berücksichtige veraltete"
 
-#: ../yumcommands.py:525
+#: ../yumcommands.py:522
 msgid "Setting up Upgrade Process"
 msgstr "Einrichten des Upgradeprozess"
 
-#: ../yumcommands.py:539
+#: ../yumcommands.py:536
 msgid "Install a local RPM"
 msgstr "Installiere ein lokales RPM"
 
-#: ../yumcommands.py:548
+#: ../yumcommands.py:545
 msgid "Setting up Local Package Process"
 msgstr "Einrichten der lokalen Paketverarbeitung"
 
-#: ../yumcommands.py:567
+#: ../yumcommands.py:564
 msgid "Determine which package provides the given dependency"
 msgstr "Bestimme, welche Pakete die gegebenen Abhängigkeiten bereitstellen"
 
-#: ../yumcommands.py:570
+#: ../yumcommands.py:567
 msgid "Searching Packages for Dependency:"
 msgstr "Suche Pakete für Abhängigkeit:"
 
-#: ../yumcommands.py:584
+#: ../yumcommands.py:581
 msgid "Run an interactive yum shell"
 msgstr "Führe eine interaktive Yum-Shell aus"
 
-#: ../yumcommands.py:590
+#: ../yumcommands.py:587
 msgid "Setting up Yum Shell"
 msgstr "Einrichten der Yum-Shell"
 
-#: ../yumcommands.py:608
+#: ../yumcommands.py:605
 msgid "List a package's dependencies"
 msgstr "Liste von Paket-Abhängigkeiten"
 
-#: ../yumcommands.py:614
+#: ../yumcommands.py:611
 msgid "Finding dependencies: "
 msgstr "Suche Abhängigkeiten:"
 
-#: ../yumcommands.py:630
+#: ../yumcommands.py:627
 msgid "Display the configured software repositories"
 msgstr "Zeige die konfigurierten Software-Repositories an"
 
-#: ../yumcommands.py:666
-msgid "enabled"
-msgstr "aktiviert"
-
-#: ../yumcommands.py:673
-msgid "disabled"
-msgstr "deaktiviert"
-
-#: ../yumcommands.py:682
+#: ../yumcommands.py:645
 msgid "repo id"
 msgstr "Repo-ID"
 
-#: ../yumcommands.py:683
+#: ../yumcommands.py:645
 msgid "repo name"
 msgstr "Repo-Name:"
 
-#: ../yumcommands.py:683
+#: ../yumcommands.py:645
 msgid "status"
 msgstr "Status"
 
-#: ../yumcommands.py:686
-msgid "Repo-id     : "
-msgstr "Repo-ID       : "
-
-#: ../yumcommands.py:687
-msgid "Repo-name   : "
-msgstr "Repo-Name   : "
-
-#: ../yumcommands.py:688
-msgid "Repo-enabled: "
-msgstr "Repo aktiviert:"
+#: ../yumcommands.py:651
+msgid "enabled"
+msgstr "aktiviert"
 
-#: ../yumcommands.py:689
-msgid "Repo-size   : "
-msgstr "Repo-Grösse   : "
+#: ../yumcommands.py:654
+msgid "disabled"
+msgstr "deaktiviert"
 
-#: ../yumcommands.py:713
+#: ../yumcommands.py:671
 msgid "Display a helpful usage message"
 msgstr "Zeigt eine kurze Verwendungsinformation"
 
-#: ../yumcommands.py:747
+#: ../yumcommands.py:705
 #, python-format
 msgid "No help available for %s"
 msgstr "Keine Hilfe für %s vorhanden"
 
-#: ../yumcommands.py:752
+#: ../yumcommands.py:710
 msgid ""
 "\n"
 "\n"
@@ -1111,7 +1055,7 @@ msgstr ""
 "\n"
 "Aliase: "
 
-#: ../yumcommands.py:754
+#: ../yumcommands.py:712
 msgid ""
 "\n"
 "\n"
@@ -1121,15 +1065,15 @@ msgstr ""
 "\n"
 "Alias: "
 
-#: ../yumcommands.py:783
+#: ../yumcommands.py:741
 msgid "Setting up Reinstall Process"
 msgstr "Einrichten des Neuinstallationsprozess"
 
-#: ../yumcommands.py:797
+#: ../yumcommands.py:755
 msgid "reinstall a package"
 msgstr "Installiere Paket neu"
 
-#: ../yummain.py:55
+#: ../yummain.py:41
 msgid ""
 "\n"
 "\n"
@@ -1139,7 +1083,7 @@ msgstr ""
 "\n"
 "Verlasse nach Benutzer-Befehl"
 
-#: ../yummain.py:61
+#: ../yummain.py:47
 msgid ""
 "\n"
 "\n"
@@ -1149,28 +1093,29 @@ msgstr ""
 "\n"
 "Verlasse wegen defekter Pipe"
 
-#: ../yummain.py:112
-msgid "Another app is currently holding the yum lock; waiting for it to exit..."
-msgstr "Eine andere Anwendung hält momentan den Yum-Lock. Warte, dass sie endet wird..."
+#: ../yummain.py:105
+msgid ""
+"Another app is currently holding the yum lock; waiting for it to exit..."
+msgstr ""
+"Eine andere Anwendung hält momentan den Yum-Lock. Warte, dass sie endet "
+"wird..."
 
-#: ../yummain.py:139
-#: ../yummain.py:178
+#: ../yummain.py:132 ../yummain.py:171
 #, python-format
 msgid "Error: %s"
 msgstr "Fehler: %s"
 
-#: ../yummain.py:149
-#: ../yummain.py:185
+#: ../yummain.py:142 ../yummain.py:178
 #, python-format
 msgid "Unknown Error(s): Exit Code: %d:"
 msgstr "Unbekannte(r) Fehlercode: Exit Code: %d:"
 
 #. Depsolve stage
-#: ../yummain.py:156
+#: ../yummain.py:149
 msgid "Resolving Dependencies"
 msgstr "Löse Abhängigkeiten auf"
 
-#: ../yummain.py:191
+#: ../yummain.py:184
 msgid ""
 "\n"
 "Dependencies Resolved"
@@ -1178,11 +1123,11 @@ msgstr ""
 "\n"
 "Abhängigkeiten aufgelöst"
 
-#: ../yummain.py:205
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr "Komplett!"
 
-#: ../yummain.py:252
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
@@ -1192,264 +1137,322 @@ msgstr ""
 "\n"
 "Verlasse nach Benutzer-Anforderung."
 
-#: ../yum/depsolve.py:78
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr "doTsSetup() wird in zukünftigen Version von Yum verschwinden.\n"
 
-#: ../yum/depsolve.py:91
+#: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
-msgstr "Konfiguriere TransactionSets bevor die Konfigurationsklasse gestartet ist"
+msgstr ""
+"Konfiguriere TransactionSets bevor die Konfigurationsklasse gestartet ist"
 
-#: ../yum/depsolve.py:132
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr "Ungültiges tsflag in Konfigurationsdatei: %s"
 
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:147
+#, python-format
+msgid "Searching pkgSack for dep: %s"
+msgstr "Suche pkgSack für Abhängigkeiten: %s"
+
+#: ../yum/depsolve.py:170
+#, python-format
+msgid "Potential match for %s from %s"
+msgstr "Potentielle Übereinstimmung für %s von %s"
+
+#: ../yum/depsolve.py:178
+#, python-format
+msgid "Matched %s to require for %s"
+msgstr "Übereinstimmung von %s, welche gebraucht wird für %s"
+
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "Mitglied: %s"
 
-#: ../yum/depsolve.py:190
-#: ../yum/depsolve.py:592
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s konvertiert zum Installieren"
 
-#: ../yum/depsolve.py:197
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "Füge Paket %s hinzu in Modus %s"
 
-#: ../yum/depsolve.py:207
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Entferne Paket %s"
 
-#: ../yum/depsolve.py:218
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s benötigt: %s"
 
-#: ../yum/depsolve.py:273
+#: ../yum/depsolve.py:312
+msgid "Needed Require has already been looked up, cheating"
+msgstr "Benötigte Anforderung wurde bereits nachgeschlagen, betrüge"
+
+#: ../yum/depsolve.py:322
+#, python-format
+msgid "Needed Require is not a package name. Looking up: %s"
+msgstr "Benötigte Anforderung ist kein Paket-Name. Schlagen nach: %s"
+
+#: ../yum/depsolve.py:329
+#, python-format
+msgid "Potential Provider: %s"
+msgstr "Potentieller Bereitsteller: %s"
+
+#: ../yum/depsolve.py:352
+#, python-format
+msgid "Mode is %s for provider of %s: %s"
+msgstr "Modus ist %s für Bereitsteller von %s: %s"
+
+#: ../yum/depsolve.py:356
+#, python-format
+msgid "Mode for pkg providing %s: %s"
+msgstr "Modus für pkg-Bereitstellung %s: %s"
+
+#: ../yum/depsolve.py:360
+#, python-format
+msgid "TSINFO: %s package requiring %s marked as erase"
+msgstr "TSINFO: %s Paket benötigt %s markiert als gelöscht"
+
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr "TSINFO: Veraltetes %s mit %s zum Auflösen der Abhängigkeit."
 
-#: ../yum/depsolve.py:276
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr "TSINFO: Aktualisiere %s zum Auflösen der Abhängigkeit."
 
-#: ../yum/depsolve.py:279
+#: ../yum/depsolve.py:378
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr "Kann keine Aktualisierungspfad für Abhängigkeit finden für: %s"
 
-#: ../yum/depsolve.py:283
+#: ../yum/depsolve.py:388
 #, python-format
-msgid "TSINFO: %s package requiring %s marked as erase"
-msgstr "TSINFO: %s Paket benötigt %s markiert als gelöscht"
+msgid "Unresolvable requirement %s for %s"
+msgstr "Unlösbare Anforderung %s für %s"
 
 #. is it already installed?
-#: ../yum/depsolve.py:329
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
-msgstr "%s ist in einem bereitgestellten Paket, aber bereits installiert, entferne."
+msgstr ""
+"%s ist in einem bereitgestellten Paket, aber bereits installiert, entferne."
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr "Potentielles aufgelöste Paket %s hat eine neuere Instanz in ts."
 
-#: ../yum/depsolve.py:355
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr "Potentielles aufgelöste Paket %s hat eine neuere Instanz installiert."
 
-#: ../yum/depsolve.py:363
-#: ../yum/depsolve.py:410
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr "Fehlende Abhängigkeit: %s wird benötigt von Paket %s"
 
-#: ../yum/depsolve.py:376
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr "%s bereits in ts, überspringe dies"
 
-#: ../yum/depsolve.py:420
+#: ../yum/depsolve.py:510
+#, python-format
+msgid ""
+"Failure finding best provider of %s for %s, exceeded maximum loop length"
+msgstr ""
+"Fehler beim FInden des besten Providers von %s für %s, überschrittene "
+"maximale Schleifenlänge"
+
+#: ../yum/depsolve.py:537
 #, python-format
 msgid "TSINFO: Marking %s as update for %s"
 msgstr "TSINFO: Markiere %s als Aktualisierung für %s"
 
-#: ../yum/depsolve.py:427
+#: ../yum/depsolve.py:544
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr "TSINFO: Markiert %s als Installation für %s"
 
-#: ../yum/depsolve.py:518
-#: ../yum/depsolve.py:610
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Erfolg - Leere Transaktion"
 
-#: ../yum/depsolve.py:562
-#: ../yum/depsolve.py:582
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Starte Schleife neu"
 
-#: ../yum/depsolve.py:598
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "Abhängigkeitsverarbeitung beendet"
 
-#: ../yum/depsolve.py:604
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr "%s von %s hat Abhängigkeitsauflöse-Probleme"
 
-#: ../yum/depsolve.py:611
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "Erfolg - Abhängigkeiten aufgelöst"
 
-#: ../yum/depsolve.py:625
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "Prüfe Abhängigkeiten für %s"
 
-#: ../yum/depsolve.py:687
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr "schauen nach %s als eine Anforderung von %s"
 
-#: ../yum/depsolve.py:814
+#: ../yum/depsolve.py:933
+#, python-format
+msgid "Comparing best: %s to po: %s"
+msgstr "Vergleiche besseres: %s zu po: %s"
+
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr "Gleich: besser %s == po: %s"
+
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, fuzzy, python-format
+msgid "best %s obsoletes po: %s"
+msgstr " %s veraltete %s"
+
+#: ../yum/depsolve.py:955
 #, python-format
-msgid "Running compare_providers() for %s"
-msgstr "Führe compare_providers() aus für %s"
+msgid "po %s obsoletes best: %s"
+msgstr "po %s veraltetes besser: %s"
 
-#: ../yum/depsolve.py:842
-#: ../yum/depsolve.py:848
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
 #, python-format
 msgid "better arch in po %s"
 msgstr "bessere Architektur in po %s"
 
-#: ../yum/depsolve.py:887
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
 #, python-format
-msgid "%s obsoletes %s"
-msgstr " %s veraltete %s"
+msgid "po %s shares a sourcerpm with %s"
+msgstr "po %s teilen ein Quellen-RPM mit %s"
 
-#: ../yum/depsolve.py:898
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
 #, python-format
-msgid ""
-"archdist compared %s to %s on %s\n"
-"  Winner: %s"
-msgstr ""
-"Archdist verglichen %s zu %s auf %s\n"
-"  Gewinner: %s"
+msgid "best %s shares a sourcerpm with %s"
+msgstr "besseres %s teilen ein Quellen-RPM mit %s"
 
-#: ../yum/depsolve.py:905
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
 #, python-format
-msgid "common sourcerpm %s and %s"
-msgstr "Gemeinsames Quellen-RPM %s und %s"
+msgid "po %s shares more of the name prefix with %s"
+msgstr "po %s teilt mehr als den Prefixnamen mit %s"
 
-#: ../yum/depsolve.py:911
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
 #, python-format
-msgid "common prefix of %s between %s and %s"
-msgstr "Gemeinsamer Prefix von %s zwischen %s und %s"
+msgid "po %s has a shorter name than best %s"
+msgstr "po %s hat einen kürzeren Namen als das bessere %s"
 
-# Hat jemand eine Idee für eine bessere Übersetzung? Fabian
-#: ../yum/depsolve.py:919
-#, fuzzy, python-format
-msgid "Best Order: %s"
-msgstr "Beste Bestellung: %s"
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr "bestpkg %s teilt mehr als als den Prefixnamen mit %s"
 
-#: ../yum/__init__.py:148
+#: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr "doConfigSetup() wird verschwinden in zukünftigen Version von Yum.\n"
 
-#. FIXME: Use critical? or exception?
-#: ../yum/__init__.py:323
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr "Bei Repository %r fehlt der Name in der Konfiguration, benutze id"
 
-#: ../yum/__init__.py:359
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr "Plugins bereits initialisiert"
 
-#: ../yum/__init__.py:366
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr "doRpmDBSetup() wird verschwinden in zukünftigen Version von Yum.\n"
 
-#: ../yum/__init__.py:376
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr "Lese lokale RPMDB"
 
-#: ../yum/__init__.py:394
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr "doRepoSetup() wird verschwinden in zukünftigen Version von Yum.\n"
 
-#: ../yum/__init__.py:414
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr "doSackSetup() wird verschwinden in zukünftigen Version von Yum.\n"
 
-#: ../yum/__init__.py:431
+#: ../yum/__init__.py:404
 msgid "Setting up Package Sacks"
 msgstr "Einrichten des Paket-Behälters"
 
-#: ../yum/__init__.py:474
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr "Repository-Objekt für Repository %s fehlt a _resetSack method\n"
 
-#: ../yum/__init__.py:475
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr "deshalb dieses Repository kann nicht zurückgesetzt werden.\n"
 
-#: ../yum/__init__.py:480
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr "doUpdateSetup() wird verschwinden in zukünftigen Version von Yum.\n"
 
-#: ../yum/__init__.py:492
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr "Baue Aktualisierungsobjekt"
 
-#: ../yum/__init__.py:523
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr "doGroupSetup() wird verschwinden in zukünftigen Version von Yum.\n"
 
-#: ../yum/__init__.py:547
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Beziehe Gruppen-Metadaten"
 
-#: ../yum/__init__.py:572
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr "Füge Gruppen-Datei von Repository hinzu: %s"
 
-#: ../yum/__init__.py:577
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr "Hinzufügen von Gruppen-Datei für Repository fehlgeschlagen: %s - %s"
 
-#: ../yum/__init__.py:583
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Keine Gruppen in irgendeinem Repository verfügbar"
 
-#: ../yum/__init__.py:633
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Importiere zusätzlichen Dateilisten-Informationen"
 
-#: ../yum/__init__.py:684
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Ãœberspringe defekte Runde %i"
 
-#: ../yum/__init__.py:707
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr "Ãœberspringe defekte brachte %i Runden"
 
-#: ../yum/__init__.py:708
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
@@ -1457,479 +1460,462 @@ msgstr ""
 "\n"
 "Pakete übersprungen wegen Abhängigkeitsproblemen:"
 
-#: ../yum/__init__.py:712
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s von %s"
 
-#: ../yum/__init__.py:792
-msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
-msgstr "Warnung: Es sind Scriptlet- oder andere nicht-fatale Fehler bei der Verarbeitung aufgetreten."
-
-#: ../yum/__init__.py:807
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "Entfernen der Verarbeitungsdatei %s fehlgeschlagen"
 
-#: ../yum/__init__.py:847
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "Ausschluss für Kosten: %s from %s"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Schliessen Pakete aus globaler Ausschlussliste aus"
 
-#: ../yum/__init__.py:880
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Schliesse Pakete aus von %s"
 
-#: ../yum/__init__.py:906
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Reduziere %s nur zum Einbeziehen der Pakete"
 
-#: ../yum/__init__.py:911
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Behalte integriertes Paket %s"
 
-#: ../yum/__init__.py:917
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Entferne nicht übereinstimmendes Paket %s"
 
-#: ../yum/__init__.py:920
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "Abgeschlossen"
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:950
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "Unfähig zum Prüfen, ob PID %s ist aktiv"
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:954
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr "Existierende Blockierung %s: eine andere Kopie läuft mit PID %s."
 
-#: ../yum/__init__.py:1017
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "Paket stimmt nicht mit dem vorgesehenen Herunterladen überein."
 
-#: ../yum/__init__.py:1032
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "Konnte Prüfsumme nicht ausführen"
 
-#: ../yum/__init__.py:1035
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "Paket stimmt nicht mit der Prüfsumme überein"
 
-#: ../yum/__init__.py:1079
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
-msgstr "Paket bei Checksumme-Prüfung durchgefallen, aber Zwischenspeicherung ist aktiviert für %s"
+msgstr ""
+"Paket bei Checksumme-Prüfung durchgefallen, aber Zwischenspeicherung ist "
+"aktiviert für %s"
 
-#: ../yum/__init__.py:1082
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "benutze lokale Kopie von %s"
 
-#: ../yum/__init__.py:1107
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr "Nicht genügend Platz im Download-Verzeichnis %s vorhanden"
 
-#: ../yum/__init__.py:1140
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "Header ist nicht vollständig."
 
-#: ../yum/__init__.py:1180
+#: ../yum/__init__.py:1134
 #, python-format
-msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
-msgstr "Header ist nicht im lokalen Zwischen-Speicher und Nur-Zwischenspeicher-Modus aktiviert. Kann nicht herunterladen %s"
+msgid ""
+"Header not in local cache and caching-only mode enabled. Cannot download %s"
+msgstr ""
+"Header ist nicht im lokalen Zwischen-Speicher und Nur-Zwischenspeicher-Modus "
+"aktiviert. Kann nicht herunterladen %s"
 
-#: ../yum/__init__.py:1235
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr "Öffentlicher Schlüssel für %s ist nicht installiert"
 
-#: ../yum/__init__.py:1239
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Problem beim Öffnen des Paketes %s"
 
-#: ../yum/__init__.py:1247
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr "Öffentlicher Schlüssel für %s ist nicht vertrauenswürdig"
 
-#: ../yum/__init__.py:1251
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Paket %s ist nicht unterschrieben"
 
-#: ../yum/__init__.py:1289
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Kann %s nicht entfernen"
 
-#: ../yum/__init__.py:1292
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "%s entfernt"
 
-#: ../yum/__init__.py:1328
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Kann %s Datei nicht entfernt %s"
 
-#: ../yum/__init__.py:1331
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "%s Datei %s entfernt"
 
-#: ../yum/__init__.py:1333
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d %s Dateien entfernt"
 
-#: ../yum/__init__.py:1386
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr "Mehr als eine identische Übereinstimmung im Behälter für %s"
 
-#: ../yum/__init__.py:1391
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr "Keine Ãœbereinstimmungen  %s.%s %s:%s-%s mit der Aktualisierung"
 
-#: ../yum/__init__.py:1585
-msgid "searchPackages() will go away in a future version of Yum.                      Use searchGenerator() instead. \n"
-msgstr "searchPackages() wird verschwinden in zukünftigen Version von Yum.                      Benutze stattdessen searchGenerator(). \n"
+#: ../yum/__init__.py:1543
+msgid ""
+"searchPackages() will go away in a future version of "
+"Yum.                      Use searchGenerator() instead. \n"
+msgstr ""
+"searchPackages() wird verschwinden in zukünftigen Version von "
+"Yum.                      Benutze stattdessen searchGenerator(). \n"
 
-#: ../yum/__init__.py:1621
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "Suche %d Pakete"
 
-#: ../yum/__init__.py:1624
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "Suche Paket %s"
 
-#: ../yum/__init__.py:1635
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "Suche in Datei-Einträgen"
 
-#: ../yum/__init__.py:1641
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "suche in bereitgestellten Einträgen"
 
-#: ../yum/__init__.py:1671
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Stelle Ãœbereinstimmung bereit: %s"
 
-#: ../yum/__init__.py:1717
-msgid "No group data available for configured repositories"
-msgstr "Keine Gruppe für konfigurierte Repositories verfügbar"
-
-#: ../yum/__init__.py:1743
-#: ../yum/__init__.py:1762
-#: ../yum/__init__.py:1788
-#: ../yum/__init__.py:1794
-#: ../yum/__init__.py:1850
-#: ../yum/__init__.py:1854
+#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
+#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
 #, python-format
 msgid "No Group named %s exists"
 msgstr "Kein Gruppe mit dem Namen %s vorhanden"
 
-#: ../yum/__init__.py:1773
-#: ../yum/__init__.py:1866
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr "Paket %s war nicht markiert in Gruppe %s"
 
-#: ../yum/__init__.py:1811
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr "Füge Paket %s aus Gruppe %s hinzu"
 
-#: ../yum/__init__.py:1816
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr "Kein Paket mit Namen %s verfügbar zum Installieren"
 
-#: ../yum/__init__.py:1891
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr "Paket-Tupel %s kann nicht gefunden werden im Paket-Behälter"
 
-#: ../yum/__init__.py:1959
-#: ../yum/__init__.py:1999
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
-msgstr "Ungültig versionierte Abhängigkeitszeichenkette, versuche es zu notieren."
+msgstr ""
+"Ungültig versionierte Abhängigkeitszeichenkette, versuche es zu notieren."
 
-#: ../yum/__init__.py:1961
-#: ../yum/__init__.py:2001
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Ungültiges Versionsflag"
 
-#: ../yum/__init__.py:1973
-#: ../yum/__init__.py:1977
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "Kein Paket gefunden für %s"
 
-#: ../yum/__init__.py:2105
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr "Paketobjekt war keine Paketobjektinstanz"
 
-#: ../yum/__init__.py:2109
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr "Nichts angegeben zum Installieren"
 
 #. only one in there
-#: ../yum/__init__.py:2124
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
-msgstr "Überprüfe nach virtueller Bereitstellung oder Datei-Bereitstellung für %s"
+msgstr ""
+"Überprüfe nach virtueller Bereitstellung oder Datei-Bereitstellung für %s"
 
-#: ../yum/__init__.py:2130
-#: ../yum/__init__.py:2446
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr "Kein Übereinstimmung für Argument: %s"
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2185
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr "Kein Paket(e) zum Installieren verfügbar."
 
-#: ../yum/__init__.py:2198
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr "Paket: %s - bereits im Transaktionsset"
 
-#: ../yum/__init__.py:2212
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
-msgstr "Paket %s ist bereits installiert und ist in der neusten Version vorhanden."
+msgstr ""
+"Paket %s ist bereits installiert und ist in der neusten Version vorhanden."
 
-#: ../yum/__init__.py:2219
+#: ../yum/__init__.py:2178
 #, python-format
 msgid "Package matching %s already installed. Checking for update."
-msgstr "Paket, das auf %s passt ist bereits installiert. Überprüfe auf Aktualisierung."
-
-#: ../yum/__init__.py:2230
-#, python-format
-msgid "Package %s is obsoleted by %s, trying to install %s instead"
-msgstr "Paket %s ist veraltet von %s, versuche stattdessen %s zu installieren."
+msgstr ""
+"Paket, das auf %s passt ist bereits installiert. Überprüfe auf "
+"Aktualisierung."
 
 #. update everything (the easy case)
-#: ../yum/__init__.py:2263
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Aktualisiere alles"
 
-#: ../yum/__init__.py:2366
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Paket ist bereits veraltet: %s.%s %s:%s-%s"
 
-#: ../yum/__init__.py:2390
-#, python-format
-msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
-msgstr "Aktualisiere Paket nicht, da es bereits veraltet ist:  %s.%s %s:%s-%s"
-
-#: ../yum/__init__.py:2443
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#. FIXME we should give the caller some nice way to hush this warning
-#. probably just a kwarg of 'silence_warnings' or something
-#. b/c when this is called from groupRemove() it makes a lot of
-#. garbage noise
-#: ../yum/__init__.py:2462
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Kein Paket stimmt zum Entfernen überein"
 
-#: ../yum/__init__.py:2496
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Kann Datei nicht öffnen: %s. Überspringen."
 
-#: ../yum/__init__.py:2498
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Untersuche %s: %s"
 
-#: ../yum/__init__.py:2504
-#, python-format
-msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
-msgstr "Kann Paket %s nicht zur Transaktion hinzufügen. Keine kompatible Architektur: %s"
-
-#: ../yum/__init__.py:2512
+#: ../yum/__init__.py:2436
 #, python-format
-msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
-msgstr "Paket %s nicht installiert, kann es nicht aktualisieren. Führen Sie stattdessen yum install aus, um es zu installieren."
+msgid ""
+"Package %s not installed, cannot update it. Run yum install to install it "
+"instead."
+msgstr ""
+"Paket %s nicht installiert, kann es nicht aktualisieren. Führen Sie "
+"stattdessen yum install aus, um es zu installieren."
 
-#: ../yum/__init__.py:2545
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Exklusive %s"
 
-#: ../yum/__init__.py:2549
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Markiere %s zum Installieren"
 
-#: ../yum/__init__.py:2554
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr "Markiere %s als eine Aktualisierung für %s"
 
-#: ../yum/__init__.py:2559
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr "%s: aktualisiert installierte Pakete nicht."
 
-#: ../yum/__init__.py:2576
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr "Probleme beim Neuinstallieren: kein Paket stimmt zum Entfernen überein"
 
-#: ../yum/__init__.py:2587
+#: ../yum/__init__.py:2515
 #, python-format
 msgid "Package %s is allowed multiple installs, skipping"
 msgstr "Paket %s darf mehrfach installiert sein, überspringe"
 
-#: ../yum/__init__.py:2594
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
-msgstr "Probleme beim Neuinstallieren: kein Paket stimmt zum Installieren überein"
+msgstr ""
+"Probleme beim Neuinstallieren: kein Paket stimmt zum Installieren überein"
 
-#: ../yum/__init__.py:2641
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr "GPG-Schlüssel abrufen von %s"
 
-#: ../yum/__init__.py:2647
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "GPG-Schlüssel-Abruf fehlgeschlagen:"
 
-#: ../yum/__init__.py:2663
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "GPG-Schlüssel-Analyse fehlgeschlagen: "
 
-#: ../yum/__init__.py:2667
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr "GPG-Schlüssel unter %s (0x%s) ist bereits installiert"
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2672
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr "Importiere GPG-Schlüssel 0x%s \"%s\" von %s"
 
-#: ../yum/__init__.py:2685
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "Nicht installierter Schlüssel"
 
-#: ../yum/__init__.py:2691
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "Schlüssel-Import fehlgeschlagen (Code %d)"
 
-#: ../yum/__init__.py:2694
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "Schlüssel erfolgreich importiert"
 
-#: ../yum/__init__.py:2699
+#: ../yum/__init__.py:2624
 #, 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 ""
-"Die aufgelisteten GPG-Schlüssel für das \"%s\" Repository sind bereits installiert, aber sie sind nicht korrekt für dieses Paket.\n"
-"Stellen Sie sicher, dass die korrekten Schlüssel-URLs für dieses Repository konfiguriert sind."
+"Die aufgelisteten GPG-Schlüssel für das \"%s\" Repository sind bereits "
+"installiert, aber sie sind nicht korrekt für dieses Paket.\n"
+"Stellen Sie sicher, dass die korrekten Schlüssel-URLs für dieses Repository "
+"konfiguriert sind."
 
-#: ../yum/__init__.py:2708
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr "Importieren der Schlüssel hat nicht geholfen, falsche Schlüssel?"
 
-#: ../yum/__init__.py:2789
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "Es kann kein geeigneter Mirror gefunden werden."
 
-#: ../yum/__init__.py:2791
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr "Beim Herunterladen der Pakete sind Fehler aufgetreten."
 
-#: ../yum/__init__.py:2854
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Test-Transaktionsfehler"
 
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:197
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "Geladene Plugins: "
 
-#: ../yum/plugins.py:208
+#: ../yum/plugins.py:206
 #, python-format
 msgid "No plugin match for: %s"
 msgstr "Kein Plugin für Argument: %s"
 
-#: ../yum/plugins.py:221
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "\"%s\" Plugin ist deaktiviert"
 
-#: ../yum/plugins.py:233
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr "Plugin \"%s\" gibt keine benötigte API-Version an"
 
-#: ../yum/plugins.py:237
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr "Plugin \"%s\" benötigt API %s. Unterstützte API ist %s."
 
-#: ../yum/plugins.py:266
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Lade \"%s\" Plugin"
 
-#: ../yum/plugins.py:273
+#: ../yum/plugins.py:271
 #, python-format
-msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
-msgstr "Zwei oder mehr Plugins mit dem Namen \"%s\" existieren im Plugin-Suchpfad"
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr ""
+"Zwei oder mehr Plugins mit dem Namen \"%s\" existieren im Plugin-Suchpfad"
 
-#: ../yum/plugins.py:293
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr "Konfigurationsdatei %s nicht gefunden"
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:296
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr "Kann Konfigurationsdatei für Plugin %s nicht finden"
 
-#: ../yum/plugins.py:450
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "Registrierung von Befehlen nicht unterstützt"
 
-# Geht sicher auch besser..., Ideen? Fabian
-#: ../yum/rpmtrans.py:78
-msgid "Repackaging"
-msgstr "Neu verpacken"
-
 #: ../rpmUtils/oldUtils.py:26
 #, python-format
 msgid "Header cannot be opened or does not match %s, %s."
@@ -1948,10 +1934,8 @@ msgstr "Kann RPM-Datenbank nicht öffnen. Wird sie eventuell schon benutzt?"
 msgid "Got an empty Header, something has gone wrong"
 msgstr "Erhalte einen leeren Header, irgendetwas ging schief"
 
-#: ../rpmUtils/oldUtils.py:244
-#: ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254
-#: ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
+#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
 #, python-format
 msgid "Damaged Header %s"
 msgstr "Defekter Header %s"
@@ -1961,55 +1945,95 @@ msgstr "Defekter Header %s"
 msgid "Error opening rpm %s - error %s"
 msgstr "Fehler bei Öffnen des RPM %s - Fehler %s"
 
-#~ msgid "Searching pkgSack for dep: %s"
-#~ msgstr "Suche pkgSack für Abhängigkeiten: %s"
-#~ msgid "Potential match for %s from %s"
-#~ msgstr "Potentielle Übereinstimmung für %s von %s"
-#~ msgid "Matched %s to require for %s"
-#~ msgstr "Übereinstimmung von %s, welche gebraucht wird für %s"
-#~ msgid "Needed Require has already been looked up, cheating"
-#~ msgstr "Benötigte Anforderung wurde bereits nachgeschlagen, betrüge"
-#~ msgid "Needed Require is not a package name. Looking up: %s"
-#~ msgstr "Benötigte Anforderung ist kein Paket-Name. Schlagen nach: %s"
-#~ msgid "Potential Provider: %s"
-#~ msgstr "Potentieller Bereitsteller: %s"
-#~ msgid "Mode is %s for provider of %s: %s"
-#~ msgstr "Modus ist %s für Bereitsteller von %s: %s"
-#~ msgid "Mode for pkg providing %s: %s"
-#~ msgstr "Modus für pkg-Bereitstellung %s: %s"
-#~ msgid "Unresolvable requirement %s for %s"
-#~ msgstr "Unlösbare Anforderung %s für %s"
 #~ msgid ""
-#~ "Failure finding best provider of %s for %s, exceeded maximum loop length"
+#~ "\n"
+#~ "\n"
+#~ "%s: %s option requires an argument"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s Option benötigt ein Argument"
+
+#~ msgid "show this help message and exit"
+#~ msgstr "Hilfeinformation anzeigen und beenden"
+
+#~ msgid "verbose operation"
+#~ msgstr "Wortreicher Betrieb"
+
+#~ msgid "Repo-id     : "
+#~ msgstr "Repo-ID       : "
+
+#~ msgid "Repo-name   : "
+#~ msgstr "Repo-Name   : "
+
+#~ msgid "Repo-enabled: "
+#~ msgstr "Repo aktiviert:"
+
+#~ msgid "Repo-size   : "
+#~ msgstr "Repo-Grösse   : "
+
+#~ msgid "Running compare_providers() for %s"
+#~ msgstr "Führe compare_providers() aus für %s"
+
+#~ msgid ""
+#~ "archdist compared %s to %s on %s\n"
+#~ "  Winner: %s"
 #~ msgstr ""
-#~ "Fehler beim FInden des besten Providers von %s für %s, überschrittene "
-#~ "maximale Schleifenlänge"
-#~ msgid "Comparing best: %s to po: %s"
-#~ msgstr "Vergleiche besseres: %s zu po: %s"
-#~ msgid "Same: best %s == po: %s"
-#~ msgstr "Gleich: besser %s == po: %s"
-#~ msgid "po %s obsoletes best: %s"
-#~ msgstr "po %s veraltetes besser: %s"
-#~ msgid "po %s shares a sourcerpm with %s"
-#~ msgstr "po %s teilen ein Quellen-RPM mit %s"
-#~ msgid "best %s shares a sourcerpm with %s"
-#~ msgstr "besseres %s teilen ein Quellen-RPM mit %s"
-#~ msgid "po %s shares more of the name prefix with %s"
-#~ msgstr "po %s teilt mehr als den Prefixnamen mit %s"
-#~ msgid "po %s has a shorter name than best %s"
-#~ msgstr "po %s hat einen kürzeren Namen als das bessere %s"
-#~ msgid "bestpkg %s shares more of the name prefix with %s"
-#~ msgstr "bestpkg %s teilt mehr als als den Prefixnamen mit %s"
+#~ "Archdist verglichen %s zu %s auf %s\n"
+#~ "  Gewinner: %s"
+
+#~ msgid "common sourcerpm %s and %s"
+#~ msgstr "Gemeinsames Quellen-RPM %s und %s"
+
+#~ msgid "common prefix of %s between %s and %s"
+#~ msgstr "Gemeinsamer Prefix von %s zwischen %s und %s"
+
+# Hat jemand eine Idee für eine bessere Übersetzung? Fabian
+#, fuzzy
+#~ msgid "Best Order: %s"
+#~ msgstr "Beste Bestellung: %s"
+
+#~ msgid ""
+#~ "Warning: scriptlet or other non-fatal errors occurred during transaction."
+#~ msgstr ""
+#~ "Warnung: Es sind Scriptlet- oder andere nicht-fatale Fehler bei der "
+#~ "Verarbeitung aufgetreten."
+
+#~ msgid "No group data available for configured repositories"
+#~ msgstr "Keine Gruppe für konfigurierte Repositories verfügbar"
+
+#~ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+#~ msgstr ""
+#~ "Paket %s ist veraltet von %s, versuche stattdessen %s zu installieren."
+
+#~ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+#~ msgstr ""
+#~ "Aktualisiere Paket nicht, da es bereits veraltet ist:  %s.%s %s:%s-%s"
+
+#~ msgid ""
+#~ "Cannot add package %s to transaction. Not a compatible architecture: %s"
+#~ msgstr ""
+#~ "Kann Paket %s nicht zur Transaktion hinzufügen. Keine kompatible "
+#~ "Architektur: %s"
+
+# Geht sicher auch besser..., Ideen? Fabian
+#~ msgid "Repackaging"
+#~ msgstr "Neu verpacken"
+
 #~ msgid "Package %s needs %s, this is not available."
 #~ msgstr "Paket %s braucht %s, dies ist nicht verfügbar."
+
 #~ msgid "Package %s conflicts with %s."
 #~ msgstr "Paket %s kollidiert mit %s."
+
 #~ msgid "Looking for Obsoletes for %s"
 #~ msgstr "Suche nach veralteten Paketen für %s"
+
 #~ msgid "TSINFO: Updating %s to resolve conflict."
 #~ msgstr "TSINFO: Aktualisiere %s zum Lösen des Konflikts.."
+
 #~ msgid "%s conflicts: %s"
 #~ msgstr "%s kollidiert: %s"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s kollidiert mit %s"
-
diff --git a/po/fr.po b/po/fr.po
index a828bc0..c0ebd33 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,32 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-20 09:28+0000\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-09-20 19:32+0200\n"
 "Last-Translator: Johan Cwiklinski <johan at x-tnd.be>\n"
 "Language-Team: fr_FR <fedora-trans-fr at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: ../callback.py:48 ../output.py:516 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Mise à jour"
 
-#: ../callback.py:49 ../yum/rpmtrans.py:72
+#: ../callback.py:49
 msgid "Erasing"
 msgstr "Suppression"
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:515
-#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Installation"
 
-#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
+#: ../callback.py:52 ../callback.py:58
 msgid "Obsoleted"
 msgstr "Obsolète"
 
-#: ../callback.py:54 ../output.py:562
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Mis à jour"
 
@@ -42,7 +41,7 @@ msgstr "Mis à jour"
 msgid "Erased"
 msgstr "Supprimé"
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:560
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "Installé"
 
@@ -64,53 +63,53 @@ msgstr "Erreur : statut de sortie invalide : %s pour %s"
 msgid "Erased: %s"
 msgstr "Supprimé : %s"
 
-#: ../callback.py:217 ../output.py:517
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Suppression"
 
-#: ../callback.py:219 ../yum/rpmtrans.py:77
+#: ../callback.py:219
 msgid "Cleanup"
 msgstr "Nettoyage"
 
-#: ../cli.py:105
+#: ../cli.py:103
 #, python-format
 msgid "Command \"%s\" already defined"
 msgstr "Commande « %s » déjà définie"
 
-#: ../cli.py:117
+#: ../cli.py:115
 msgid "Setting up repositories"
 msgstr "Configuration des dépôts"
 
-#: ../cli.py:128
+#: ../cli.py:126
 msgid "Reading repository metadata in from local files"
 msgstr "Lecture des méta données du dépôt depuis les fichiers locaux"
 
-#: ../cli.py:186 ../utils.py:71
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "Erreur de configuration : %s"
 
-#: ../cli.py:189 ../cli.py:1081 ../utils.py:74
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Erreur d'options : %s"
 
-#: ../cli.py:232
+#: ../cli.py:229
 msgid "You need to give some command"
 msgstr "Vous devez spécifier des commandes"
 
-#: ../cli.py:274
+#: ../cli.py:271
 msgid "Disk Requirements:\n"
 msgstr "Besoins en espace disque :\n"
 
-#: ../cli.py:276
+#: ../cli.py:273
 #, python-format
 msgid "  At least %dMB needed on the %s filesystem.\n"
 msgstr "Au moins %dMB requis sur le système de fichiers %s.\n"
 
 #. TODO: simplify the dependency errors?
 #. Fixup the summary
-#: ../cli.py:281
+#: ../cli.py:278
 msgid ""
 "Error Summary\n"
 "-------------\n"
@@ -118,57 +117,57 @@ msgstr ""
 "Résumé des erreurs\n"
 "-------------\n"
 
-#: ../cli.py:320
+#: ../cli.py:317
 msgid "Trying to run the transaction but nothing to do. Exiting."
 msgstr ""
 "Tentative d'exécution de la transaction mais aucune tâche à effectuer. "
 "Sortie."
 
-#: ../cli.py:350
+#: ../cli.py:347
 msgid "Exiting on user Command"
 msgstr "Arrêt à la demande de l'utilisateur"
 
-#: ../cli.py:354
+#: ../cli.py:351
 msgid "Downloading Packages:"
 msgstr "Téléchargement des paquetages :"
 
-#: ../cli.py:359
+#: ../cli.py:356
 msgid "Error Downloading Packages:\n"
 msgstr "Erreur durant le téléchargement des paquetages :\n"
 
-#: ../cli.py:373 ../yum/__init__.py:2826
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "Lancement de rpm_check_debug"
 
-#: ../cli.py:376 ../yum/__init__.py:2829
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr "ERREUR de résolution de dépendance par rpm_check_debug :"
 
-#: ../cli.py:380 ../yum/__init__.py:2831
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Veuillez reporter cette erreur dans le bugzilla"
 
-#: ../cli.py:386
+#: ../cli.py:383
 msgid "Running Transaction Test"
 msgstr "Lancement de la transaction de test"
 
-#: ../cli.py:402
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr "Transaction de test terminée"
 
-#: ../cli.py:404
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr "Erreur du contrôle de transaction :\n"
 
-#: ../cli.py:411
+#: ../cli.py:408
 msgid "Transaction Test Succeeded"
 msgstr "Transaction de test réussie"
 
-#: ../cli.py:432
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr "Lancement de la transaction"
 
-#: ../cli.py:462
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
@@ -177,318 +176,299 @@ msgstr ""
 "inattendue.\n"
 "Utilisez l'option « -y » pour passer outre."
 
-#: ../cli.py:494
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr "Traitement des options d'installation des paquetages"
 
-#: ../cli.py:504
+#: ../cli.py:501
 #, python-format
 msgid "No package %s available."
 msgstr "Aucun paquetage %s disponible."
 
-#: ../cli.py:508 ../cli.py:626 ../yumcommands.py:790
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Paquetage(s) à installer"
 
-#: ../cli.py:509 ../cli.py:627 ../yumcommands.py:147 ../yumcommands.py:791
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr "Rien à faire"
 
-#: ../cli.py:539 ../yum/__init__.py:2275 ../yum/__init__.py:2375
-#: ../yum/__init__.py:2387
+#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
+#: ../yum/__init__.py:2340
 #, python-format
 msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
 msgstr ""
 "Pas de mise à jour des paquetages qui ont déjà été rendus obsolètes : %s.%s %"
 "s:%s-%s"
 
-#: ../cli.py:571
+#: ../cli.py:568
 #, python-format
 msgid "Could not find update match for %s"
 msgstr "Impossible de trouver une correspondance pour la mise à jour de %s"
 
-#: ../cli.py:583
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr "%d paquetages marqués pour mise à jour"
 
-#: ../cli.py:586
+#: ../cli.py:583
 msgid "No Packages marked for Update"
 msgstr "Aucun paquetage marqué pour mise à jour"
 
-#: ../cli.py:602
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr "%d paquetages marqués pour suppression"
 
-#: ../cli.py:605
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr "Aucun paquetage marqué pour suppression"
 
-#: ../cli.py:617
+#: ../cli.py:614
 msgid "No Packages Provided"
 msgstr "Pas de paquetage fourni"
 
-#: ../cli.py:657
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr "Liste des paquetages correspondant à la demande de l'utilisateur"
 
-#: ../cli.py:705
+#: ../cli.py:701
 #, python-format
 msgid "Warning: No matches found for: %s"
 msgstr "Attention : Aucune correspondance trouvée pour : %s"
 
-#: ../cli.py:708
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Aucune correspondance trouvée"
 
-#: ../cli.py:749
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Aucun paquetage trouvé pour %s"
 
-#: ../cli.py:761
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "Nettoyage complet"
 
-#: ../cli.py:775
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "Nettoyage des en-têtes"
 
-#: ../cli.py:778
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "Nettoyage des paquetages"
 
-#: ../cli.py:781
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "Nettoyage des méta données xml"
 
-#: ../cli.py:784
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "Nettoyage du cache de la base de données"
 
-#: ../cli.py:787
+#: ../cli.py:783
 msgid "Cleaning up expire-cache metadata"
 msgstr "Nettoyage des méta données expirées dans le cache"
 
-#: ../cli.py:790
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "Nettoyage des modules complémentaires"
 
-#: ../cli.py:812
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Groupes installés :"
 
-#: ../cli.py:819
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "Groupes disponibles :"
 
-#: ../cli.py:825
+#: ../cli.py:820
 msgid "Done"
 msgstr "Effectué"
 
-#: ../cli.py:836 ../cli.py:854 ../cli.py:860
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "Attention : le groupe %s n'existe pas."
 
-#: ../cli.py:864
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
 msgstr ""
 "Aucun paquetage disponible pour installation ou mise à jour dans les groupes "
 "demandés"
 
-#: ../cli.py:866
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d paquetage(s) à installer"
 
-#: ../cli.py:876
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Aucun groupe nommé %s n'existe"
 
-#: ../cli.py:882
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Aucun paquetage du groupe à supprimer"
 
-#: ../cli.py:884
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d paquetage(s) à supprimer"
 
-#: ../cli.py:926
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "Le paquetage %s est déjà installé, omission"
 
-#: ../cli.py:937
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr "Rejet du paquetage non comparable %s.%s"
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:963
+#: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
 msgstr ""
 "Pas d'autre %s installé, ajout à la liste pour installation potentielle"
 
-#: ../cli.py:982
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "Erreur sur la ligne de commande : %s"
 
-#: ../cli.py:994
-#, python-format
-msgid ""
-"\n"
-"\n"
-"%s: %s option requires an argument"
-msgstr ""
-"\n"
-"\n"
-"%s : l'option %s requiert un argument"
-
-#: ../cli.py:1123
-msgid "show this help message and exit"
-msgstr "affiche ce message d'aide et quitte"
-
-#: ../cli.py:1127
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "tolérer les erreurs"
 
-#: ../cli.py:1129
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr "exécuter entièrement depuis le cache, ne pas le mettre à jour"
 
-#: ../cli.py:1131
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "emplacement du fichier de configuration"
 
-#: ../cli.py:1133
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "temps d'attente maximum de la commande"
 
-#: ../cli.py:1135
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "niveau de déboguage pour la sortie"
 
-#: ../cli.py:1139
+#: ../cli.py:1113
 msgid "show duplicates, in repos, in list/search commands"
 msgstr "afficher les doublons, dans les dépôts, pour les commandes list/search"
 
-#: ../cli.py:1141
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "niveau d'erreur pour la sortie"
 
-#: ../cli.py:1144
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "opération silencieuse"
 
-#: ../cli.py:1146
-msgid "verbose operation"
-msgstr "opération verbeuse"
-
-#: ../cli.py:1148
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "répondre oui à toutes les questions"
 
-#: ../cli.py:1150
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "affiche la version de Yum et quitte"
 
-#: ../cli.py:1151
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "définit la racine d'installation"
 
-#: ../cli.py:1155
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "active un ou plusieurs dépôts (jokers autorisés)"
 
-#: ../cli.py:1159
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr "désactive un ou plusieurs dépôts (jokers autorisés)"
 
-#: ../cli.py:1162
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr "exclut des paquetages par nom ou caractère générique"
 
-#: ../cli.py:1164
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
 msgstr ""
 "désactive l'exclusion pour le dépôt principal, pour un dépôt particulier ou "
 "pour tout"
 
-#: ../cli.py:1167
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr "active le traitement des paquetages obsolètes pendant les mises à jour"
 
-#: ../cli.py:1169
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "désactive les modules complémentaires Yum"
 
-#: ../cli.py:1171
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "désactive la vérification de clé gpg"
 
-#: ../cli.py:1173
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "désactive les modules complémentaires par nom"
 
-#: ../cli.py:1176
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "omettre les paquetages qui ont des problèmes de dépendances"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Jan"
 msgstr "Jan"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Feb"
 msgstr "Fév"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Mar"
 msgstr "Mars"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Apr"
 msgstr "Avr"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "May"
 msgstr "Mai"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Jun"
 msgstr "Juin"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Jul"
 msgstr "Jui"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Aug"
 msgstr "Août"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Sep"
 msgstr "Sep"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Oct"
 msgstr "Oct"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Nov"
 msgstr "Nov"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Dec"
 msgstr "Déc"
 
-#: ../output.py:239
+#: ../output.py:240
 msgid "Trying other mirror."
 msgstr "Essai d'un autre miroir."
 
@@ -554,23 +534,23 @@ msgstr "Description :"
 msgid "Is this ok [y/N]: "
 msgstr "Est-ce correct [o/N] : "
 
-#: ../output.py:359 ../output.py:362
+#: ../output.py:357 ../output.py:360
 msgid "y"
 msgstr "o"
 
-#: ../output.py:359
+#: ../output.py:357
 msgid "n"
 msgstr "n"
 
-#: ../output.py:359 ../output.py:362
+#: ../output.py:357 ../output.py:360
 msgid "yes"
 msgstr "oui"
 
-#: ../output.py:359
+#: ../output.py:357
 msgid "no"
 msgstr "non"
 
-#: ../output.py:370
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -579,98 +559,98 @@ msgstr ""
 "\n"
 "Groupe : %s"
 
-#: ../output.py:372
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " Description : %s"
 
-#: ../output.py:374
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr " Paquetages mandataires :"
 
-#: ../output.py:379
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr "Paquetages par défaut :"
 
-#: ../output.py:384
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr "Paquetages optionnels :"
 
-#: ../output.py:389
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr " Paquetages conditionnels :"
 
-#: ../output.py:398
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "paquetage : %s"
 
-#: ../output.py:400
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr "Pas de dépendances pour ce paquetage"
 
-#: ../output.py:405
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr "  dépendance : %s"
 
-#: ../output.py:407
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr "   Dépendance non satisfaite"
 
-#: ../output.py:465
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Correspondance depuis :"
 
-#: ../output.py:491
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr ""
 "Une erreur est survenue pendant le calcul de la taille totale des "
 "téléchargements"
 
-#: ../output.py:496
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "Taille totale : %s"
 
-#: ../output.py:499
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "Taille totale des téléchargement : %s"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Package"
 msgstr "Paquetage"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Arch"
 msgstr "Architecture"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Version"
 msgstr "Version"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Repository"
 msgstr "Dépôt"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Size"
 msgstr "Taille"
 
-#: ../output.py:518
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Installation pour dépendance"
 
-#: ../output.py:519
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Mise à jour pour dépendance"
 
-#: ../output.py:520
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Suppression pour dépendance"
 
-#: ../output.py:532
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
@@ -679,7 +659,7 @@ msgstr ""
 "     remplace  %s.%s %s\n"
 "\n"
 
-#: ../output.py:540
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -696,27 +676,27 @@ msgstr ""
 "Mise à jour   %5.5s Package(s)         \n"
 "Suppression   %5.5s Package(s)         \n"
 
-#: ../output.py:558
+#: ../output.py:554
 msgid "Removed"
 msgstr "Supprimé"
 
-#: ../output.py:559
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "Dépendance supprimée"
 
-#: ../output.py:561
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "Dépendance installée"
 
-#: ../output.py:563
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "Dépendance mise à jour"
 
-#: ../output.py:564
+#: ../output.py:560
 msgid "Replaced"
 msgstr "Remplacé"
 
-#: ../output.py:622
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
@@ -727,76 +707,76 @@ msgstr ""
 "Téléchargement courant annulé, interruption %s (crtl-c), %s de nouveau dans %"
 "s%s%s secondes pour quitter.\n"
 
-#: ../output.py:632
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "interruption par l'utilisateur"
 
-#: ../output.py:643
+#: ../output.py:639
 msgid "installed"
 msgstr "installé"
 
-#: ../output.py:644
+#: ../output.py:640
 msgid "updated"
 msgstr "mis à jour"
 
-#: ../output.py:645
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "obsolète"
 
-#: ../output.py:646
+#: ../output.py:642
 msgid "erased"
 msgstr "effacé"
 
-#: ../output.py:650
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> Paquetage %s.%s %s:%s-%s marqué pour être %s "
 
-#: ../output.py:657
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> Lancement de la transaction de test"
 
-#: ../output.py:662
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr ""
 "--> Redémarrage de la résolution des dépendances avec les nouveaux "
 "changements."
 
-#: ../output.py:667
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> Résolution des dépendances terminée"
 
-#: ../output.py:672
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr "--> Traitement de la dépendance : %s pour le paquetage : %s"
 
-#: ../output.py:677
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> Dépendance non résolue : %s"
 
-#: ../output.py:683
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Traitement du conflit : %s entre en conflit avec %s"
 
-#: ../output.py:686
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr ""
 "--> Peuplement du jeu de transaction avec les paquetages sélectionnés. Merci "
 "de patienter."
 
-#: ../output.py:690
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr "--> Téléchargement de l'en-tête de %s pour l'ajouter à la transaction."
 
-#: ../yumcommands.py:37
+#: ../yumcommands.py:36
 msgid "You need to be root to perform this command."
 msgstr "Vous devez être super-utilisateur pour lancer cette commande."
 
-#: ../yumcommands.py:44
+#: ../yumcommands.py:43
 msgid ""
 "\n"
 "You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -831,265 +811,249 @@ msgstr ""
 "Pour plus de renseignements, contactez le fournisseur de paquetages de votre "
 "distribution.\n"
 
-#: ../yumcommands.py:64
+#: ../yumcommands.py:63
 #, python-format
 msgid "Error: Need to pass a list of pkgs to %s"
 msgstr "Erreur : il faut passer une liste de paquetages à %s"
 
-#: ../yumcommands.py:70
+#: ../yumcommands.py:69
 msgid "Error: Need an item to match"
 msgstr "Erreur : un élément de correspondance est requis"
 
-#: ../yumcommands.py:76
+#: ../yumcommands.py:75
 msgid "Error: Need a group or list of groups"
 msgstr "Erreur : un groupe ou une liste de groupes est requise"
 
-#: ../yumcommands.py:85
+#: ../yumcommands.py:84
 #, python-format
 msgid "Error: clean requires an option: %s"
 msgstr "Erreur : clean requiert une option : %s"
 
-#: ../yumcommands.py:90
+#: ../yumcommands.py:89
 #, python-format
 msgid "Error: invalid clean argument: %r"
 msgstr "Erreur : argument invalide pour clean : %r"
 
-#: ../yumcommands.py:103
+#: ../yumcommands.py:102
 msgid "No argument to shell"
 msgstr "Pas d'options à passer au terminal"
 
-#: ../yumcommands.py:106
+#: ../yumcommands.py:105
 #, python-format
 msgid "Filename passed to shell: %s"
 msgstr "Nom de fichier passé au terminal : %s"
 
-#: ../yumcommands.py:110
+#: ../yumcommands.py:109
 #, python-format
 msgid "File %s given as argument to shell does not exist."
 msgstr "Le fichier %s passé en argument au shell n'existe pas."
 
-#: ../yumcommands.py:116
+#: ../yumcommands.py:115
 msgid "Error: more than one file given as argument to shell."
 msgstr "Erreur : plus d'un fichier passé en argument au shell."
 
-#: ../yumcommands.py:157
+#: ../yumcommands.py:156
 msgid "PACKAGE..."
 msgstr "PAQUETAGE..."
 
-#: ../yumcommands.py:160
+#: ../yumcommands.py:159
 msgid "Install a package or packages on your system"
 msgstr "Installe un ou plusieurs paquetages sur votre système"
 
-#: ../yumcommands.py:169
+#: ../yumcommands.py:168
 msgid "Setting up Install Process"
 msgstr "Configuration du processus d'installation"
 
-#: ../yumcommands.py:180
+#: ../yumcommands.py:179
 msgid "[PACKAGE...]"
 msgstr "[PAQUETAGE...]"
 
-#: ../yumcommands.py:183
+#: ../yumcommands.py:182
 msgid "Update a package or packages on your system"
 msgstr "Met à jour un ou plusieurs paquetages sur votre système"
 
-#: ../yumcommands.py:191
+#: ../yumcommands.py:190
 msgid "Setting up Update Process"
 msgstr "Configuration du processus de mise à jour"
 
-#: ../yumcommands.py:205
+#: ../yumcommands.py:204
 msgid "Display details about a package or group of packages"
 msgstr "Affiche les détails d'un paquetage ou d'un groupe de paquetages"
 
-#: ../yumcommands.py:213
+#: ../yumcommands.py:212
 msgid "Installed Packages"
 msgstr "Paquetages installés"
 
-#: ../yumcommands.py:214
+#: ../yumcommands.py:213
 msgid "Available Packages"
 msgstr "Paquetages disponibles"
 
-#: ../yumcommands.py:215
+#: ../yumcommands.py:214
 msgid "Extra Packages"
 msgstr "Paquetages supplémentaires"
 
-#: ../yumcommands.py:216
+#: ../yumcommands.py:215
 msgid "Updated Packages"
 msgstr "Paquetages mis à jour"
 
-#: ../yumcommands.py:222 ../yumcommands.py:228
+#: ../yumcommands.py:221 ../yumcommands.py:225
 msgid "Obsoleting Packages"
 msgstr "Obsolescence des paquetages"
 
-#: ../yumcommands.py:229
+#: ../yumcommands.py:226
 msgid "Recently Added Packages"
 msgstr "Paquetages récemment ajoutés"
 
-#: ../yumcommands.py:235
+#: ../yumcommands.py:232
 msgid "No matching Packages to list"
 msgstr "Aucun paquetage correspondant à lister"
 
-#: ../yumcommands.py:249
+#: ../yumcommands.py:246
 msgid "List a package or groups of packages"
 msgstr "Liste un paquetage ou un groupe de paquetages"
 
-#: ../yumcommands.py:261
+#: ../yumcommands.py:258
 msgid "Remove a package or packages from your system"
 msgstr "Supprime un ou plusieurs paquetages de votre système"
 
-#: ../yumcommands.py:269
+#: ../yumcommands.py:266
 msgid "Setting up Remove Process"
 msgstr "Configuration du processus de suppression"
 
-#: ../yumcommands.py:281
+#: ../yumcommands.py:278
 msgid "Setting up Group Process"
 msgstr "Configuration du processus de groupe"
 
-#: ../yumcommands.py:287
+#: ../yumcommands.py:284
 msgid "No Groups on which to run command"
 msgstr "Aucun groupe sur lequel lancer la commande"
 
-#: ../yumcommands.py:300
+#: ../yumcommands.py:297
 msgid "List available package groups"
 msgstr "Liste les groupes de paquetages disponibles"
 
-#: ../yumcommands.py:317
+#: ../yumcommands.py:314
 msgid "Install the packages in a group on your system"
 msgstr "Installe les paquetages d'un groupe sur votre système"
 
-#: ../yumcommands.py:339
+#: ../yumcommands.py:336
 msgid "Remove the packages in a group from your system"
 msgstr "Supprime les paquetages d'un groupe de votre système"
 
-#: ../yumcommands.py:363
+#: ../yumcommands.py:360
 msgid "Display details about a package group"
 msgstr "Affiche des détails sur un groupe de paquetages"
 
-#: ../yumcommands.py:387
+#: ../yumcommands.py:384
 msgid "Generate the metadata cache"
 msgstr "Génère le cache des méta données"
 
-#: ../yumcommands.py:393
+#: ../yumcommands.py:390
 msgid "Making cache files for all metadata files."
 msgstr "Création des fichiers de cache pour tous les fichiers de méta données."
 
-#: ../yumcommands.py:394
+#: ../yumcommands.py:391
 msgid "This may take a while depending on the speed of this computer"
 msgstr "Cela peut prendre du temps en fonction de la vitesse de cet ordinateur"
 
-#: ../yumcommands.py:415
+#: ../yumcommands.py:412
 msgid "Metadata Cache Created"
 msgstr "Cache des méta données créé"
 
-#: ../yumcommands.py:429
+#: ../yumcommands.py:426
 msgid "Remove cached data"
 msgstr "Supprime les données en cache"
 
-#: ../yumcommands.py:450
+#: ../yumcommands.py:447
 msgid "Find what package provides the given value"
 msgstr "Cherche à quel paquetage correspond la valeur donnée"
 
-#: ../yumcommands.py:470
+#: ../yumcommands.py:467
 msgid "Check for available package updates"
 msgstr "Cherche les mises à jour de paquetages disponibles"
 
-#: ../yumcommands.py:493
+#: ../yumcommands.py:490
 msgid "Search package details for the given string"
 msgstr "Cherche les détails du paquetage en fonction de la chaîne entrée"
 
-#: ../yumcommands.py:499
+#: ../yumcommands.py:496
 msgid "Searching Packages: "
 msgstr "Recherche dans les paquetages :"
 
-#: ../yumcommands.py:516
+#: ../yumcommands.py:513
 msgid "Update packages taking obsoletes into account"
 msgstr "Mises à jour en tenant compte des paquetages obsolètes du profil"
 
-#: ../yumcommands.py:525
+#: ../yumcommands.py:522
 msgid "Setting up Upgrade Process"
 msgstr "Configuration du processus de mise à jour"
 
-#: ../yumcommands.py:539
+#: ../yumcommands.py:536
 msgid "Install a local RPM"
 msgstr "Installe un RPM local"
 
-#: ../yumcommands.py:548
+#: ../yumcommands.py:545
 msgid "Setting up Local Package Process"
 msgstr "Configuration du processus de paquetages locaux"
 
-#: ../yumcommands.py:567
+#: ../yumcommands.py:564
 msgid "Determine which package provides the given dependency"
 msgstr "Détermine quel paquetage fournit une dépendance donnée"
 
-#: ../yumcommands.py:570
+#: ../yumcommands.py:567
 msgid "Searching Packages for Dependency:"
 msgstr "Recherche dans les paquetages pour la dépendance :"
 
-#: ../yumcommands.py:584
+#: ../yumcommands.py:581
 msgid "Run an interactive yum shell"
 msgstr "Lance un shell yum interactif"
 
-#: ../yumcommands.py:590
+#: ../yumcommands.py:587
 msgid "Setting up Yum Shell"
 msgstr "Configuration du shell Yum"
 
-#: ../yumcommands.py:608
+#: ../yumcommands.py:605
 msgid "List a package's dependencies"
 msgstr "Liste les dépendances d'un paquetage"
 
-#: ../yumcommands.py:614
+#: ../yumcommands.py:611
 msgid "Finding dependencies: "
 msgstr "Recherche de dépendances :"
 
-#: ../yumcommands.py:630
+#: ../yumcommands.py:627
 msgid "Display the configured software repositories"
 msgstr "Affiche les dépôts logiciels configurés"
 
-#: ../yumcommands.py:666
-msgid "enabled"
-msgstr "activé"
-
-#: ../yumcommands.py:673
-msgid "disabled"
-msgstr "désactivé"
-
-#: ../yumcommands.py:682
+#: ../yumcommands.py:645
 msgid "repo id"
 msgstr "id du dépôt"
 
-#: ../yumcommands.py:683
+#: ../yumcommands.py:645
 msgid "repo name"
 msgstr "nom du dépôt"
 
-#: ../yumcommands.py:683
+#: ../yumcommands.py:645
 msgid "status"
 msgstr "statut"
 
-#: ../yumcommands.py:686
-msgid "Repo-id     : "
-msgstr "Id du dépôt       : "
-
-#: ../yumcommands.py:687
-msgid "Repo-name   : "
-msgstr "Nom du dépôt      : "
-
-#: ../yumcommands.py:688
-msgid "Repo-enabled: "
-msgstr "Dépôt activé      :"
+#: ../yumcommands.py:651
+msgid "enabled"
+msgstr "activé"
 
-#: ../yumcommands.py:689
-msgid "Repo-size   : "
-msgstr "Nom du dépôt    : "
+#: ../yumcommands.py:654
+msgid "disabled"
+msgstr "désactivé"
 
-#: ../yumcommands.py:713
+#: ../yumcommands.py:671
 msgid "Display a helpful usage message"
 msgstr "Affiche un message d'aide à l'utilisation"
 
-#: ../yumcommands.py:747
+#: ../yumcommands.py:705
 #, python-format
 msgid "No help available for %s"
 msgstr "Aucune aide disponible pour %s"
 
-#: ../yumcommands.py:752
+#: ../yumcommands.py:710
 msgid ""
 "\n"
 "\n"
@@ -1099,7 +1063,7 @@ msgstr ""
 "\n"
 "alias : "
 
-#: ../yumcommands.py:754
+#: ../yumcommands.py:712
 msgid ""
 "\n"
 "\n"
@@ -1109,15 +1073,15 @@ msgstr ""
 "\n"
 "alias : "
 
-#: ../yumcommands.py:783
+#: ../yumcommands.py:741
 msgid "Setting up Reinstall Process"
 msgstr "Configuration du processus de réinstallation"
 
-#: ../yumcommands.py:797
+#: ../yumcommands.py:755
 msgid "reinstall a package"
 msgstr "réinstaller un paquetage"
 
-#: ../yummain.py:55
+#: ../yummain.py:41
 msgid ""
 "\n"
 "\n"
@@ -1127,7 +1091,7 @@ msgstr ""
 "\n"
 "Sortie sur annulation par l'utilisateur"
 
-#: ../yummain.py:61
+#: ../yummain.py:47
 msgid ""
 "\n"
 "\n"
@@ -1137,29 +1101,29 @@ msgstr ""
 "\n"
 "Sortie suite à une redirection cassée"
 
-#: ../yummain.py:112
+#: ../yummain.py:105
 msgid ""
 "Another app is currently holding the yum lock; waiting for it to exit..."
 msgstr ""
 "Une autre application verrouille actuellement l'utilisation de yum ; attente "
 "de déverrouillage..."
 
-#: ../yummain.py:139 ../yummain.py:178
+#: ../yummain.py:132 ../yummain.py:171
 #, python-format
 msgid "Error: %s"
 msgstr "Erreur : %s"
 
-#: ../yummain.py:149 ../yummain.py:185
+#: ../yummain.py:142 ../yummain.py:178
 #, python-format
 msgid "Unknown Error(s): Exit Code: %d:"
 msgstr "Erreur(s) inconnue(s) : Code de sortie : %d :"
 
 #. Depsolve stage
-#: ../yummain.py:156
+#: ../yummain.py:149
 msgid "Resolving Dependencies"
 msgstr "Résolution des dépendances"
 
-#: ../yummain.py:191
+#: ../yummain.py:184
 msgid ""
 "\n"
 "Dependencies Resolved"
@@ -1167,11 +1131,11 @@ msgstr ""
 "\n"
 "Dépendances résolues"
 
-#: ../yummain.py:205
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr "Terminé !"
 
-#: ../yummain.py:252
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
@@ -1181,266 +1145,326 @@ msgstr ""
 "\n"
 "Sortie sur annulation par l'utilisateur."
 
-#: ../yum/depsolve.py:78
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr "doTsSetup() sera supprimé dans une future version de Yum.\n"
 
-#: ../yum/depsolve.py:91
+#: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
 msgstr "Mise en place de l'ensemble des transactions avant configuration"
 
-#: ../yum/depsolve.py:132
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr "tsflag invalide dans le fichier de configuration : %s"
 
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:147
+#, python-format
+msgid "Searching pkgSack for dep: %s"
+msgstr "Recherche dans le regroupement pour la dépendance : %s"
+
+#: ../yum/depsolve.py:170
+#, python-format
+msgid "Potential match for %s from %s"
+msgstr "Correspondance potentielle pour %s depuis %s"
+
+#: ../yum/depsolve.py:178
+#, python-format
+msgid "Matched %s to require for %s"
+msgstr "Correspondance %s trouvé pour %s "
+
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "Membre : %s"
 
-#: ../yum/depsolve.py:190 ../yum/depsolve.py:592
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s converti pour installation"
 
-#: ../yum/depsolve.py:197
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "Ajout du paquetage %s en mode %s"
 
-#: ../yum/depsolve.py:207
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Suppression du paquetage %s"
 
-#: ../yum/depsolve.py:218
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s requiert : %s"
 
-#: ../yum/depsolve.py:273
+#: ../yum/depsolve.py:312
+msgid "Needed Require has already been looked up, cheating"
+msgstr "Le prérequis a déjà été trouvé, on triche"
+
+#: ../yum/depsolve.py:322
+#, python-format
+msgid "Needed Require is not a package name. Looking up: %s"
+msgstr "Le prérequis n'est pas un nom de paquetage. Recherche de : %s "
+
+#: ../yum/depsolve.py:329
+#, python-format
+msgid "Potential Provider: %s"
+msgstr "Fournisseur potentiel : %s"
+
+#: ../yum/depsolve.py:352
+#, python-format
+msgid "Mode is %s for provider of %s: %s"
+msgstr "Le mode est %s pour le fournisseur de %s : %s"
+
+#: ../yum/depsolve.py:356
+#, python-format
+msgid "Mode for pkg providing %s: %s"
+msgstr "Mode pour le paquetage qui fournit %s : %s"
+
+#: ../yum/depsolve.py:360
+#, python-format
+msgid "TSINFO: %s package requiring %s marked as erase"
+msgstr "TSINFO : le paquetage %s requiert %s marqué pour suppression"
+
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr "TSINFO : Obsolescence de %s avec %s pour résoudre les dépendances."
 
-#: ../yum/depsolve.py:276
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr "TSINFO : Mise à jour de %s pour la résolution des dépendances."
 
-#: ../yum/depsolve.py:279
+#: ../yum/depsolve.py:378
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr ""
 "Impossible de trouver un chemin de mise à jour pour la dépendance de : %s"
 
-#: ../yum/depsolve.py:283
+#: ../yum/depsolve.py:388
 #, python-format
-msgid "TSINFO: %s package requiring %s marked as erase"
-msgstr "TSINFO : le paquetage %s requiert %s marqué pour suppression"
+msgid "Unresolvable requirement %s for %s"
+msgstr "Impossible de résoudre le prérequis  %s pour %s"
 
 #. is it already installed?
-#: ../yum/depsolve.py:329
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr ""
 "%s est dans les paquetages fournis mais est déjà installé, suppression."
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr ""
 "ts contient une version plus récente du paquetage %s susceptible de résoudre "
 "la dépendance."
 
-#: ../yum/depsolve.py:355
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr ""
 "Le paquetage susceptible de résoudre la dépedence %s est déjà installé dans "
 "une version plus récente."
 
-#: ../yum/depsolve.py:363 ../yum/depsolve.py:410
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr "Dépendance manquante : %s est requis par le paquetage %s"
 
-#: ../yum/depsolve.py:376
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr "%s déjà dans ts, omission de celui-ci"
 
-#: ../yum/depsolve.py:420
+#: ../yum/depsolve.py:510
+#, python-format
+msgid ""
+"Failure finding best provider of %s for %s, exceeded maximum loop length"
+msgstr ""
+
+#: ../yum/depsolve.py:537
 #, python-format
 msgid "TSINFO: Marking %s as update for %s"
 msgstr "TSINFO : Sélection de %s pour mise à jour de %s"
 
-#: ../yum/depsolve.py:427
+#: ../yum/depsolve.py:544
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr "TSINFO : Sélection de %s pour installation de %s"
 
-#: ../yum/depsolve.py:518 ../yum/depsolve.py:610
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Succès - transaction vide"
 
-#: ../yum/depsolve.py:562 ../yum/depsolve.py:582
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Re-démarrage de la boucle"
 
-#: ../yum/depsolve.py:598
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "Finalisation du processus de dépendance"
 
-#: ../yum/depsolve.py:604
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr "%s de %s a des problèmes de dépendances"
 
-#: ../yum/depsolve.py:611
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "Succès - dépendances résolues"
 
-#: ../yum/depsolve.py:625
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "Recherche des dépendances pour %s"
 
-#: ../yum/depsolve.py:687
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr "recherche de %s comme prérequis de %s"
 
-#: ../yum/depsolve.py:814
+#: ../yum/depsolve.py:933
 #, python-format
-msgid "Running compare_providers() for %s"
-msgstr "Lancement de compare_providers() pour %s"
+msgid "Comparing best: %s to po: %s"
+msgstr ""
 
-#: ../yum/depsolve.py:842 ../yum/depsolve.py:848
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, fuzzy, python-format
+msgid "best %s obsoletes po: %s"
+msgstr "%s rend obsolète %s"
+
+#: ../yum/depsolve.py:955
+#, fuzzy, python-format
+msgid "po %s obsoletes best: %s"
+msgstr "%s rend obsolète %s"
+
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
 #, python-format
 msgid "better arch in po %s"
 msgstr "meilleure architecture dans l'objet paquetage %s"
 
-#: ../yum/depsolve.py:887
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
 #, python-format
-msgid "%s obsoletes %s"
-msgstr "%s rend obsolète %s"
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
 
-#: ../yum/depsolve.py:898
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
 #, python-format
-msgid ""
-"archdist compared %s to %s on %s\n"
-"  Winner: %s"
+msgid "best %s shares a sourcerpm with %s"
 msgstr ""
-"architecture %s comparée à %s sur %s\n"
-"  Gagnant : %s"
 
-#: ../yum/depsolve.py:905
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
 #, python-format
-msgid "common sourcerpm %s and %s"
-msgstr "rpm source commun pour %s et %s"
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
 
-#: ../yum/depsolve.py:911
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
 #, python-format
-msgid "common prefix of %s between %s and %s"
-msgstr "préfix commun %s entre %s et %s"
+msgid "po %s has a shorter name than best %s"
+msgstr ""
 
-#: ../yum/depsolve.py:919
+#: ../yum/depsolve.py:1025
 #, python-format
-msgid "Best Order: %s"
-msgstr "Meilleur ordre : %s"
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
 
-#: ../yum/__init__.py:148
+#: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr "doConfigSetup() sera supprimé dans une future version de Yum.\n"
 
-#. FIXME: Use critical? or exception?
-#: ../yum/__init__.py:323
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr ""
 "Il manque le nom du dépôt %r dans la configuration, utilisation de "
 "l'identifiant"
 
-#: ../yum/__init__.py:359
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr "modules complémentaires déjà initialisés"
 
-#: ../yum/__init__.py:366
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr "doRpmDBSetup() sera supprimé dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:376
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr "Lecture de la base de données RPM locale"
 
-#: ../yum/__init__.py:394
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr "doRepoSetup() sera supprimé dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:414
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr "doSackSetup() sera supprimé dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:431
+#: ../yum/__init__.py:404
 msgid "Setting up Package Sacks"
 msgstr "Configuration du groupe de paquetages"
 
-#: ../yum/__init__.py:474
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr "une méthode _resetSack est manquante pour l'objet dépôt du dépôt %s\n"
 
-#: ../yum/__init__.py:475
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr "en conséquence ce dépôt ne peut être réinitialisé.\n"
 
-#: ../yum/__init__.py:480
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr "doUpdateSetup() sera supprimé dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:492
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr "Construction de l'objet de mises à jour"
 
-#: ../yum/__init__.py:523
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr "doGroupSetup() sera supprimé dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:547
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Obtention des méta données du groupe"
 
-#: ../yum/__init__.py:572
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr "Ajout du ficher de groupes depuis le dépôt : %s"
 
-#: ../yum/__init__.py:577
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr "Échec d'ajout du fichier de groupes pour le dépôt : %s - %s"
 
-#: ../yum/__init__.py:583
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Aucun groupe disponible dans les dépôts"
 
-#: ../yum/__init__.py:633
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Import d'informations additionnelles sur la liste de fichiers"
 
-#: ../yum/__init__.py:684
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Cycle %i d'évitement des dépendances cassées"
 
-#: ../yum/__init__.py:707
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr "L'évitement des dépendances cassées a pris %i cycles"
 
-#: ../yum/__init__.py:708
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
@@ -1448,103 +1472,97 @@ msgstr ""
 "\n"
 "Paquetages ignorés en raison de problèmes de dépendances :"
 
-#: ../yum/__init__.py:712
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s depuis %s"
 
-#: ../yum/__init__.py:792
-msgid ""
-"Warning: scriptlet or other non-fatal errors occurred during transaction."
-msgstr ""
-"Attention : scriptlet ou autre erreur non fatale pendant la transaction."
-
-#: ../yum/__init__.py:807
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "Échec de la suppression du fichier de transaction %s"
 
-#: ../yum/__init__.py:847
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "exclusion pour coût : %s depuis %s"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Exclusion des paquetages dans la liste globale d'exclusion"
 
-#: ../yum/__init__.py:880
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Exclusion des paquetages depuis %s"
 
-#: ../yum/__init__.py:906
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Réduction de %s aux paquetages inclus uniquement"
 
-#: ../yum/__init__.py:911
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Conservation du paquetage inclus %s"
 
-#: ../yum/__init__.py:917
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Suppression du paquetage non concordant %s"
 
-#: ../yum/__init__.py:920
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "Terminé"
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:950
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "Impossible de vérifier si le PID %s est actif"
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:954
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr "Verrou %s existant : une autre copie est lancée avec le pid %s."
 
-#: ../yum/__init__.py:1017
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "Le paquetage ne correspond pas au téléchargement attendu"
 
-#: ../yum/__init__.py:1032
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "Ne peut procéder à la vérification des sommes de contrôle"
 
-#: ../yum/__init__.py:1035
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "Le paquetage ne correspond pas à sa somme de contrôle"
 
-#: ../yum/__init__.py:1079
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr ""
 "Le paquetage ne correspond pas à la somme de contrôle mais le cache est "
 "activé pour %s"
 
-#: ../yum/__init__.py:1082
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "utilisation de la copie locale de %s"
 
-#: ../yum/__init__.py:1107
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr ""
 "Espace disque insuffisant dans le dossier de téléchargement %s pour "
 "télécharger"
 
-#: ../yum/__init__.py:1140
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "L'en-tête est incomplet."
 
-#: ../yum/__init__.py:1180
+#: ../yum/__init__.py:1134
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1552,62 +1570,62 @@ msgstr ""
 "L'en-tête n'est pas dans le cache et le mode cache uniquement est activé. "
 "Impossible de télécharger %s"
 
-#: ../yum/__init__.py:1235
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr "La clé publique pour %s n'est pas installée"
 
-#: ../yum/__init__.py:1239
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Problème à l'ouverture du paquetage %s"
 
-#: ../yum/__init__.py:1247
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr "La clé publique pour %s n'est pas de confiance"
 
-#: ../yum/__init__.py:1251
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Le paquetage %s n'est pas signé"
 
-#: ../yum/__init__.py:1289
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Impossible de supprimer %s"
 
-#: ../yum/__init__.py:1292
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "%s supprimé"
 
-#: ../yum/__init__.py:1328
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Impossible de supprimer depuis %s le fichier %s"
 
-#: ../yum/__init__.py:1331
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "fichier de %s : %s supprimé"
 
-#: ../yum/__init__.py:1333
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d fichiers de %s supprimés"
 
-#: ../yum/__init__.py:1386
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr "Plus d'une correspondance identique dans le regroupement pour %s"
 
-#: ../yum/__init__.py:1391
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr "Rien ne correspond à %s.%s %s:%s-%s dans la mise à jour"
 
-#: ../yum/__init__.py:1585
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
@@ -1615,169 +1633,142 @@ msgstr ""
 "searchPackages() sera supprimé dans une future version de "
 "Yum.                      Utilisez searchGenerator() à la place. \n"
 
-#: ../yum/__init__.py:1621
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "Recherche de %d paquetages"
 
-#: ../yum/__init__.py:1624
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "recherche du paquetage %s"
 
-#: ../yum/__init__.py:1635
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "recherche dans les entrées de fichiers"
 
-#: ../yum/__init__.py:1641
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "recherche dans les entrées de correspondance"
 
-#: ../yum/__init__.py:1671
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Correspondance fournie : %s"
 
-#: ../yum/__init__.py:1717
-msgid "No group data available for configured repositories"
-msgstr "Aucune donnée sur les groupes disponible pour les dépôts configurés"
-
-#: ../yum/__init__.py:1743 ../yum/__init__.py:1762 ../yum/__init__.py:1788
-#: ../yum/__init__.py:1794 ../yum/__init__.py:1850 ../yum/__init__.py:1854
+#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
+#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
 #, python-format
 msgid "No Group named %s exists"
 msgstr "Aucun groupe nommé %s n'existe"
 
-#: ../yum/__init__.py:1773 ../yum/__init__.py:1866
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr "le paquetage %s n'a pas été marqué dans le groupe %s"
 
-#: ../yum/__init__.py:1811
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr "Ajout du paquetage %s pour le groupe %s"
 
-#: ../yum/__init__.py:1816
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr "Aucun paquetage nommé %s n'est disponible pour installation"
 
-#: ../yum/__init__.py:1891
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr "Impossible de trouver le tuple de paquetage %s dans le regroupement"
 
-#: ../yum/__init__.py:1959 ../yum/__init__.py:1999
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr "Chaîne de version de dépendance invalide, essai entre guillemets."
 
-#: ../yum/__init__.py:1961 ../yum/__init__.py:2001
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Drapeau de version invalide"
 
-#: ../yum/__init__.py:1973 ../yum/__init__.py:1977
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "Aucun paquetage trouvé pour %s"
 
-#: ../yum/__init__.py:2105
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr "L'objet paquetage n'était pas une instance correcte d'objet paquetage"
 
-#: ../yum/__init__.py:2109
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr "Rien de spécifié pour installation"
 
 # Aucune idée
 #. only one in there
-#: ../yum/__init__.py:2124
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr ""
 "Recherche de correspondance virtuelle ou de correspondance fichier pour %s"
 
-#: ../yum/__init__.py:2130 ../yum/__init__.py:2446
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr "Aucune correspondance pour l'argument : %s"
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2185
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr "Aucun paquetage disponible pour installation"
 
-#: ../yum/__init__.py:2198
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr "Paquetage : %s - déjà dans le jeu de transaction"
 
-#: ../yum/__init__.py:2212
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr "Le paquetage %s est déjà installé dans sa dernière version"
 
-#: ../yum/__init__.py:2219
+#: ../yum/__init__.py:2178
 #, python-format
 msgid "Package matching %s already installed. Checking for update."
 msgstr ""
 "Le paquetage qui correspond à %s est déjà installé. Recherche d'une mise à "
 "jour."
 
-#: ../yum/__init__.py:2230
-#, python-format
-msgid "Package %s is obsoleted by %s, trying to install %s instead"
-msgstr ""
-"Le paquetage %s est rendu obsolète par %s, tentative d'installation de %s à "
-"la place"
-
 #. update everything (the easy case)
-#: ../yum/__init__.py:2263
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Mise à jour complète"
 
-#: ../yum/__init__.py:2366
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Paquetage déjà rendu obsolète : %s.%s %s:%s-%s"
 
-#: ../yum/__init__.py:2390
-#, python-format
-msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
-msgstr ""
-"Pas de mise à jour des paquetages qui ont déjà été mis à jour : %s.%s %s:%s-%"
-"s"
-
-#: ../yum/__init__.py:2443
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#. FIXME we should give the caller some nice way to hush this warning
-#. probably just a kwarg of 'silence_warnings' or something
-#. b/c when this is called from groupRemove() it makes a lot of
-#. garbage noise
-#: ../yum/__init__.py:2462
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Aucun paquetage sélectionné pour suppression"
 
-#: ../yum/__init__.py:2496
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Impossible d'ouvrir le fichier : %s. Omission."
 
-#: ../yum/__init__.py:2498
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Examen de %s : %s"
 
-#: ../yum/__init__.py:2504
-#, python-format
-msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
-msgstr "Impossible d'ajouter le paquet %s à la transaction. Architecture incompatible : %s"
-
-#: ../yum/__init__.py:2512
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
@@ -1786,80 +1777,80 @@ msgstr ""
 "Le paquetage %s n'est pas installé, il est impossible de le mettre à jour. "
 "Lancez plutôt yum install pour l'installer."
 
-#: ../yum/__init__.py:2545
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Exclusion de %s"
 
-#: ../yum/__init__.py:2549
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Sélection de %s pour installation "
 
-#: ../yum/__init__.py:2554
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr "Sélection de %s pour mise à jour de %s"
 
-#: ../yum/__init__.py:2559
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr "%s : ne met pas à jour le paquetage installé."
 
-#: ../yum/__init__.py:2576
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr ""
 "Problème dans la réinstallation : aucun paquetage correspondant à supprimer"
 
 # Je suis pas sûr d'avoir bien compris la chaîne originale
-#: ../yum/__init__.py:2587
+#: ../yum/__init__.py:2515
 #, python-format
 msgid "Package %s is allowed multiple installs, skipping"
 msgstr "Le paquetage %s autorise des installations multiples, omission"
 
-#: ../yum/__init__.py:2594
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr ""
 "Problème dans la réinstallation : aucun paquetage correspondant à installer"
 
-#: ../yum/__init__.py:2641
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr "Récupération de la clé GPG depuis %s"
 
-#: ../yum/__init__.py:2647
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "Échec de la récupération de la clé GPG : "
 
-#: ../yum/__init__.py:2663
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "Échec d'analyse de la clé GPG : "
 
-#: ../yum/__init__.py:2667
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr "La clé GPG %s (0x%s) est déjà installée"
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2672
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr "Import de la clé GPG 0x%s « %s » depuis %s"
 
-#: ../yum/__init__.py:2685
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "N'installe pas la clé"
 
-#: ../yum/__init__.py:2691
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "L'import de la clé à échoué (code %d)"
 
-#: ../yum/__init__.py:2694
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "La clé a été importée avec succès"
 
-#: ../yum/__init__.py:2699
+#: ../yum/__init__.py:2624
 #, python-format
 msgid ""
 "The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1870,57 +1861,57 @@ msgstr ""
 "incorrectes pour ce paquetage.\n"
 "Vérifiez que les URL des clés pour ce dépôt soient correctes."
 
-#: ../yum/__init__.py:2708
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr ""
 "L'import de la (des) clé(s) n'a pas résolu le problème, mauvaise(s) clé(s) ?"
 
-#: ../yum/__init__.py:2789
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "Impossible de trouver un miroir adapté."
 
-#: ../yum/__init__.py:2791
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr ""
 "Des erreurs ont été rencontrée durant le téléchargement des paquetages."
 
-#: ../yum/__init__.py:2854
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Erreurs de la transaction de test : "
 
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:197
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "Modules complémentaires chargés : "
 
-#: ../yum/plugins.py:208
+#: ../yum/plugins.py:206
 #, python-format
 msgid "No plugin match for: %s"
 msgstr "Aucun plugin correspondant pour : %s"
 
-#: ../yum/plugins.py:221
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "le module complémentaire « %s » est désactivé"
 
-#: ../yum/plugins.py:233
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr ""
 "Le module complémentaire « %s » ne spécifie pas la version de l'API requise"
 
-#: ../yum/plugins.py:237
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr ""
 "Le module complémentaire « %s » requiert l'API %s. L'API supportée est %s."
 
-#: ../yum/plugins.py:266
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Chargement du module complémentaire « %s »"
 
-#: ../yum/plugins.py:273
+#: ../yum/plugins.py:271
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
@@ -1928,28 +1919,24 @@ msgstr ""
 "Au moins deux modules complémentaires avec le même nom « %s » existent dans "
 "le chemin de recherche des modules complémentaires"
 
-#: ../yum/plugins.py:293
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr "Fichier de configuration %s non trouvé"
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:296
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr ""
 "Impossible de trouver le fichier de configuration pour le module "
 "complémentaire %s"
 
-#: ../yum/plugins.py:450
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "enregistrement de commandes non supporté"
 
-#: ../yum/rpmtrans.py:78
-msgid "Repackaging"
-msgstr "Ré-empaquetage"
-
 #: ../rpmUtils/oldUtils.py:26
 #, python-format
 msgid "Header cannot be opened or does not match %s, %s."
@@ -1980,29 +1967,75 @@ msgstr "En-tête endommagé %s"
 msgid "Error opening rpm %s - error %s"
 msgstr "Erreur d'ouverture du rpm %s - erreur %s"
 
-#~ msgid "Searching pkgSack for dep: %s"
-#~ msgstr "Recherche dans le regroupement pour la dépendance : %s"
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s option requires an argument"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s : l'option %s requiert un argument"
+
+#~ msgid "show this help message and exit"
+#~ msgstr "affiche ce message d'aide et quitte"
+
+#~ msgid "verbose operation"
+#~ msgstr "opération verbeuse"
+
+#~ msgid "Repo-id     : "
+#~ msgstr "Id du dépôt       : "
+
+#~ msgid "Repo-name   : "
+#~ msgstr "Nom du dépôt      : "
+
+#~ msgid "Repo-enabled: "
+#~ msgstr "Dépôt activé      :"
+
+#~ msgid "Repo-size   : "
+#~ msgstr "Nom du dépôt    : "
+
+#~ msgid "Running compare_providers() for %s"
+#~ msgstr "Lancement de compare_providers() pour %s"
+
+#~ msgid ""
+#~ "archdist compared %s to %s on %s\n"
+#~ "  Winner: %s"
+#~ msgstr ""
+#~ "architecture %s comparée à %s sur %s\n"
+#~ "  Gagnant : %s"
+
+#~ msgid "common sourcerpm %s and %s"
+#~ msgstr "rpm source commun pour %s et %s"
 
-#~ msgid "Potential match for %s from %s"
-#~ msgstr "Correspondance potentielle pour %s depuis %s"
+#~ msgid "common prefix of %s between %s and %s"
+#~ msgstr "préfix commun %s entre %s et %s"
 
-#~ msgid "Matched %s to require for %s"
-#~ msgstr "Correspondance %s trouvé pour %s "
+#~ msgid "Best Order: %s"
+#~ msgstr "Meilleur ordre : %s"
 
-#~ msgid "Needed Require has already been looked up, cheating"
-#~ msgstr "Le prérequis a déjà été trouvé, on triche"
+#~ msgid ""
+#~ "Warning: scriptlet or other non-fatal errors occurred during transaction."
+#~ msgstr ""
+#~ "Attention : scriptlet ou autre erreur non fatale pendant la transaction."
 
-#~ msgid "Needed Require is not a package name. Looking up: %s"
-#~ msgstr "Le prérequis n'est pas un nom de paquetage. Recherche de : %s "
+#~ msgid "No group data available for configured repositories"
+#~ msgstr "Aucune donnée sur les groupes disponible pour les dépôts configurés"
 
-#~ msgid "Potential Provider: %s"
-#~ msgstr "Fournisseur potentiel : %s"
+#~ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+#~ msgstr ""
+#~ "Le paquetage %s est rendu obsolète par %s, tentative d'installation de %s "
+#~ "à la place"
 
-#~ msgid "Mode is %s for provider of %s: %s"
-#~ msgstr "Le mode est %s pour le fournisseur de %s : %s"
+#~ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+#~ msgstr ""
+#~ "Pas de mise à jour des paquetages qui ont déjà été mis à jour : %s.%s %s:%"
+#~ "s-%s"
 
-#~ msgid "Mode for pkg providing %s: %s"
-#~ msgstr "Mode pour le paquetage qui fournit %s : %s"
+#~ msgid ""
+#~ "Cannot add package %s to transaction. Not a compatible architecture: %s"
+#~ msgstr ""
+#~ "Impossible d'ajouter le paquet %s à la transaction. Architecture "
+#~ "incompatible : %s"
 
-#~ msgid "Unresolvable requirement %s for %s"
-#~ msgstr "Impossible de résoudre le prérequis  %s pour %s"
+#~ msgid "Repackaging"
+#~ msgstr "Ré-empaquetage"
diff --git a/po/it.po b/po/it.po
index e409dae..7e608b0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,8 +4,8 @@
 # This file is distributed under the same license as the yum package.
 # Silvio Pierro <perplesso82 at gmail.com>, 2008.
 # Gianluca Busiello <busiello at ceinge.unina.it>, 2008.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: yum-it 3.2.8\n"
@@ -527,8 +527,8 @@ msgstr "Licenza    : %s"
 msgid "Description: "
 msgstr "Descrizione: "
 
+#
 #: ../output.py:351
-# 
 msgid "Is this ok [y/N]: "
 msgstr "È corretto [s/N]: "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4f17e03..919c002 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,8 +17,7 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../callback.py:48
-#: ../output.py:512
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Atualizando"
 
@@ -26,20 +25,15 @@ msgstr "Atualizando"
 msgid "Erasing"
 msgstr "Apagando"
 
-#: ../callback.py:50
-#: ../callback.py:51
-#: ../callback.py:53
-#: ../output.py:511
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Instalando"
 
-#: ../callback.py:52
-#: ../callback.py:58
+#: ../callback.py:52 ../callback.py:58
 msgid "Obsoleted"
 msgstr "Obsoletos"
 
-#: ../callback.py:54
-#: ../output.py:558
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Atualizados"
 
@@ -47,10 +41,7 @@ msgstr "Atualizados"
 msgid "Erased"
 msgstr "Removidos"
 
-#: ../callback.py:56
-#: ../callback.py:57
-#: ../callback.py:59
-#: ../output.py:556
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "Instalados"
 
@@ -72,8 +63,7 @@ msgstr "Erro: estado de saída inválido: %s de %s"
 msgid "Erased: %s"
 msgstr "Removidos: %s"
 
-#: ../callback.py:217
-#: ../output.py:513
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Removendo"
 
@@ -94,15 +84,12 @@ msgstr "Configurando repositórios"
 msgid "Reading repository metadata in from local files"
 msgstr "Lendo metadados do repositório a partir dos arquivos locais"
 
-#: ../cli.py:183
-#: ../utils.py:72
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "Erro de Configuração: %s"
 
-#: ../cli.py:186
-#: ../cli.py:1068
-#: ../utils.py:75
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Erro nas Opções: %s"
@@ -146,18 +133,15 @@ msgstr "Baixando Pacotes:"
 msgid "Error Downloading Packages:\n"
 msgstr "Erro ao Baixar Pacotes:\n"
 
-#: ../cli.py:370
-#: ../yum/__init__.py:2746
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "Executando o rpm_check_debug"
 
-#: ../cli.py:373
-#: ../yum/__init__.py:2749
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr "Erro com o rpm_check_debug vs depsolve:"
 
-#: ../cli.py:377
-#: ../yum/__init__.py:2751
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Por favor, reporte esse erro ao bugzilla"
 
@@ -186,7 +170,8 @@ msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
 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:491
@@ -198,22 +183,15 @@ msgstr "Analisando argumentos da instalação de pacotes"
 msgid "No package %s available."
 msgstr "Nenhum pacote %s disponível."
 
-#: ../cli.py:505
-#: ../cli.py:623
-#: ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Pacotes a serem instalados"
 
-#: ../cli.py:506
-#: ../cli.py:624
-#: ../yumcommands.py:146
-#: ../yumcommands.py:749
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr "Nada a ser feito"
 
-#: ../cli.py:536
-#: ../yum/__init__.py:2232
-#: ../yum/__init__.py:2311
+#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
 #: ../yum/__init__.py:2340
 #, python-format
 msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
@@ -248,7 +226,8 @@ msgstr "Nenhum Pacote Fornecido"
 
 #: ../cli.py:654
 msgid "Matching packages for package list to user args"
-msgstr "Resultado dos pacotes para a lista de pacotes dos argumentos do usuário"
+msgstr ""
+"Resultado dos pacotes para a lista de pacotes dos argumentos do usuário"
 
 #: ../cli.py:701
 #, python-format
@@ -304,16 +283,16 @@ msgstr "Grupos Disponíveis:"
 msgid "Done"
 msgstr "Concluído"
 
-#: ../cli.py:829
-#: ../cli.py:841
-#: ../cli.py:847
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "Aviso: O grupo %s não existe."
 
 #: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
-msgstr "Nenhum pacote disponível para instalação ou atualização nos grupos requisitados"
+msgstr ""
+"Nenhum pacote disponível para instalação ou atualização nos grupos "
+"requisitados"
 
 #: ../cli.py:855
 #, python-format
@@ -348,7 +327,8 @@ msgstr "Descartando pacote não comparável %s.%s"
 #: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
-msgstr "Nenhum outro %s instalado, adicionado à lista para potencial instalação"
+msgstr ""
+"Nenhum outro %s instalado, adicionado à lista para potencial instalação"
 
 #: ../cli.py:971
 #, python-format
@@ -413,7 +393,9 @@ msgstr "excluir pacote(s) por nome ou glob"
 
 #: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
-msgstr "desabilitar a exclusão a partir do principal, para um repositório ou para tudo"
+msgstr ""
+"desabilitar a exclusão a partir do principal, para um repositório ou para "
+"tudo"
 
 #: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
@@ -549,8 +531,7 @@ msgstr "Descrição: "
 msgid "Is this ok [y/N]: "
 msgstr "Correto? [s/N]:"
 
-#: ../output.py:357
-#: ../output.py:360
+#: ../output.py:357 ../output.py:360
 msgid "y"
 msgstr "s"
 
@@ -558,8 +539,7 @@ msgstr "s"
 msgid "n"
 msgstr "n"
 
-#: ../output.py:357
-#: ../output.py:360
+#: ../output.py:357 ../output.py:360
 msgid "yes"
 msgstr "sim"
 
@@ -715,10 +695,12 @@ msgstr "Substituído(s)"
 #, python-format
 msgid ""
 "\n"
-" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds to exit.\n"
+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
+"seconds to exit.\n"
 msgstr ""
 "\n"
-" Download atual cancelado, interrupção %s, (ctrl-c) novamente %s com %s%s%s segundos até sair.\n"
+" Download atual cancelado, interrupção %s, (ctrl-c) novamente %s com %s%s%s "
+"segundos até sair.\n"
 
 #: ../output.py:628
 msgid "user interrupt"
@@ -774,7 +756,9 @@ msgstr "--> Processando Conflito: %s conflita com %s"
 
 #: ../output.py:682
 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:686
 #, python-format
@@ -789,7 +773,8 @@ 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"
@@ -802,8 +787,10 @@ 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"
@@ -813,7 +800,8 @@ 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:63
 #, python-format
@@ -900,8 +888,7 @@ msgstr "Pacotes Extras"
 msgid "Updated Packages"
 msgstr "Pacotes Atualizados"
 
-#: ../yumcommands.py:221
-#: ../yumcommands.py:225
+#: ../yumcommands.py:221 ../yumcommands.py:225
 msgid "Obsoleting Packages"
 msgstr "Tornando Pacotes Obsoletos"
 
@@ -1107,17 +1094,18 @@ msgstr ""
 "Saindo por um Pipe Defeituoso"
 
 #: ../yummain.py:105
-msgid "Another app is currently holding the yum lock; waiting for it to exit..."
-msgstr "Outra aplicação está retendo o bloqueio do yum; esperando por ele para sair..."
+msgid ""
+"Another app is currently holding the yum lock; waiting for it to exit..."
+msgstr ""
+"Outra aplicação está retendo o bloqueio do yum; esperando por ele para "
+"sair..."
 
-#: ../yummain.py:132
-#: ../yummain.py:171
+#: ../yummain.py:132 ../yummain.py:171
 #, python-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: ../yummain.py:142
-#: ../yummain.py:178
+#: ../yummain.py:142 ../yummain.py:178
 #, python-format
 msgid "Unknown Error(s): Exit Code: %d:"
 msgstr "Erro(s) Desconhecido(s): Código de Saída: %d:"
@@ -1155,7 +1143,8 @@ msgstr "doTsSetup() será removida em uma futura versão do Yum.\n"
 
 #: ../yum/depsolve.py:95
 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:136
 #, python-format
@@ -1182,8 +1171,7 @@ msgstr "%s encontrado para solicitar o %s"
 msgid "Member: %s"
 msgstr "Membro: %s"
 
-#: ../yum/depsolve.py:233
-#: ../yum/depsolve.py:696
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s convertido para instalar"
@@ -1245,7 +1233,8 @@ msgstr "TSINFO: Atualizando %s para resolver a dependência."
 #: ../yum/depsolve.py:378
 #, 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:388
 #, python-format
@@ -1266,10 +1255,10 @@ msgstr "O pacote de solução em potencial %s tem uma instância mais nova no ct
 #: ../yum/depsolve.py:460
 #, 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:468
-#: ../yum/depsolve.py:527
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr "Dependência Faltando: %s é requerido pelo pacote %s"
@@ -1281,8 +1270,11 @@ msgstr "%s já está no ct, pulando esse"
 
 #: ../yum/depsolve.py:510
 #, python-format
-msgid "Failure finding best provider of %s for %s, exceeded maximum loop length"
-msgstr "Falha ao encontrar o melhor fornecedor de %s para %s, tamanho máximo do loop excedido"
+msgid ""
+"Failure finding best provider of %s for %s, exceeded maximum loop length"
+msgstr ""
+"Falha ao encontrar o melhor fornecedor de %s para %s, tamanho máximo do loop "
+"excedido"
 
 #: ../yum/depsolve.py:537
 #, python-format
@@ -1294,13 +1286,11 @@ msgstr "TSINFO: Marcando %s como uma atualização para o %s"
 msgid "TSINFO: Marking %s as install for %s"
 msgstr "TSINFO: Marcando %s como uma instalação para o %s"
 
-#: ../yum/depsolve.py:635
-#: ../yum/depsolve.py:714
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Sucesso - transação vazia"
 
-#: ../yum/depsolve.py:673
-#: ../yum/depsolve.py:686
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Reiniciando o Loop"
 
@@ -1337,8 +1327,7 @@ msgstr "Comparando melhor: %s para po: %s"
 msgid "Same: best %s == po: %s"
 msgstr "Igual: melhor %s == po: %s"
 
-#: ../yum/depsolve.py:952
-#: ../yum/depsolve.py:963
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
 #, python-format
 msgid "best %s obsoletes po: %s"
 msgstr "melhor %s torna po obsoleto: %s"
@@ -1348,33 +1337,27 @@ msgstr "melhor %s torna po obsoleto: %s"
 msgid "po %s obsoletes best: %s"
 msgstr "po %s torna melhor obsoleto: %s"
 
-#: ../yum/depsolve.py:972
-#: ../yum/depsolve.py:979
-#: ../yum/depsolve.py:1036
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
 #, python-format
 msgid "better arch in po %s"
 msgstr "melhor arquitetura no po %s"
 
-#: ../yum/depsolve.py:988
-#: ../yum/depsolve.py:1010
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
 #, python-format
 msgid "po %s shares a sourcerpm with %s"
 msgstr "po %s compartilha um sourcerpm com %s"
 
-#: ../yum/depsolve.py:992
-#: ../yum/depsolve.py:1015
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
 #, python-format
 msgid "best %s shares a sourcerpm with %s"
 msgstr "melhor %s compartilha um sourcerpm com %s"
 
-#: ../yum/depsolve.py:999
-#: ../yum/depsolve.py:1020
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
 #, python-format
 msgid "po %s shares more of the name prefix with %s"
 msgstr "po %s compartilha mais do prefixo do nome com %s"
 
-#: ../yum/depsolve.py:1003
-#: ../yum/depsolve.py:1029
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
 #, python-format
 msgid "po %s has a shorter name than best %s"
 msgstr "po %s tem um nome mais curto do que o melhor %s"
@@ -1533,8 +1516,7 @@ msgstr "Não foi possível verificar se o PID %s está ativo"
 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."
 
-#: ../yum/__init__.py:970
-#: ../yum/__init__.py:977
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "O pacote não corresponde ao download pretendido"
 
@@ -1549,7 +1531,8 @@ msgstr "O pacote não corresponde à soma de verificação"
 #: ../yum/__init__.py:1036
 #, 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:1042
 #, python-format
@@ -1567,8 +1550,11 @@ msgstr "O cabeçalho não está completo."
 
 #: ../yum/__init__.py:1134
 #, 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:1189
 #, python-format
@@ -1626,8 +1612,12 @@ 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:1543
-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"
+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:1580
 #, python-format
@@ -1652,18 +1642,13 @@ msgstr "pesquisando nas entradas dos fornecimentos"
 msgid "Provides-match: %s"
 msgstr "Fornecimento combina com: %s"
 
-#: ../yum/__init__.py:1702
-#: ../yum/__init__.py:1720
-#: ../yum/__init__.py:1748
-#: ../yum/__init__.py:1753
-#: ../yum/__init__.py:1808
-#: ../yum/__init__.py:1812
+#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
+#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
 #, python-format
 msgid "No Group named %s exists"
 msgstr "Não existe nenhum grupo de nome %s"
 
-#: ../yum/__init__.py:1731
-#: ../yum/__init__.py:1824
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr "o pacote %s não foi marcado no grupo %s"
@@ -1683,18 +1668,15 @@ msgstr "Nenhum pacote de nome %s disponível para ser instalado"
 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:1917
-#: ../yum/__init__.py:1960
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr "String de dependência versionada inválida, tente citá-la."
 
-#: ../yum/__init__.py:1919
-#: ../yum/__init__.py:1962
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Sinalizador de versão inválido"
 
-#: ../yum/__init__.py:1934
-#: ../yum/__init__.py:1938
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "Nenhum pacote encontrado para %s"
@@ -1713,8 +1695,7 @@ msgstr "Nada especificado para instalar"
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr "Verificando por fornecimento virtual ou de arquivo para %s"
 
-#: ../yum/__init__.py:2091
-#: ../yum/__init__.py:2380
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr "Nenhuma correspondência para o argumento: %s"
@@ -1771,8 +1752,12 @@ msgstr "Examinando %s: %s"
 
 #: ../yum/__init__.py:2436
 #, 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 ""
+"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:2468
 #, python-format
@@ -1847,11 +1832,14 @@ msgstr "Chave importada com sucesso"
 #: ../yum/__init__.py:2624
 #, 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:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
@@ -1901,8 +1889,10 @@ msgstr "Carregando o plugin \"%s\""
 
 #: ../yum/plugins.py:271
 #, 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:291
 #, python-format
@@ -1932,16 +1922,16 @@ msgstr "O RPM %s não passou na verificação md5"
 
 #: ../rpmUtils/oldUtils.py:144
 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:174
 msgid "Got an empty Header, something has gone wrong"
 msgstr "Um cabeçalho vazio foi obtido, algo deu errado"
 
-#: ../rpmUtils/oldUtils.py:244
-#: ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254
-#: ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
+#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
 #, python-format
 msgid "Damaged Header %s"
 msgstr "Cabeçalho %s Danificado"
@@ -1953,26 +1943,37 @@ msgstr "Erro ao abrir o rpm %s - erro %s"
 
 #~ msgid "Looking for Obsoletes for %s"
 #~ msgstr "Localizando Obsoletos para %s"
+
 #~ msgid "unable to find newer package for %s"
 #~ msgstr "não foi possível encontrar um pacote mais recente para o %s"
+
 #~ msgid "TSINFO: Updating %s to resolve conflict."
 #~ msgstr "TSINFO: Atualizando o %s para resolver o conflito."
+
 #~ msgid "%s conflicts: %s"
 #~ msgstr "%s conflita com: %s"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s conflita com %s"
+
 #~ msgid "Package %s needs %s, this is not available."
 #~ msgstr "O pacote %s necessita do %s, que não está disponível."
+
 #~ msgid "Package %s conflicts with %s."
 #~ msgstr "O pacote %s conflita com %s."
+
 #~ msgid "Running \"%s\" handler for \"%s\" plugin"
 #~ msgstr "Executando o manipulador \"%s\" para o plugin \"%s\""
+
 #~ msgid "Directory of rpms must exist"
 #~ msgstr "O diretório de rpms precisa existir"
+
 #~ msgid "Error accessing URL: %s"
 #~ msgstr "Erro ao acessar a URL: %s"
+
 #~ msgid "No Packages installed not included in a repository"
 #~ msgstr "Nenhum pacote instalado não incluído em um repositório"
+
 #~ msgid ""
 #~ "\n"
 #~ "   Total: %d\n"
@@ -1983,10 +1984,13 @@ msgstr "Erro ao abrir o rpm %s - erro %s"
 #~ "   Total: %d\n"
 #~ "   Usado: %d\n"
 #~ "   Src: %d"
+
 #~ msgid "Error restoring the backup of lilo.conf  The backup was:\n"
 #~ msgstr "Erro ao restaurar o backup do lilo.conf. O backup era:\n"
+
 #~ msgid "Looking in available packages for a providing package"
 #~ msgstr "Procurando pelo pacote fornecido nos pacotes disponíveis"
+
 #~ msgid ""
 #~ "retrygrab() failed for:\n"
 #~ "  %s%s\n"
@@ -1995,12 +1999,16 @@ msgstr "Erro ao abrir o rpm %s - erro %s"
 #~ "retrygrab() falhou para:\n"
 #~ "  %s%s\n"
 #~ "  Executando método de recuperação"
+
 #~ msgid "I will install/upgrade these to satisfy the dependencies:"
 #~ msgstr "Eu irei instalar/atualizar isto para satisfazer as dependências:"
+
 #~ msgid "Cannot delete %s - check perms"
 #~ msgstr "Não foi possível remover %s - verifique as permissões"
+
 #~ msgid "Need a provides to match"
 #~ msgstr "É necessário fornecer uma informação para corresponder"
+
 #~ msgid ""
 #~ "lilo options that are not supported by yum are used in the default lilo."
 #~ "conf. This file will not be modified. The options include:\n"
@@ -2008,10 +2016,13 @@ msgstr "Erro ao abrir o rpm %s - erro %s"
 #~ "opções do lilo que não são suportadas pelo yum estão sendo utilizadas no "
 #~ "arquivo lilo.conf padrão. Este arquivo não será modificado. Dentre as "
 #~ "opções estão:\n"
+
 #~ msgid "Error getting file %s"
 #~ msgstr "Erro ao obter arquivo %s"
+
 #~ msgid "%s is not writable"
 #~ msgstr "%s não é gravável"
+
 #~ msgid ""
 #~ "\n"
 #~ "Already found tuple: %s %s:\n"
@@ -2020,86 +2031,117 @@ msgstr "Erro ao abrir o rpm %s - erro %s"
 #~ "\n"
 #~ "Tupla já encontrada: %s %s:\n"
 #~ "%s "
+
 #~ msgid "errors found"
 #~ msgstr "erros encontrados"
+
 #~ msgid "Unable to determine boot loader."
 #~ msgstr "Não foi possível determinar o gerenciador de inicialização."
+
 #~ msgid "getting %s"
 #~ msgstr "obtendo %s"
+
 #~ msgid "Error Reading Header on %s"
 #~ msgstr "Erro ao Ler Cabeçalho em %s"
+
 #~ msgid "Error accessing File: %s"
 #~ msgstr "Erro ao acessar arquivo: %s"
+
 #~ msgid "You're not root, we can't install things"
 #~ msgstr "Você não é root, nós não podemos instalar coisas"
+
 #~ msgid "Cannot find any conf file."
 #~ msgstr "Não foi possível encontrar um arquivo de configuração."
+
 #~ msgid "Local file does not exist: %s"
 #~ msgstr "O arquivo local não existe: %s"
+
 #~ msgid "using ftp, http[s], or file for servers, Aborting - %s"
 #~ msgstr "usando ftp, http[s] ou arquivos para servidores. Abortando - %s"
+
 #~ msgid "Found %s."
 #~ msgstr "%s encontrado."
+
 #~ msgid "Transaction(s) Complete"
 #~ msgstr "Transação Completa"
+
 #~ msgid "IOError: %s"
 #~ msgstr "IOError (Erro E/S): %s"
+
 #~ msgid "Cleaning packages and old headers"
 #~ msgstr "Limpando pacotes e cabeçalhos antigos"
+
 #~ msgid ""
 #~ "Cannot download %s in caching only mode or when running as non-root user."
 #~ msgstr ""
 #~ "Não é possível baixar %s no modo \"somente cache\" ou quando estiver "
 #~ "executando com um usuário não root."
+
 #~ msgid ""
 #~ "Error: You may want to run yum clean or remove the file: \n"
 #~ " %s"
 #~ msgstr ""
 #~ "Erro: Você pode querer executar a limpeza do yum ou remover o arquivo: \n"
 #~ " %s"
+
 #~ msgid "Error reading lilo.conf: The messages was:\n"
 #~ msgstr "Erro ao ler o lilo.conf: A mensagem foi:\n"
+
 #~ msgid "No groups provided or accessible on any server."
 #~ msgstr "Nenhum grupo fornecido ou acessível em nenhum servidor."
+
 #~ msgid "%s results returned"
 #~ msgstr "%s resultados retornados"
+
 #~ msgid "Error moving %s to %s, fatal"
 #~ msgstr "Erro ao mover %s para %s, fatal"
+
 #~ msgid ""
 #~ "\n"
 #~ "ignoring bad rpm: %s"
 #~ msgstr ""
 #~ "\n"
 #~ "ignorando rpm defeituoso: %s"
+
 #~ msgid "[erase: %s]"
 #~ msgstr "[remover: %s]"
+
 #~ msgid "%s is not a dir"
 #~ msgstr "%s não é um diretório"
+
 #~ msgid "Best version for %s is %s:%s-%s"
 #~ msgstr "A melhor versão para %s é %s:%s-%s"
+
 #~ msgid "[deps: %s]"
 #~ msgstr "[deps: %s]"
+
 #~ msgid ""
 #~ "\n"
 #~ "ignoring srpm: %s"
 #~ msgstr ""
 #~ "\n"
 #~ "ignorando srpm: %s"
+
 #~ msgid "Checking deps %d/%d complete"
 #~ msgstr "Checando dependências, %d/%d completo"
+
 #~ msgid ""
 #~ "Errors within the dir(s):\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Erro dentro do(s) diretório(s):\n"
 #~ " %s"
+
 #~ msgid "Please run yum in non-caching mode to correct this header."
 #~ msgstr ""
 #~ "Por favor, execute o yum no modo sem cache para corrigir este cabeçalho."
+
 #~ msgid "Error installing lilo.conf  The message was:\n"
 #~ msgstr "Erro ao instalar o lilo.conf. A mensagem foi:\n"
+
 #~ msgid "Error: Untrusted GPG key on %s"
 #~ msgstr "Erro: Chave GPG não confiável em %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -2110,50 +2152,69 @@ msgstr "Erro ao abrir o rpm %s - erro %s"
 #~ "\n"
 #~ "Problema com a assinatura gpg ou com o md5sum em %s\n"
 #~ "\n"
+
 #~ msgid "No Packages Available for Update or Install"
 #~ msgstr "Nenhum Pacote Disponível para Atualização ou Instalação"
+
 #~ msgid "Found best arch for install only pkg %s"
 #~ msgstr "Encontre a melhor arquitetura para instalar apenas o pacote %s"
+
 #~ msgid "I will do the following:"
 #~ msgstr "Eu farei o seguinte:"
+
 #~ msgid "Bad URL: %s"
 #~ msgstr "URL Inválida: %s"
+
 #~ msgid "NonMatching RPM version, %s, removing."
 #~ msgstr "Versão do RPM não coincide, %s, removendo."
+
 #~ msgid "I will erase these to satisfy the dependencies:"
 #~ msgstr "Eu irei apagar isto para satisfazer as dependências:"
+
 #~ msgid "HTTP Error (%s): %s"
 #~ msgstr "Erro HTTP (%s): %s"
+
 #~ msgid "Please ask your sysadmin to update the headers on this system."
 #~ msgstr ""
 #~ "Por favor, peça ao administrador do seu sistema para atualizar os "
 #~ "cabeçalhos."
+
 #~ msgid "Putting back old headers"
 #~ msgstr "Recolocando cabeçalhos antigos"
+
 #~ msgid "CacheDir: %s"
 #~ msgstr "CacheDir (diretório de cache): %s"
+
 #~ msgid "Completing update for %s  - %d/%d"
 #~ msgstr "Completando atualização para %s - %d/%d"
+
 #~ msgid ""
 #~ "Error: You may need to disable gpg checking to install this package\n"
 #~ msgstr ""
 #~ "Erro: Talvez seja necessário desabilitar a verificação gpg para instalar "
 #~ "este pacote\n"
+
 #~ msgid "Options Error: no commands found"
 #~ msgstr "Erro nas opções: nenhum comando encontrado"
+
 #~ msgid "Unable to run grubby correctly: the message was:\n"
 #~ msgstr "Não foi possível executar o grubby corretamente: a mensagem foi:\n"
+
 #~ msgid "IOError - # %s - %s"
 #~ msgstr "IOError (Erro E/S) - # %s - %s"
+
 #~ msgid "Kernel Updated/Installed, checking for bootloader"
 #~ msgstr ""
 #~ "Kernel atualizado/instalado, verificando gerenciador de inicialização"
+
 #~ msgid "Need to pass a list of pkgs to install"
 #~ msgstr "É necessário passar uma lista de pacotes para instalar"
+
 #~ msgid "Insufficient server config - no servers found. Aborting."
 #~ msgstr ""
 #~ "Configuração de servidor insuficiente - nenhum servidor encontrado. "
 #~ "Abortando."
+
 #~ msgid ""
 #~ "\n"
 #~ "    Usage:  yum [options] <update | upgrade | install | info | remove | "
@@ -2199,76 +2260,102 @@ msgstr "Erro ao abrir o rpm %s - erro %s"
 #~ "          --version - exibe a versão do yum\n"
 #~ "          -h, --help - exibe esta tela\n"
 #~ "    "
+
 #~ msgid "From %s installing %s"
 #~ msgstr "A partir de %s, instalando %s"
+
 #~ msgid "No bootloader found, Cannot configure kernel, continuing."
 #~ msgstr ""
 #~ "Nenhum gerenciador de inicialização encontrado. Não é possível configurar "
 #~ "o kernel, continuando."
+
 #~ msgid "Attempt to delete a missing file %s - ignoring."
 #~ msgstr "Tentativa de remover um arquivo faltando %s - ignorando."
+
 #~ msgid "Getting %s"
 #~ msgstr "Obtendo %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "Writing header.info file"
 #~ msgstr ""
 #~ "\n"
 #~ "Gravando arquivo header.info"
+
 #~ msgid "Gathering header information file(s) from server(s)"
 #~ msgstr ""
 #~ "Coletando arquivo(s) de informações de cabeçalhos a partir do(s) servidor"
 #~ "(es)"
+
 #~ msgid "Using cached header.info file"
 #~ msgstr "Utilizando arquivo header.info do cache"
+
 #~ msgid "localrpmdb not defined"
 #~ msgstr "localrpmdb não definido"
+
 #~ msgid "Error installing the new bootloader: \n"
 #~ msgstr "Erro ao instalar o novo gerenciador de inicialização: \n"
+
 #~ msgid "Error: Could not find the GPG Key necessary to validate pkg %s"
 #~ msgstr ""
 #~ "Erro: Não foi possível localizar a Chave GPG necessária para validar o "
 #~ "pacote %s"
+
 #~ msgid "No actions to take"
 #~ msgstr "Nenhuma ação a ser tomada"
+
 #~ msgid ""
 #~ "Available package: %s.%s %s:%s-%s from %s matches with\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Pacote disponível: %s.%s %s:%s-%s de %s resultados com\n"
 #~ " %s"
+
 #~ msgid "   "
 #~ msgstr "   "
+
 #~ msgid "Error: Cannot find baseurl or name for server '%s'. Skipping"
 #~ msgstr ""
 #~ "Erro: Não foi possível localizar a baseurl ou o nome do servidor \"%s\". "
 #~ "Ignorando."
+
 #~ msgid "Odd header %s suddenly disappeared"
 #~ msgstr "Cabeçalho indefinido %s desapareceu repentinamente"
+
 #~ msgid "All dependencies resolved and no conflicts detected"
 #~ msgstr "Todas as dependências resolvidas e nenhum conflito detectado"
+
 #~ msgid "using cached groups from server: %s"
 #~ msgstr "usando grupos em cache a partir do servidor: %s"
+
 #~ msgid "Exiting."
 #~ msgstr "Saindo."
+
 #~ msgid ""
 #~ "asking for package %s.%s - does not exist in nevral - bailing out - check "
 #~ "rpmdb for errors"
 #~ msgstr ""
 #~ "perguntando pelo pacote %s.%s - não existe no nevral - saindo "
 #~ "abruptamente - verifique por erros no rpmdb"
+
 #~ msgid "Errors reported doing trial run"
 #~ msgstr "Erros reportados na execução experimental"
+
 #~ msgid "Lilo found - adding kernel to lilo and making it the default"
 #~ msgstr "Lilo encontrado - adicionando o kernel ao lilo e tornando-o padrão"
+
 #~ msgid "[update: %s]"
 #~ msgstr "[atualizar: %s]"
+
 #~ msgid "ERROR: Url Return no Content-Length  - something is wrong"
 #~ msgstr "ERRO: A URL retornou conteúdo vazio - algo está errado"
+
 #~ msgid "Got a file - yay"
 #~ msgstr "Obteve um arquivo - yay"
+
 #~ msgid "From %s updating %s"
 #~ msgstr "A partir de %s, atualizando %s"
+
 #~ msgid ""
 #~ "Usage:\n"
 #~ "yum-arch [-v] [-z] [-l] [-c] [-n] [-d] [-q] [-vv] (path of dir where "
@@ -2298,56 +2385,77 @@ msgstr "Erro ao abrir o rpm %s - erro %s"
 #~ "   -l  = utiliza links simbólicos como rpms válidos ao compilar "
 #~ "cabeçalhos\n"
 #~ "   -q  = faz uma exibição mais discreta"
+
 #~ msgid "The file %s is damaged."
 #~ msgstr "O arquivo %s está danificado."
+
 #~ msgid "Repo"
 #~ msgstr "Repo"
+
 #~ msgid "No bootloader found, Cannot configure kernel."
 #~ msgstr ""
 #~ "Nenhum gerenciador de inicialização encontrado. Não é possível configurar "
 #~ "o kernel."
+
 #~ msgid "Name"
 #~ msgstr "Nome"
+
 #~ msgid "[install: %s]"
 #~ msgstr "[instalar: %s]"
+
 #~ msgid "Downloading needed headers"
 #~ msgstr "Baixando os cabeçalhos necessários"
+
 #~ msgid "Header for pkg %s not found"
 #~ msgstr "O cabeçalho para o pacote %s não foi encontrado"
+
 #~ msgid "Cleaning all headers"
 #~ msgstr "Limpando todos os cabeçalhos"
+
 #~ 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"
+
 #~ msgid "Nothing in any group to update or install"
 #~ msgstr "Nada em nenhum grupo para atualizar ou instalar"
+
 #~ msgid "Grub found - making this kernel the default"
 #~ msgstr "Grub encontrado - tornando este kernel o padrão"
+
 #~ msgid "Digesting rpm - %s - %d/%d"
 #~ msgstr "Preparando rpm - %s - %d/%d"
+
 #~ msgid "Damaged RPM %s, removing."
 #~ msgstr "RPM %s danificado, removendo."
+
 #~ msgid ""
 #~ "Bad Header for pkg %s.%s trying to get headers for the nevral - exiting"
 #~ msgstr ""
 #~ "Cabeçalho danificado para o pacote %s.%s, tentando obter cabeçalhos para "
 #~ "o nevral - saindo"
+
 #~ msgid ""
 #~ "Error: You may also check that you have the correct GPG keys installed"
 #~ msgstr ""
 #~ "Erro: Você também pode verificar se tem as Chaves GPG corretas instaladas"
+
 #~ msgid "No rpms to work with and no header dir. Exiting."
 #~ msgstr ""
 #~ "Nenhum diretório de cabeçalhos e nenhum rpm para ser utilizado. Saindo."
+
 #~ msgid "ignoring bad rpm: %s"
 #~ msgstr "ignorando rpm danificado: %s"
+
 #~ msgid "Directory of rpms must be a directory."
 #~ msgstr "O diretório de rpms deve ser um diretório."
+
 #~ msgid "failover: out of servers to try"
 #~ msgstr "recuperação: não há mais servidores para tentar"
+
 #~ msgid "Getting header.info from server"
 #~ msgstr "Obtendo header.info do servidor"
-
diff --git a/po/sr.po b/po/sr.po
index 0f51d47..afff3ea 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-26 13:28+0000\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-05-26 20:30-0000\n"
 "Last-Translator: Miloš Komarčević <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
@@ -20,24 +20,23 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../callback.py:48 ../output.py:516 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Aжурирам"
 
-#: ../callback.py:49 ../yum/rpmtrans.py:72
+#: ../callback.py:49
 msgid "Erasing"
 msgstr "Бришем"
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:515
-#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Инсталирам"
 
-#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
+#: ../callback.py:52 ../callback.py:58
 msgid "Obsoleted"
 msgstr "Превазиђени"
 
-#: ../callback.py:54 ../output.py:562
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Ажурирани"
 
@@ -45,7 +44,7 @@ msgstr "Ажурирани"
 msgid "Erased"
 msgstr "Обрисани"
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:560
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "Инсталирани"
 
@@ -67,53 +66,53 @@ msgstr "Грешка: погрешно излазно стање: %s за %s"
 msgid "Erased: %s"
 msgstr "Обрисано: %s"
 
-#: ../callback.py:217 ../output.py:517
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Уклањам"
 
-#: ../callback.py:219 ../yum/rpmtrans.py:77
+#: ../callback.py:219
 msgid "Cleanup"
 msgstr "Чишћење"
 
-#: ../cli.py:105
+#: ../cli.py:103
 #, python-format
 msgid "Command \"%s\" already defined"
 msgstr "Наредба „%s“ је већ дефинисана"
 
-#: ../cli.py:117
+#: ../cli.py:115
 msgid "Setting up repositories"
 msgstr "Постављам ризнице"
 
-#: ../cli.py:128
+#: ../cli.py:126
 msgid "Reading repository metadata in from local files"
 msgstr "Читам метаподатке ризница из локалних датотека"
 
-#: ../cli.py:185 ../utils.py:71
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "Грешка при подешавању: %s"
 
-#: ../cli.py:188 ../cli.py:1080 ../utils.py:74
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Грешка у опцијама: %s"
 
-#: ../cli.py:231
+#: ../cli.py:229
 msgid "You need to give some command"
 msgstr "Морате да унесете неку команду"
 
-#: ../cli.py:273
+#: ../cli.py:271
 msgid "Disk Requirements:\n"
 msgstr "Захтеви диска:\n"
 
-#: ../cli.py:275
+#: ../cli.py:273
 #, python-format
 msgid "  At least %dMB needed on the %s filesystem.\n"
 msgstr "  Потребно је најмање %dМБ на %s систему датотека.\n"
 
 #. TODO: simplify the dependency errors?
 #. Fixup the summary
-#: ../cli.py:280
+#: ../cli.py:278
 msgid ""
 "Error Summary\n"
 "-------------\n"
@@ -121,55 +120,55 @@ msgstr ""
 "Сажетак грешака\n"
 "-------------\n"
 
-#: ../cli.py:319
+#: ../cli.py:317
 msgid "Trying to run the transaction but nothing to do. Exiting."
 msgstr "Покушавам да извршим трансакцију али нема шта да се ради. Излазим."
 
-#: ../cli.py:349
+#: ../cli.py:347
 msgid "Exiting on user Command"
 msgstr "Излазим на команду корисника"
 
-#: ../cli.py:353
+#: ../cli.py:351
 msgid "Downloading Packages:"
 msgstr "Преузимам пакете:"
 
-#: ../cli.py:358
+#: ../cli.py:356
 msgid "Error Downloading Packages:\n"
 msgstr "Грешка при преузимању пакета:\n"
 
-#: ../cli.py:372 ../yum/__init__.py:2816
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "Извршавам rpm_check_debug"
 
-#: ../cli.py:375 ../yum/__init__.py:2819
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr "ГРЕШКА са rpm_check_debug у односу на depsolve:"
 
-#: ../cli.py:379 ../yum/__init__.py:2821
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Молим вас, пријавите ову грешку у bugzilla-и"
 
-#: ../cli.py:385
+#: ../cli.py:383
 msgid "Running Transaction Test"
 msgstr "Извршавам проверу трансакције"
 
-#: ../cli.py:401
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr "Завршио сам проверу трансакције"
 
-#: ../cli.py:403
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr "Грешка при провери трансакције:\n"
 
-#: ../cli.py:410
+#: ../cli.py:408
 msgid "Transaction Test Succeeded"
 msgstr "Провера трансакције је успела"
 
-#: ../cli.py:431
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr "Извршавам трансакцију"
 
-#: ../cli.py:461
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
@@ -177,315 +176,296 @@ msgstr ""
 "Одбијам да аутоматски увезем кључеве када се извршавање не надгледа.\n"
 "За превазилажење овога користите „-y“."
 
-#: ../cli.py:493
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr "Рашчлањујем аргументе инсталације пакета"
 
-#: ../cli.py:503
+#: ../cli.py:501
 #, python-format
 msgid "No package %s available."
 msgstr "Не постоји доступан %s пакет."
 
-#: ../cli.py:507 ../cli.py:625 ../yumcommands.py:790
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Пакет(и) који ће се инсталирати"
 
-#: ../cli.py:508 ../cli.py:626 ../yumcommands.py:147 ../yumcommands.py:791
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr "Нема шта да се ради"
 
-#: ../cli.py:538 ../yum/__init__.py:2268 ../yum/__init__.py:2368
-#: ../yum/__init__.py:2380
+#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
+#: ../yum/__init__.py:2340
 #, python-format
 msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Не ажурирам пакете који су већ превазиђени: %s.%s %s:%s-%s"
 
-#: ../cli.py:570
+#: ../cli.py:568
 #, python-format
 msgid "Could not find update match for %s"
 msgstr "Не могу да пронађем одговарајуће ажурирање за %s"
 
-#: ../cli.py:582
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr "%d пакети означени за ажурирање"
 
-#: ../cli.py:585
+#: ../cli.py:583
 msgid "No Packages marked for Update"
 msgstr "Нема пакета означених за ажурирање"
 
-#: ../cli.py:601
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr "%d пакети означени за уклањање"
 
-#: ../cli.py:604
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr "Нема пакета означених за уклањање"
 
-#: ../cli.py:616
+#: ../cli.py:614
 msgid "No Packages Provided"
 msgstr "Ниједан пакет није добављен"
 
-#: ../cli.py:656
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr "Повезивање пакета за списак пакета по аргументима корисника"
 
-#: ../cli.py:704
+#: ../cli.py:701
 #, python-format
 msgid "Warning: No matches found for: %s"
 msgstr "Упозорење: није нађено подударање за %s"
 
-#: ../cli.py:707
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Нису пронађена подударања"
 
-#: ../cli.py:748
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Нису пронађени пакети за %s"
 
-#: ../cli.py:760
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "Чистим све"
 
-#: ../cli.py:774
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "Чистим заглавља"
 
-#: ../cli.py:777
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "Чистим пакете"
 
-#: ../cli.py:780
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "Чистим xml метаподатке"
 
-#: ../cli.py:783
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "Чистим кеш база података"
 
-#: ../cli.py:786
+#: ../cli.py:783
 msgid "Cleaning up expire-cache metadata"
 msgstr "Чистим expire-cache метаподатке"
 
-#: ../cli.py:789
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "Чистим додатке"
 
-#: ../cli.py:811
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Инсталиране групе:"
 
-#: ../cli.py:818
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "Доступне групе:"
 
-#: ../cli.py:824
+#: ../cli.py:820
 msgid "Done"
 msgstr "Урађено"
 
-#: ../cli.py:835 ../cli.py:853 ../cli.py:859
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "Упозорење: група %s не постоји."
 
-#: ../cli.py:863
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
 msgstr ""
 "Нема доступних пакета за инсталацију или ажурирање у свим захтеваним групама"
 
-#: ../cli.py:865
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d пакет(и) за инсталацију"
 
-#: ../cli.py:875
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Не постоји група под именом %s"
 
-#: ../cli.py:881
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Нема пакета за уклањање из група"
 
-#: ../cli.py:883
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d  пакет(и) за уклањање"
 
-#: ../cli.py:925
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "Пакет %s је већ инсталиран, прескачем га"
 
-#: ../cli.py:936
+#: ../cli.py:926
 #, 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:962
+#: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
 msgstr ""
 "Не постоји инсталиран други %s, додајем га у списак за потенцијалну "
 "инсталацију"
 
-#: ../cli.py:981
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "Грешка командне линије: %s"
 
-#: ../cli.py:993
-#, python-format
-msgid ""
-"\n"
-"\n"
-"%s: %s option requires an argument"
-msgstr ""
-"\n"
-"\n"
-"%s: %s опција захтева аргумент"
-
-#: ../cli.py:1122
-msgid "show this help message and exit"
-msgstr "прикажи ову помоћну поруку и изађи"
-
-#: ../cli.py:1126
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "буди толерантан на грешке"
 
-#: ../cli.py:1128
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr "извршавај се у потпуности из кеша, не ажурирај кеш"
 
-#: ../cli.py:1130
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "место датотеке подешавања"
 
-#: ../cli.py:1132
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "најдуже време чекања на команду"
 
-#: ../cli.py:1134
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "ниво излазног приказа за проналажење грешака"
 
-#: ../cli.py:1138
+#: ../cli.py:1113
 msgid "show duplicates, in repos, in list/search commands"
 msgstr ""
 "приказуј дупликате, у ризницама, у командама за излиставање/претраживање"
 
-#: ../cli.py:1140
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "ниво излазног приказа грешака"
 
-#: ../cli.py:1143
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "тиха радња"
 
-#: ../cli.py:1145
-msgid "verbose operation"
-msgstr "опширна радња"
-
-#: ../cli.py:1147
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "одговори са да на сва питања"
 
-#: ../cli.py:1149
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "прикажи верзију Yum-а и изађи"
 
-#: ../cli.py:1150
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "постави корени директоријум инсталације"
 
-#: ../cli.py:1154
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "укључи једну или више ризница (скраћенице су дозвољене)"
 
-#: ../cli.py:1158
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr "искључи једну или више ризница (скраћенице су дозвољене)"
 
-#: ../cli.py:1161
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr "изузмите пакет(е) по имену или glob-у"
 
-#: ../cli.py:1163
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
 msgstr "искључи изузимање из главног скупа, за ризницу или за све"
 
-#: ../cli.py:1166
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr "укључи обраду застарелих пакета у току ажурирања"
 
-#: ../cli.py:1168
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "искључи додатке за Yum"
 
-#: ../cli.py:1170
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "искључи проверу gpg потписа"
 
-#: ../cli.py:1172
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "искључи додатке по имену"
 
-#: ../cli.py:1175
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "прескочи пакете који имају проблема са решавањем зависности"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Jan"
 msgstr "јан"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Feb"
 msgstr "феб"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Mar"
 msgstr "мар"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Apr"
 msgstr "апр"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "May"
 msgstr "мај"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Jun"
 msgstr "јун"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Jul"
 msgstr "јул"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Aug"
 msgstr "авг"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Sep"
 msgstr "сеп"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Oct"
 msgstr "окт"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Nov"
 msgstr "нов"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Dec"
 msgstr "дец"
 
-#: ../output.py:239
+#: ../output.py:240
 msgid "Trying other mirror."
 msgstr "Покушавам други одраз."
 
@@ -551,23 +531,23 @@ msgstr "Опис       : "
 msgid "Is this ok [y/N]: "
 msgstr "Да ли је ово у реду [d/N]: "
 
-#: ../output.py:359 ../output.py:362
+#: ../output.py:357 ../output.py:360
 msgid "y"
 msgstr "d"
 
-#: ../output.py:359
+#: ../output.py:357
 msgid "n"
 msgstr "n"
 
-#: ../output.py:359 ../output.py:362
+#: ../output.py:357 ../output.py:360
 msgid "yes"
 msgstr "da"
 
-#: ../output.py:359
+#: ../output.py:357
 msgid "no"
 msgstr "ne"
 
-#: ../output.py:370
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -576,96 +556,96 @@ msgstr ""
 "\n"
 "Група: %s"
 
-#: ../output.py:372
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " Опис: %s"
 
-#: ../output.py:374
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr " Обавезни пакети:"
 
-#: ../output.py:379
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr " Подразумевани пакети:"
 
-#: ../output.py:384
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr " Изборни пакети:"
 
-#: ../output.py:389
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr " Условљени пакети:"
 
-#: ../output.py:398
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "пакет: %s"
 
-#: ../output.py:400
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr "  Не постоје зависности овог пакета"
 
-#: ../output.py:405
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr "  зависност: %s"
 
-#: ../output.py:407
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr "   Незадовољена зависност"
 
-#: ../output.py:465
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Повезан из:"
 
-#: ../output.py:491
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr "Догодила се грешка при рачунању укупне величине за преузимање"
 
-#: ../output.py:496
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "Укупна величина: %s"
 
-#: ../output.py:499
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "Укупна величина за преузимање: %s"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Package"
 msgstr "Пакет"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Arch"
 msgstr "Архитектура"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Version"
 msgstr "Верзија"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Repository"
 msgstr "Ризница"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Size"
 msgstr "Величина"
 
-#: ../output.py:518
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Инсталирам због зависности"
 
-#: ../output.py:519
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Ажурирам због зависности"
 
-#: ../output.py:520
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Уклањам због зависности"
 
-#: ../output.py:532
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
@@ -674,7 +654,7 @@ msgstr ""
 "     уклањам  %s.%s %s\n"
 "\n"
 
-#: ../output.py:540
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -691,27 +671,27 @@ msgstr ""
 "ажурирање    %5.5s пакет(а)       \n"
 "уклањање     %5.5s пакет(а)       \n"
 
-#: ../output.py:558
+#: ../output.py:554
 msgid "Removed"
 msgstr "Уклоњено"
 
-#: ../output.py:559
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "Зависност уклоњена"
 
-#: ../output.py:561
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "Зависност инсталирана"
 
-#: ../output.py:563
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "Зависност ажурирана"
 
-#: ../output.py:564
+#: ../output.py:560
 msgid "Replaced"
 msgstr "Замењено"
 
-#: ../output.py:622
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
@@ -722,73 +702,73 @@ msgstr ""
 " Тренутно преузимање је обустављено, %sinterrupt (ctrl-c) још једном%s у "
 "току %s%s%s секунди да бисте изашли.\n"
 
-#: ../output.py:632
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "прекид од стране корисника"
 
-#: ../output.py:643
+#: ../output.py:639
 msgid "installed"
 msgstr "инсталиран"
 
-#: ../output.py:644
+#: ../output.py:640
 msgid "updated"
 msgstr "ажуриран"
 
-#: ../output.py:645
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "превазиђен"
 
-#: ../output.py:646
+#: ../output.py:642
 msgid "erased"
 msgstr "обрисан"
 
-#: ../output.py:650
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> Пакет %s.%s %s:%s-%s постављен да буде %s"
 
-#: ../output.py:657
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> Извршава се провера трансакције"
 
-#: ../output.py:662
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr "--> Поновно покретање разрешавања зависности са новим променама."
 
-#: ../output.py:667
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> Завршено је разрешавање зависности"
 
-#: ../output.py:672
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr "--> Обрађујем зависност: %s за пакет: %s"
 
-#: ../output.py:677
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> Неразрешена зависност: %s"
 
-#: ../output.py:683
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Сукоб при обради: %s се сукоби са %s"
 
-#: ../output.py:686
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr ""
 "--> Попуњавам скуп трансакције са изабраним пакетима. Молим вас, сачекајте."
 
-#: ../output.py:690
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr "---> Преузимам заглавље за %s ради паковања у скуп трансакције."
 
-#: ../yumcommands.py:37
+#: ../yumcommands.py:36
 msgid "You need to be root to perform this command."
 msgstr "Морате бити root корисник да бисте извршили ову команду."
 
-#: ../yumcommands.py:44
+#: ../yumcommands.py:43
 msgid ""
 "\n"
 "You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -819,267 +799,251 @@ msgstr ""
 "\n"
 "За више информација контактирајте добављача ваше дистрибуције или пакета.\n"
 
-#: ../yumcommands.py:64
+#: ../yumcommands.py:63
 #, python-format
 msgid "Error: Need to pass a list of pkgs to %s"
 msgstr "Грешка: потребно је да додате списак пакета %s-у"
 
-#: ../yumcommands.py:70
+#: ../yumcommands.py:69
 msgid "Error: Need an item to match"
 msgstr "Грешка: потребно је придружити ставку"
 
-#: ../yumcommands.py:76
+#: ../yumcommands.py:75
 msgid "Error: Need a group or list of groups"
 msgstr "Грешка: потребна је група или списак група"
 
-#: ../yumcommands.py:85
+#: ../yumcommands.py:84
 #, python-format
 msgid "Error: clean requires an option: %s"
 msgstr "Грешка: clean захтева опцију: %s"
 
-#: ../yumcommands.py:90
+#: ../yumcommands.py:89
 #, python-format
 msgid "Error: invalid clean argument: %r"
 msgstr "Грешка: погрешан clean аргумент:%r"
 
-#: ../yumcommands.py:103
+#: ../yumcommands.py:102
 msgid "No argument to shell"
 msgstr "Не постоји аргумент за командно окружење"
 
-#: ../yumcommands.py:106
+#: ../yumcommands.py:105
 #, python-format
 msgid "Filename passed to shell: %s"
 msgstr "Име датотеке је прослеђено командном окружењу: %s"
 
-#: ../yumcommands.py:110
+#: ../yumcommands.py:109
 #, python-format
 msgid "File %s given as argument to shell does not exist."
 msgstr ""
 "Не постоји датотека %s, која је прослеђена као аргумент комадном окружењу."
 
-#: ../yumcommands.py:116
+#: ../yumcommands.py:115
 msgid "Error: more than one file given as argument to shell."
 msgstr ""
 "Грешка: више од једне датотеке је прослеђено као аргумент командном окружењу."
 
-#: ../yumcommands.py:157
+#: ../yumcommands.py:156
 msgid "PACKAGE..."
 msgstr "ПАКЕТ..."
 
-#: ../yumcommands.py:160
+#: ../yumcommands.py:159
 msgid "Install a package or packages on your system"
 msgstr "Инсталирајте пакет или пакете на ваш систем"
 
-#: ../yumcommands.py:169
+#: ../yumcommands.py:168
 msgid "Setting up Install Process"
 msgstr "Постављам процес инсталације"
 
-#: ../yumcommands.py:180
+#: ../yumcommands.py:179
 msgid "[PACKAGE...]"
 msgstr "[ПАКЕТ...]"
 
-#: ../yumcommands.py:183
+#: ../yumcommands.py:182
 msgid "Update a package or packages on your system"
 msgstr "Ажурирај пакет или пакете на вашем систему"
 
-#: ../yumcommands.py:191
+#: ../yumcommands.py:190
 msgid "Setting up Update Process"
 msgstr "Постављам процес ажурирања"
 
-#: ../yumcommands.py:205
+#: ../yumcommands.py:204
 msgid "Display details about a package or group of packages"
 msgstr "Прикажи детаље о сваком пакету или групи пакета"
 
-#: ../yumcommands.py:213
+#: ../yumcommands.py:212
 msgid "Installed Packages"
 msgstr "Инсталирани пакети"
 
-#: ../yumcommands.py:214
+#: ../yumcommands.py:213
 msgid "Available Packages"
 msgstr "Доступни пакети"
 
-#: ../yumcommands.py:215
+#: ../yumcommands.py:214
 msgid "Extra Packages"
 msgstr "Додатни пакети"
 
-#: ../yumcommands.py:216
+#: ../yumcommands.py:215
 msgid "Updated Packages"
 msgstr "Ажурирани пакети"
 
-#: ../yumcommands.py:222 ../yumcommands.py:228
+#: ../yumcommands.py:221 ../yumcommands.py:225
 msgid "Obsoleting Packages"
 msgstr "Превазиђени пакети"
 
-#: ../yumcommands.py:229
+#: ../yumcommands.py:226
 msgid "Recently Added Packages"
 msgstr "Недавно додати пакети"
 
-#: ../yumcommands.py:235
+#: ../yumcommands.py:232
 msgid "No matching Packages to list"
 msgstr "Не постоје одговарајући пакети за излиставање"
 
-#: ../yumcommands.py:249
+#: ../yumcommands.py:246
 msgid "List a package or groups of packages"
 msgstr "Излистај пакете или групе пакета"
 
-#: ../yumcommands.py:261
+#: ../yumcommands.py:258
 msgid "Remove a package or packages from your system"
 msgstr "Уклоните пакет или пакете са вашег система"
 
-#: ../yumcommands.py:269
+#: ../yumcommands.py:266
 msgid "Setting up Remove Process"
 msgstr "Постављам процес уклањања"
 
-#: ../yumcommands.py:281
+#: ../yumcommands.py:278
 msgid "Setting up Group Process"
 msgstr "Постављам процес за групе"
 
-#: ../yumcommands.py:287
+#: ../yumcommands.py:284
 msgid "No Groups on which to run command"
 msgstr "Не постоји група над којом се може извршити команда"
 
-#: ../yumcommands.py:300
+#: ../yumcommands.py:297
 msgid "List available package groups"
 msgstr "Излистај доступне групе пакета"
 
-#: ../yumcommands.py:317
+#: ../yumcommands.py:314
 msgid "Install the packages in a group on your system"
 msgstr "Инсталирајте пакете у групи на вашем систему"
 
-#: ../yumcommands.py:339
+#: ../yumcommands.py:336
 msgid "Remove the packages in a group from your system"
 msgstr "Уклоните пакете у групи са вашег система"
 
-#: ../yumcommands.py:363
+#: ../yumcommands.py:360
 msgid "Display details about a package group"
 msgstr "Прикажи детаље о групи пакета"
 
-#: ../yumcommands.py:387
+#: ../yumcommands.py:384
 msgid "Generate the metadata cache"
 msgstr "Направи кеш са метаподацима"
 
-#: ../yumcommands.py:393
+#: ../yumcommands.py:390
 msgid "Making cache files for all metadata files."
 msgstr "Правим кеш датотеке за све датотеке са метаподацима."
 
-#: ../yumcommands.py:394
+#: ../yumcommands.py:391
 msgid "This may take a while depending on the speed of this computer"
 msgstr "Ово може да потраје у зависности од брзине вашег рачунара"
 
-#: ../yumcommands.py:415
+#: ../yumcommands.py:412
 msgid "Metadata Cache Created"
 msgstr "Направљен је кеш са метаподацима"
 
-#: ../yumcommands.py:429
+#: ../yumcommands.py:426
 msgid "Remove cached data"
 msgstr "Уклони кеширане податке"
 
-#: ../yumcommands.py:450
+#: ../yumcommands.py:447
 msgid "Find what package provides the given value"
 msgstr "Пронађи који пакет пружа дату вредност"
 
-#: ../yumcommands.py:470
+#: ../yumcommands.py:467
 msgid "Check for available package updates"
 msgstr "Проверите да ли су доступна ажурирања пакета"
 
-#: ../yumcommands.py:493
+#: ../yumcommands.py:490
 msgid "Search package details for the given string"
 msgstr "Претражите детаље о пакету за задату ниску"
 
-#: ../yumcommands.py:499
+#: ../yumcommands.py:496
 msgid "Searching Packages: "
 msgstr "Претражујем пакете: "
 
-#: ../yumcommands.py:516
+#: ../yumcommands.py:513
 msgid "Update packages taking obsoletes into account"
 msgstr "Ажурирајте пакете узимајући превазиђене у обзир"
 
-#: ../yumcommands.py:525
+#: ../yumcommands.py:522
 msgid "Setting up Upgrade Process"
 msgstr "Постављам процес надградње"
 
-#: ../yumcommands.py:539
+#: ../yumcommands.py:536
 msgid "Install a local RPM"
 msgstr "Инсталирај локални RPM"
 
-#: ../yumcommands.py:548
+#: ../yumcommands.py:545
 msgid "Setting up Local Package Process"
 msgstr "Постављам процес локалних пакета"
 
-#: ../yumcommands.py:567
+#: ../yumcommands.py:564
 msgid "Determine which package provides the given dependency"
 msgstr "Одреди који пакети пружају дату зависност"
 
-#: ../yumcommands.py:570
+#: ../yumcommands.py:567
 msgid "Searching Packages for Dependency:"
 msgstr "Претражујем пакете у потрази за зависностима:"
 
-#: ../yumcommands.py:584
+#: ../yumcommands.py:581
 msgid "Run an interactive yum shell"
 msgstr "Извршавај интерактивно командно окружење yum-а"
 
-#: ../yumcommands.py:590
+#: ../yumcommands.py:587
 msgid "Setting up Yum Shell"
 msgstr "Постављам Yum командно окружење"
 
-#: ../yumcommands.py:608
+#: ../yumcommands.py:605
 msgid "List a package's dependencies"
 msgstr "Излистај зависности пакета"
 
-#: ../yumcommands.py:614
+#: ../yumcommands.py:611
 msgid "Finding dependencies: "
 msgstr "Тражим зависности: "
 
-#: ../yumcommands.py:630
+#: ../yumcommands.py:627
 msgid "Display the configured software repositories"
 msgstr "Прикажи подешене софтверске ризнице"
 
-#: ../yumcommands.py:666
-msgid "enabled"
-msgstr "укључена"
-
-#: ../yumcommands.py:673
-msgid "disabled"
-msgstr "искључена"
-
-#: ../yumcommands.py:682
+#: ../yumcommands.py:645
 msgid "repo id"
 msgstr "репо id"
 
-#: ../yumcommands.py:683
+#: ../yumcommands.py:645
 msgid "repo name"
 msgstr "репо име"
 
-#: ../yumcommands.py:683
+#: ../yumcommands.py:645
 msgid "status"
 msgstr "статус"
 
-#: ../yumcommands.py:686
-msgid "Repo-id     : "
-msgstr "ИБ ризнице      : "
-
-#: ../yumcommands.py:687
-msgid "Repo-name   : "
-msgstr "Име ризнице     : "
-
-#: ../yumcommands.py:688
-msgid "Repo-enabled: "
-msgstr "Ризница укључена: "
+#: ../yumcommands.py:651
+msgid "enabled"
+msgstr "укључена"
 
-#: ../yumcommands.py:689
-msgid "Repo-size   : "
-msgstr "Величина ризнице: "
+#: ../yumcommands.py:654
+msgid "disabled"
+msgstr "искључена"
 
-#: ../yumcommands.py:713
+#: ../yumcommands.py:671
 msgid "Display a helpful usage message"
 msgstr "Прикажи корисну поруку о употреби"
 
-#: ../yumcommands.py:747
+#: ../yumcommands.py:705
 #, python-format
 msgid "No help available for %s"
 msgstr "Није доступна помоћ за %s"
 
-#: ../yumcommands.py:752
+#: ../yumcommands.py:710
 msgid ""
 "\n"
 "\n"
@@ -1089,7 +1053,7 @@ msgstr ""
 "\n"
 "алијаси: "
 
-#: ../yumcommands.py:754
+#: ../yumcommands.py:712
 msgid ""
 "\n"
 "\n"
@@ -1099,15 +1063,15 @@ msgstr ""
 "\n"
 "алијас: "
 
-#: ../yumcommands.py:783
+#: ../yumcommands.py:741
 msgid "Setting up Reinstall Process"
 msgstr "Постављам процес поновне инсталације"
 
-#: ../yumcommands.py:797
+#: ../yumcommands.py:755
 msgid "reinstall a package"
 msgstr "поновно инсталирам пакет"
 
-#: ../yummain.py:53
+#: ../yummain.py:41
 msgid ""
 "\n"
 "\n"
@@ -1117,7 +1081,7 @@ msgstr ""
 "\n"
 "Излазим када корисник откаже"
 
-#: ../yummain.py:59
+#: ../yummain.py:47
 msgid ""
 "\n"
 "\n"
@@ -1127,29 +1091,29 @@ msgstr ""
 "\n"
 "Излазим када се сломи цев"
 
-#: ../yummain.py:110
+#: ../yummain.py:105
 msgid ""
 "Another app is currently holding the yum lock; waiting for it to exit..."
 msgstr ""
 "Неки други програм тренутно држи yum закључавање, чекам да се тај програм "
 "искључи..."
 
-#: ../yummain.py:137 ../yummain.py:176
+#: ../yummain.py:132 ../yummain.py:171
 #, python-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: ../yummain.py:147 ../yummain.py:183
+#: ../yummain.py:142 ../yummain.py:178
 #, python-format
 msgid "Unknown Error(s): Exit Code: %d:"
 msgstr "Непозната грешка(е): излазни код: %d:"
 
 #. Depsolve stage
-#: ../yummain.py:154
+#: ../yummain.py:149
 msgid "Resolving Dependencies"
 msgstr "Разрешавам зависности"
 
-#: ../yummain.py:189
+#: ../yummain.py:184
 msgid ""
 "\n"
 "Dependencies Resolved"
@@ -1157,11 +1121,11 @@ msgstr ""
 "\n"
 "Зависности су разрешене"
 
-#: ../yummain.py:203
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr "Завршено!"
 
-#: ../yummain.py:250
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
@@ -1171,257 +1135,318 @@ msgstr ""
 "\n"
 "Излазим када корисник откаже."
 
-#: ../yum/depsolve.py:78
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr "doTsSetup() неће бити присутна у будућим верзијама Yum-а.\n"
 
-#: ../yum/depsolve.py:91
+#: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
 msgstr "Постављам TransactionSets пре него што се подигне класа подешавања"
 
-#: ../yum/depsolve.py:132
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr "Погрешан tsflag у датотеци подешавања: %s"
 
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:147
+#, fuzzy, python-format
+msgid "Searching pkgSack for dep: %s"
+msgstr "тражим пакет %s"
+
+#: ../yum/depsolve.py:170
+#, fuzzy, python-format
+msgid "Potential match for %s from %s"
+msgstr "Постоји више од једног идентичног слагања у групи за %s"
+
+#: ../yum/depsolve.py:178
+#, fuzzy, python-format
+msgid "Matched %s to require for %s"
+msgstr "%s захтева: %s"
+
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "Члан: %s"
 
-#: ../yum/depsolve.py:190 ../yum/depsolve.py:595
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s пребачен за инсталацију"
 
-#: ../yum/depsolve.py:197
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "Додајем пакет %s у начину рада %s"
 
-#: ../yum/depsolve.py:207
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Уклањам пакет %s"
 
-#: ../yum/depsolve.py:218
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s захтева: %s"
 
-#: ../yum/depsolve.py:273
+#: ../yum/depsolve.py:312
+msgid "Needed Require has already been looked up, cheating"
+msgstr ""
+
+#: ../yum/depsolve.py:322
+#, python-format
+msgid "Needed Require is not a package name. Looking up: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:329
+#, fuzzy, python-format
+msgid "Potential Provider: %s"
+msgstr "Укупна величина: %s"
+
+#: ../yum/depsolve.py:352
+#, python-format
+msgid "Mode is %s for provider of %s: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:356
+#, python-format
+msgid "Mode for pkg providing %s: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:360
+#, python-format
+msgid "TSINFO: %s package requiring %s marked as erase"
+msgstr "TSINFO: %s пакет захтева да %s буде означен за брисање"
+
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr "TSINFO: мењам %s са %s да бих разрешио зависност."
 
-#: ../yum/depsolve.py:276
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr "TSINFO: ажурирам %s да бих разрешио зависност."
 
-#: ../yum/depsolve.py:279
+#: ../yum/depsolve.py:378
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr "Не могу да пронађем путању ажурирања за зависност за: %s"
 
-#: ../yum/depsolve.py:283
+#: ../yum/depsolve.py:388
 #, python-format
-msgid "TSINFO: %s package requiring %s marked as erase"
-msgstr "TSINFO: %s пакет захтева да %s буде означен за брисање"
+msgid "Unresolvable requirement %s for %s"
+msgstr ""
 
 #. is it already installed?
-#: ../yum/depsolve.py:329
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr "%s је у пруженим пакета али је већ инсталиран, уклањам га."
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr "Потенцијално разрешавање пакета %s има новији примерак у ts-у."
 
-#: ../yum/depsolve.py:355
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr "Потенцијално разрешавање пакета %s има инсталиран нови примерак."
 
-#: ../yum/depsolve.py:363 ../yum/depsolve.py:412
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr "Недостаје зависност: %s је потребан од стране пакета %s"
 
-#: ../yum/depsolve.py:376
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr "%s је већ у ts-у, прескачем га"
 
-#: ../yum/depsolve.py:422
+#: ../yum/depsolve.py:510
+#, python-format
+msgid ""
+"Failure finding best provider of %s for %s, exceeded maximum loop length"
+msgstr ""
+
+#: ../yum/depsolve.py:537
 #, python-format
 msgid "TSINFO: Marking %s as update for %s"
 msgstr "TSINFO: означавам %s као ажурирање за %s"
 
-#: ../yum/depsolve.py:429
+#: ../yum/depsolve.py:544
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr "TSINFO: означавам %s као инсталацију за %s"
 
-#: ../yum/depsolve.py:520 ../yum/depsolve.py:613
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Успех - празна трансакција"
 
-#: ../yum/depsolve.py:565 ../yum/depsolve.py:585
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Поново покрећем петљу"
 
-#: ../yum/depsolve.py:601
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "Завршетак процеса зависности"
 
-#: ../yum/depsolve.py:607
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr "%s из %s има проблема са разрешавањем зависности"
 
-#: ../yum/depsolve.py:614
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "Успех - зависности су разрешене"
 
-#: ../yum/depsolve.py:628
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "Проверавам зависности за %s"
 
-#: ../yum/depsolve.py:690
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr "тражим %s као захтев за %s"
 
-#: ../yum/depsolve.py:817
+#: ../yum/depsolve.py:933
 #, python-format
-msgid "Running compare_providers() for %s"
-msgstr "Покрећем compare_providers() за %s"
+msgid "Comparing best: %s to po: %s"
+msgstr ""
 
-#: ../yum/depsolve.py:845 ../yum/depsolve.py:851
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, fuzzy, python-format
+msgid "best %s obsoletes po: %s"
+msgstr "%s превазилази %s"
+
+#: ../yum/depsolve.py:955
+#, fuzzy, python-format
+msgid "po %s obsoletes best: %s"
+msgstr "%s превазилази %s"
+
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
 #, python-format
 msgid "better arch in po %s"
 msgstr "боља архитектура у po %s"
 
-#: ../yum/depsolve.py:890
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
 #, python-format
-msgid "%s obsoletes %s"
-msgstr "%s превазилази %s"
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
 
-#: ../yum/depsolve.py:901
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
 #, python-format
-msgid ""
-"archdist compared %s to %s on %s\n"
-"  Winner: %s"
+msgid "best %s shares a sourcerpm with %s"
 msgstr ""
-"archdist упоредио %s са %s на %s\n"
-"  Победник: %s"
 
-#: ../yum/depsolve.py:908
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
 #, python-format
-msgid "common sourcerpm %s and %s"
-msgstr "заједнички изворни rpm %s и %s"
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
 
-#: ../yum/depsolve.py:914
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
 #, python-format
-msgid "common prefix of %s between %s and %s"
-msgstr "заједнички префикс %s између %s и %s"
+msgid "po %s has a shorter name than best %s"
+msgstr ""
 
-#: ../yum/depsolve.py:922
+#: ../yum/depsolve.py:1025
 #, python-format
-msgid "Best Order: %s"
-msgstr "Најбољи редослед: %s"
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
 
-#: ../yum/__init__.py:129
+#: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr "doConfigSetup() неће бити присутна у будућим верзијама Yum-а.\n"
 
-#: ../yum/__init__.py:303
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr "Ризници %r недостаје име у подешавањима, користим id"
 
-#: ../yum/__init__.py:339
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr "већ иницијализовани додаци"
 
-#: ../yum/__init__.py:346
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr "doRpmDBSetup() неће бити присутна у будућим верзијама Yum-а.\n"
 
-#: ../yum/__init__.py:356
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr "Читам локални RPMDB"
 
-#: ../yum/__init__.py:374
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr "doRepoSetup() неће бити присутна у будућим верзијама Yum-а.\n"
 
-#: ../yum/__init__.py:394
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr "doSackSetup() неће бити присутна у будућим верзијама Yum-а.\n"
 
-#: ../yum/__init__.py:411
+#: ../yum/__init__.py:404
 msgid "Setting up Package Sacks"
 msgstr "Постављам групе пакета"
 
-#: ../yum/__init__.py:454
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr "репо објекту за репо %s недостаје a _resetSack метода\n"
 
-#: ../yum/__init__.py:455
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr "због тога се овај репо не може вратити на почетну поставку.\n"
 
-#: ../yum/__init__.py:460
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr "doUpdateSetup() неће бити присутна у будућим верзијама Yum-а.\n"
 
-#: ../yum/__init__.py:472
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr "Изграђујем објекат ажурирња"
 
-#: ../yum/__init__.py:503
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr "doGroupSetup() неће бити присутна у будућим верзијама Yum-а.\n"
 
-#: ../yum/__init__.py:527
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Добављам метаподатке групе"
 
-#: ../yum/__init__.py:553
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr "Додајем датотеку групе из ризнице: %s"
 
-#: ../yum/__init__.py:562
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr "Нисам успео да додам датотеку групе за ризницу: %s - %s"
 
-#: ../yum/__init__.py:568
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Не постоји група која је доступна у било којој ризници"
 
-#: ../yum/__init__.py:618
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Увозим додатне информације о списковима датотека"
 
-#: ../yum/__init__.py:670
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Skip-broken етапа %i"
 
-#: ../yum/__init__.py:693
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr "Skip-broken је завршен у %i етапа "
 
-#: ../yum/__init__.py:694
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
@@ -1429,102 +1454,95 @@ msgstr ""
 "\n"
 "Пакети су прескочени због проблема са зависностима:"
 
-#: ../yum/__init__.py:698
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s из %s"
 
-#: ../yum/__init__.py:779
-msgid ""
-"Warning: scriptlet or other non-fatal errors occurred during transaction."
-msgstr ""
-"Упозорење: дошло је до грешке у скриптици или неке друге некритичне грешке "
-"током транскације."
-
-#: ../yum/__init__.py:794
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "Нисам успео да уклоним датотеку трансакције %s"
 
-#: ../yum/__init__.py:834
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "изузимам из трошка: %s из %s"
 
-#: ../yum/__init__.py:865
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Изузимам пакете у глобалном списку за изузимање"
 
-#: ../yum/__init__.py:867
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Изузимам пакете из %s"
 
-#: ../yum/__init__.py:895
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Сажимам %s само у садржане пакете"
 
-#: ../yum/__init__.py:900
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Задржавам садржани пакет %s"
 
-#: ../yum/__init__.py:906
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Уклањам неповезани пакет %s"
 
-#: ../yum/__init__.py:909
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "Завршио"
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:939
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "Нисам у могућнисти да проверим да ли је PID %s активан"
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:943
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr "Постоји закључавање %s: друга копија се извршава као pid %s."
 
-#: ../yum/__init__.py:1006
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "Пакет није одговарајући за намеравано преузимање"
 
-#: ../yum/__init__.py:1021
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "Не могу да извршим контролу суме"
 
-#: ../yum/__init__.py:1024
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "Пакет нема одговарајући контролну суму"
 
-#: ../yum/__init__.py:1068
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr ""
 "пакет нема одговарајућу вредност контролне суме или је за %s укључено "
 "кеширање"
 
-#: ../yum/__init__.py:1071
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "користим локални умножак %s-а"
 
-#: ../yum/__init__.py:1096
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr "Недовољна количина простора у директоријуму %s намењеног за преузимање"
 
-#: ../yum/__init__.py:1129
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "Заглавље није потпуно."
 
-#: ../yum/__init__.py:1169
+#: ../yum/__init__.py:1134
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1532,62 +1550,62 @@ msgstr ""
 "Заглавље није у локалном кешу и само начин рада са кеширањем је укључен. Не "
 "могу да преузмем %s"
 
-#: ../yum/__init__.py:1224
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr "Јавни кључ за %s није инсталиран"
 
-#: ../yum/__init__.py:1228
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Проблем са отварањем пакета %s"
 
-#: ../yum/__init__.py:1236
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr "Јавни кључ за %s није поверљив"
 
-#: ../yum/__init__.py:1240
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Пакет %s није потписан"
 
-#: ../yum/__init__.py:1278
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Не могу да уклоним %s"
 
-#: ../yum/__init__.py:1282
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "%s је уклоњен"
 
-#: ../yum/__init__.py:1318
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Не могу да уклоним %s датотеку %s"
 
-#: ../yum/__init__.py:1322
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "%s датотека %s је уклоњена"
 
-#: ../yum/__init__.py:1324
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d %s датотеке су уклоњене"
 
-#: ../yum/__init__.py:1378
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr "Постоји више од једног идентичног слагања у групи за %s"
 
-#: ../yum/__init__.py:1384
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr "Ништа се не слаже са %s.%s %s:%s-%s из ажурирања"
 
-#: ../yum/__init__.py:1577
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
@@ -1595,155 +1613,141 @@ msgstr ""
 "searchPackages() неће бити присутна у будућим верзијама Yum-"
 "а.                      Уместо ње користите searchGenerator(). \n"
 
-#: ../yum/__init__.py:1614
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "Претражујем %d пакете"
 
-#: ../yum/__init__.py:1618
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "тражим пакет %s"
 
-#: ../yum/__init__.py:1630
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "тражим у уносима датотека"
 
-#: ../yum/__init__.py:1637
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "тражим у уносима достављача"
 
-#: ../yum/__init__.py:1667
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Доставља-слагање: %s"
 
-#: ../yum/__init__.py:1736 ../yum/__init__.py:1755 ../yum/__init__.py:1782
-#: ../yum/__init__.py:1788 ../yum/__init__.py:1844 ../yum/__init__.py:1848
+#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
+#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
 #, python-format
 msgid "No Group named %s exists"
 msgstr "Не постоји група под именом %s"
 
-#: ../yum/__init__.py:1767 ../yum/__init__.py:1861
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr "пакет %s није означен у групи %s"
 
-#: ../yum/__init__.py:1806
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr "Додајем пакет %s из групе %s"
 
-#: ../yum/__init__.py:1810
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr "Ниједан пакет под именом %s није доступан за инсталацију"
 
-#: ../yum/__init__.py:1886
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr "Група пакета %s није нађена у packagesack-у"
 
-#: ../yum/__init__.py:1954 ../yum/__init__.py:1994
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr ""
 "Неисправна ниска зависности са верзијом, покушајте да је обележите "
 "наводницима."
 
-#: ../yum/__init__.py:1956 ../yum/__init__.py:1996
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Погрешна ознака верзије"
 
-#: ../yum/__init__.py:1968 ../yum/__init__.py:1972
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "Нема пронађених пакета за %s"
 
-#: ../yum/__init__.py:2100
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr "Објекат пакета није био примерак објекта пакета"
 
-#: ../yum/__init__.py:2104
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr "Није одређено ништа за инсталацију"
 
 #. only one in there
-#: ../yum/__init__.py:2119
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr "Проверавам виртуелну доставу или доставу датотеке за %s"
 
-#: ../yum/__init__.py:2125 ../yum/__init__.py:2440
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr "Не постоји слагање за аргумент: %s"
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2180
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr "Нема пакета доступних за инсталацију"
 
-#: ../yum/__init__.py:2192
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr "Пакет: %s  - већ је у скупу трансакције"
 
-#: ../yum/__init__.py:2205
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr "Већ је инсталирана најновија верзија пакета %s"
 
-#: ../yum/__init__.py:2212
+#: ../yum/__init__.py:2178
 #, python-format
 msgid "Package matching %s already installed. Checking for update."
 msgstr ""
 "Пакет који се поклапа са %s је већ инсталиран. Проверавам за новију верзију."
 
-#: ../yum/__init__.py:2223
-#, python-format
-msgid "Package %s is obsoleted by %s, trying to install %s instead"
-msgstr "Пакет %s је замењен пакетом %s, покушавам да наместо инсталирам %s"
-
 #. update everything (the easy case)
-#: ../yum/__init__.py:2256
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Ажурирам све"
 
-#: ../yum/__init__.py:2359
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Пакет је већ превазиђен: %s.%s %s:%s-%s"
 
-#: ../yum/__init__.py:2383
-#, python-format
-msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
-msgstr "Не ажурирам пакете који су већ ажурирани: %s.%s %s:%s-%s"
-
-#: ../yum/__init__.py:2437
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#. FIXME we should give the caller some nice way to hush this warning
-#. probably just a kwarg of 'silence_warnings' or something
-#. b/c when this is called from groupRemove() it makes a lot of
-#. garbage noise
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Ниједан пакет није одређен за уклањање"
 
-#: ../yum/__init__.py:2490
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Не могу да отворим датотеку: %s. Прескачем је."
 
-#: ../yum/__init__.py:2493
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Испитујем %s: %s"
 
-#: ../yum/__init__.py:2500
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
@@ -1752,79 +1756,79 @@ msgstr ""
 "Пакет %s није инсталиран, не могу да га ажурирам. Извршите yum инсталацију "
 "да бисте га инсталирали."
 
-#: ../yum/__init__.py:2533
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Изузимам %s"
 
-#: ../yum/__init__.py:2538
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Означавам %s за инсталацију"
 
-#: ../yum/__init__.py:2544
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr "Означавам %s као ажурирање за %s"
 
-#: ../yum/__init__.py:2551
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr "%s: не ажурира инсталирани пакет."
 
-#: ../yum/__init__.py:2569
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr ""
 "Проблем при поновној инсталацији: ниједан пакет није одређен за уклањање"
 
-#: ../yum/__init__.py:2580
+#: ../yum/__init__.py:2515
 #, python-format
 msgid "Package %s is allowed multiple installs, skipping"
 msgstr "Пакету %s су дозвољене многоструке инсталације, прескачем га"
 
-#: ../yum/__init__.py:2587
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr ""
 "Проблем при поновној инсталацији: ниједан пакет није одређен за инсталацију"
 
-#: ../yum/__init__.py:2635
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr "Добављам GPG кључ са %s"
 
-#: ../yum/__init__.py:2641
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "Добављање GPG кључа није успело: "
 
-#: ../yum/__init__.py:2654
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "Рашчлањивање GPG кључа није успело: "
 
-#: ../yum/__init__.py:2658
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr "GPG кључ на %s (0x%s) је већ инсталиран"
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2663
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr "Увозим GPG кључ 0x%s „%s“ из %s"
 
-#: ../yum/__init__.py:2675
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "Не инсталирам кључ"
 
-#: ../yum/__init__.py:2681
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "Није успео увоз кључа (код %d)"
 
-#: ../yum/__init__.py:2684
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "Кључ је успешно увезен"
 
-#: ../yum/__init__.py:2689
+#: ../yum/__init__.py:2624
 #, python-format
 msgid ""
 "The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1835,53 +1839,53 @@ msgstr ""
 "одговарајући за овај пакет.\n"
 "Проверите да ли су подешени одговарајући УРЛ-ови кључева за ову ризницу."
 
-#: ../yum/__init__.py:2698
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr "Увоз кључа(кључева) није помогао, погрешан кључ(кључеви)?"
 
-#: ../yum/__init__.py:2778
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "Не могу да пронађем одговарајући одраз."
 
-#: ../yum/__init__.py:2780
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr "Појавиле су се грешке за време преузимања пакета."
 
-#: ../yum/__init__.py:2844
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Грешке при провери трансакције: "
 
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:197
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "Учитани додаци: "
 
-#: ../yum/plugins.py:208
+#: ../yum/plugins.py:206
 #, python-format
 msgid "No plugin match for: %s"
 msgstr "Не постоји слагање за додатак: %s"
 
-#: ../yum/plugins.py:221
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "„%s“ додатак је искључен"
 
-#: ../yum/plugins.py:233
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr "Додатак „%s“ не одређује верзију захтеваног API-а"
 
-#: ../yum/plugins.py:237
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr "Додатак „%s“ захтева API %s. Подржани API је %s."
 
-#: ../yum/plugins.py:266
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Учитавам „%s“ додатак"
 
-#: ../yum/plugins.py:273
+#: ../yum/plugins.py:271
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
@@ -1889,26 +1893,22 @@ msgstr ""
 "У путањи за претраживање додатака постоје два или више додатака под именом „%"
 "s“"
 
-#: ../yum/plugins.py:293
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr "Датотека подешавања %s није пронађена"
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:296
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr "Не могу да пронађем датотеку подешавања за додатак %s"
 
-#: ../yum/plugins.py:450
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "регистрација команди није подржана"
 
-#: ../yum/rpmtrans.py:78
-msgid "Repackaging"
-msgstr "Поновно паковање"
-
 #: ../rpmUtils/oldUtils.py:26
 #, python-format
 msgid "Header cannot be opened or does not match %s, %s."
@@ -1939,3 +1939,64 @@ msgstr "Оштећено заглавље %s"
 #, python-format
 msgid "Error opening rpm %s - error %s"
 msgstr "Грешка при отварању rpm-а %s - грешка %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s option requires an argument"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s опција захтева аргумент"
+
+#~ msgid "show this help message and exit"
+#~ msgstr "прикажи ову помоћну поруку и изађи"
+
+#~ msgid "verbose operation"
+#~ msgstr "опширна радња"
+
+#~ msgid "Repo-id     : "
+#~ msgstr "ИБ ризнице      : "
+
+#~ msgid "Repo-name   : "
+#~ msgstr "Име ризнице     : "
+
+#~ msgid "Repo-enabled: "
+#~ msgstr "Ризница укључена: "
+
+#~ msgid "Repo-size   : "
+#~ msgstr "Величина ризнице: "
+
+#~ msgid "Running compare_providers() for %s"
+#~ msgstr "Покрећем compare_providers() за %s"
+
+#~ msgid ""
+#~ "archdist compared %s to %s on %s\n"
+#~ "  Winner: %s"
+#~ msgstr ""
+#~ "archdist упоредио %s са %s на %s\n"
+#~ "  Победник: %s"
+
+#~ msgid "common sourcerpm %s and %s"
+#~ msgstr "заједнички изворни rpm %s и %s"
+
+#~ msgid "common prefix of %s between %s and %s"
+#~ msgstr "заједнички префикс %s између %s и %s"
+
+#~ msgid "Best Order: %s"
+#~ msgstr "Најбољи редослед: %s"
+
+#~ msgid ""
+#~ "Warning: scriptlet or other non-fatal errors occurred during transaction."
+#~ msgstr ""
+#~ "Упозорење: дошло је до грешке у скриптици или неке друге некритичне "
+#~ "грешке током транскације."
+
+#~ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+#~ msgstr "Пакет %s је замењен пакетом %s, покушавам да наместо инсталирам %s"
+
+#~ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+#~ msgstr "Не ажурирам пакете који су већ ажурирани: %s.%s %s:%s-%s"
+
+#~ msgid "Repackaging"
+#~ msgstr "Поновно паковање"
diff --git a/po/sr at latin.po b/po/sr at latin.po
index e053e91..dba9dcc 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-26 13:28+0000\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-05-26 20:30-0000\n"
 "Last-Translator: Miloš Komarčević <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
@@ -20,24 +20,23 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../callback.py:48 ../output.py:516 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Ažuriram"
 
-#: ../callback.py:49 ../yum/rpmtrans.py:72
+#: ../callback.py:49
 msgid "Erasing"
 msgstr "Brišem"
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:515
-#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Instaliram"
 
-#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
+#: ../callback.py:52 ../callback.py:58
 msgid "Obsoleted"
 msgstr "Prevaziđeni"
 
-#: ../callback.py:54 ../output.py:562
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Ažurirani"
 
@@ -45,7 +44,7 @@ msgstr "Ažurirani"
 msgid "Erased"
 msgstr "Obrisani"
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:560
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "Instalirani"
 
@@ -67,53 +66,53 @@ msgstr "Greška: pogrešno izlazno stanje: %s za %s"
 msgid "Erased: %s"
 msgstr "Obrisano: %s"
 
-#: ../callback.py:217 ../output.py:517
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Uklanjam"
 
-#: ../callback.py:219 ../yum/rpmtrans.py:77
+#: ../callback.py:219
 msgid "Cleanup"
 msgstr "Čišćenje"
 
-#: ../cli.py:105
+#: ../cli.py:103
 #, python-format
 msgid "Command \"%s\" already defined"
 msgstr "Naredba „%s“ je već definisana"
 
-#: ../cli.py:117
+#: ../cli.py:115
 msgid "Setting up repositories"
 msgstr "Postavljam riznice"
 
-#: ../cli.py:128
+#: ../cli.py:126
 msgid "Reading repository metadata in from local files"
 msgstr "ÄŒitam metapodatke riznica iz lokalnih datoteka"
 
-#: ../cli.py:185 ../utils.py:71
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "Greška pri podešavanju: %s"
 
-#: ../cli.py:188 ../cli.py:1080 ../utils.py:74
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Greška u opcijama: %s"
 
-#: ../cli.py:231
+#: ../cli.py:229
 msgid "You need to give some command"
 msgstr "Morate da unesete neku komandu"
 
-#: ../cli.py:273
+#: ../cli.py:271
 msgid "Disk Requirements:\n"
 msgstr "Zahtevi diska:\n"
 
-#: ../cli.py:275
+#: ../cli.py:273
 #, python-format
 msgid "  At least %dMB needed on the %s filesystem.\n"
 msgstr "  Potrebno je najmanje %dMB na %s sistemu datoteka.\n"
 
 #. TODO: simplify the dependency errors?
 #. Fixup the summary
-#: ../cli.py:280
+#: ../cli.py:278
 msgid ""
 "Error Summary\n"
 "-------------\n"
@@ -121,55 +120,55 @@ msgstr ""
 "Sažetak grešaka\n"
 "-------------\n"
 
-#: ../cli.py:319
+#: ../cli.py:317
 msgid "Trying to run the transaction but nothing to do. Exiting."
 msgstr "Pokušavam da izvršim transakciju ali nema šta da se radi. Izlazim."
 
-#: ../cli.py:349
+#: ../cli.py:347
 msgid "Exiting on user Command"
 msgstr "Izlazim na komandu korisnika"
 
-#: ../cli.py:353
+#: ../cli.py:351
 msgid "Downloading Packages:"
 msgstr "Preuzimam pakete:"
 
-#: ../cli.py:358
+#: ../cli.py:356
 msgid "Error Downloading Packages:\n"
 msgstr "Greška pri preuzimanju paketa:\n"
 
-#: ../cli.py:372 ../yum/__init__.py:2816
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "Izvršavam rpm_check_debug"
 
-#: ../cli.py:375 ../yum/__init__.py:2819
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr "GREÅ KA sa rpm_check_debug u odnosu na depsolve:"
 
-#: ../cli.py:379 ../yum/__init__.py:2821
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Molim vas, prijavite ovu grešku u bugzilli"
 
-#: ../cli.py:385
+#: ../cli.py:383
 msgid "Running Transaction Test"
 msgstr "Izvršavam proveru transakcije"
 
-#: ../cli.py:401
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr "Završio sam proveru transakcije"
 
-#: ../cli.py:403
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr "Greška pri proveri transakcije:\n"
 
-#: ../cli.py:410
+#: ../cli.py:408
 msgid "Transaction Test Succeeded"
 msgstr "Provera transakcije je uspela"
 
-#: ../cli.py:431
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr "Izvršavam transakciju"
 
-#: ../cli.py:461
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
@@ -177,315 +176,296 @@ msgstr ""
 "Odbijam da automatski uvezem ključeve kada se izvršavanje ne nadgleda.\n"
 "Za prevazilaženje ovoga koristite „-y“."
 
-#: ../cli.py:493
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr "Raščlanjujem argumente instalacije paketa"
 
-#: ../cli.py:503
+#: ../cli.py:501
 #, python-format
 msgid "No package %s available."
 msgstr "Ne postoji dostupan %s paket."
 
-#: ../cli.py:507 ../cli.py:625 ../yumcommands.py:790
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Paket(i) koji će se instalirati"
 
-#: ../cli.py:508 ../cli.py:626 ../yumcommands.py:147 ../yumcommands.py:791
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr "Nema Å¡ta da se radi"
 
-#: ../cli.py:538 ../yum/__init__.py:2268 ../yum/__init__.py:2368
-#: ../yum/__init__.py:2380
+#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
+#: ../yum/__init__.py:2340
 #, python-format
 msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Ne ažuriram pakete koji su već prevaziđeni: %s.%s %s:%s-%s"
 
-#: ../cli.py:570
+#: ../cli.py:568
 #, python-format
 msgid "Could not find update match for %s"
 msgstr "Ne mogu da pronađem odgovarajuće ažuriranje za %s"
 
-#: ../cli.py:582
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr "%d paketi označeni za ažuriranje"
 
-#: ../cli.py:585
+#: ../cli.py:583
 msgid "No Packages marked for Update"
 msgstr "Nema paketa označenih za ažuriranje"
 
-#: ../cli.py:601
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr "%d paketi označeni za uklanjanje"
 
-#: ../cli.py:604
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr "Nema paketa označenih za uklanjanje"
 
-#: ../cli.py:616
+#: ../cli.py:614
 msgid "No Packages Provided"
 msgstr "Nijedan paket nije dobavljen"
 
-#: ../cli.py:656
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr "Povezivanje paketa za spisak paketa po argumentima korisnika"
 
-#: ../cli.py:704
+#: ../cli.py:701
 #, python-format
 msgid "Warning: No matches found for: %s"
 msgstr "Upozorenje: nije nađeno podudaranje za %s"
 
-#: ../cli.py:707
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Nisu pronađena podudaranja"
 
-#: ../cli.py:748
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Nisu pronađeni paketi za %s"
 
-#: ../cli.py:760
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "ÄŒistim sve"
 
-#: ../cli.py:774
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "ÄŒistim zaglavlja"
 
-#: ../cli.py:777
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "ÄŒistim pakete"
 
-#: ../cli.py:780
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "ÄŒistim xml metapodatke"
 
-#: ../cli.py:783
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "Čistim keš baza podataka"
 
-#: ../cli.py:786
+#: ../cli.py:783
 msgid "Cleaning up expire-cache metadata"
 msgstr "ÄŒistim expire-cache metapodatke"
 
-#: ../cli.py:789
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "ÄŒistim dodatke"
 
-#: ../cli.py:811
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Instalirane grupe:"
 
-#: ../cli.py:818
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "Dostupne grupe:"
 
-#: ../cli.py:824
+#: ../cli.py:820
 msgid "Done"
 msgstr "Urađeno"
 
-#: ../cli.py:835 ../cli.py:853 ../cli.py:859
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "Upozorenje: grupa %s ne postoji."
 
-#: ../cli.py:863
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
 msgstr ""
 "Nema dostupnih paketa za instalaciju ili ažuriranje u svim zahtevanim grupama"
 
-#: ../cli.py:865
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d paket(i) za instalaciju"
 
-#: ../cli.py:875
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Ne postoji grupa pod imenom %s"
 
-#: ../cli.py:881
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Nema paketa za uklanjanje iz grupa"
 
-#: ../cli.py:883
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d  paket(i) za uklanjanje"
 
-#: ../cli.py:925
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "Paket %s je već instaliran, preskačem ga"
 
-#: ../cli.py:936
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr "Uklanjam neuporediv paket %s.%s"
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:962
+#: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
 msgstr ""
 "Ne postoji instaliran drugi %s, dodajem ga u spisak za potencijalnu "
 "instalaciju"
 
-#: ../cli.py:981
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "Greška komandne linije: %s"
 
-#: ../cli.py:993
-#, python-format
-msgid ""
-"\n"
-"\n"
-"%s: %s option requires an argument"
-msgstr ""
-"\n"
-"\n"
-"%s: %s opcija zahteva argument"
-
-#: ../cli.py:1122
-msgid "show this help message and exit"
-msgstr "prikaži ovu pomoćnu poruku i izađi"
-
-#: ../cli.py:1126
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "budi tolerantan na greške"
 
-#: ../cli.py:1128
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr "izvršavaj se u potpunosti iz keša, ne ažuriraj keš"
 
-#: ../cli.py:1130
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "mesto datoteke podešavanja"
 
-#: ../cli.py:1132
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "najduže vreme čekanja na komandu"
 
-#: ../cli.py:1134
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "nivo izlaznog prikaza za pronalaženje grešaka"
 
-#: ../cli.py:1138
+#: ../cli.py:1113
 msgid "show duplicates, in repos, in list/search commands"
 msgstr ""
 "prikazuj duplikate, u riznicama, u komandama za izlistavanje/pretraživanje"
 
-#: ../cli.py:1140
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "nivo izlaznog prikaza grešaka"
 
-#: ../cli.py:1143
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "tiha radnja"
 
-#: ../cli.py:1145
-msgid "verbose operation"
-msgstr "opširna radnja"
-
-#: ../cli.py:1147
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "odgovori sa da na sva pitanja"
 
-#: ../cli.py:1149
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "prikaži verziju Yum-a i izađi"
 
-#: ../cli.py:1150
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "postavi koreni direktorijum instalacije"
 
-#: ../cli.py:1154
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "uključi jednu ili više riznica (skraćenice su dozvoljene)"
 
-#: ../cli.py:1158
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr "isključi jednu ili više riznica (skraćenice su dozvoljene)"
 
-#: ../cli.py:1161
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr "izuzmite paket(e) po imenu ili glob-u"
 
-#: ../cli.py:1163
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
 msgstr "isključi izuzimanje iz glavnog skupa, za riznicu ili za sve"
 
-#: ../cli.py:1166
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr "uključi obradu zastarelih paketa u toku ažuriranja"
 
-#: ../cli.py:1168
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "isključi dodatke za Yum"
 
-#: ../cli.py:1170
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "isključi proveru gpg potpisa"
 
-#: ../cli.py:1172
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "isključi dodatke po imenu"
 
-#: ../cli.py:1175
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "preskoči pakete koji imaju problema sa rešavanjem zavisnosti"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Jan"
 msgstr "jan"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Feb"
 msgstr "feb"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Mar"
 msgstr "mar"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Apr"
 msgstr "apr"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "May"
 msgstr "maj"
 
-#: ../output.py:228
+#: ../output.py:229
 msgid "Jun"
 msgstr "jun"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Jul"
 msgstr "jul"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Aug"
 msgstr "avg"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Sep"
 msgstr "sep"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Oct"
 msgstr "okt"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Nov"
 msgstr "nov"
 
-#: ../output.py:229
+#: ../output.py:230
 msgid "Dec"
 msgstr "dec"
 
-#: ../output.py:239
+#: ../output.py:240
 msgid "Trying other mirror."
 msgstr "Pokušavam drugi odraz."
 
@@ -551,23 +531,23 @@ msgstr "Opis       : "
 msgid "Is this ok [y/N]: "
 msgstr "Da li je ovo u redu [d/N]: "
 
-#: ../output.py:359 ../output.py:362
+#: ../output.py:357 ../output.py:360
 msgid "y"
 msgstr "d"
 
-#: ../output.py:359
+#: ../output.py:357
 msgid "n"
 msgstr "n"
 
-#: ../output.py:359 ../output.py:362
+#: ../output.py:357 ../output.py:360
 msgid "yes"
 msgstr "da"
 
-#: ../output.py:359
+#: ../output.py:357
 msgid "no"
 msgstr "ne"
 
-#: ../output.py:370
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -576,96 +556,96 @@ msgstr ""
 "\n"
 "Grupa: %s"
 
-#: ../output.py:372
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " Opis: %s"
 
-#: ../output.py:374
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr " Obavezni paketi:"
 
-#: ../output.py:379
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr " Podrazumevani paketi:"
 
-#: ../output.py:384
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr " Izborni paketi:"
 
-#: ../output.py:389
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr " Uslovljeni paketi:"
 
-#: ../output.py:398
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "paket: %s"
 
-#: ../output.py:400
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr "  Ne postoje zavisnosti ovog paketa"
 
-#: ../output.py:405
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr "  zavisnost: %s"
 
-#: ../output.py:407
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr "   Nezadovoljena zavisnost"
 
-#: ../output.py:465
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Povezan iz:"
 
-#: ../output.py:491
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr "Dogodila se greška pri računanju ukupne veličine za preuzimanje"
 
-#: ../output.py:496
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "Ukupna veličina: %s"
 
-#: ../output.py:499
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "Ukupna veličina za preuzimanje: %s"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Package"
 msgstr "Paket"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Arch"
 msgstr "Arhitektura"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Version"
 msgstr "Verzija"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Repository"
 msgstr "Riznica"
 
-#: ../output.py:511
+#: ../output.py:507
 msgid "Size"
 msgstr "Veličina"
 
-#: ../output.py:518
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Instaliram zbog zavisnosti"
 
-#: ../output.py:519
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Ažuriram zbog zavisnosti"
 
-#: ../output.py:520
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Uklanjam zbog zavisnosti"
 
-#: ../output.py:532
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
@@ -674,7 +654,7 @@ msgstr ""
 "     uklanjam  %s.%s %s\n"
 "\n"
 
-#: ../output.py:540
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -691,27 +671,27 @@ msgstr ""
 "ažuriranje    %5.5s paket(a)       \n"
 "uklanjanje     %5.5s paket(a)       \n"
 
-#: ../output.py:558
+#: ../output.py:554
 msgid "Removed"
 msgstr "Uklonjeno"
 
-#: ../output.py:559
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "Zavisnost uklonjena"
 
-#: ../output.py:561
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "Zavisnost instalirana"
 
-#: ../output.py:563
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "Zavisnost ažurirana"
 
-#: ../output.py:564
+#: ../output.py:560
 msgid "Replaced"
 msgstr "Zamenjeno"
 
-#: ../output.py:622
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
@@ -722,73 +702,73 @@ msgstr ""
 " Trenutno preuzimanje je obustavljeno, %sinterrupt (ctrl-c) još jednom%s u "
 "toku %s%s%s sekundi da biste izašli.\n"
 
-#: ../output.py:632
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "prekid od strane korisnika"
 
-#: ../output.py:643
+#: ../output.py:639
 msgid "installed"
 msgstr "instaliran"
 
-#: ../output.py:644
+#: ../output.py:640
 msgid "updated"
 msgstr "ažuriran"
 
-#: ../output.py:645
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "prevaziđen"
 
-#: ../output.py:646
+#: ../output.py:642
 msgid "erased"
 msgstr "obrisan"
 
-#: ../output.py:650
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> Paket %s.%s %s:%s-%s postavljen da bude %s"
 
-#: ../output.py:657
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> Izvršava se provera transakcije"
 
-#: ../output.py:662
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr "--> Ponovno pokretanje razrešavanja zavisnosti sa novim promenama."
 
-#: ../output.py:667
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> Završeno je razrešavanje zavisnosti"
 
-#: ../output.py:672
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr "--> Obrađujem zavisnost: %s za paket: %s"
 
-#: ../output.py:677
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> Nerazrešena zavisnost: %s"
 
-#: ../output.py:683
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Sukob pri obradi: %s se sukobi sa %s"
 
-#: ../output.py:686
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr ""
 "--> Popunjavam skup transakcije sa izabranim paketima. Molim vas, sačekajte."
 
-#: ../output.py:690
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr "---> Preuzimam zaglavlje za %s radi pakovanja u skup transakcije."
 
-#: ../yumcommands.py:37
+#: ../yumcommands.py:36
 msgid "You need to be root to perform this command."
 msgstr "Morate biti root korisnik da biste izvršili ovu komandu."
 
-#: ../yumcommands.py:44
+#: ../yumcommands.py:43
 msgid ""
 "\n"
 "You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -819,267 +799,252 @@ msgstr ""
 "\n"
 "Za više informacija kontaktirajte dobavljača vaše distribucije ili paketa.\n"
 
-#: ../yumcommands.py:64
+#: ../yumcommands.py:63
 #, python-format
 msgid "Error: Need to pass a list of pkgs to %s"
 msgstr "Greška: potrebno je da dodate spisak paketa %s-u"
 
-#: ../yumcommands.py:70
+#: ../yumcommands.py:69
 msgid "Error: Need an item to match"
 msgstr "Greška: potrebno je pridružiti stavku"
 
-#: ../yumcommands.py:76
+#: ../yumcommands.py:75
 msgid "Error: Need a group or list of groups"
 msgstr "Greška: potrebna je grupa ili spisak grupa"
 
-#: ../yumcommands.py:85
+#: ../yumcommands.py:84
 #, python-format
 msgid "Error: clean requires an option: %s"
 msgstr "Greška: clean zahteva opciju: %s"
 
-#: ../yumcommands.py:90
+#: ../yumcommands.py:89
 #, python-format
 msgid "Error: invalid clean argument: %r"
 msgstr "Greška: pogrešan clean argument:%r"
 
-#: ../yumcommands.py:103
+#: ../yumcommands.py:102
 msgid "No argument to shell"
 msgstr "Ne postoji argument za komandno okruženje"
 
-#: ../yumcommands.py:106
+#: ../yumcommands.py:105
 #, python-format
 msgid "Filename passed to shell: %s"
 msgstr "Ime datoteke je prosleđeno komandnom okruženju: %s"
 
-#: ../yumcommands.py:110
+#: ../yumcommands.py:109
 #, python-format
 msgid "File %s given as argument to shell does not exist."
 msgstr ""
 "Ne postoji datoteka %s, koja je prosleđena kao argument komadnom okruženju."
 
-#: ../yumcommands.py:116
+#: ../yumcommands.py:115
 msgid "Error: more than one file given as argument to shell."
 msgstr ""
-"Greška: više od jedne datoteke je prosleđeno kao argument komandnom okruženju."
+"Greška: više od jedne datoteke je prosleđeno kao argument komandnom "
+"okruženju."
 
-#: ../yumcommands.py:157
+#: ../yumcommands.py:156
 msgid "PACKAGE..."
 msgstr "PAKET..."
 
-#: ../yumcommands.py:160
+#: ../yumcommands.py:159
 msgid "Install a package or packages on your system"
 msgstr "Instalirajte paket ili pakete na vaš sistem"
 
-#: ../yumcommands.py:169
+#: ../yumcommands.py:168
 msgid "Setting up Install Process"
 msgstr "Postavljam proces instalacije"
 
-#: ../yumcommands.py:180
+#: ../yumcommands.py:179
 msgid "[PACKAGE...]"
 msgstr "[PAKET...]"
 
-#: ../yumcommands.py:183
+#: ../yumcommands.py:182
 msgid "Update a package or packages on your system"
 msgstr "Ažuriraj paket ili pakete na vašem sistemu"
 
-#: ../yumcommands.py:191
+#: ../yumcommands.py:190
 msgid "Setting up Update Process"
 msgstr "Postavljam proces ažuriranja"
 
-#: ../yumcommands.py:205
+#: ../yumcommands.py:204
 msgid "Display details about a package or group of packages"
 msgstr "Prikaži detalje o svakom paketu ili grupi paketa"
 
-#: ../yumcommands.py:213
+#: ../yumcommands.py:212
 msgid "Installed Packages"
 msgstr "Instalirani paketi"
 
-#: ../yumcommands.py:214
+#: ../yumcommands.py:213
 msgid "Available Packages"
 msgstr "Dostupni paketi"
 
-#: ../yumcommands.py:215
+#: ../yumcommands.py:214
 msgid "Extra Packages"
 msgstr "Dodatni paketi"
 
-#: ../yumcommands.py:216
+#: ../yumcommands.py:215
 msgid "Updated Packages"
 msgstr "Ažurirani paketi"
 
-#: ../yumcommands.py:222 ../yumcommands.py:228
+#: ../yumcommands.py:221 ../yumcommands.py:225
 msgid "Obsoleting Packages"
 msgstr "Prevaziđeni paketi"
 
-#: ../yumcommands.py:229
+#: ../yumcommands.py:226
 msgid "Recently Added Packages"
 msgstr "Nedavno dodati paketi"
 
-#: ../yumcommands.py:235
+#: ../yumcommands.py:232
 msgid "No matching Packages to list"
 msgstr "Ne postoje odgovarajući paketi za izlistavanje"
 
-#: ../yumcommands.py:249
+#: ../yumcommands.py:246
 msgid "List a package or groups of packages"
 msgstr "Izlistaj pakete ili grupe paketa"
 
-#: ../yumcommands.py:261
+#: ../yumcommands.py:258
 msgid "Remove a package or packages from your system"
 msgstr "Uklonite paket ili pakete sa vašeg sistema"
 
-#: ../yumcommands.py:269
+#: ../yumcommands.py:266
 msgid "Setting up Remove Process"
 msgstr "Postavljam proces uklanjanja"
 
-#: ../yumcommands.py:281
+#: ../yumcommands.py:278
 msgid "Setting up Group Process"
 msgstr "Postavljam proces za grupe"
 
-#: ../yumcommands.py:287
+#: ../yumcommands.py:284
 msgid "No Groups on which to run command"
 msgstr "Ne postoji grupa nad kojom se može izvršiti komanda"
 
-#: ../yumcommands.py:300
+#: ../yumcommands.py:297
 msgid "List available package groups"
 msgstr "Izlistaj dostupne grupe paketa"
 
-#: ../yumcommands.py:317
+#: ../yumcommands.py:314
 msgid "Install the packages in a group on your system"
 msgstr "Instalirajte pakete u grupi na vašem sistemu"
 
-#: ../yumcommands.py:339
+#: ../yumcommands.py:336
 msgid "Remove the packages in a group from your system"
 msgstr "Uklonite pakete u grupi sa vašeg sistema"
 
-#: ../yumcommands.py:363
+#: ../yumcommands.py:360
 msgid "Display details about a package group"
 msgstr "Prikaži detalje o grupi paketa"
 
-#: ../yumcommands.py:387
+#: ../yumcommands.py:384
 msgid "Generate the metadata cache"
 msgstr "Napravi keš sa metapodacima"
 
-#: ../yumcommands.py:393
+#: ../yumcommands.py:390
 msgid "Making cache files for all metadata files."
 msgstr "Pravim keš datoteke za sve datoteke sa metapodacima."
 
-#: ../yumcommands.py:394
+#: ../yumcommands.py:391
 msgid "This may take a while depending on the speed of this computer"
 msgstr "Ovo može da potraje u zavisnosti od brzine vašeg računara"
 
-#: ../yumcommands.py:415
+#: ../yumcommands.py:412
 msgid "Metadata Cache Created"
 msgstr "Napravljen je keš sa metapodacima"
 
-#: ../yumcommands.py:429
+#: ../yumcommands.py:426
 msgid "Remove cached data"
 msgstr "Ukloni keširane podatke"
 
-#: ../yumcommands.py:450
+#: ../yumcommands.py:447
 msgid "Find what package provides the given value"
 msgstr "Pronađi koji paket pruža datu vrednost"
 
-#: ../yumcommands.py:470
+#: ../yumcommands.py:467
 msgid "Check for available package updates"
 msgstr "Proverite da li su dostupna ažuriranja paketa"
 
-#: ../yumcommands.py:493
+#: ../yumcommands.py:490
 msgid "Search package details for the given string"
 msgstr "Pretražite detalje o paketu za zadatu nisku"
 
-#: ../yumcommands.py:499
+#: ../yumcommands.py:496
 msgid "Searching Packages: "
 msgstr "Pretražujem pakete: "
 
-#: ../yumcommands.py:516
+#: ../yumcommands.py:513
 msgid "Update packages taking obsoletes into account"
 msgstr "Ažurirajte pakete uzimajući prevaziđene u obzir"
 
-#: ../yumcommands.py:525
+#: ../yumcommands.py:522
 msgid "Setting up Upgrade Process"
 msgstr "Postavljam proces nadgradnje"
 
-#: ../yumcommands.py:539
+#: ../yumcommands.py:536
 msgid "Install a local RPM"
 msgstr "Instaliraj lokalni RPM"
 
-#: ../yumcommands.py:548
+#: ../yumcommands.py:545
 msgid "Setting up Local Package Process"
 msgstr "Postavljam proces lokalnih paketa"
 
-#: ../yumcommands.py:567
+#: ../yumcommands.py:564
 msgid "Determine which package provides the given dependency"
 msgstr "Odredi koji paketi pružaju datu zavisnost"
 
-#: ../yumcommands.py:570
+#: ../yumcommands.py:567
 msgid "Searching Packages for Dependency:"
 msgstr "Pretražujem pakete u potrazi za zavisnostima:"
 
-#: ../yumcommands.py:584
+#: ../yumcommands.py:581
 msgid "Run an interactive yum shell"
 msgstr "Izvršavaj interaktivno komandno okruženje yum-a"
 
-#: ../yumcommands.py:590
+#: ../yumcommands.py:587
 msgid "Setting up Yum Shell"
 msgstr "Postavljam Yum komandno okruženje"
 
-#: ../yumcommands.py:608
+#: ../yumcommands.py:605
 msgid "List a package's dependencies"
 msgstr "Izlistaj zavisnosti paketa"
 
-#: ../yumcommands.py:614
+#: ../yumcommands.py:611
 msgid "Finding dependencies: "
 msgstr "Tražim zavisnosti: "
 
-#: ../yumcommands.py:630
+#: ../yumcommands.py:627
 msgid "Display the configured software repositories"
 msgstr "Prikaži podešene softverske riznice"
 
-#: ../yumcommands.py:666
-msgid "enabled"
-msgstr "uključena"
-
-#: ../yumcommands.py:673
-msgid "disabled"
-msgstr "isključena"
-
-#: ../yumcommands.py:682
+#: ../yumcommands.py:645
 msgid "repo id"
 msgstr "repo id"
 
-#: ../yumcommands.py:683
+#: ../yumcommands.py:645
 msgid "repo name"
 msgstr "repo ime"
 
-#: ../yumcommands.py:683
+#: ../yumcommands.py:645
 msgid "status"
 msgstr "status"
 
-#: ../yumcommands.py:686
-msgid "Repo-id     : "
-msgstr "IB riznice      : "
-
-#: ../yumcommands.py:687
-msgid "Repo-name   : "
-msgstr "Ime riznice     : "
-
-#: ../yumcommands.py:688
-msgid "Repo-enabled: "
-msgstr "Riznica uključena: "
+#: ../yumcommands.py:651
+msgid "enabled"
+msgstr "uključena"
 
-#: ../yumcommands.py:689
-msgid "Repo-size   : "
-msgstr "Veličina riznice: "
+#: ../yumcommands.py:654
+msgid "disabled"
+msgstr "isključena"
 
-#: ../yumcommands.py:713
+#: ../yumcommands.py:671
 msgid "Display a helpful usage message"
 msgstr "Prikaži korisnu poruku o upotrebi"
 
-#: ../yumcommands.py:747
+#: ../yumcommands.py:705
 #, python-format
 msgid "No help available for %s"
 msgstr "Nije dostupna pomoć za %s"
 
-#: ../yumcommands.py:752
+#: ../yumcommands.py:710
 msgid ""
 "\n"
 "\n"
@@ -1089,7 +1054,7 @@ msgstr ""
 "\n"
 "alijasi: "
 
-#: ../yumcommands.py:754
+#: ../yumcommands.py:712
 msgid ""
 "\n"
 "\n"
@@ -1099,15 +1064,15 @@ msgstr ""
 "\n"
 "alijas: "
 
-#: ../yumcommands.py:783
+#: ../yumcommands.py:741
 msgid "Setting up Reinstall Process"
 msgstr "Postavljam proces ponovne instalacije"
 
-#: ../yumcommands.py:797
+#: ../yumcommands.py:755
 msgid "reinstall a package"
 msgstr "ponovno instaliram paket"
 
-#: ../yummain.py:53
+#: ../yummain.py:41
 msgid ""
 "\n"
 "\n"
@@ -1117,7 +1082,7 @@ msgstr ""
 "\n"
 "Izlazim kada korisnik otkaže"
 
-#: ../yummain.py:59
+#: ../yummain.py:47
 msgid ""
 "\n"
 "\n"
@@ -1127,29 +1092,29 @@ msgstr ""
 "\n"
 "Izlazim kada se slomi cev"
 
-#: ../yummain.py:110
+#: ../yummain.py:105
 msgid ""
 "Another app is currently holding the yum lock; waiting for it to exit..."
 msgstr ""
 "Neki drugi program trenutno drži yum zaključavanje, čekam da se taj program "
 "isključi..."
 
-#: ../yummain.py:137 ../yummain.py:176
+#: ../yummain.py:132 ../yummain.py:171
 #, python-format
 msgid "Error: %s"
 msgstr "Greška: %s"
 
-#: ../yummain.py:147 ../yummain.py:183
+#: ../yummain.py:142 ../yummain.py:178
 #, python-format
 msgid "Unknown Error(s): Exit Code: %d:"
 msgstr "Nepoznata greška(e): izlazni kod: %d:"
 
 #. Depsolve stage
-#: ../yummain.py:154
+#: ../yummain.py:149
 msgid "Resolving Dependencies"
 msgstr "Razrešavam zavisnosti"
 
-#: ../yummain.py:189
+#: ../yummain.py:184
 msgid ""
 "\n"
 "Dependencies Resolved"
@@ -1157,11 +1122,11 @@ msgstr ""
 "\n"
 "Zavisnosti su razrešene"
 
-#: ../yummain.py:203
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr "Završeno!"
 
-#: ../yummain.py:250
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
@@ -1171,257 +1136,318 @@ msgstr ""
 "\n"
 "Izlazim kada korisnik otkaže."
 
-#: ../yum/depsolve.py:78
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr "doTsSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
 
-#: ../yum/depsolve.py:91
+#: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
 msgstr "Postavljam TransactionSets pre nego što se podigne klasa podešavanja"
 
-#: ../yum/depsolve.py:132
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr "Pogrešan tsflag u datoteci podešavanja: %s"
 
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:147
+#, fuzzy, python-format
+msgid "Searching pkgSack for dep: %s"
+msgstr "tražim paket %s"
+
+#: ../yum/depsolve.py:170
+#, fuzzy, python-format
+msgid "Potential match for %s from %s"
+msgstr "Postoji više od jednog identičnog slaganja u grupi za %s"
+
+#: ../yum/depsolve.py:178
+#, fuzzy, python-format
+msgid "Matched %s to require for %s"
+msgstr "%s zahteva: %s"
+
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "ÄŒlan: %s"
 
-#: ../yum/depsolve.py:190 ../yum/depsolve.py:595
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s prebačen za instalaciju"
 
-#: ../yum/depsolve.py:197
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "Dodajem paket %s u načinu rada %s"
 
-#: ../yum/depsolve.py:207
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Uklanjam paket %s"
 
-#: ../yum/depsolve.py:218
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s zahteva: %s"
 
-#: ../yum/depsolve.py:273
+#: ../yum/depsolve.py:312
+msgid "Needed Require has already been looked up, cheating"
+msgstr ""
+
+#: ../yum/depsolve.py:322
+#, python-format
+msgid "Needed Require is not a package name. Looking up: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:329
+#, fuzzy, python-format
+msgid "Potential Provider: %s"
+msgstr "Ukupna veličina: %s"
+
+#: ../yum/depsolve.py:352
+#, python-format
+msgid "Mode is %s for provider of %s: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:356
+#, python-format
+msgid "Mode for pkg providing %s: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:360
+#, python-format
+msgid "TSINFO: %s package requiring %s marked as erase"
+msgstr "TSINFO: %s paket zahteva da %s bude označen za brisanje"
+
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr "TSINFO: menjam %s sa %s da bih razrešio zavisnost."
 
-#: ../yum/depsolve.py:276
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr "TSINFO: ažuriram %s da bih razrešio zavisnost."
 
-#: ../yum/depsolve.py:279
+#: ../yum/depsolve.py:378
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr "Ne mogu da pronađem putanju ažuriranja za zavisnost za: %s"
 
-#: ../yum/depsolve.py:283
+#: ../yum/depsolve.py:388
 #, python-format
-msgid "TSINFO: %s package requiring %s marked as erase"
-msgstr "TSINFO: %s paket zahteva da %s bude označen za brisanje"
+msgid "Unresolvable requirement %s for %s"
+msgstr ""
 
 #. is it already installed?
-#: ../yum/depsolve.py:329
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr "%s je u pruženim paketa ali je već instaliran, uklanjam ga."
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr "Potencijalno razrešavanje paketa %s ima noviji primerak u ts-u."
 
-#: ../yum/depsolve.py:355
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr "Potencijalno razrešavanje paketa %s ima instaliran novi primerak."
 
-#: ../yum/depsolve.py:363 ../yum/depsolve.py:412
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr "Nedostaje zavisnost: %s je potreban od strane paketa %s"
 
-#: ../yum/depsolve.py:376
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr "%s je već u ts-u, preskačem ga"
 
-#: ../yum/depsolve.py:422
+#: ../yum/depsolve.py:510
+#, python-format
+msgid ""
+"Failure finding best provider of %s for %s, exceeded maximum loop length"
+msgstr ""
+
+#: ../yum/depsolve.py:537
 #, python-format
 msgid "TSINFO: Marking %s as update for %s"
 msgstr "TSINFO: označavam %s kao ažuriranje za %s"
 
-#: ../yum/depsolve.py:429
+#: ../yum/depsolve.py:544
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr "TSINFO: označavam %s kao instalaciju za %s"
 
-#: ../yum/depsolve.py:520 ../yum/depsolve.py:613
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Uspeh - prazna transakcija"
 
-#: ../yum/depsolve.py:565 ../yum/depsolve.py:585
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Ponovo pokrećem petlju"
 
-#: ../yum/depsolve.py:601
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "Završetak procesa zavisnosti"
 
-#: ../yum/depsolve.py:607
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr "%s iz %s ima problema sa razrešavanjem zavisnosti"
 
-#: ../yum/depsolve.py:614
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "Uspeh - zavisnosti su razrešene"
 
-#: ../yum/depsolve.py:628
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "Proveravam zavisnosti za %s"
 
-#: ../yum/depsolve.py:690
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr "tražim %s kao zahtev za %s"
 
-#: ../yum/depsolve.py:817
+#: ../yum/depsolve.py:933
 #, python-format
-msgid "Running compare_providers() for %s"
-msgstr "Pokrećem compare_providers() za %s"
+msgid "Comparing best: %s to po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
 
-#: ../yum/depsolve.py:845 ../yum/depsolve.py:851
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, fuzzy, python-format
+msgid "best %s obsoletes po: %s"
+msgstr "%s prevazilazi %s"
+
+#: ../yum/depsolve.py:955
+#, fuzzy, python-format
+msgid "po %s obsoletes best: %s"
+msgstr "%s prevazilazi %s"
+
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
 #, python-format
 msgid "better arch in po %s"
 msgstr "bolja arhitektura u po %s"
 
-#: ../yum/depsolve.py:890
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
 #, python-format
-msgid "%s obsoletes %s"
-msgstr "%s prevazilazi %s"
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
 
-#: ../yum/depsolve.py:901
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
 #, python-format
-msgid ""
-"archdist compared %s to %s on %s\n"
-"  Winner: %s"
+msgid "best %s shares a sourcerpm with %s"
 msgstr ""
-"archdist uporedio %s sa %s na %s\n"
-"  Pobednik: %s"
 
-#: ../yum/depsolve.py:908
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
 #, python-format
-msgid "common sourcerpm %s and %s"
-msgstr "zajednički izvorni rpm %s i %s"
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
 
-#: ../yum/depsolve.py:914
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
 #, python-format
-msgid "common prefix of %s between %s and %s"
-msgstr "zajednički prefiks %s između %s i %s"
+msgid "po %s has a shorter name than best %s"
+msgstr ""
 
-#: ../yum/depsolve.py:922
+#: ../yum/depsolve.py:1025
 #, python-format
-msgid "Best Order: %s"
-msgstr "Najbolji redosled: %s"
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
 
-#: ../yum/__init__.py:129
+#: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr "doConfigSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
 
-#: ../yum/__init__.py:303
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr "Riznici %r nedostaje ime u podešavanjima, koristim id"
 
-#: ../yum/__init__.py:339
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr "već inicijalizovani dodaci"
 
-#: ../yum/__init__.py:346
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr "doRpmDBSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
 
-#: ../yum/__init__.py:356
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr "ÄŒitam lokalni RPMDB"
 
-#: ../yum/__init__.py:374
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr "doRepoSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
 
-#: ../yum/__init__.py:394
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr "doSackSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
 
-#: ../yum/__init__.py:411
+#: ../yum/__init__.py:404
 msgid "Setting up Package Sacks"
 msgstr "Postavljam grupe paketa"
 
-#: ../yum/__init__.py:454
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr "repo objektu za repo %s nedostaje a _resetSack metoda\n"
 
-#: ../yum/__init__.py:455
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr "zbog toga se ovaj repo ne može vratiti na početnu postavku.\n"
 
-#: ../yum/__init__.py:460
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr "doUpdateSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
 
-#: ../yum/__init__.py:472
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr "Izgrađujem objekat ažurirnja"
 
-#: ../yum/__init__.py:503
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr "doGroupSetup() neće biti prisutna u budućim verzijama Yum-a.\n"
 
-#: ../yum/__init__.py:527
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Dobavljam metapodatke grupe"
 
-#: ../yum/__init__.py:553
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr "Dodajem datoteku grupe iz riznice: %s"
 
-#: ../yum/__init__.py:562
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr "Nisam uspeo da dodam datoteku grupe za riznicu: %s - %s"
 
-#: ../yum/__init__.py:568
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Ne postoji grupa koja je dostupna u bilo kojoj riznici"
 
-#: ../yum/__init__.py:618
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Uvozim dodatne informacije o spiskovima datoteka"
 
-#: ../yum/__init__.py:670
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Skip-broken etapa %i"
 
-#: ../yum/__init__.py:693
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr "Skip-broken je završen u %i etapa "
 
-#: ../yum/__init__.py:694
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
@@ -1429,165 +1455,159 @@ msgstr ""
 "\n"
 "Paketi su preskočeni zbog problema sa zavisnostima:"
 
-#: ../yum/__init__.py:698
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s iz %s"
 
-#: ../yum/__init__.py:779
-msgid ""
-"Warning: scriptlet or other non-fatal errors occurred during transaction."
-msgstr ""
-"Upozorenje: došlo je do greške u skriptici ili neke druge nekritične greške "
-"tokom transkacije."
-
-#: ../yum/__init__.py:794
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "Nisam uspeo da uklonim datoteku transakcije %s"
 
-#: ../yum/__init__.py:834
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "izuzimam iz troška: %s iz %s"
 
-#: ../yum/__init__.py:865
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Izuzimam pakete u globalnom spisku za izuzimanje"
 
-#: ../yum/__init__.py:867
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Izuzimam pakete iz %s"
 
-#: ../yum/__init__.py:895
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Sažimam %s samo u sadržane pakete"
 
-#: ../yum/__init__.py:900
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Zadržavam sadržani paket %s"
 
-#: ../yum/__init__.py:906
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Uklanjam nepovezani paket %s"
 
-#: ../yum/__init__.py:909
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "Završio"
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:939
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "Nisam u mogućnisti da proverim da li je PID %s aktivan"
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:943
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr "Postoji zaključavanje %s: druga kopija se izvršava kao pid %s."
 
-#: ../yum/__init__.py:1006
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "Paket nije odgovarajući za nameravano preuzimanje"
 
-#: ../yum/__init__.py:1021
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "Ne mogu da izvršim kontrolu sume"
 
-#: ../yum/__init__.py:1024
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "Paket nema odgovarajući kontrolnu sumu"
 
-#: ../yum/__init__.py:1068
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr ""
 "paket nema odgovarajuću vrednost kontrolne sume ili je za %s uključeno "
 "keširanje"
 
-#: ../yum/__init__.py:1071
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "koristim lokalni umnožak %s-a"
 
-#: ../yum/__init__.py:1096
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
-msgstr "Nedovoljna količina prostora u direktorijumu %s namenjenog za preuzimanje"
+msgstr ""
+"Nedovoljna količina prostora u direktorijumu %s namenjenog za preuzimanje"
 
-#: ../yum/__init__.py:1129
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "Zaglavlje nije potpuno."
 
-#: ../yum/__init__.py:1169
+#: ../yum/__init__.py:1134
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
 msgstr ""
-"Zaglavlje nije u lokalnom kešu i samo način rada sa keširanjem je uključen. Ne "
-"mogu da preuzmem %s"
+"Zaglavlje nije u lokalnom kešu i samo način rada sa keširanjem je uključen. "
+"Ne mogu da preuzmem %s"
 
-#: ../yum/__init__.py:1224
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr "Javni ključ za %s nije instaliran"
 
-#: ../yum/__init__.py:1228
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Problem sa otvaranjem paketa %s"
 
-#: ../yum/__init__.py:1236
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr "Javni ključ za %s nije poverljiv"
 
-#: ../yum/__init__.py:1240
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Paket %s nije potpisan"
 
-#: ../yum/__init__.py:1278
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Ne mogu da uklonim %s"
 
-#: ../yum/__init__.py:1282
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "%s je uklonjen"
 
-#: ../yum/__init__.py:1318
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Ne mogu da uklonim %s datoteku %s"
 
-#: ../yum/__init__.py:1322
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "%s datoteka %s je uklonjena"
 
-#: ../yum/__init__.py:1324
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d %s datoteke su uklonjene"
 
-#: ../yum/__init__.py:1378
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr "Postoji više od jednog identičnog slaganja u grupi za %s"
 
-#: ../yum/__init__.py:1384
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr "Ništa se ne slaže sa %s.%s %s:%s-%s iz ažuriranja"
 
-#: ../yum/__init__.py:1577
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
@@ -1595,155 +1615,141 @@ msgstr ""
 "searchPackages() neće biti prisutna u budućim verzijama Yum-"
 "a.                      Umesto nje koristite searchGenerator(). \n"
 
-#: ../yum/__init__.py:1614
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "Pretražujem %d pakete"
 
-#: ../yum/__init__.py:1618
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "tražim paket %s"
 
-#: ../yum/__init__.py:1630
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "tražim u unosima datoteka"
 
-#: ../yum/__init__.py:1637
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "tražim u unosima dostavljača"
 
-#: ../yum/__init__.py:1667
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Dostavlja-slaganje: %s"
 
-#: ../yum/__init__.py:1736 ../yum/__init__.py:1755 ../yum/__init__.py:1782
-#: ../yum/__init__.py:1788 ../yum/__init__.py:1844 ../yum/__init__.py:1848
+#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
+#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
 #, python-format
 msgid "No Group named %s exists"
 msgstr "Ne postoji grupa pod imenom %s"
 
-#: ../yum/__init__.py:1767 ../yum/__init__.py:1861
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr "paket %s nije označen u grupi %s"
 
-#: ../yum/__init__.py:1806
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr "Dodajem paket %s iz grupe %s"
 
-#: ../yum/__init__.py:1810
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr "Nijedan paket pod imenom %s nije dostupan za instalaciju"
 
-#: ../yum/__init__.py:1886
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr "Grupa paketa %s nije nađena u packagesack-u"
 
-#: ../yum/__init__.py:1954 ../yum/__init__.py:1994
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr ""
 "Neispravna niska zavisnosti sa verzijom, pokušajte da je obeležite "
 "navodnicima."
 
-#: ../yum/__init__.py:1956 ../yum/__init__.py:1996
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Pogrešna oznaka verzije"
 
-#: ../yum/__init__.py:1968 ../yum/__init__.py:1972
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "Nema pronađenih paketa za %s"
 
-#: ../yum/__init__.py:2100
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr "Objekat paketa nije bio primerak objekta paketa"
 
-#: ../yum/__init__.py:2104
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr "Nije određeno ništa za instalaciju"
 
 #. only one in there
-#: ../yum/__init__.py:2119
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr "Proveravam virtuelnu dostavu ili dostavu datoteke za %s"
 
-#: ../yum/__init__.py:2125 ../yum/__init__.py:2440
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr "Ne postoji slaganje za argument: %s"
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2180
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr "Nema paketa dostupnih za instalaciju"
 
-#: ../yum/__init__.py:2192
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr "Paket: %s  - već je u skupu transakcije"
 
-#: ../yum/__init__.py:2205
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr "Već je instalirana najnovija verzija paketa %s"
 
-#: ../yum/__init__.py:2212
+#: ../yum/__init__.py:2178
 #, python-format
 msgid "Package matching %s already installed. Checking for update."
 msgstr ""
 "Paket koji se poklapa sa %s je već instaliran. Proveravam za noviju verziju."
 
-#: ../yum/__init__.py:2223
-#, python-format
-msgid "Package %s is obsoleted by %s, trying to install %s instead"
-msgstr "Paket %s je zamenjen paketom %s, pokušavam da namesto instaliram %s"
-
 #. update everything (the easy case)
-#: ../yum/__init__.py:2256
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Ažuriram sve"
 
-#: ../yum/__init__.py:2359
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Paket je već prevaziđen: %s.%s %s:%s-%s"
 
-#: ../yum/__init__.py:2383
-#, python-format
-msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
-msgstr "Ne ažuriram pakete koji su već ažurirani: %s.%s %s:%s-%s"
-
-#: ../yum/__init__.py:2437
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#. FIXME we should give the caller some nice way to hush this warning
-#. probably just a kwarg of 'silence_warnings' or something
-#. b/c when this is called from groupRemove() it makes a lot of
-#. garbage noise
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Nijedan paket nije određen za uklanjanje"
 
-#: ../yum/__init__.py:2490
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Ne mogu da otvorim datoteku: %s. Preskačem je."
 
-#: ../yum/__init__.py:2493
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Ispitujem %s: %s"
 
-#: ../yum/__init__.py:2500
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
@@ -1752,79 +1758,79 @@ msgstr ""
 "Paket %s nije instaliran, ne mogu da ga ažuriram. Izvršite yum instalaciju "
 "da biste ga instalirali."
 
-#: ../yum/__init__.py:2533
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Izuzimam %s"
 
-#: ../yum/__init__.py:2538
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Označavam %s za instalaciju"
 
-#: ../yum/__init__.py:2544
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr "Označavam %s kao ažuriranje za %s"
 
-#: ../yum/__init__.py:2551
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr "%s: ne ažurira instalirani paket."
 
-#: ../yum/__init__.py:2569
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr ""
 "Problem pri ponovnoj instalaciji: nijedan paket nije određen za uklanjanje"
 
-#: ../yum/__init__.py:2580
+#: ../yum/__init__.py:2515
 #, python-format
 msgid "Package %s is allowed multiple installs, skipping"
 msgstr "Paketu %s su dozvoljene mnogostruke instalacije, preskačem ga"
 
-#: ../yum/__init__.py:2587
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr ""
 "Problem pri ponovnoj instalaciji: nijedan paket nije određen za instalaciju"
 
-#: ../yum/__init__.py:2635
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr "Dobavljam GPG ključ sa %s"
 
-#: ../yum/__init__.py:2641
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "Dobavljanje GPG ključa nije uspelo: "
 
-#: ../yum/__init__.py:2654
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "Raščlanjivanje GPG ključa nije uspelo: "
 
-#: ../yum/__init__.py:2658
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr "GPG ključ na %s (0x%s) je već instaliran"
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2663
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr "Uvozim GPG ključ 0x%s „%s“ iz %s"
 
-#: ../yum/__init__.py:2675
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "Ne instaliram ključ"
 
-#: ../yum/__init__.py:2681
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "Nije uspeo uvoz ključa (kod %d)"
 
-#: ../yum/__init__.py:2684
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "Ključ je uspešno uvezen"
 
-#: ../yum/__init__.py:2689
+#: ../yum/__init__.py:2624
 #, python-format
 msgid ""
 "The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1835,80 +1841,76 @@ msgstr ""
 "odgovarajući za ovaj paket.\n"
 "Proverite da li su podešeni odgovarajući URL-ovi ključeva za ovu riznicu."
 
-#: ../yum/__init__.py:2698
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr "Uvoz ključa(ključeva) nije pomogao, pogrešan ključ(ključevi)?"
 
-#: ../yum/__init__.py:2778
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "Ne mogu da pronađem odgovarajući odraz."
 
-#: ../yum/__init__.py:2780
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr "Pojavile su se greške za vreme preuzimanja paketa."
 
-#: ../yum/__init__.py:2844
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Greške pri proveri transakcije: "
 
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:197
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "Učitani dodaci: "
 
-#: ../yum/plugins.py:208
+#: ../yum/plugins.py:206
 #, python-format
 msgid "No plugin match for: %s"
 msgstr "Ne postoji slaganje za dodatak: %s"
 
-#: ../yum/plugins.py:221
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "„%s“ dodatak je isključen"
 
-#: ../yum/plugins.py:233
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr "Dodatak „%s“ ne određuje verziju zahtevanog API-a"
 
-#: ../yum/plugins.py:237
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr "Dodatak „%s“ zahteva API %s. Podržani API je %s."
 
-#: ../yum/plugins.py:266
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Učitavam „%s“ dodatak"
 
-#: ../yum/plugins.py:273
+#: ../yum/plugins.py:271
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
 msgstr ""
-"U putanji za pretraživanje dodataka postoje dva ili više dodataka pod imenom „%"
-"s“"
+"U putanji za pretraživanje dodataka postoje dva ili više dodataka pod imenom "
+"„%s“"
 
-#: ../yum/plugins.py:293
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr "Datoteka podešavanja %s nije pronađena"
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:296
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr "Ne mogu da pronađem datoteku podešavanja za dodatak %s"
 
-#: ../yum/plugins.py:450
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "registracija komandi nije podržana"
 
-#: ../yum/rpmtrans.py:78
-msgid "Repackaging"
-msgstr "Ponovno pakovanje"
-
 #: ../rpmUtils/oldUtils.py:26
 #, python-format
 msgid "Header cannot be opened or does not match %s, %s."
@@ -1939,3 +1941,64 @@ msgstr "Oštećeno zaglavlje %s"
 #, python-format
 msgid "Error opening rpm %s - error %s"
 msgstr "Greška pri otvaranju rpm-a %s - greška %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s option requires an argument"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s opcija zahteva argument"
+
+#~ msgid "show this help message and exit"
+#~ msgstr "prikaži ovu pomoćnu poruku i izađi"
+
+#~ msgid "verbose operation"
+#~ msgstr "opširna radnja"
+
+#~ msgid "Repo-id     : "
+#~ msgstr "IB riznice      : "
+
+#~ msgid "Repo-name   : "
+#~ msgstr "Ime riznice     : "
+
+#~ msgid "Repo-enabled: "
+#~ msgstr "Riznica uključena: "
+
+#~ msgid "Repo-size   : "
+#~ msgstr "Veličina riznice: "
+
+#~ msgid "Running compare_providers() for %s"
+#~ msgstr "Pokrećem compare_providers() za %s"
+
+#~ msgid ""
+#~ "archdist compared %s to %s on %s\n"
+#~ "  Winner: %s"
+#~ msgstr ""
+#~ "archdist uporedio %s sa %s na %s\n"
+#~ "  Pobednik: %s"
+
+#~ msgid "common sourcerpm %s and %s"
+#~ msgstr "zajednički izvorni rpm %s i %s"
+
+#~ msgid "common prefix of %s between %s and %s"
+#~ msgstr "zajednički prefiks %s između %s i %s"
+
+#~ msgid "Best Order: %s"
+#~ msgstr "Najbolji redosled: %s"
+
+#~ msgid ""
+#~ "Warning: scriptlet or other non-fatal errors occurred during transaction."
+#~ msgstr ""
+#~ "Upozorenje: došlo je do greške u skriptici ili neke druge nekritične "
+#~ "greške tokom transkacije."
+
+#~ msgid "Package %s is obsoleted by %s, trying to install %s instead"
+#~ msgstr "Paket %s je zamenjen paketom %s, pokušavam da namesto instaliram %s"
+
+#~ msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+#~ msgstr "Ne ažuriram pakete koji su već ažurirani: %s.%s %s:%s-%s"
+
+#~ msgid "Repackaging"
+#~ msgstr "Ponovno pakovanje"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3b30c2f..20dc426 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-20 10:00+0000\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-07-24 19:43+0800\n"
 "Last-Translator: lijiansheng <lijiangsheng1 at gmail.com>\n"
 "Language-Team: zh_CN <lijiangsheng1 at gmail.com>\n"
@@ -12,1300 +12,1900 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: CHINA\n"
 
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
-msgstr ""
-"\n"
-"\n"
-"管道损坏而退出"
-
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
-msgstr ""
-"\n"
-"\n"
-"用户取消而退出"
-
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel."
-msgstr ""
-"\n"
-"\n"
-"用户取消而退出"
-
-msgid ""
-"\n"
-"\n"
-"alias: "
-msgstr ""
-"\n"
-"\n"
-"别名: "
-
-msgid ""
-"\n"
-"\n"
-"aliases: "
-msgstr ""
-"\n"
-"\n"
-"多重别名: "
-
-msgid ""
-"\n"
-" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds to exit.\n"
-msgstr ""
-"\n"
-" 当前下载取消, %s 中断 (ctrl-c) 再次 %s 将在%s%s%s 秒内退出.\n"
-
-msgid ""
-"\n"
-"Dependencies Resolved"
-msgstr ""
-"\n"
-"依赖性解决"
-
-msgid ""
-"\n"
-"Group: %s"
-msgstr ""
-"\n"
-"组: %s"
-
-msgid ""
-"\n"
-"Packages skipped because of dependency problems:"
-msgstr ""
-"\n"
-"因为依赖性问题而忽略的包:"
-
-msgid ""
-"\n"
-"Transaction Summary\n"
-"=============================================================================\n"
-"Install  %5.5s Package(s)         \n"
-"Update   %5.5s Package(s)         \n"
-"Remove   %5.5s Package(s)         \n"
-msgstr ""
-"\n"
-"处理信息摘要\n"
-"=============================================================================\n"
-"安装    %5.5s 个包        \n"
-"升级   %5.5s 个包         \n"
-"删除      %5.5s 个包         \n"
-
-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"
-"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"
-"\n"
-"\n"
-"Alternatively you can specify the url to the key you would like to use\n"
-"for a repository in the 'gpgkey' option in a repository section and yum \n"
-"will install it for you.\n"
-"\n"
-"For more information contact your distribution or package provider.\n"
-msgstr ""
-"\n"
-"你已经激活通过GPG密钥验证包,这是个好东西。 \n"
-"然而,你没有安装任何的GPG公钥,你需要下载:\n"
-"如果你要安装包的密钥\n"
-"你可以执行下面的命令:\n"
-"    rpm --import public.gpg.key\n"
-"\n"
-"\n"
-"Alternatively you can specify the url to the key you would like to use\n"
-"for a repository in the 'gpgkey' option in a repository section and yum \n"
-"will install it for you.\n"
-"\n"
-"For more information contact your distribution or package provider.\n"
-
-msgid ""
-"     replacing  %s.%s %s\n"
-"\n"
-msgstr ""
-"     替代中 %s.%s %s\n"
-"\n"
-
-msgid "    %s from %s"
-msgstr "    %s 从 %s"
-
-msgid "   Unsatisfied dependency"
-msgstr "  不能满意的依赖性"
-
-msgid "  At least %dMB needed on the %s filesystem.\n"
-msgstr " 至少 需要%d MB ,但前的 %s 文件系统.\n"
+#: ../callback.py:48 ../output.py:512
+msgid "Updating"
+msgstr "正在升级"
 
-msgid "  No dependencies for this package"
-msgstr "此包无任何的依赖"
+#: ../callback.py:49
+msgid "Erasing"
+msgstr "正在删除"
 
-msgid "  dependency: %s"
-msgstr "   依赖: %s"
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
+msgid "Installing"
+msgstr "正在安装"
 
-msgid " Conditional Packages:"
-msgstr " 包条件:"
+#: ../callback.py:52 ../callback.py:58
+msgid "Obsoleted"
+msgstr "已废弃"
 
-msgid " Default Packages:"
-msgstr " 默认的包:"
+#: ../callback.py:54 ../output.py:558
+msgid "Updated"
+msgstr "更新完毕"
 
-msgid " Description: %s"
-msgstr " 描述: %s"
+#: ../callback.py:55
+msgid "Erased"
+msgstr "已删除"
 
-msgid " Mandatory Packages:"
-msgstr " 托管的包是:"
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
+msgid "Installed"
+msgstr "已安装"
 
-msgid " Optional Packages:"
-msgstr "  包的属性:"
+#: ../callback.py:130
+msgid "No header - huh?"
+msgstr "没有头文件--:)?"
 
-msgid "\"%s\" plugin is disabled"
-msgstr "\"%s\" 此插件已被禁掉"
+#: ../callback.py:168
+msgid "Repackage"
+msgstr "重新打包"
 
-msgid "%d %s files removed"
-msgstr "%d %s 文件已移除"
+#: ../callback.py:189
+#, python-format
+msgid "Error: invalid output state: %s for %s"
+msgstr "Error: invalid output state: %s for %s"
 
-msgid "%d Package(s) to Install"
-msgstr "%d 个包将安装"
+#: ../callback.py:212
+#, python-format
+msgid "Erased: %s"
+msgstr "已删除: %s"
 
-msgid "%d Package(s) to remove"
-msgstr "%d 个包将删除"
+#: ../callback.py:217 ../output.py:513
+msgid "Removing"
+msgstr "正在删除"
 
-msgid "%d packages marked for Update"
-msgstr "%d 个包已标志为升级"
+#: ../callback.py:219
+msgid "Cleanup"
+msgstr "清理"
 
-msgid "%d packages marked for removal"
-msgstr "%d 个包已标志为删除"
+#: ../cli.py:103
+#, python-format
+msgid "Command \"%s\" already defined"
+msgstr "命令 \"%s\" 早已经被定义"
 
-msgid "%s"
-msgstr "%s"
+#: ../cli.py:115
+msgid "Setting up repositories"
+msgstr "设置仓库"
 
-msgid "%s already in ts, skipping this one"
-msgstr "%s 已在处理中, 忽略此项"
+#: ../cli.py:126
+msgid "Reading repository metadata in from local files"
+msgstr "从本地文件读入仓库元数据"
 
-msgid "%s converted to install"
-msgstr "%s 已转换的将安装"
+#: ../cli.py:183 ../utils.py:72
+#, python-format
+msgid "Config Error: %s"
+msgstr "配置错误: %s"
 
-msgid "%s file %s removed"
-msgstr "%s 文件 %s 已移除"
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
+#, python-format
+msgid "Options Error: %s"
+msgstr "属性错误: %s"
 
-msgid "%s from %s has depsolving problems"
-msgstr "%s 已从%s  解决了问题"
+#: ../cli.py:229
+msgid "You need to give some command"
+msgstr "你需要给出命令"
 
-msgid "%s is in providing packages but it is already installed, removing."
-msgstr "%s 在假设的包中,但是已经安装,删除中...."
+#: ../cli.py:271
+msgid "Disk Requirements:\n"
+msgstr "磁盘要求:\n"
 
-msgid "%s removed"
-msgstr "%s 已删除"
+#: ../cli.py:273
+#, python-format
+msgid "  At least %dMB needed on the %s filesystem.\n"
+msgstr " 至少 需要%d MB ,但前的 %s 文件系统.\n"
 
-msgid "%s requires: %s"
-msgstr "%s 需要: %s"
+#. TODO: simplify the dependency errors?
+#. Fixup the summary
+#: ../cli.py:278
+msgid ""
+"Error Summary\n"
+"-------------\n"
+msgstr ""
+"错误的语法\n"
+"-------------\n"
 
-msgid "%s: does not update installed package."
-msgstr "%s: 没有可供升级的包."
+#: ../cli.py:317
+msgid "Trying to run the transaction but nothing to do. Exiting."
+msgstr "尝试运行事务处理但是什么也做不成,退出."
 
-msgid "---> Downloading header for %s to pack into transaction set."
-msgstr "--->为 %s下载头文件以便于设置处理."
+#: ../cli.py:347
+msgid "Exiting on user Command"
+msgstr "在用户的命令下退出"
 
-msgid "---> Package %s.%s %s:%s-%s set to be %s"
-msgstr "---> 包 %s.%s %s:%s-%s 设置为 %s "
+#: ../cli.py:351
+msgid "Downloading Packages:"
+msgstr "下载软件包:"
 
-msgid "--> Finished Dependency Resolution"
-msgstr "--> 完成依赖性检查"
+#: ../cli.py:356
+msgid "Error Downloading Packages:\n"
+msgstr "下载包错误:\n"
 
-msgid "--> Populating transaction set with selected packages. Please wait."
-msgstr "--> 正在处理已选择的包,请稍候。"
+#: ../cli.py:370 ../yum/__init__.py:2746
+msgid "Running rpm_check_debug"
+msgstr "运行 rpm_check_debug "
 
-msgid "--> Processing Conflict: %s conflicts %s"
-msgstr "--> 过程冲突: %s 冲突于 %s"
+#: ../cli.py:373 ../yum/__init__.py:2749
+msgid "ERROR with rpm_check_debug vs depsolve:"
+msgstr "错误 rpm_check_debug 和 depsolve:"
 
-msgid "--> Processing Dependency: %s for package: %s"
-msgstr "--> 过程依赖: %s 依赖于包: %s"
+#: ../cli.py:377 ../yum/__init__.py:2751
+msgid "Please report this error in bugzilla"
+msgstr "请报告这个错误给 Bugzilla"
 
-msgid "--> Restarting Dependency Resolution with new changes."
-msgstr "--> 为新包重新启动解决依赖问题"
+#: ../cli.py:383
+msgid "Running Transaction Test"
+msgstr "运行测试事务处理"
 
-msgid "--> Running transaction check"
-msgstr "-->运行处理检查"
+#: ../cli.py:399
+msgid "Finished Transaction Test"
+msgstr "传输测试完成"
 
-msgid "--> Unresolved Dependency: %s"
-msgstr "--> 没有解决的依赖: %s"
+#: ../cli.py:401
+msgid "Transaction Check Error:\n"
+msgstr "处理检查错误:\n"
 
-msgid "Adding Package %s in mode %s"
-msgstr "添加包 %s 在 %s 的模式下"
+#: ../cli.py:408
+msgid "Transaction Test Succeeded"
+msgstr "事务处理测试成功"
 
-msgid "Adding group file from repository: %s"
-msgstr "从仓库: %s 中添加组文件"
+#: ../cli.py:429
+msgid "Running Transaction"
+msgstr "运行事务处理"
 
-msgid "Adding package %s from group %s"
-msgstr "添加包 %s 从组 %s 中"
+#: ../cli.py:459
+msgid ""
+"Refusing to automatically import keys when running unattended.\n"
+"Use \"-y\" to override."
+msgstr ""
+"当运行unattended时拒绝自动导入密钥.\n"
+"用 \"-y\" 来覆盖"
 
-msgid "Another app is currently holding the yum lock; waiting for it to exit..."
-msgstr "另外一个应用程序正在适用yum锁;等待其退出 ... ..."
+#: ../cli.py:491
+msgid "Parsing package install arguments"
+msgstr "分析安装参数的语法"
 
-msgid "Apr"
-msgstr "Apr"
+#: ../cli.py:501
+#, python-format
+msgid "No package %s available."
+msgstr "包 %s 不可提供."
 
-msgid "Arch"
-msgstr "架构"
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
+msgid "Package(s) to install"
+msgstr "包将安装"
 
-msgid "Arch       : %s"
-msgstr "架构 : %s"
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
+msgid "Nothing to do"
+msgstr "无事可做"
 
-msgid "Aug"
-msgstr "Aug"
+#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
+#: ../yum/__init__.py:2340
+#, python-format
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+msgstr "不可更新早已被废弃的包: %s.%s %s:%s-%s"
 
-msgid "Available Groups:"
-msgstr "有效的组:"
+#: ../cli.py:568
+#, python-format
+msgid "Could not find update match for %s"
+msgstr "不能找到和 %s 匹配的升级"
 
-msgid "Available Packages"
-msgstr "已经提供的包"
+#: ../cli.py:580
+#, python-format
+msgid "%d packages marked for Update"
+msgstr "%d 个包已标志为升级"
 
-msgid "Building updates object"
-msgstr "建立升级对象"
+#: ../cli.py:583
+msgid "No Packages marked for Update"
+msgstr "没有包标志为升级"
 
-msgid "Cannot find an update path for dep for: %s"
-msgstr "Cannot find an update path for dep for: %s"
+#: ../cli.py:599
+#, python-format
+msgid "%d packages marked for removal"
+msgstr "%d 个包已标志为删除"
 
-msgid "Cannot open file: %s. Skipping."
-msgstr "不能打开文件: %s. 跳过."
+#: ../cli.py:602
+msgid "No Packages marked for removal"
+msgstr "没有包标志为删除"
 
-msgid "Cannot remove %s"
-msgstr "无法删除 %s "
+#: ../cli.py:614
+msgid "No Packages Provided"
+msgstr "没有可提供的包"
 
-msgid "Cannot remove %s file %s"
-msgstr "无法删除 %s 文件 %s"
+#: ../cli.py:654
+msgid "Matching packages for package list to user args"
+msgstr "从用户的包列表中匹配包"
 
-msgid "Check for available package updates"
-msgstr "检查可提供的包升级"
+#: ../cli.py:701
+#, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "提示 : 没有发现和: %s 匹配"
 
-msgid "Checking deps for %s"
-msgstr "为 %s 检查依赖性"
+#: ../cli.py:704
+msgid "No Matches found"
+msgstr "没有匹配发现"
 
-msgid "Checking for virtual provide or file-provide for %s"
-msgstr "Checking for virtual provide or file-provide for %s"
+#: ../cli.py:745
+#, python-format
+msgid "No Package Found for %s"
+msgstr "没有发现包 %s"
 
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "清理一切"
 
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "Räume Header auf"
 
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "清理包"
 
+#: ../cli.py:777
+msgid "Cleaning up xml metadata"
+msgstr "清理XML元数据"
+
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "清理数据库缓存"
 
+#: ../cli.py:783
+#, fuzzy
+msgid "Cleaning up expire-cache metadata"
+msgstr "清理XML元数据"
+
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "清理插件"
 
-msgid "Cleaning up xml metadata"
-msgstr "清理XML元数据"
+#: ../cli.py:807
+msgid "Installed Groups:"
+msgstr "已安装组:"
 
-msgid "Cleanup"
-msgstr "清理"
+#: ../cli.py:814
+msgid "Available Groups:"
+msgstr "有效的组:"
 
-msgid "Command \"%s\" already defined"
-msgstr "命令 \"%s\" 早已经被定义"
+#: ../cli.py:820
+msgid "Done"
+msgstr "完成"
 
-msgid "Command line error: %s"
-msgstr "命令行错误: %s"
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
+#, python-format
+msgid "Warning: Group %s does not exist."
+msgstr "提示: 组 %s 不存在."
 
-msgid "Committer  : %s"
-msgstr "Ãœbermittler  : %s"
+#: ../cli.py:853
+msgid "No packages in any requested group available to install or update"
+msgstr "没有包在所要求的组中可提供安装或升级"
 
-msgid "Comparing best: %s to po: %s"
-msgstr "Vergleiche besseres: %s zu po: %s"
+#: ../cli.py:855
+#, python-format
+msgid "%d Package(s) to Install"
+msgstr "%d 个包将安装"
 
-msgid "Complete!"
-msgstr "恭喜你!成功完成!"
+#: ../cli.py:865
+#, python-format
+msgid "No group named %s exists"
+msgstr "没有组名为 %s "
 
-msgid "Config Error: %s"
-msgstr "配置错误: %s"
+#: ../cli.py:871
+msgid "No packages to remove from groups"
+msgstr "No packages to remove from groups"
 
-msgid "Configuration file %s not found"
-msgstr "配置文件 %s 不能被找到"
+#: ../cli.py:873
+#, python-format
+msgid "%d Package(s) to remove"
+msgstr "%d 个包将删除"
 
-msgid "Could not find update match for %s"
-msgstr "不能找到和 %s 匹配的升级"
+#: ../cli.py:915
+#, python-format
+msgid "Package %s is already installed, skipping"
+msgstr "包 %s 早已安装,忽略"
 
-msgid "Could not open RPM database for reading. Perhaps it is already in use?"
-msgstr "不能以读的方式打开RPM数据库,或许是它已经在被用?"
+#: ../cli.py:926
+#, python-format
+msgid "Discarding non-comparable pkg %s.%s"
+msgstr " 丢弃无对照的包%s.%s"
 
-msgid "Could not perform checksum"
-msgstr "无法执行校验和"
+#. we've not got any installed that match n or n+a
+#: ../cli.py:952
+#, python-format
+msgid "No other %s installed, adding to list for potential install"
+msgstr "No other %s installed, adding to list for 潜在的install"
 
-msgid "Damaged Header %s"
-msgstr "损坏的头文件 %s"
+#: ../cli.py:971
+#, python-format
+msgid "Command line error: %s"
+msgstr "命令行错误: %s"
 
-msgid "Dec"
-msgstr "Dec"
+#: ../cli.py:1101
+msgid "be tolerant of errors"
+msgstr "be tolerant of errors"
 
-msgid "Dependency Installed"
-msgstr "依赖安装"
+#: ../cli.py:1103
+msgid "run entirely from cache, don't update cache"
+msgstr "从缓冲中运行,而不是升级缓存"
 
-msgid "Dependency Process ending"
-msgstr "依赖进程完成中"
+#: ../cli.py:1105
+msgid "config file location"
+msgstr "config file location"
 
-msgid "Dependency Removed"
-msgstr "依赖删除"
+#: ../cli.py:1107
+msgid "maximum command wait time"
+msgstr "最大化的命令等待时间"
 
-msgid "Dependency Updated"
-msgstr "依赖升级"
+#: ../cli.py:1109
+msgid "debugging output level"
+msgstr "调试输出级别"
 
-msgid "Description: "
-msgstr "升级:"
+#: ../cli.py:1113
+msgid "show duplicates, in repos, in list/search commands"
+msgstr "显示复制, 在repo,list/search命令下"
 
-msgid "Determine which package provides the given dependency"
-msgstr "决定哪个包提供了给定的依赖"
+#: ../cli.py:1115
+msgid "error output level"
+msgstr "错误输出级别"
 
-msgid "Discarding non-comparable pkg %s.%s"
-msgstr " 丢弃无对照的包%s.%s"
+#: ../cli.py:1118
+msgid "quiet operation"
+msgstr "安静的操作"
 
-msgid "Disk Requirements:\n"
-msgstr "磁盘要求:\n"
+#: ../cli.py:1122
+msgid "answer yes for all questions"
+msgstr "回答所有的问题为是"
 
-msgid "Display a helpful usage message"
-msgstr "显示帮助用法信息"
+#: ../cli.py:1124
+msgid "show Yum version and exit"
+msgstr "显示 YUM版本信息并退出"
 
-msgid "Display details about a package group"
-msgstr "显示关于包组的细节"
+#: ../cli.py:1125
+msgid "set install root"
+msgstr "设置为root安装"
 
-msgid "Display details about a package or group of packages"
-msgstr "显示关于包或一组包的细节信息"
+#: ../cli.py:1129
+msgid "enable one or more repositories (wildcards allowed)"
+msgstr "激活一个或多个仓库(支持通配符)"
 
-msgid "Display the configured software repositories"
-msgstr "显示软件仓库的配置"
+#: ../cli.py:1133
+msgid "disable one or more repositories (wildcards allowed)"
+msgstr "禁掉一个或多个仓库(支持通配符)"
 
-msgid "Done"
-msgstr "完成"
+#: ../cli.py:1136
+msgid "exclude package(s) by name or glob"
+msgstr "在名称或glob不包含包。"
 
-msgid "Downloading Packages:"
-msgstr "下载软件包:"
+#: ../cli.py:1138
+msgid "disable exclude from main, for a repo or for everything"
+msgstr "disable exclude from main, for a repo or for everything"
 
-msgid "ERROR with rpm_check_debug vs depsolve:"
-msgstr "错误 rpm_check_debug 和 depsolve:"
+#: ../cli.py:1141
+msgid "enable obsoletes processing during updates"
+msgstr "enable obsoletes processing during updates"
 
-msgid "Epoch      : %s"
-msgstr "Epoch      : %s"
+#: ../cli.py:1143
+msgid "disable Yum plugins"
+msgstr "禁掉yum插件"
 
-msgid "Erased"
-msgstr "已删除"
+#: ../cli.py:1145
+msgid "disable gpg signature checking"
+msgstr "禁掉GPG验证检查"
 
-msgid "Erased: %s"
-msgstr "已删除: %s"
+#: ../cli.py:1147
+msgid "disable plugins by name"
+msgstr "用名称禁掉插件"
 
-msgid "Erasing"
-msgstr "正在删除"
+#: ../cli.py:1150
+msgid "skip packages with depsolving problems"
+msgstr "忽略包的依赖问题"
 
-msgid "Error Downloading Packages:\n"
-msgstr "下载包错误:\n"
+#: ../output.py:229
+msgid "Jan"
+msgstr "一月"
 
-msgid ""
-"Error Summary\n"
-"-------------\n"
-msgstr ""
-"错误的语法\n"
-"-------------\n"
+#: ../output.py:229
+msgid "Feb"
+msgstr "二月"
 
-msgid "Error opening rpm %s - error %s"
-msgstr "打开 RPM %s 错误 - 错误 %s"
+#: ../output.py:229
+msgid "Mar"
+msgstr "Mar"
 
-msgid "Error: %s"
-msgstr "错误: %s"
+#: ../output.py:229
+msgid "Apr"
+msgstr "Apr"
 
-msgid "Error: Need a group or list of groups"
-msgstr "错误:需要组或组的列表"
+#: ../output.py:229
+msgid "May"
+msgstr "Mai"
 
-msgid "Error: Need an item to match"
-msgstr "错误:需要细微的匹配"
+#: ../output.py:229
+msgid "Jun"
+msgstr "Jun"
 
-msgid "Error: Need to pass a list of pkgs to %s"
-msgstr "错误: 需要传输在列表的包到%s"
+#: ../output.py:230
+msgid "Jul"
+msgstr "Jul"
 
-msgid "Error: clean requires an option: %s"
-msgstr "Error: clean requires an option: %s"
+#: ../output.py:230
+msgid "Aug"
+msgstr "Aug"
 
-msgid "Error: invalid clean argument: %r"
-msgstr "Error: invalid clean argument: %r"
+#: ../output.py:230
+msgid "Sep"
+msgstr "Sep"
 
-msgid "Error: invalid output state: %s for %s"
-msgstr "Error: invalid output state: %s for %s"
+#: ../output.py:230
+msgid "Oct"
+msgstr "十月"
 
-msgid "Error: more than one file given as argument to shell."
-msgstr "Error: more than one file given as argument to shell."
+#: ../output.py:230
+msgid "Nov"
+msgstr "Nov"
 
-msgid "Errors were encountered while downloading packages."
-msgstr "Errors were encountered while downloading packages."
+#: ../output.py:230
+msgid "Dec"
+msgstr "Dec"
 
-msgid "Examining %s: %s"
-msgstr " 诊断 %s: %s"
+#: ../output.py:240
+msgid "Trying other mirror."
+msgstr "尝试其他镜像."
 
-msgid "Excluding %s"
-msgstr "不包括 %s"
+#: ../output.py:293
+#, python-format
+msgid "Name       : %s"
+msgstr "名称       : %s"
 
-msgid "Excluding Packages from %s"
-msgstr "在 %s 中排除的包"
+#: ../output.py:294
+#, python-format
+msgid "Arch       : %s"
+msgstr "架构 : %s"
 
-msgid "Excluding Packages in global exclude list"
-msgstr "不包适包在全局的排除的列表中"
+#: ../output.py:296
+#, python-format
+msgid "Epoch      : %s"
+msgstr "Epoch      : %s"
 
-msgid "Existing lock %s: another copy is running as pid %s."
-msgstr "锁已被用 %s:  另外的一个复制正在运行在 PID为 %s."
+#: ../output.py:297
+#, python-format
+msgid "Version    : %s"
+msgstr "版本    : %s"
 
-msgid "Exiting on user Command"
-msgstr "在用户的命令下退出"
+#: ../output.py:298
+#, python-format
+msgid "Release    : %s"
+msgstr "发行    : %s"
 
-msgid "Extra Packages"
-msgstr "扩展的包"
+#: ../output.py:299
+#, python-format
+msgid "Size       : %s"
+msgstr "大小    : %s"
 
-msgid "Failed to add groups file for repository: %s - %s"
-msgstr "为仓库添加组失败: %s - %s"
+#: ../output.py:300
+#, python-format
+msgid "Repo       : %s"
+msgstr "Repo       : %s"
 
-msgid "Failed to remove transaction file %s"
-msgstr "移除处理文件%s 失败"
+#: ../output.py:302
+#, python-format
+msgid "Committer  : %s"
+msgstr "Ãœbermittler  : %s"
 
-msgid "Failure finding best provider of %s for %s, exceeded maximum loop length"
-msgstr "Failure finding best provider of %s for %s, exceeded maximum loop length"
+#: ../output.py:303
+msgid "Summary    : "
+msgstr "语法    : "
 
-msgid "Feb"
-msgstr "二月"
+#: ../output.py:305
+#, python-format
+msgid "URL        : %s"
+msgstr "统一资源定位符       : %s"
 
-msgid "File %s given as argument to shell does not exist."
-msgstr "File %s given as argument to shell does not exist."
+#: ../output.py:306
+#, python-format
+msgid "License    : %s"
+msgstr "许可证    : %s"
 
-msgid "Filename passed to shell: %s"
-msgstr "Filename passed to shell: %s"
+#: ../output.py:307
+msgid "Description: "
+msgstr "升级:"
 
-msgid "Find what package provides the given value"
-msgstr "Find what package provides the given value"
+#: ../output.py:351
+msgid "Is this ok [y/N]: "
+msgstr "确定是这样吗? [y/N]: "
 
-msgid "Finding dependencies: "
-msgstr "找到依赖:"
+#: ../output.py:357 ../output.py:360
+msgid "y"
+msgstr "Y"
 
-msgid "Finished"
-msgstr "完成"
+#: ../output.py:357
+msgid "n"
+msgstr "n"
 
-msgid "Finished Transaction Test"
-msgstr "传输测试完成"
+#: ../output.py:357 ../output.py:360
+msgid "yes"
+msgstr "是"
 
-msgid "GPG key at %s (0x%s) is already installed"
-msgstr "GPG密钥在 %s (0x%s) 已经安装"
+#: ../output.py:357
+msgid "no"
+msgstr "否"
 
-msgid "GPG key parsing failed: "
-msgstr "分析GPG密钥失败: "
+#: ../output.py:367
+#, python-format
+msgid ""
+"\n"
+"Group: %s"
+msgstr ""
+"\n"
+"组: %s"
 
-msgid "GPG key retrieval failed: "
-msgstr "GPG密钥修复失败:"
+#: ../output.py:369
+#, python-format
+msgid " Description: %s"
+msgstr " 描述: %s"
 
-msgid "Generate the metadata cache"
-msgstr "生成原数据缓存"
+#: ../output.py:371
+msgid " Mandatory Packages:"
+msgstr " 托管的包是:"
 
-msgid "Getting group metadata"
-msgstr "获得组元数据"
+#: ../output.py:376
+msgid " Default Packages:"
+msgstr " 默认的包:"
 
-msgid "Got an empty Header, something has gone wrong"
-msgstr "得到空的头文件,有错误发生"
+#: ../output.py:381
+msgid " Optional Packages:"
+msgstr "  包的属性:"
 
-msgid "Header cannot be opened or does not match %s, %s."
-msgstr "Header 不能打开或对 %s, %s不匹配."
+#: ../output.py:386
+msgid " Conditional Packages:"
+msgstr " 包条件:"
 
-msgid "Header is not complete."
-msgstr "Header 不是完整的."
+#: ../output.py:394
+#, python-format
+msgid "package: %s"
+msgstr "包: %s"
 
-msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
-msgstr "Header并不在本地缓存而且caching-only 模式被激活。不能下载 %s"
+#: ../output.py:396
+msgid "  No dependencies for this package"
+msgstr "此包无任何的依赖"
 
-msgid "Import of key(s) didn't help, wrong key(s)?"
-msgstr "导入密钥时没有求助,错误的密钥?"
+#: ../output.py:401
+#, python-format
+msgid "  dependency: %s"
+msgstr "   依赖: %s"
 
-msgid "Importing GPG key 0x%s \"%s\" from %s"
-msgstr "导入GPG密钥 0x%s \"%s\" ,来自 %s"
+#: ../output.py:403
+msgid "   Unsatisfied dependency"
+msgstr "  不能满意的依赖性"
 
-msgid "Importing additional filelist information"
-msgstr "正在导入额外的文件列表信息"
+#: ../output.py:461
+msgid "Matched from:"
+msgstr "匹配来自于:"
 
-msgid "Install a local RPM"
-msgstr "安装本地 RPM"
+#: ../output.py:487
+msgid "There was an error calculating total download size"
+msgstr "There was an error calculating total download size"
 
-msgid "Install a package or packages on your system"
-msgstr "安装一个或多个软件包在你的系统"
+#: ../output.py:492
+#, python-format
+msgid "Total size: %s"
+msgstr "总大小: %s"
 
-msgid "Install the packages in a group on your system"
-msgstr "从组里安装软件包到你的系统"
+#: ../output.py:495
+#, python-format
+msgid "Total download size: %s"
+msgstr "总共下载大小: %s"
 
-msgid "Installed"
-msgstr "已安装"
+#: ../output.py:507
+msgid "Package"
+msgstr "包"
 
-msgid "Installed Groups:"
-msgstr "已安装组:"
+#: ../output.py:507
+msgid "Arch"
+msgstr "架构"
 
-msgid "Installed Packages"
-msgstr "已经安装的包"
+#: ../output.py:507
+msgid "Version"
+msgstr "版本"
 
-msgid "Installing"
-msgstr "正在安装"
+#: ../output.py:507
+msgid "Repository"
+msgstr "仓库"
+
+#: ../output.py:507
+msgid "Size"
+msgstr "大小"
 
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "为依赖而安装"
 
-msgid "Insufficient space in download directory %s to download"
-msgstr "目录 %s没有足够的空间下载文件"
+#: ../output.py:515
+msgid "Updating for dependencies"
+msgstr "更新依赖性"
 
-msgid "Invalid tsflag in config file: %s"
-msgstr "配置文件: %s中的tsflag是无效的"
+#: ../output.py:516
+msgid "Removing for dependencies"
+msgstr "为依赖移除"
 
-msgid "Invalid version flag"
-msgstr "无效的版本标志"
+#: ../output.py:528
+#, python-format
+msgid ""
+"     replacing  %s.%s %s\n"
+"\n"
+msgstr ""
+"     替代中 %s.%s %s\n"
+"\n"
 
-msgid "Invalid versioned dependency string, try quoting it."
-msgstr "无效的依赖字符串,尝试重新引用."
+#: ../output.py:536
+#, python-format
+msgid ""
+"\n"
+"Transaction Summary\n"
+"=============================================================================\n"
+"Install  %5.5s Package(s)         \n"
+"Update   %5.5s Package(s)         \n"
+"Remove   %5.5s Package(s)         \n"
+msgstr ""
+"\n"
+"处理信息摘要\n"
+"=============================================================================\n"
+"安装    %5.5s 个包        \n"
+"升级   %5.5s 个包         \n"
+"删除      %5.5s 个包         \n"
 
-msgid "Is this ok [y/N]: "
-msgstr "确定是这样吗? [y/N]: "
+#: ../output.py:554
+msgid "Removed"
+msgstr "已删除"
 
-msgid "Jan"
-msgstr "一月"
+#: ../output.py:555
+msgid "Dependency Removed"
+msgstr "依赖删除"
 
-msgid "Jul"
-msgstr "Jul"
+#: ../output.py:557
+msgid "Dependency Installed"
+msgstr "依赖安装"
 
-msgid "Jun"
-msgstr "Jun"
+#: ../output.py:559
+msgid "Dependency Updated"
+msgstr "依赖升级"
 
-msgid "Keeping included package %s"
-msgstr "保持已包含的包 %s"
+#: ../output.py:560
+msgid "Replaced"
+msgstr "替代"
 
-msgid "Key import failed (code %d)"
-msgstr "导入密钥失败 (代号 %d)"
+#: ../output.py:618
+#, python-format
+msgid ""
+"\n"
+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
+"seconds to exit.\n"
+msgstr ""
+"\n"
+" 当前下载取消, %s 中断 (ctrl-c) 再次 %s 将在%s%s%s 秒内退出.\n"
 
-msgid "Key imported successfully"
-msgstr "导入密钥成功"
+#: ../output.py:628
+msgid "user interrupt"
+msgstr "用户中断"
 
-msgid "License    : %s"
-msgstr "许可证    : %s"
+#: ../output.py:639
+msgid "installed"
+msgstr "已安装"
 
-msgid "List a package or groups of packages"
-msgstr "列出一个包或某组的包"
+#: ../output.py:640
+msgid "updated"
+msgstr "升级"
 
-msgid "List a package's dependencies"
-msgstr "列出包依赖相关"
+#: ../output.py:641
+msgid "obsoleted"
+msgstr "已废弃"
 
-msgid "List available package groups"
-msgstr "列出当前的组"
+#: ../output.py:642
+msgid "erased"
+msgstr "删除"
 
-msgid "Loaded plugins: "
-msgstr "载入插件: "
+#: ../output.py:646
+#, python-format
+msgid "---> Package %s.%s %s:%s-%s set to be %s"
+msgstr "---> 包 %s.%s %s:%s-%s 设置为 %s "
 
-msgid "Loading \"%s\" plugin"
-msgstr "载入 \"%s\" 插件"
+#: ../output.py:653
+msgid "--> Running transaction check"
+msgstr "-->运行处理检查"
 
-msgid "Making cache files for all metadata files."
-msgstr "将所有的元数据文件生成缓存文件."
+#: ../output.py:658
+msgid "--> Restarting Dependency Resolution with new changes."
+msgstr "--> 为新包重新启动解决依赖问题"
 
-msgid "Mar"
-msgstr "Mar"
+#: ../output.py:663
+msgid "--> Finished Dependency Resolution"
+msgstr "--> 完成依赖性检查"
 
-msgid "Marking %s as an update to %s"
-msgstr "标志 %s 将被更新为 %s"
+#: ../output.py:668
+#, python-format
+msgid "--> Processing Dependency: %s for package: %s"
+msgstr "--> 过程依赖: %s 依赖于包: %s"
 
-msgid "Marking %s to be installed"
-msgstr "标志 %s 将被安装"
+#: ../output.py:673
+#, python-format
+msgid "--> Unresolved Dependency: %s"
+msgstr "--> 没有解决的依赖: %s"
 
-msgid "Matched %s to require for %s"
-msgstr "标志%s 要求 %s"
+#: ../output.py:679
+#, python-format
+msgid "--> Processing Conflict: %s conflicts %s"
+msgstr "--> 过程冲突: %s 冲突于 %s"
 
-msgid "Matched from:"
-msgstr "匹配来自于:"
+#: ../output.py:682
+msgid "--> Populating transaction set with selected packages. Please wait."
+msgstr "--> 正在处理已选择的包,请稍候。"
 
-msgid "Matching packages for package list to user args"
-msgstr "从用户的包列表中匹配包"
+#: ../output.py:686
+#, python-format
+msgid "---> Downloading header for %s to pack into transaction set."
+msgstr "--->为 %s下载头文件以便于设置处理."
 
-msgid "May"
-msgstr "Mai"
+#: ../yumcommands.py:36
+msgid "You need to be root to perform this command."
+msgstr "你需要root身份执行此命令."
 
-msgid "Member: %s"
-msgstr "成员: %s"
+#: ../yumcommands.py:43
+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"
+"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"
+"\n"
+"\n"
+"Alternatively you can specify the url to the key you would like to use\n"
+"for a repository in the 'gpgkey' option in a repository section and yum \n"
+"will install it for you.\n"
+"\n"
+"For more information contact your distribution or package provider.\n"
+msgstr ""
+"\n"
+"你已经激活通过GPG密钥验证包,这是个好东西。 \n"
+"然而,你没有安装任何的GPG公钥,你需要下载:\n"
+"如果你要安装包的密钥\n"
+"你可以执行下面的命令:\n"
+"    rpm --import public.gpg.key\n"
+"\n"
+"\n"
+"Alternatively you can specify the url to the key you would like to use\n"
+"for a repository in the 'gpgkey' option in a repository section and yum \n"
+"will install it for you.\n"
+"\n"
+"For more information contact your distribution or package provider.\n"
 
-msgid "Metadata Cache Created"
-msgstr "原数据缓存已建立"
+#: ../yumcommands.py:63
+#, python-format
+msgid "Error: Need to pass a list of pkgs to %s"
+msgstr "错误: 需要传输在列表的包到%s"
 
-msgid "Missing Dependency: %s is needed by package %s"
-msgstr "丢失的依赖相关: %s 被包 %s 所需要"
+#: ../yumcommands.py:69
+msgid "Error: Need an item to match"
+msgstr "错误:需要细微的匹配"
 
-msgid "Mode for pkg providing %s: %s"
-msgstr "Mode for pkg providing %s: %s"
+#: ../yumcommands.py:75
+msgid "Error: Need a group or list of groups"
+msgstr "错误:需要组或组的列表"
 
-msgid "Mode is %s for provider of %s: %s"
-msgstr "Mode is %s for provider of %s: %s"
+#: ../yumcommands.py:84
+#, python-format
+msgid "Error: clean requires an option: %s"
+msgstr "Error: clean requires an option: %s"
 
-msgid "More than one identical match in sack for %s"
-msgstr "More than one identical match in sack for %s"
+#: ../yumcommands.py:89
+#, python-format
+msgid "Error: invalid clean argument: %r"
+msgstr "Error: invalid clean argument: %r"
 
-msgid "Name       : %s"
-msgstr "名称       : %s"
+#: ../yumcommands.py:102
+msgid "No argument to shell"
+msgstr "没有参数提供给shell"
 
-msgid "Needed Require has already been looked up, cheating"
-msgstr "Needed Require has already been looked up, cheating"
+#: ../yumcommands.py:105
+#, python-format
+msgid "Filename passed to shell: %s"
+msgstr "Filename passed to shell: %s"
 
-msgid "Needed Require is not a package name. Looking up: %s"
-msgstr "Needed Require is not a package name. Looking up: %s"
+#: ../yumcommands.py:109
+#, python-format
+msgid "File %s given as argument to shell does not exist."
+msgstr "File %s given as argument to shell does not exist."
 
-msgid "No Group named %s exists"
-msgstr "没有发现组 %s "
+#: ../yumcommands.py:115
+msgid "Error: more than one file given as argument to shell."
+msgstr "Error: more than one file given as argument to shell."
 
-msgid "No Groups Available in any repository"
-msgstr "在现有的仓库中没有组可被提供"
+#: ../yumcommands.py:156
+msgid "PACKAGE..."
+msgstr "包..."
 
-msgid "No Groups on which to run command"
-msgstr "没有组可以运行的命令"
+#: ../yumcommands.py:159
+msgid "Install a package or packages on your system"
+msgstr "安装一个或多个软件包在你的系统"
 
-msgid "No Match for argument: %s"
-msgstr "没有匹配的参数: %s"
+#: ../yumcommands.py:168
+msgid "Setting up Install Process"
+msgstr "设置安装进程"
 
-msgid "No Matches found"
-msgstr "没有匹配发现"
+#: ../yumcommands.py:179
+msgid "[PACKAGE...]"
+msgstr "[包 ...]"
 
-msgid "No Package Found for %s"
-msgstr "没有发现包 %s"
+#: ../yumcommands.py:182
+msgid "Update a package or packages on your system"
+msgstr "更新一个或多个包在你的系统"
 
-msgid "No Package found for %s"
-msgstr "没有发现包 %s"
+#: ../yumcommands.py:190
+msgid "Setting up Update Process"
+msgstr "设置更新进程"
 
-msgid "No Packages Provided"
-msgstr "没有可提供的包"
+#: ../yumcommands.py:204
+msgid "Display details about a package or group of packages"
+msgstr "显示关于包或一组包的细节信息"
 
-msgid "No Packages marked for Update"
-msgstr "没有包标志为升级"
+#: ../yumcommands.py:212
+msgid "Installed Packages"
+msgstr "已经安装的包"
 
-msgid "No Packages marked for removal"
-msgstr "没有包标志为删除"
+#: ../yumcommands.py:213
+msgid "Available Packages"
+msgstr "已经提供的包"
 
-msgid "No argument to shell"
-msgstr "没有参数提供给shell"
+#: ../yumcommands.py:214
+msgid "Extra Packages"
+msgstr "扩展的包"
 
-msgid "No group named %s exists"
-msgstr "没有组名为 %s "
+#: ../yumcommands.py:215
+msgid "Updated Packages"
+msgstr "更新过的包"
 
-msgid "No header - huh?"
-msgstr "没有头文件--:)?"
+#: ../yumcommands.py:221 ../yumcommands.py:225
+msgid "Obsoleting Packages"
+msgstr "废弃中的包"
 
-msgid "No help available for %s"
-msgstr "没有关于 %s 的帮助"
+#: ../yumcommands.py:226
+msgid "Recently Added Packages"
+msgstr "近期添加的包"
 
+#: ../yumcommands.py:232
 msgid "No matching Packages to list"
 msgstr "列表中没有匹配的包"
 
-msgid "No other %s installed, adding to list for potential install"
-msgstr "No other %s installed, adding to list for 潜在的install"
-
-msgid "No package %s available."
-msgstr "包 %s 不可提供."
+#: ../yumcommands.py:246
+msgid "List a package or groups of packages"
+msgstr "列出一个包或某组的包"
 
-msgid "No package matched to remove"
-msgstr "没有匹配的包删除"
+#: ../yumcommands.py:258
+msgid "Remove a package or packages from your system"
+msgstr "移除一个或多个包从你的系统"
 
-msgid "No package named %s available to be installed"
-msgstr "没有名称为 %s 包可供安装"
+#: ../yumcommands.py:266
+msgid "Setting up Remove Process"
+msgstr "设置删除进程"
 
-msgid "No package(s) available to install"
-msgstr "没有包可供安装."
+#: ../yumcommands.py:278
+msgid "Setting up Group Process"
+msgstr "设置组进程"
 
-msgid "No packages in any requested group available to install or update"
-msgstr "没有包在所要求的组中可提供安装或升级"
+#: ../yumcommands.py:284
+msgid "No Groups on which to run command"
+msgstr "没有组可以运行的命令"
 
-msgid "No packages to remove from groups"
-msgstr "No packages to remove from groups"
+#: ../yumcommands.py:297
+msgid "List available package groups"
+msgstr "列出当前的组"
 
-msgid "No plugin match for: %s"
-msgstr "没有插件可匹配: %s"
+#: ../yumcommands.py:314
+msgid "Install the packages in a group on your system"
+msgstr "从组里安装软件包到你的系统"
 
-msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
-msgstr "不可更新早已被废弃的包: %s.%s %s:%s-%s"
+#: ../yumcommands.py:336
+msgid "Remove the packages in a group from your system"
+msgstr "在一个组中移除包从您的系统"
 
-msgid "Not installing key"
-msgstr "没有安装密钥"
+#: ../yumcommands.py:360
+msgid "Display details about a package group"
+msgstr "显示关于包组的细节"
 
-msgid "Nothing matches %s.%s %s:%s-%s from update"
-msgstr "无法匹配  %s.%s %s:%s-%s 从更新中"
+#: ../yumcommands.py:384
+msgid "Generate the metadata cache"
+msgstr "生成原数据缓存"
 
-msgid "Nothing specified to install"
-msgstr "没有指定安装"
+#: ../yumcommands.py:390
+msgid "Making cache files for all metadata files."
+msgstr "将所有的元数据文件生成缓存文件."
 
-msgid "Nothing to do"
-msgstr "无事可做"
+#: ../yumcommands.py:391
+msgid "This may take a while depending on the speed of this computer"
+msgstr "这会占用一段时间,具体将取决于这台计算机的速度"
 
-msgid "Nov"
-msgstr "Nov"
+#: ../yumcommands.py:412
+msgid "Metadata Cache Created"
+msgstr "原数据缓存已建立"
 
-msgid "Obsoleted"
-msgstr "已废弃"
+#: ../yumcommands.py:426
+msgid "Remove cached data"
+msgstr "删除缓存数据"
 
-msgid "Obsoleting Packages"
-msgstr "废弃中的包"
+#: ../yumcommands.py:447
+msgid "Find what package provides the given value"
+msgstr "Find what package provides the given value"
 
-msgid "Oct"
-msgstr "十月"
+#: ../yumcommands.py:467
+msgid "Check for available package updates"
+msgstr "检查可提供的包升级"
 
-msgid "Options Error: %s"
-msgstr "属性错误: %s"
+#: ../yumcommands.py:490
+msgid "Search package details for the given string"
+msgstr "查找包细节居给定的字符串"
 
-msgid "PACKAGE..."
-msgstr "包..."
+#: ../yumcommands.py:496
+msgid "Searching Packages: "
+msgstr "查询包:"
 
-msgid "Package"
-msgstr "包"
+#: ../yumcommands.py:513
+msgid "Update packages taking obsoletes into account"
+msgstr "Update packages taking obsoletes into account"
 
-msgid "Package %s already installed and latest version"
-msgstr "包 %s 已安装并且是最新版本"
+#: ../yumcommands.py:522
+msgid "Setting up Upgrade Process"
+msgstr "设置升级进程"
 
-msgid "Package %s is allowed multiple installs, skipping"
-msgstr "包 %s 被允许多方式安装,忽略"
+#: ../yumcommands.py:536
+msgid "Install a local RPM"
+msgstr "安装本地 RPM"
 
-msgid "Package %s is already installed, skipping"
-msgstr "包 %s 早已安装,忽略"
+#: ../yumcommands.py:545
+msgid "Setting up Local Package Process"
+msgstr "设置本地包进程"
 
-msgid "Package %s is not signed"
-msgstr "包 %s 无签名认证"
+#: ../yumcommands.py:564
+msgid "Determine which package provides the given dependency"
+msgstr "决定哪个包提供了给定的依赖"
 
-msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
-msgstr "包 %s 没有安装, 不能安装。请适用yum install 安装它。"
+#: ../yumcommands.py:567
+msgid "Searching Packages for Dependency:"
+msgstr "为依赖相关查找包:"
 
-msgid "Package Object was not a package object instance"
-msgstr "Package Object was not a package object instance"
+#: ../yumcommands.py:581
+msgid "Run an interactive yum shell"
+msgstr "运行交互式的yum shell"
 
-msgid "Package does not match checksum"
-msgstr "包不匹配校验结果"
+#: ../yumcommands.py:587
+msgid "Setting up Yum Shell"
+msgstr "设置Yum-Shell yum交互式环境"
 
-msgid "Package does not match intended download"
-msgstr "Package does not match intended download."
+#: ../yumcommands.py:605
+msgid "List a package's dependencies"
+msgstr "列出包依赖相关"
 
-msgid "Package is already obsoleted: %s.%s %s:%s-%s"
-msgstr "包已经废弃: %s.%s %s:%s-%s"
+#: ../yumcommands.py:611
+msgid "Finding dependencies: "
+msgstr "找到依赖:"
 
-msgid "Package matching %s already installed. Checking for update."
-msgstr "匹配包 %s 已经安装. 检查更新."
+#: ../yumcommands.py:627
+msgid "Display the configured software repositories"
+msgstr "显示软件仓库的配置"
 
-msgid "Package tuple %s could not be found in packagesack"
-msgstr "包元组 %s 不能在packagesack中发现"
+#: ../yumcommands.py:645
+msgid "repo id"
+msgstr "Repo-号"
 
-msgid "Package(s) to install"
-msgstr "包将安装"
+#: ../yumcommands.py:645
+msgid "repo name"
+msgstr "Repo-名称:"
 
-msgid "Package: %s  - already in transaction set"
-msgstr "安装包: %s - 事务处理已设置"
+#: ../yumcommands.py:645
+msgid "status"
+msgstr "状态"
 
-msgid "Parsing package install arguments"
-msgstr "分析安装参数的语法"
+#: ../yumcommands.py:651
+msgid "enabled"
+msgstr "激活"
 
-msgid "Please report this error in bugzilla"
-msgstr "请报告这个错误给 Bugzilla"
+#: ../yumcommands.py:654
+msgid "disabled"
+msgstr "禁掉"
 
-msgid "Plugin \"%s\" doesn't specify required API version"
-msgstr "Plugin \"%s\" 没有指定必要的API版本"
+#: ../yumcommands.py:671
+msgid "Display a helpful usage message"
+msgstr "显示帮助用法信息"
 
-msgid "Plugin \"%s\" requires API %s. Supported API is %s."
-msgstr "Plugin \"%s\" 需要 API %s. 支持的 API 为 %s."
+#: ../yumcommands.py:705
+#, python-format
+msgid "No help available for %s"
+msgstr "没有关于 %s 的帮助"
 
-msgid "Potential Provider: %s"
-msgstr " 潜在的提供者: %s"
+#: ../yumcommands.py:710
+msgid ""
+"\n"
+"\n"
+"aliases: "
+msgstr ""
+"\n"
+"\n"
+"多重别名: "
 
-msgid "Potential match for %s from %s"
-msgstr "Potential match for %s from %s"
+#: ../yumcommands.py:712
+msgid ""
+"\n"
+"\n"
+"alias: "
+msgstr ""
+"\n"
+"\n"
+"别名: "
 
-msgid "Potential resolving package %s has newer instance in ts."
-msgstr "Potential resolving package %s has newer instance in ts."
+#: ../yumcommands.py:741
+msgid "Setting up Reinstall Process"
+msgstr "设置重新安装进程"
 
-msgid "Potential resolving package %s has newer instance installed."
-msgstr "Potential resolving package %s has newer instance installed."
+#: ../yumcommands.py:755
+msgid "reinstall a package"
+msgstr "重新安装一个包"
 
-msgid "Problem in reinstall: no package matched to install"
-msgstr "Problem in reinstall: no package matched to install"
+#: ../yummain.py:41
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+"\n"
+"\n"
+"用户取消而退出"
 
-msgid "Problem in reinstall: no package matched to remove"
-msgstr "Problem in reinstall: no package matched to remove"
+#: ../yummain.py:47
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+"\n"
+"\n"
+"管道损坏而退出"
 
-msgid "Problem opening package %s"
-msgstr "打开包 %s 出现问题"
+#: ../yummain.py:105
+msgid ""
+"Another app is currently holding the yum lock; waiting for it to exit..."
+msgstr "另外一个应用程序正在适用yum锁;等待其退出 ... ..."
 
-msgid "Provides-match: %s"
-msgstr "Provides-match: %s"
+#: ../yummain.py:132 ../yummain.py:171
+#, python-format
+msgid "Error: %s"
+msgstr "错误: %s"
 
-msgid "Public key for %s is not installed"
-msgstr "给 %s 的公钥没有安装"
+#: ../yummain.py:142 ../yummain.py:178
+#, python-format
+msgid "Unknown Error(s): Exit Code: %d:"
+msgstr "莫名的错误:  退出代码为: %d:"
 
-msgid "Public key for %s is not trusted"
-msgstr "给 %s 的公钥不可信任"
+#. Depsolve stage
+#: ../yummain.py:149
+msgid "Resolving Dependencies"
+msgstr "解决依赖相关"
 
-msgid "RPM %s fails md5 check"
-msgstr "RPM %s md5码校验失败"
+#: ../yummain.py:184
+msgid ""
+"\n"
+"Dependencies Resolved"
+msgstr ""
+"\n"
+"依赖性解决"
 
-msgid "Reading Local RPMDB"
-msgstr "读入本地RPMDB"
+#: ../yummain.py:198
+msgid "Complete!"
+msgstr "恭喜你!成功完成!"
 
-msgid "Reading repository metadata in from local files"
-msgstr "从本地文件读入仓库元数据"
+#: ../yummain.py:245
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel."
+msgstr ""
+"\n"
+"\n"
+"用户取消而退出"
 
-msgid "Recently Added Packages"
-msgstr "近期添加的包"
+#: ../yum/depsolve.py:82
+msgid "doTsSetup() will go away in a future version of Yum.\n"
+msgstr "doTsSetup() 将在未来的YUM版本中消失.\n"
 
-msgid "Reducing %s to included packages only"
-msgstr "减少 %s 所仅包含的包"
+#: ../yum/depsolve.py:95
+msgid "Setting up TransactionSets before config class is up"
+msgstr "在config类启用之前设置事务处理"
 
-msgid ""
-"Refusing to automatically import keys when running unattended.\n"
-"Use \"-y\" to override."
-msgstr ""
-"当运行unattended时拒绝自动导入密钥.\n"
-"用 \"-y\" 来覆盖"
+#: ../yum/depsolve.py:136
+#, python-format
+msgid "Invalid tsflag in config file: %s"
+msgstr "配置文件: %s中的tsflag是无效的"
 
-msgid "Release    : %s"
-msgstr "发行    : %s"
+#: ../yum/depsolve.py:147
+#, python-format
+msgid "Searching pkgSack for dep: %s"
+msgstr "查找pkgSack 为依赖: %s"
 
-msgid "Remove a package or packages from your system"
-msgstr "移除一个或多个包从你的系统"
+#: ../yum/depsolve.py:170
+#, python-format
+msgid "Potential match for %s from %s"
+msgstr "Potential match for %s from %s"
 
-msgid "Remove cached data"
-msgstr "删除缓存数据"
+#: ../yum/depsolve.py:178
+#, python-format
+msgid "Matched %s to require for %s"
+msgstr "标志%s 要求 %s"
 
-msgid "Remove the packages in a group from your system"
-msgstr "在一个组中移除包从您的系统"
+#: ../yum/depsolve.py:219
+#, python-format
+msgid "Member: %s"
+msgstr "成员: %s"
 
-msgid "Removed"
-msgstr "已删除"
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
+#, python-format
+msgid "%s converted to install"
+msgstr "%s 已转换的将安装"
 
-msgid "Removing"
-msgstr "正在删除"
+#: ../yum/depsolve.py:240
+#, python-format
+msgid "Adding Package %s in mode %s"
+msgstr "添加包 %s 在 %s 的模式下"
 
+#: ../yum/depsolve.py:250
+#, python-format
 msgid "Removing Package %s"
 msgstr "正在删除包 %s"
 
-msgid "Removing for dependencies"
-msgstr "为依赖移除"
+#: ../yum/depsolve.py:261
+#, python-format
+msgid "%s requires: %s"
+msgstr "%s 需要: %s"
 
-msgid "Removing unmatched package %s"
-msgstr "移除不匹配的包: %s"
+#: ../yum/depsolve.py:312
+msgid "Needed Require has already been looked up, cheating"
+msgstr "Needed Require has already been looked up, cheating"
 
-msgid "Repackage"
-msgstr "重新打包"
+#: ../yum/depsolve.py:322
+#, python-format
+msgid "Needed Require is not a package name. Looking up: %s"
+msgstr "Needed Require is not a package name. Looking up: %s"
 
-msgid "Replaced"
-msgstr "替代"
+#: ../yum/depsolve.py:329
+#, python-format
+msgid "Potential Provider: %s"
+msgstr " 潜在的提供者: %s"
 
-msgid "Repo       : %s"
-msgstr "Repo       : %s"
+#: ../yum/depsolve.py:352
+#, python-format
+msgid "Mode is %s for provider of %s: %s"
+msgstr "Mode is %s for provider of %s: %s"
 
-msgid "Repository"
-msgstr "仓库"
+#: ../yum/depsolve.py:356
+#, python-format
+msgid "Mode for pkg providing %s: %s"
+msgstr "Mode for pkg providing %s: %s"
 
-msgid "Repository %r is missing name in configuration, using id"
-msgstr "仓库 %r 丢失了名字在配置文件中,用id代替"
+#: ../yum/depsolve.py:360
+#, python-format
+msgid "TSINFO: %s package requiring %s marked as erase"
+msgstr "TSINFO: %s package requiring %s marked as erase"
 
-msgid "Resolving Dependencies"
-msgstr "解决依赖相关"
+#: ../yum/depsolve.py:372
+#, python-format
+msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+msgstr "TSINFO: Obsoleting %s with %s to resolve dep."
+
+#: ../yum/depsolve.py:375
+#, python-format
+msgid "TSINFO: Updating %s to resolve dep."
+msgstr "TSINFO: Updating %s to resolve dep."
 
+#: ../yum/depsolve.py:378
+#, python-format
+msgid "Cannot find an update path for dep for: %s"
+msgstr "Cannot find an update path for dep for: %s"
+
+#: ../yum/depsolve.py:388
+#, python-format
+msgid "Unresolvable requirement %s for %s"
+msgstr "没有解决的需求 %s 为 %s"
+
+#. is it already installed?
+#: ../yum/depsolve.py:434
+#, python-format
+msgid "%s is in providing packages but it is already installed, removing."
+msgstr "%s 在假设的包中,但是已经安装,删除中...."
+
+#: ../yum/depsolve.py:449
+#, python-format
+msgid "Potential resolving package %s has newer instance in ts."
+msgstr "Potential resolving package %s has newer instance in ts."
+
+#: ../yum/depsolve.py:460
+#, python-format
+msgid "Potential resolving package %s has newer instance installed."
+msgstr "Potential resolving package %s has newer instance installed."
+
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
+#, python-format
+msgid "Missing Dependency: %s is needed by package %s"
+msgstr "丢失的依赖相关: %s 被包 %s 所需要"
+
+#: ../yum/depsolve.py:481
+#, python-format
+msgid "%s already in ts, skipping this one"
+msgstr "%s 已在处理中, 忽略此项"
+
+#: ../yum/depsolve.py:510
+#, python-format
+msgid ""
+"Failure finding best provider of %s for %s, exceeded maximum loop length"
+msgstr ""
+"Failure finding best provider of %s for %s, exceeded maximum loop length"
+
+#: ../yum/depsolve.py:537
+#, python-format
+msgid "TSINFO: Marking %s as update for %s"
+msgstr "TSINFO: Marking %s as update for %s"
+
+#: ../yum/depsolve.py:544
+#, python-format
+msgid "TSINFO: Marking %s as install for %s"
+msgstr "TSINFO: Marking %s as install for %s"
+
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
+msgid "Success - empty transaction"
+msgstr "成功 --空的事务处理"
+
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "重新启动环回"
 
-msgid "Retrieving GPG key from %s"
-msgstr "从 %s 中恢复GPG密钥"
+#: ../yum/depsolve.py:702
+msgid "Dependency Process ending"
+msgstr "依赖进程完成中"
 
-msgid "Run an interactive yum shell"
-msgstr "运行交互式的yum shell"
+#: ../yum/depsolve.py:708
+#, python-format
+msgid "%s from %s has depsolving problems"
+msgstr "%s 已从%s  解决了问题"
 
-msgid "Running Transaction"
-msgstr "运行事务处理"
+#: ../yum/depsolve.py:715
+msgid "Success - deps resolved"
+msgstr "成功 --依赖性解决"
 
-msgid "Running Transaction Test"
-msgstr "运行测试事务处理"
+#: ../yum/depsolve.py:729
+#, python-format
+msgid "Checking deps for %s"
+msgstr "为 %s 检查依赖性"
 
-msgid "Running rpm_check_debug"
-msgstr "运行 rpm_check_debug "
+#: ../yum/depsolve.py:782
+#, python-format
+msgid "looking for %s as a requirement of %s"
+msgstr "查找 %s 在要求的 %s 下"
+
+#: ../yum/depsolve.py:933
+#, python-format
+msgid "Comparing best: %s to po: %s"
+msgstr "Vergleiche besseres: %s zu po: %s"
 
+#: ../yum/depsolve.py:937
+#, python-format
 msgid "Same: best %s == po: %s"
 msgstr "Same: best %s == po: %s"
 
-msgid "Search package details for the given string"
-msgstr "查找包细节居给定的字符串"
-
-msgid "Searching %d packages"
-msgstr "查询 %d 个包"
-
-msgid "Searching Packages for Dependency:"
-msgstr "为依赖相关查找包:"
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, python-format
+msgid "best %s obsoletes po: %s"
+msgstr "best %s obsoletes po: %s"
 
-msgid "Searching Packages: "
-msgstr "查询包:"
+#: ../yum/depsolve.py:955
+#, python-format
+msgid "po %s obsoletes best: %s"
+msgstr "po %s obsoletes best: %s"
 
-msgid "Searching pkgSack for dep: %s"
-msgstr "查找pkgSack 为依赖: %s"
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#, python-format
+msgid "better arch in po %s"
+msgstr "better arch in po %s"
 
-msgid "Sep"
-msgstr "Sep"
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#, python-format
+msgid "po %s shares a sourcerpm with %s"
+msgstr "po %s shares a sourcerpm with %s"
 
-msgid "Setting up Group Process"
-msgstr "设置组进程"
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#, python-format
+msgid "best %s shares a sourcerpm with %s"
+msgstr "best %s shares a sourcerpm with %s"
 
-msgid "Setting up Install Process"
-msgstr "设置安装进程"
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#, python-format
+msgid "po %s shares more of the name prefix with %s"
+msgstr "po %s shares more of the name prefix with %s"
 
-msgid "Setting up Local Package Process"
-msgstr "设置本地包进程"
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#, python-format
+msgid "po %s has a shorter name than best %s"
+msgstr "po %s has a shorter name than best %s"
 
-msgid "Setting up Package Sacks"
-msgstr "设置包麻袋"
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr "bestpkg %s shares more of the name prefix with %s"
 
-msgid "Setting up Reinstall Process"
-msgstr "设置重新安装进程"
+#: ../yum/__init__.py:119
+msgid "doConfigSetup() will go away in a future version of Yum.\n"
+msgstr "doConfigSetup() 将在未来的YUM版本中消失.\n"
 
-msgid "Setting up Remove Process"
-msgstr "设置删除进程"
+#: ../yum/__init__.py:296
+#, python-format
+msgid "Repository %r is missing name in configuration, using id"
+msgstr "仓库 %r 丢失了名字在配置文件中,用id代替"
 
-msgid "Setting up TransactionSets before config class is up"
-msgstr "在config类启用之前设置事务处理"
+#: ../yum/__init__.py:332
+msgid "plugins already initialised"
+msgstr "插件已经initialised"
 
-msgid "Setting up Update Process"
-msgstr "设置更新进程"
+#: ../yum/__init__.py:339
+msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+msgstr "doRpmDBSetup() 将在未来的YUM版本中消失.\n"
 
-msgid "Setting up Upgrade Process"
-msgstr "设置升级进程"
+#: ../yum/__init__.py:349
+msgid "Reading Local RPMDB"
+msgstr "读入本地RPMDB"
 
-msgid "Setting up Yum Shell"
-msgstr "设置Yum-Shell yum交互式环境"
+#: ../yum/__init__.py:367
+msgid "doRepoSetup() will go away in a future version of Yum.\n"
+msgstr "doRepoSetup() 将在未来的YUM版本中消失.\n"
 
-msgid "Setting up repositories"
-msgstr "设置仓库"
+#: ../yum/__init__.py:387
+msgid "doSackSetup() will go away in a future version of Yum.\n"
+msgstr "doSackSetup() 将在未来的YUM版本中消失.\n"
 
-msgid "Size"
-msgstr "大小"
+#: ../yum/__init__.py:404
+msgid "Setting up Package Sacks"
+msgstr "设置包麻袋"
 
-msgid "Size       : %s"
-msgstr "大小    : %s"
+#: ../yum/__init__.py:447
+#, python-format
+msgid "repo object for repo %s lacks a _resetSack method\n"
+msgstr "repo对象for repo  %s 缺少 a _resetSack 方法\n"
 
-msgid "Skip-broken round %i"
-msgstr "Skip-broken round %i"
+#: ../yum/__init__.py:448
+msgid "therefore this repo cannot be reset.\n"
+msgstr "因此此repo不能复位.\n"
 
-msgid "Skip-broken took %i rounds "
-msgstr "Skip-broken took %i rounds"
+#: ../yum/__init__.py:453
+msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+msgstr "doUpdateSetup() wird verschwinden in zukünfigen Version von Yum.\n"
 
-msgid "Success - deps resolved"
-msgstr "成功 --依赖性解决"
+#: ../yum/__init__.py:465
+msgid "Building updates object"
+msgstr "建立升级对象"
 
-msgid "Success - empty transaction"
-msgstr "成功 --空的事务处理"
+#: ../yum/__init__.py:496
+msgid "doGroupSetup() will go away in a future version of Yum.\n"
+msgstr "doGroupSetup()将在未来的YUM版本中消失.\n"
 
-msgid "Summary    : "
-msgstr "语法    : "
+#: ../yum/__init__.py:520
+msgid "Getting group metadata"
+msgstr "获得组元数据"
 
-msgid "TSINFO: %s package requiring %s marked as erase"
-msgstr "TSINFO: %s package requiring %s marked as erase"
+#: ../yum/__init__.py:546
+#, python-format
+msgid "Adding group file from repository: %s"
+msgstr "从仓库: %s 中添加组文件"
 
-msgid "TSINFO: Marking %s as install for %s"
-msgstr "TSINFO: Marking %s as install for %s"
+#: ../yum/__init__.py:555
+#, python-format
+msgid "Failed to add groups file for repository: %s - %s"
+msgstr "为仓库添加组失败: %s - %s"
 
-msgid "TSINFO: Marking %s as update for %s"
-msgstr "TSINFO: Marking %s as update for %s"
+#: ../yum/__init__.py:561
+msgid "No Groups Available in any repository"
+msgstr "在现有的仓库中没有组可被提供"
 
-msgid "TSINFO: Obsoleting %s with %s to resolve dep."
-msgstr "TSINFO: Obsoleting %s with %s to resolve dep."
+#: ../yum/__init__.py:611
+msgid "Importing additional filelist information"
+msgstr "正在导入额外的文件列表信息"
 
-msgid "TSINFO: Updating %s to resolve dep."
-msgstr "TSINFO: Updating %s to resolve dep."
+#: ../yum/__init__.py:657
+#, python-format
+msgid "Skip-broken round %i"
+msgstr "Skip-broken round %i"
 
-msgid "Test Transaction Errors: "
-msgstr "测试事务处理错误"
+#: ../yum/__init__.py:680
+#, python-format
+msgid "Skip-broken took %i rounds "
+msgstr "Skip-broken took %i rounds"
 
+#: ../yum/__init__.py:681
 msgid ""
-"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
-"Check that the correct key URLs are configured for this repository."
+"\n"
+"Packages skipped because of dependency problems:"
 msgstr ""
-"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
-"Check that the correct key URLs are configured for this repository."
-
-msgid "There was an error calculating total download size"
-msgstr "There was an error calculating total download size"
+"\n"
+"因为依赖性问题而忽略的包:"
 
-msgid "This may take a while depending on the speed of this computer"
-msgstr "这会占用一段时间,具体将取决于这台计算机的速度"
+#: ../yum/__init__.py:685
+#, python-format
+msgid "    %s from %s"
+msgstr "    %s 从 %s"
 
-msgid "Total download size: %s"
-msgstr "总共下载大小: %s"
+#: ../yum/__init__.py:774
+#, python-format
+msgid "Failed to remove transaction file %s"
+msgstr "移除处理文件%s 失败"
 
-msgid "Total size: %s"
-msgstr "总大小: %s"
+#: ../yum/__init__.py:814
+#, python-format
+msgid "excluding for cost: %s from %s"
+msgstr "excluding for cost: %s from %s"
 
-msgid "Transaction Check Error:\n"
-msgstr "处理检查错误:\n"
+#: ../yum/__init__.py:845
+msgid "Excluding Packages in global exclude list"
+msgstr "不包适包在全局的排除的列表中"
 
-msgid "Transaction Test Succeeded"
-msgstr "事务处理测试成功"
+#: ../yum/__init__.py:847
+#, python-format
+msgid "Excluding Packages from %s"
+msgstr "在 %s 中排除的包"
 
-msgid "Trying other mirror."
-msgstr "尝试其他镜像."
+#: ../yum/__init__.py:875
+#, python-format
+msgid "Reducing %s to included packages only"
+msgstr "减少 %s 所仅包含的包"
 
-msgid "Trying to run the transaction but nothing to do. Exiting."
-msgstr "尝试运行事务处理但是什么也做不成,退出."
+#: ../yum/__init__.py:880
+#, python-format
+msgid "Keeping included package %s"
+msgstr "保持已包含的包 %s"
 
-msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
-msgstr "Two or more plugins with the name \"%s\" exist in the plugin search path"
+#: ../yum/__init__.py:886
+#, python-format
+msgid "Removing unmatched package %s"
+msgstr "移除不匹配的包: %s"
 
-msgid "URL        : %s"
-msgstr "统一资源定位符       : %s"
+#: ../yum/__init__.py:889
+msgid "Finished"
+msgstr "完成"
 
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:919
+#, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "不能检查到PID %s是否激活"
 
-msgid "Unable to find a suitable mirror."
-msgstr "不能发现合适的镜像."
+#. Another copy seems to be running.
+#: ../yum/__init__.py:923
+#, python-format
+msgid "Existing lock %s: another copy is running as pid %s."
+msgstr "锁已被用 %s:  另外的一个复制正在运行在 PID为 %s."
 
-msgid "Unable to find configuration file for plugin %s"
-msgstr "不能找到插件 %s 的配置文件 "
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
+msgid "Package does not match intended download"
+msgstr "Package does not match intended download."
 
-msgid "Unknown Error(s): Exit Code: %d:"
-msgstr "莫名的错误:  退出代码为: %d:"
+#: ../yum/__init__.py:991
+msgid "Could not perform checksum"
+msgstr "无法执行校验和"
 
-msgid "Unresolvable requirement %s for %s"
-msgstr "没有解决的需求 %s 为 %s"
+#: ../yum/__init__.py:994
+msgid "Package does not match checksum"
+msgstr "包不匹配校验结果"
 
-msgid "Update a package or packages on your system"
-msgstr "更新一个或多个包在你的系统"
+#: ../yum/__init__.py:1036
+#, python-format
+msgid "package fails checksum but caching is enabled for %s"
+msgstr "包校验失败但是缓存已为 %s激活"
 
-msgid "Update packages taking obsoletes into account"
-msgstr "Update packages taking obsoletes into account"
+#: ../yum/__init__.py:1042
+#, python-format
+msgid "using local copy of %s"
+msgstr "在本地复制 %s"
 
-msgid "Updated"
-msgstr "更新完毕"
+#: ../yum/__init__.py:1061
+#, python-format
+msgid "Insufficient space in download directory %s to download"
+msgstr "目录 %s没有足够的空间下载文件"
 
-msgid "Updated Packages"
-msgstr "更新过的包"
+#: ../yum/__init__.py:1094
+msgid "Header is not complete."
+msgstr "Header 不是完整的."
 
-msgid "Updating"
-msgstr "正在升级"
+#: ../yum/__init__.py:1134
+#, python-format
+msgid ""
+"Header not in local cache and caching-only mode enabled. Cannot download %s"
+msgstr "Header并不在本地缓存而且caching-only 模式被激活。不能下载 %s"
 
-msgid "Updating Everything"
-msgstr "全部升级"
+#: ../yum/__init__.py:1189
+#, python-format
+msgid "Public key for %s is not installed"
+msgstr "给 %s 的公钥没有安装"
 
-msgid "Updating for dependencies"
-msgstr "更新依赖性"
+#: ../yum/__init__.py:1193
+#, python-format
+msgid "Problem opening package %s"
+msgstr "打开包 %s 出现问题"
 
-msgid "Version"
-msgstr "版本"
+#: ../yum/__init__.py:1201
+#, python-format
+msgid "Public key for %s is not trusted"
+msgstr "给 %s 的公钥不可信任"
 
-msgid "Version    : %s"
-msgstr "版本    : %s"
+#: ../yum/__init__.py:1205
+#, python-format
+msgid "Package %s is not signed"
+msgstr "包 %s 无签名认证"
 
-msgid "Warning: Group %s does not exist."
-msgstr "提示: 组 %s 不存在."
+#: ../yum/__init__.py:1243
+#, python-format
+msgid "Cannot remove %s"
+msgstr "无法删除 %s "
 
-msgid "Warning: No matches found for: %s"
-msgstr "提示 : 没有发现和: %s 匹配"
+#: ../yum/__init__.py:1247
+#, python-format
+msgid "%s removed"
+msgstr "%s 已删除"
 
-msgid "You need to be root to perform this command."
-msgstr "你需要root身份执行此命令."
+#: ../yum/__init__.py:1283
+#, python-format
+msgid "Cannot remove %s file %s"
+msgstr "无法删除 %s 文件 %s"
 
-msgid "You need to give some command"
-msgstr "你需要给出命令"
+#: ../yum/__init__.py:1287
+#, python-format
+msgid "%s file %s removed"
+msgstr "%s 文件 %s 已移除"
 
-msgid "[PACKAGE...]"
-msgstr "[包 ...]"
+#: ../yum/__init__.py:1289
+#, python-format
+msgid "%d %s files removed"
+msgstr "%d %s 文件已移除"
 
-msgid "answer yes for all questions"
-msgstr "回答所有的问题为是"
+#: ../yum/__init__.py:1329
+#, python-format
+msgid "More than one identical match in sack for %s"
+msgstr "More than one identical match in sack for %s"
 
-msgid "be tolerant of errors"
-msgstr "be tolerant of errors"
+#: ../yum/__init__.py:1335
+#, python-format
+msgid "Nothing matches %s.%s %s:%s-%s from update"
+msgstr "无法匹配  %s.%s %s:%s-%s 从更新中"
 
-msgid "best %s obsoletes po: %s"
-msgstr "best %s obsoletes po: %s"
+#: ../yum/__init__.py:1543
+msgid ""
+"searchPackages() will go away in a future version of "
+"Yum.                      Use searchGenerator() instead. \n"
+msgstr ""
+"searchPackages() 将在YUM未来的版本中消失.                     用 "
+"searchGenerator()替代. \n"
 
-msgid "best %s shares a sourcerpm with %s"
-msgstr "best %s shares a sourcerpm with %s"
+#: ../yum/__init__.py:1580
+#, python-format
+msgid "Searching %d packages"
+msgstr "查询 %d 个包"
 
-msgid "bestpkg %s shares more of the name prefix with %s"
-msgstr "bestpkg %s shares more of the name prefix with %s"
+#: ../yum/__init__.py:1584
+#, python-format
+msgid "searching package %s"
+msgstr "查询包: %s"
 
-msgid "better arch in po %s"
-msgstr "better arch in po %s"
+#: ../yum/__init__.py:1596
+msgid "searching in file entries"
+msgstr "searching in file entries"
 
-msgid "config file location"
-msgstr "config file location"
+#: ../yum/__init__.py:1603
+msgid "searching in provides entries"
+msgstr "在可提供的入口查询"
 
-msgid "debugging output level"
-msgstr "调试输出级别"
+#: ../yum/__init__.py:1633
+#, python-format
+msgid "Provides-match: %s"
+msgstr "Provides-match: %s"
 
-msgid "disable Yum plugins"
-msgstr "禁掉yum插件"
+#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
+#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
+#, python-format
+msgid "No Group named %s exists"
+msgstr "没有发现组 %s "
 
-msgid "disable exclude from main, for a repo or for everything"
-msgstr "disable exclude from main, for a repo or for everything"
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
+#, python-format
+msgid "package %s was not marked in group %s"
+msgstr "包 %s 在组 %s中没有被标志"
 
-msgid "disable gpg signature checking"
-msgstr "禁掉GPG验证检查"
+#: ../yum/__init__.py:1770
+#, python-format
+msgid "Adding package %s from group %s"
+msgstr "添加包 %s 从组 %s 中"
 
-msgid "disable one or more repositories (wildcards allowed)"
-msgstr "禁掉一个或多个仓库(支持通配符)"
+#: ../yum/__init__.py:1774
+#, python-format
+msgid "No package named %s available to be installed"
+msgstr "没有名称为 %s 包可供安装"
 
-msgid "disable plugins by name"
-msgstr "用名称禁掉插件"
+#: ../yum/__init__.py:1849
+#, python-format
+msgid "Package tuple %s could not be found in packagesack"
+msgstr "包元组 %s 不能在packagesack中发现"
 
-msgid "disabled"
-msgstr "禁掉"
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
+msgid "Invalid versioned dependency string, try quoting it."
+msgstr "无效的依赖字符串,尝试重新引用."
 
-msgid "doConfigSetup() will go away in a future version of Yum.\n"
-msgstr "doConfigSetup() 将在未来的YUM版本中消失.\n"
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
+msgid "Invalid version flag"
+msgstr "无效的版本标志"
 
-msgid "doGroupSetup() will go away in a future version of Yum.\n"
-msgstr "doGroupSetup()将在未来的YUM版本中消失.\n"
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
+#, python-format
+msgid "No Package found for %s"
+msgstr "没有发现包 %s"
 
-msgid "doRepoSetup() will go away in a future version of Yum.\n"
-msgstr "doRepoSetup() 将在未来的YUM版本中消失.\n"
+#: ../yum/__init__.py:2066
+msgid "Package Object was not a package object instance"
+msgstr "Package Object was not a package object instance"
 
-msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
-msgstr "doRpmDBSetup() 将在未来的YUM版本中消失.\n"
+#: ../yum/__init__.py:2070
+msgid "Nothing specified to install"
+msgstr "没有指定安装"
 
-msgid "doSackSetup() will go away in a future version of Yum.\n"
-msgstr "doSackSetup() 将在未来的YUM版本中消失.\n"
+#. only one in there
+#: ../yum/__init__.py:2085
+#, python-format
+msgid "Checking for virtual provide or file-provide for %s"
+msgstr "Checking for virtual provide or file-provide for %s"
 
-msgid "doTsSetup() will go away in a future version of Yum.\n"
-msgstr "doTsSetup() 将在未来的YUM版本中消失.\n"
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
+#, python-format
+msgid "No Match for argument: %s"
+msgstr "没有匹配的参数: %s"
 
-msgid "doUpdateSetup() will go away in a future version of Yum.\n"
-msgstr "doUpdateSetup() wird verschwinden in zukünfigen Version von Yum.\n"
+#. FIXME - this is where we could check to see if it already installed
+#. for returning better errors
+#: ../yum/__init__.py:2146
+msgid "No package(s) available to install"
+msgstr "没有包可供安装."
 
-msgid "enable obsoletes processing during updates"
-msgstr "enable obsoletes processing during updates"
+#: ../yum/__init__.py:2158
+#, python-format
+msgid "Package: %s  - already in transaction set"
+msgstr "安装包: %s - 事务处理已设置"
 
-msgid "enable one or more repositories (wildcards allowed)"
-msgstr "激活一个或多个仓库(支持通配符)"
+#: ../yum/__init__.py:2171
+#, python-format
+msgid "Package %s already installed and latest version"
+msgstr "包 %s 已安装并且是最新版本"
 
-msgid "enabled"
-msgstr "激活"
+#: ../yum/__init__.py:2178
+#, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr "匹配包 %s 已经安装. 检查更新."
 
-msgid "erased"
-msgstr "删除"
+#. update everything (the easy case)
+#: ../yum/__init__.py:2220
+msgid "Updating Everything"
+msgstr "全部升级"
 
-msgid "error output level"
-msgstr "错误输出级别"
+#: ../yum/__init__.py:2304
+#, python-format
+msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgstr "包已经废弃: %s.%s %s:%s-%s"
 
-msgid "exclude package(s) by name or glob"
-msgstr "在名称或glob不包含包。"
+#: ../yum/__init__.py:2377
+#, python-format
+msgid "%s"
+msgstr "%s"
 
-msgid "excluding for cost: %s from %s"
-msgstr "excluding for cost: %s from %s"
+#: ../yum/__init__.py:2392
+msgid "No package matched to remove"
+msgstr "没有匹配的包删除"
 
-msgid "installed"
-msgstr "已安装"
+#: ../yum/__init__.py:2426
+#, python-format
+msgid "Cannot open file: %s. Skipping."
+msgstr "不能打开文件: %s. 跳过."
 
-msgid "looking for %s as a requirement of %s"
-msgstr "查找 %s 在要求的 %s 下"
+#: ../yum/__init__.py:2429
+#, python-format
+msgid "Examining %s: %s"
+msgstr " 诊断 %s: %s"
 
-msgid "maximum command wait time"
-msgstr "最大化的命令等待时间"
+#: ../yum/__init__.py:2436
+#, python-format
+msgid ""
+"Package %s not installed, cannot update it. Run yum install to install it "
+"instead."
+msgstr "包 %s 没有安装, 不能安装。请适用yum install 安装它。"
 
-msgid "n"
-msgstr "n"
+#: ../yum/__init__.py:2468
+#, python-format
+msgid "Excluding %s"
+msgstr "不包括 %s"
 
-msgid "no"
-msgstr "否"
+#: ../yum/__init__.py:2473
+#, python-format
+msgid "Marking %s to be installed"
+msgstr "标志 %s 将被安装"
 
-msgid "obsoleted"
-msgstr "已废弃"
+#: ../yum/__init__.py:2479
+#, python-format
+msgid "Marking %s as an update to %s"
+msgstr "标志 %s 将被更新为 %s"
 
-msgid "package %s was not marked in group %s"
-msgstr "包 %s 在组 %s中没有被标志"
+#: ../yum/__init__.py:2486
+#, python-format
+msgid "%s: does not update installed package."
+msgstr "%s: 没有可供升级的包."
 
-msgid "package fails checksum but caching is enabled for %s"
-msgstr "包校验失败但是缓存已为 %s激活"
+#: ../yum/__init__.py:2504
+msgid "Problem in reinstall: no package matched to remove"
+msgstr "Problem in reinstall: no package matched to remove"
 
-msgid "package: %s"
-msgstr "包: %s"
+#: ../yum/__init__.py:2515
+#, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr "包 %s 被允许多方式安装,忽略"
 
-msgid "plugins already initialised"
-msgstr "插件已经initialised"
+#: ../yum/__init__.py:2522
+msgid "Problem in reinstall: no package matched to install"
+msgstr "Problem in reinstall: no package matched to install"
 
-msgid "po %s has a shorter name than best %s"
-msgstr "po %s has a shorter name than best %s"
+#: ../yum/__init__.py:2570
+#, python-format
+msgid "Retrieving GPG key from %s"
+msgstr "从 %s 中恢复GPG密钥"
 
-msgid "po %s obsoletes best: %s"
-msgstr "po %s obsoletes best: %s"
+#: ../yum/__init__.py:2576
+msgid "GPG key retrieval failed: "
+msgstr "GPG密钥修复失败:"
 
-msgid "po %s shares a sourcerpm with %s"
-msgstr "po %s shares a sourcerpm with %s"
+#: ../yum/__init__.py:2589
+msgid "GPG key parsing failed: "
+msgstr "分析GPG密钥失败: "
 
-msgid "po %s shares more of the name prefix with %s"
-msgstr "po %s shares more of the name prefix with %s"
+#: ../yum/__init__.py:2593
+#, python-format
+msgid "GPG key at %s (0x%s) is already installed"
+msgstr "GPG密钥在 %s (0x%s) 已经安装"
 
-msgid "quiet operation"
-msgstr "安静的操作"
+#. Try installing/updating GPG key
+#: ../yum/__init__.py:2598
+#, python-format
+msgid "Importing GPG key 0x%s \"%s\" from %s"
+msgstr "导入GPG密钥 0x%s \"%s\" ,来自 %s"
 
-msgid "registration of commands not supported"
-msgstr "注册命令不支持"
+#: ../yum/__init__.py:2610
+msgid "Not installing key"
+msgstr "没有安装密钥"
 
-msgid "reinstall a package"
-msgstr "重新安装一个包"
+#: ../yum/__init__.py:2616
+#, python-format
+msgid "Key import failed (code %d)"
+msgstr "导入密钥失败 (代号 %d)"
 
-msgid "repo id"
-msgstr "Repo-号"
+#: ../yum/__init__.py:2619
+msgid "Key imported successfully"
+msgstr "导入密钥成功"
 
-msgid "repo name"
-msgstr "Repo-名称:"
+#: ../yum/__init__.py:2624
+#, python-format
+msgid ""
+"The GPG keys listed for the \"%s\" repository are already installed but they "
+"are not correct for this package.\n"
+"Check that the correct key URLs are configured for this repository."
+msgstr ""
+"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."
 
-msgid "repo object for repo %s lacks a _resetSack method\n"
-msgstr "repo对象for repo  %s 缺少 a _resetSack 方法\n"
+#: ../yum/__init__.py:2633
+msgid "Import of key(s) didn't help, wrong key(s)?"
+msgstr "导入密钥时没有求助,错误的密钥?"
 
-msgid "run entirely from cache, don't update cache"
-msgstr "从缓冲中运行,而不是升级缓存"
+#: ../yum/__init__.py:2707
+msgid "Unable to find a suitable mirror."
+msgstr "不能发现合适的镜像."
 
-msgid "searchPackages() will go away in a future version of Yum.                      Use searchGenerator() instead. \n"
-msgstr "searchPackages() 将在YUM未来的版本中消失.                     用 searchGenerator()替代. \n"
+#: ../yum/__init__.py:2709
+msgid "Errors were encountered while downloading packages."
+msgstr "Errors were encountered while downloading packages."
 
-msgid "searching in file entries"
-msgstr "searching in file entries"
+#: ../yum/__init__.py:2774
+msgid "Test Transaction Errors: "
+msgstr "测试事务处理错误"
 
-msgid "searching in provides entries"
-msgstr "在可提供的入口查询"
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:195
+msgid "Loaded plugins: "
+msgstr "载入插件: "
 
-msgid "searching package %s"
-msgstr "查询包: %s"
+#: ../yum/plugins.py:206
+#, python-format
+msgid "No plugin match for: %s"
+msgstr "没有插件可匹配: %s"
 
-msgid "set install root"
-msgstr "设置为root安装"
+#: ../yum/plugins.py:219
+#, python-format
+msgid "\"%s\" plugin is disabled"
+msgstr "\"%s\" 此插件已被禁掉"
 
-msgid "show Yum version and exit"
-msgstr "显示 YUM版本信息并退出"
+#: ../yum/plugins.py:231
+#, python-format
+msgid "Plugin \"%s\" doesn't specify required API version"
+msgstr "Plugin \"%s\" 没有指定必要的API版本"
 
-msgid "show duplicates, in repos, in list/search commands"
-msgstr "显示复制, 在repo,list/search命令下"
+#: ../yum/plugins.py:235
+#, python-format
+msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+msgstr "Plugin \"%s\" 需要 API %s. 支持的 API 为 %s."
 
-msgid "skip packages with depsolving problems"
-msgstr "忽略包的依赖问题"
+#: ../yum/plugins.py:264
+#, python-format
+msgid "Loading \"%s\" plugin"
+msgstr "载入 \"%s\" 插件"
 
-msgid "status"
-msgstr "状态"
+#: ../yum/plugins.py:271
+#, python-format
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
 
-msgid "therefore this repo cannot be reset.\n"
-msgstr "因此此repo不能复位.\n"
+#: ../yum/plugins.py:291
+#, python-format
+msgid "Configuration file %s not found"
+msgstr "配置文件 %s 不能被找到"
 
-msgid "updated"
-msgstr "升级"
+#. for
+#. Configuration files for the plugin not found
+#: ../yum/plugins.py:294
+#, python-format
+msgid "Unable to find configuration file for plugin %s"
+msgstr "不能找到插件 %s 的配置文件 "
 
-msgid "user interrupt"
-msgstr "用户中断"
+#: ../yum/plugins.py:448
+msgid "registration of commands not supported"
+msgstr "注册命令不支持"
 
-msgid "using local copy of %s"
-msgstr "在本地复制 %s"
+#: ../rpmUtils/oldUtils.py:26
+#, python-format
+msgid "Header cannot be opened or does not match %s, %s."
+msgstr "Header 不能打开或对 %s, %s不匹配."
 
-msgid "y"
-msgstr "Y"
+#: ../rpmUtils/oldUtils.py:46
+#, python-format
+msgid "RPM %s fails md5 check"
+msgstr "RPM %s md5码校验失败"
 
-msgid "yes"
-msgstr "是"
+#: ../rpmUtils/oldUtils.py:144
+msgid "Could not open RPM database for reading. Perhaps it is already in use?"
+msgstr "不能以读的方式打开RPM数据库,或许是它已经在被用?"
 
+#: ../rpmUtils/oldUtils.py:174
+msgid "Got an empty Header, something has gone wrong"
+msgstr "得到空的头文件,有错误发生"
+
+#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
+#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#, python-format
+msgid "Damaged Header %s"
+msgstr "损坏的头文件 %s"
+
+#: ../rpmUtils/oldUtils.py:272
+#, python-format
+msgid "Error opening rpm %s - error %s"
+msgstr "打开 RPM %s 错误 - 错误 %s"


More information about the Yum-commits mailing list