[yum-git] po/da.po po/de.po po/fr.po po/it.po po/ms.po po/nb.po po/pl.po po/pt_BR.po po/pt.po po/ru.po po/yum.pot

Tue Mar 25 10:37:50 UTC 2008

po/da.po    |  740 ++++++++------
 po/de.po    |  730 +++++++-------
 po/fr.po    |  860 +++++++++-------
 po/it.po    |  547 +++++-----
 po/ms.po    |  691 +++++++------
 po/nb.po    |  708 +++++++------
 po/pl.po    |  722 +++++++------
 po/pt.po    | 3103 +++++++++++++++++++++++++++++++++++++++++++-----------------
 po/pt_BR.po |  979 +++++++++++-------
 po/ru.po    |  697 +++++++------
 po/yum.pot  |  671 +++++++-----
 11 files changed, 6337 insertions(+), 4111 deletions(-)

New commits:
commit 41ea29ea19de03b5d19df10aa8df0759570a66bd
Author: Tim Lauridsen <tla at rasmil.dk>
Date:   Tue Mar 25 11:31:11 2008 +0100

    updated yum.pot and all po with latest added _() strings

diff --git a/po/da.po b/po/da.po
index 69b4d86..5c220bb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum 3.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-08 09:57-0700\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-02-08 20:44+0100\n"
 "Last-Translator: Tim Lauridsen <timlau at fedoraproject.org>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../callback.py:48 ../output.py:487
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Opdaterer"
 
@@ -26,7 +26,7 @@ msgstr "Opdaterer"
 msgid "Erasing"
 msgstr "Sletter"
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:486
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Installerer"
 
@@ -34,7 +34,7 @@ msgstr "Installerer"
 msgid "Obsoleted"
 msgstr "OverflÃ¸diggjort"
 
-#: ../callback.py:54 ../output.py:533
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Opdateret"
 
@@ -42,7 +42,7 @@ msgstr "Opdateret"
 msgid "Erased"
 msgstr "Slettet"
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:531
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "Installeret"
 
@@ -64,7 +64,7 @@ msgstr "Error: Invalid output-status: %s for %s"
 msgid "Erased: %s"
 msgstr "Slettet : %s"
 
-#: ../callback.py:217 ../output.py:488
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Sletter"
 
@@ -85,12 +85,12 @@ msgstr "OpsÃ¦tning af filkilder"
 msgid "Reading repository metadata in from local files"
 msgstr "LÃ¦ser filkilde-metadata fra lokale filer"
 
-#: ../cli.py:183 ../utils.py:57
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "Konfigurationsfejl: %s"
 
-#: ../cli.py:186 ../cli.py:1040 ../utils.py:60
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Fejl i valgmulighed: %s"
@@ -134,39 +134,39 @@ msgstr "Henter pakker:"
 msgid "Error Downloading Packages:\n"
 msgstr "Fejl ved hentning af pakker:\n"
 
-#: ../cli.py:369 ../yum/__init__.py:2689
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "KÃ¸rer rpm_check_debug"
 
-#: ../cli.py:372 ../yum/__init__.py:2692
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr "FEJL i rpm_check_dedug vs afhÃ¦ngighedslÃ¸sning:"
 
-#: ../cli.py:376 ../yum/__init__.py:2694
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Opret venligst en fejlrapport i bugzilla"
 
-#: ../cli.py:380
+#: ../cli.py:383
 msgid "Running Transaction Test"
 msgstr "KÃ¸rer transaktionstest"
 
-#: ../cli.py:396
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr "Afsluttede transaktionstest"
 
-#: ../cli.py:398
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr "Fejl i transaktionscheck:\n"
 
-#: ../cli.py:405
+#: ../cli.py:408
 msgid "Transaction Test Succeeded"
 msgstr "Transaktionstest afsluttet uden fejl"
 
-#: ../cli.py:423
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr "KÃ¸rer transaktion"
 
-#: ../cli.py:452
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
@@ -174,228 +174,245 @@ msgstr ""
 "Afviser automatisk import af nÃ¸gler ved baggrundskÃ¸rsel.\n"
 "Brug \"-y\" til at forcere."
 
-#: ../cli.py:484
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr "Behandler pakkeinstallationsargumenter"
 
-#: ../cli.py:494
+#: ../cli.py:501
 #, python-format
 msgid "No package %s available."
 msgstr "Pakken %s er ikke tilgÃ¦ngelig"
 
-#: ../cli.py:498 ../cli.py:616 ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Pakke(r) til installation"
 
-#: ../cli.py:499 ../cli.py:617 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr "Intet at udfÃ¸re"
 
-#: ../cli.py:529 ../yum/__init__.py:2192 ../yum/__init__.py:2271
-#: ../yum/__init__.py:2283
+#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
+#: ../yum/__init__.py:2340
 #, python-format
 msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
-msgstr "Ingen opdatering af pakke som allerede er overflÃ¸diggjort: %s.%s %s:%s-%s"
+msgstr ""
+"Ingen opdatering af pakke som allerede er overflÃ¸diggjort: %s.%s %s:%s-%s"
 
-#: ../cli.py:561
+#: ../cli.py:568
 #, python-format
 msgid "Could not find update match for %s"
 msgstr "Kunne ikke finde et match for %s"
 
-#: ../cli.py:573
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr "%d pakker markeret til opdatering"
 
-#: ../cli.py:576
+#: ../cli.py:583
 msgid "No Packages marked for Update"
 msgstr "Ingen pakker markeret til opdatering"
 
-#: ../cli.py:592
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr "%d pakker markeret til sletning"
 
-#: ../cli.py:595
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr "Ingen pakker markeret til sletning"
 
-#: ../cli.py:607
+#: ../cli.py:614
 msgid "No Packages Provided"
 msgstr "Ingen pakker angivet"
 
-#: ../cli.py:647
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr "Matcher pakker til pakkeliste baseret pÃ¥ brugerens argumenter"
 
-#: ../cli.py:685
+#: ../cli.py:701
+#, fuzzy, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "%s pakken blev ikke fundet"
+
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Ingen match fundet"
 
-#: ../cli.py:722
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Ingen pakke fundet for %s"
 
-#: ../cli.py:734
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "Oprydning af alt"
 
-#: ../cli.py:748
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "Oprydning af header-filer"
 
-#: ../cli.py:751
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "Oprydning af pakker"
 
-#: ../cli.py:754
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "Oprydning af xml-metadata"
 
-#: ../cli.py:757
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "Oprydning af database-cache"
 
-#: ../cli.py:760
+#: ../cli.py:783
+#, fuzzy
+msgid "Cleaning up expire-cache metadata"
+msgstr "Oprydning af xml-metadata"
+
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "Oprydning af udvidelsesmoduler"
 
-#: ../cli.py:782
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Installerede grupper:"
 
-#: ../cli.py:789
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "TilgÃ¦ngelige grupper:"
 
-#: ../cli.py:795
+#: ../cli.py:820
 msgid "Done"
 msgstr "Afsluttet"
 
-#: ../cli.py:804 ../cli.py:816 ../cli.py:822
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "Advarsel: Gruppen %s ikke fundet."
 
-#: ../cli.py:828
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
-msgstr "Ingen efterspurgte pakker er tilgÃ¦ngelige til installation eller opdatering"
+msgstr ""
+"Ingen efterspurgte pakker er tilgÃ¦ngelige til installation eller opdatering"
 
-#: ../cli.py:830
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d pakke(r) til installation"
 
-#: ../cli.py:840
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Gruppen %s findes ikke"
 
-#: ../cli.py:846
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Ingen pakker at slette fra grupper"
 
-#: ../cli.py:848
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d pakke(r) til sletning"
 
-#: ../cli.py:890
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "Pakken %s er allerede installeret"
 
-#: ../cli.py:901
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr "Ser bort fra ikke-kompatibel pakke %s.%s"
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:927
+#: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
 msgstr ""
 "Ingen andre %s er installeret, tilfÃ¸jer til liste af mulig installation"
 
-#: ../cli.py:946
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "Kommandolinie-fejl: %s"
 
-#: ../cli.py:1073
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "vÃ¦r fejltolerant"
 
-#: ../cli.py:1075
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr "KÃ¸r kun med lokal cache, ingen opdatering af cachen"
 
-#: ../cli.py:1077
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "placering af konfigurationsfil"
 
-#: ../cli.py:1079
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "maksimal kommando-ventetid"
 
-#: ../cli.py:1081
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "debug-visningsniveau"
 
-#: ../cli.py:1084
+#: ../cli.py:1113
+msgid "show duplicates, in repos, in list/search commands"
+msgstr ""
+
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "fejl-visningsniveau"
 
-#: ../cli.py:1087
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "stille operation"
 
-#: ../cli.py:1091
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "svar 'ja' pÃ¥ alle spÃ¸rgsmÃ¥l"
 
-#: ../cli.py:1093
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "vis Yum version og afslut"
 
-#: ../cli.py:1094
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "SÃ¦t installationsroden"
 
-#: ../cli.py:1098
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "aktiver en eller flere filkilder (wildcards er tilladt)"
 
-#: ../cli.py:1102
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr "deaktiver en eller flere filkilder (wildcards tilladt)"
 
-#: ../cli.py:1105
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr "ekskluder pakke(r) med navn eller wildcards"
 
-#: ../cli.py:1107
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
-msgstr "deaktiver ekskludering af pakker, for filkilde eller for alle filkilder"
+msgstr ""
+"deaktiver ekskludering af pakker, for filkilde eller for alle filkilder"
 
-#: ../cli.py:1110
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr "aktiver overflÃ¸diggÃ¸relse under behandling af opdateringer"
 
-#: ../cli.py:1112
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "deaktiver yum-udvidelser (plugins)"
 
-#: ../cli.py:1114
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "deaktiver check af gpg signaturer"
 
-#: ../cli.py:1116
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "deaktiver navngivne udvidelser (plugins)"
 
-#: ../cli.py:1119
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "drop pakker med afhÃ¦ngighedsproblemer"
 
@@ -451,69 +468,85 @@ msgstr "Dec"
 msgid "Trying other mirror."
 msgstr "PrÃ¸ver et andet filspejl (mirror)"
 
-#: ../output.py:273
+#: ../output.py:293
 #, python-format
 msgid "Name       : %s"
 msgstr "Navn       : %s"
 
-#: ../output.py:274
+#: ../output.py:294
 #, python-format
 msgid "Arch       : %s"
 msgstr "Arkt       : %s"
 
-#: ../output.py:276
+#: ../output.py:296
 #, python-format
 msgid "Epoch      : %s"
 msgstr "Epoch      : %s"
 
-#: ../output.py:277
+#: ../output.py:297
 #, python-format
 msgid "Version    : %s"
 msgstr "Version    : %s"
 
-#: ../output.py:278
+#: ../output.py:298
 #, python-format
 msgid "Release    : %s"
 msgstr "Release    : %s"
 
-#: ../output.py:279
+#: ../output.py:299
 #, python-format
 msgid "Size       : %s"
 msgstr "Strl       : %s"
 
-#: ../output.py:280
+#: ../output.py:300
 #, python-format
 msgid "Repo       : %s"
 msgstr "Kilde      : %s"
 
-#: ../output.py:282
+#: ../output.py:302
 #, python-format
 msgid "Committer  : %s"
 msgstr "Committer  : %s"
 
-#: ../output.py:283
+#: ../output.py:303
 msgid "Summary    : "
 msgstr "Sammendrag  : "
 
-#: ../output.py:285
+#: ../output.py:305
 #, python-format
 msgid "URL        : %s"
 msgstr "URL        : %s"
 
-#: ../output.py:286
+#: ../output.py:306
 #, python-format
 msgid "License    : %s"
 msgstr "Lisense    : %s"
 
-#: ../output.py:287
+#: ../output.py:307
 msgid "Description: "
 msgstr "Beskrivelse:"
 
-#: ../output.py:331
+#: ../output.py:351
 msgid "Is this ok [y/N]: "
 msgstr "Er dette o.k. [y/N]: "
 
-#: ../output.py:345
+#: ../output.py:357 ../output.py:360
+msgid "y"
+msgstr ""
+
+#: ../output.py:357
+msgid "n"
+msgstr ""
+
+#: ../output.py:357 ../output.py:360
+msgid "yes"
+msgstr ""
+
+#: ../output.py:357
+msgid "no"
+msgstr ""
+
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -522,103 +555,105 @@ msgstr ""
 "\n"
 "Gruppe: %s"
 
-#: ../output.py:347
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " Beskrivelse: %s"
 
-#: ../output.py:349
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr " Tvungne pakker:"
 
-#: ../output.py:354
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr "-Standard-pakker:"
 
-#: ../output.py:359
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr "-Valgfrie pakker:"
 
-#: ../output.py:364
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr "-AfhÃ¦ngige pakker:"
 
-#: ../output.py:372
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "pakke: %s"
 
-#: ../output.py:374
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr "  Ingen afhÃ¦ngigheder for denne pakke"
 
-#: ../output.py:379
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr "  AfhÃ¦ngighed: %s"
 
-#: ../output.py:381
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr "   Ufuldendt afhÃ¦ngighed"
 
-#: ../output.py:436
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Matchet af:"
 
-#: ../output.py:462
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr "Der var en fejl i beregning af den totale download-stÃ¸rrelse"
 
-#: ../output.py:467
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "Total stÃ¸rrelse: %s"
 
-#: ../output.py:470
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "Total download-stÃ¸rrelse: %s"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Package"
 msgstr "Pakke"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Arch"
 msgstr "Arkt"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Version"
 msgstr "Version"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Repository"
 msgstr "Filkilde"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Size"
 msgstr "StÃ¸rrelse"
 
-#: ../output.py:489
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Installer som afhÃ¦ngighed"
 
-#: ../output.py:490
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Opdaterer som afhÃ¦ngighed"
 
-#: ../output.py:491
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Sletter som afhÃ¦ngighed"
 
-#: ../output.py:503
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
 "\n"
-msgstr "     erstatter  %s.%s %s\n\n"
+msgstr ""
+"     erstatter  %s.%s %s\n"
+"\n"
 
-#: ../output.py:511
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -635,91 +670,94 @@ msgstr ""
 "Opdaterer    %5.5s pakke(r)         \n"
 "Sletter      %5.5s pakke(r)         \n"
 
-#: ../output.py:529
+#: ../output.py:554
 msgid "Removed"
 msgstr "Slettet"
 
-#: ../output.py:530
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "AfhÃ¦ngighed slettet"
 
-#: ../output.py:532
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "AfhÃ¦ngighed installeret"
 
-#: ../output.py:534
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "AfhÃ¦ngighed opdateret"
 
-#: ../output.py:535
+#: ../output.py:560
 msgid "Replaced"
 msgstr "Erstattet"
 
-#: ../output.py:593
+#: ../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 NuvÃ¦rende download afbrudt, %safbryd (ctrl-c) igen %s indenfor %s%s%s sekunder for at afslutte.\n"
+msgstr ""
+"\n"
+" NuvÃ¦rende download afbrudt, %safbryd (ctrl-c) igen %s indenfor %s%s%s "
+"sekunder for at afslutte.\n"
 
-#: ../output.py:603
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "afsluttet af bruger"
 
-#: ../output.py:614
+#: ../output.py:639
 msgid "installed"
 msgstr "installeret"
 
-#: ../output.py:615
+#: ../output.py:640
 msgid "updated"
 msgstr "opdateret"
 
-#: ../output.py:616
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "overflÃ¸diggjort"
 
-#: ../output.py:617
+#: ../output.py:642
 msgid "erased"
 msgstr "slettet"
 
-#: ../output.py:621
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> Pakke %s.%s %s:%s-%s sat til at blive %s"
 
-#: ../output.py:628
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> KÃ¸rer transaktionscheck"
 
-#: ../output.py:633
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr "--> Genstarter afhÃ¦ngighedssÃ¸gning med nye Ã¦ndringer."
 
-#: ../output.py:638
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> Afsluttede afhÃ¦ngighedssÃ¸gningen"
 
-#: ../output.py:643
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr "--> Behandler afhÃ¦ngighed: %s for pakken: %s"
 
-#: ../output.py:648
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> Ikke fundet afhÃ¦ngighed: %s"
 
-#: ../output.py:654
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Behandler konflikt: %s konflikter med %s"
 
-#: ../output.py:657
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr "--> Udfylder transaktionssÃ¦ttet med valgte pakker, vent venligst."
 
-#: ../output.py:661
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr "---> Downloader header for %s til at indsÃ¦tte i transaktionssÃ¦ttet."
@@ -1035,7 +1073,10 @@ msgid ""
 "\n"
 "\n"
 "Exiting on user cancel"
-msgstr "\n\nAfslutter efter brugerens Ã¸nske"
+msgstr ""
+"\n"
+"\n"
+"Afslutter efter brugerens Ã¸nske"
 
 #: ../yummain.py:47
 msgid ""
@@ -1075,11 +1116,11 @@ msgstr ""
 "\n"
 "AfhÃ¦ngigheder fundet"
 
-#: ../yummain.py:199
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr "Afsluttet!"
 
-#: ../yummain.py:246
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
@@ -1089,442 +1130,475 @@ msgstr ""
 "\n"
 "Afslutter efter brugerens Ã¸nske"
 
-#: ../yum/depsolve.py:70
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr "doTsSetup() vil blive fjernet i en fremtidig version af Yum.\n"
 
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
 msgstr "OpsÃ¦tning af TransactionSets fÃ¸r config-klassen er sat op"
 
-#: ../yum/depsolve.py:123
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr "Invalid tsflag i konfigurationsfilen: %s"
 
-#: ../yum/depsolve.py:134
+#: ../yum/depsolve.py:147
 #, python-format
 msgid "Searching pkgSack for dep: %s"
 msgstr "SÃ¸ger i pkgSack for afhÃ¦ngigheden: %s"
 
-#: ../yum/depsolve.py:163
+#: ../yum/depsolve.py:170
 #, python-format
 msgid "Potential match for %s from %s"
 msgstr "Mulig match for %s fra %s"
 
-#: ../yum/depsolve.py:171
+#: ../yum/depsolve.py:178
 #, python-format
 msgid "Matched %s to require for %s"
 msgstr "Matchede %s som afhÃ¦ngighed for %s"
 
-#: ../yum/depsolve.py:212
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "Medlem: %s"
 
-#: ../yum/depsolve.py:226 ../yum/depsolve.py:788
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s konverteret til installation"
 
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "TilfÃ¸jer pakke %s i mode %s"
 
-#: ../yum/depsolve.py:243
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Sletter Pakke %s"
 
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s behÃ¸ver: %s"
 
-#: ../yum/depsolve.py:300
+#: ../yum/depsolve.py:312
 msgid "Needed Require has already been looked up, cheating"
 msgstr "AfhÃ¦ngighed fundet tidligere, snyder"
 
-#: ../yum/depsolve.py:310
+#: ../yum/depsolve.py:322
 #, python-format
 msgid "Needed Require is not a package name. Looking up: %s"
 msgstr "AfhÃ¦ngighed er ikke et pakkenavn. SÃ¸ger efter: %s"
 
-#: ../yum/depsolve.py:317
+#: ../yum/depsolve.py:329
 #, python-format
 msgid "Potential Provider: %s"
 msgstr "Mulig leverandÃ¸r af afhÃ¦ngighed: %s"
 
-#: ../yum/depsolve.py:340
+#: ../yum/depsolve.py:352
 #, python-format
 msgid "Mode is %s for provider of %s: %s"
 msgstr "Mode er %s for leverandÃ¸r af %s: %s"
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:356
 #, python-format
 msgid "Mode for pkg providing %s: %s"
 msgstr "Mode for pakke som leverer  %s: %s"
 
-#: ../yum/depsolve.py:348
+#: ../yum/depsolve.py:360
 #, python-format
 msgid "TSINFO: %s package requiring %s marked as erase"
 msgstr "TSINFO: %s pakker som behÃ¸ver %s markeret for sletning"
 
-#: ../yum/depsolve.py:361
-#, python-format
-msgid "Looking for Obsoletes for %s"
-msgstr "SÃ¸ger efter overflÃ¸diggÃ¸relse for %s"
-
-#: ../yum/depsolve.py:373
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr "TSINFO: OverflÃ¸diggÃ¸r %s med %s for at finde afhÃ¦ngighed."
 
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr "TSINFO: Opdaterer %s for at opfylde afhÃ¦ngighed."
 
-#. if there's no update then pass this over to requringFromTransaction()
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:378
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr "Kan ikke finde en opdateringsvej for afhÃ¦ngigheden for : %s"
 
-#: ../yum/depsolve.py:420
+#: ../yum/depsolve.py:388
 #, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr "Ikke fundet afhÃ¦ngighed %s for %s"
 
 #. is it already installed?
-#: ../yum/depsolve.py:466
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
-msgstr "%s som leverer afhÃ¦ngigheder er allerede installeret, fjerner fra transaktion"
+msgstr ""
+"%s som leverer afhÃ¦ngigheder er allerede installeret, fjerner fra transaktion"
 
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr "Pakken %s findes i en nyere udgave i transaktionen"
 
-#: ../yum/depsolve.py:492
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr "Pakken %s er allerede installeret i en nyere udgave"
 
-#: ../yum/depsolve.py:500 ../yum/depsolve.py:568
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr "Manglende afhÃ¦ngighed: %s behÃ¸ves af fÃ¸lgende pakke %s"
 
-#: ../yum/depsolve.py:513
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr "%s er allerede fundet i transaktion, springer den over"
 
-#: ../yum/depsolve.py:578
+#: ../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: Markerer %s som en opdatering for %s"
 
-#: ../yum/depsolve.py:585
+#: ../yum/depsolve.py:544
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr "TSINFO: Markerer %s til installerer for %s"
 
-#: ../yum/depsolve.py:647 ../yum/depsolve.py:654
-#, python-format
-msgid "unable to find newer package for %s"
-msgstr "Kunne ikke fine en nyere pakke for %s"
-
-#: ../yum/depsolve.py:661
-#, python-format
-msgid "TSINFO: Updating %s to resolve conflict."
-msgstr "TSINFO: Opdaterer %s for at lÃ¸se en konflikt."
-
-#: ../yum/depsolve.py:671
-#, python-format
-msgid "%s conflicts: %s"
-msgstr "%s konflikter med: %s"
-
-#: ../yum/depsolve.py:681
-#, python-format
-msgid "%s conflicts with %s"
-msgstr "%s konflikter med %s"
-
-#: ../yum/depsolve.py:720 ../yum/depsolve.py:806
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Succes -- tom transaktion"
 
-#: ../yum/depsolve.py:765 ../yum/depsolve.py:778
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Genstarter loop"
 
-#: ../yum/depsolve.py:794
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "AfhÃ¦ngighedssÃ¸gning afsluttet"
 
-#: ../yum/depsolve.py:800
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr "%s fra %s har afhÃ¦ngighedsproblemer"
 
-#: ../yum/depsolve.py:807
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "Succes - afhÃ¦ngigheder fundet"
 
-#: ../yum/depsolve.py:824
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "Checker afhÃ¦ngigheder for %s"
 
-#: ../yum/depsolve.py:880
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr "sÃ¸ger efter %s som afhÃ¦ngighed for %s"
 
+#: ../yum/depsolve.py:933
+#, python-format
+msgid "Comparing best: %s to po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, python-format
+msgid "best %s obsoletes po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:955
+#, python-format
+msgid "po %s obsoletes best: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#, fuzzy, python-format
+msgid "better arch in po %s"
+msgstr "gennemsÃ¸ger fÃ¸lgende pakke %s"
+
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#, python-format
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#, python-format
+msgid "best %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#, python-format
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#, python-format
+msgid "po %s has a shorter name than best %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
+
 #: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr "doConfigSetup() vil forsvinde i en fremtidig version af Yum.\n"
 
-#: ../yum/__init__.py:311
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr "Kilden %r mangler 'name' i konfigurationen, bruger 'id' i stedet"
 
-#: ../yum/__init__.py:347
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr "Udvidelser (plugins) er allerede indlÃ¦st"
 
-#: ../yum/__init__.py:354
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr "doRpmDBSetup() vil forsvinde i en fremtidig version af Yum.\n"
 
-#: ../yum/__init__.py:363
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr "LÃ¦ser lokal RPMDB"
 
-#: ../yum/__init__.py:381
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr "doRepoSetup() vil forsvinde i en fremtidig version af Yum.\n"
 
-#: ../yum/__init__.py:399
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr "doSackSetup() vil forsvinde i en fremtidig version af Yum.\n"
 
-#: ../yum/__init__.py:416
+#: ../yum/__init__.py:404
 msgid "Setting up Package Sacks"
 msgstr "OpsÃ¦tning af pakkelister"
 
-#: ../yum/__init__.py:458
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr "repo object for repo %s lacks a _resetSack method\n"
 
-#: ../yum/__init__.py:459
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr "derfor kan denne filkilde ikke blive nulstillet\n"
 
-#: ../yum/__init__.py:464
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr "doUpdateSetup() vil forsvinde i en fremtidig version af Yum.\n"
 
-#: ../yum/__init__.py:476
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr "Bygger opdateringsobjekt"
 
-#: ../yum/__init__.py:499
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr "doGroupSetup() vil forsvinde i en fremtidig version af Yum.\n"
 
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Henter gruppe-metadata"
 
-#: ../yum/__init__.py:548
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr "TilfÃ¸rer gruppefil fra kilden %s"
 
-#: ../yum/__init__.py:557
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr "TilfÃ¸jelse af gruppefil fejlede for fÃ¸lgende filkilde: %s - %s"
 
-#: ../yum/__init__.py:563
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Ingen tilgÃ¦ngelige grupper i nogen filkilder"
 
-#: ../yum/__init__.py:614
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Importerer ekstra informationer om filer"
 
-#: ../yum/__init__.py:646
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Skip-broken runde %i"
 
-#: ../yum/__init__.py:674
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr "Skip-broken tog %i runder "
 
-#: ../yum/__init__.py:675
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
-msgstr "\nPakker droppet pÃ¥grund af problemer med afhÃ¦ngigheder:"
+msgstr ""
+"\n"
+"Pakker droppet pÃ¥grund af problemer med afhÃ¦ngigheder:"
 
-#: ../yum/__init__.py:679
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s fra %s"
 
-#: ../yum/__init__.py:767
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "Kunne ikke slette transaktionsfilen %s"
 
-#: ../yum/__init__.py:807
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "ekskluderer pÃ¥ grund af cost: %s fra %s"
 
-#: ../yum/__init__.py:838
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Ekskluderer pakker i den globale ekskluderingsliste"
 
-#: ../yum/__init__.py:840
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Ekskluderer pakker fra %s"
 
-#: ../yum/__init__.py:867
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Reducerer %s til kun at indholde inkluderede pakker"
 
-#: ../yum/__init__.py:872
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Beholder inkluderet pakke %s"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Sletter ikke-fundet pakke %s"
 
-#: ../yum/__init__.py:881
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "Afsluttet"
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:911
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "Kunne ikke teste om PID %s er aktiv"
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:915
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr "LÃ¥s fundet %s: Anden kopi kÃ¸rer som pid %s."
 
-#: ../yum/__init__.py:962 ../yum/__init__.py:969
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "Pakken matcher ikke"
 
-#: ../yum/__init__.py:983
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "Kunne ikke udfÃ¸re checksum"
 
-#: ../yum/__init__.py:986
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "Pakken matcher ikke checksum"
 
-#: ../yum/__init__.py:1028
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr "Pakken fejlede checksum. men caching er aktiveret for %s"
 
-#: ../yum/__init__.py:1034
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "bruger lokal kopi af %s"
 
-#: ../yum/__init__.py:1053
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr "Ikke plads nok i download-biblioteket %s"
 
-#: ../yum/__init__.py:1086
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "Header er ikke komplet"
 
-#: ../yum/__init__.py:1126
+#: ../yum/__init__.py:1134
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
 msgstr ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
 
-#: ../yum/__init__.py:1181
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr "Offentlig nÃ¸gle for %s er ikke installeret i RPM-databasen"
 
-#: ../yum/__init__.py:1185
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Kunne ikke Ã¥bne fÃ¸lgende pakke %s"
 
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr "Offentlig nÃ¸gle for %s er ikke sikker"
 
-#: ../yum/__init__.py:1197
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Pakken %s er ikke signeret"
 
-#: ../yum/__init__.py:1235
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Kan ikke slette %s"
 
-#: ../yum/__init__.py:1239
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "%s slettet"
 
-#: ../yum/__init__.py:1271
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Kan ikke slette %s filen %s"
 
-#: ../yum/__init__.py:1275
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "%s filen %s er slettet"
 
-#: ../yum/__init__.py:1277
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d %s filer slettet"
 
-#: ../yum/__init__.py:1317
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr "Mere end et match for %s"
 
-#: ../yum/__init__.py:1323
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr "Ingen opdateringer matcher %s.%s %s:%s-%s"
 
-#: ../yum/__init__.py:1513
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
@@ -1532,284 +1606,292 @@ msgstr ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
 
-#: ../yum/__init__.py:1550
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "GenemsÃ¸ger %d pakker"
 
-#: ../yum/__init__.py:1554
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "gennemsÃ¸ger fÃ¸lgende pakke %s"
 
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "gennemsÃ¸ger filer indeholdt i pakkerne"
 
-#: ../yum/__init__.py:1569
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "sÃ¸ger efter afhÃ¦ngigheder"
 
-#: ../yum/__init__.py:1599
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Levere match: %s"
 
-#: ../yum/__init__.py:1668 ../yum/__init__.py:1686 ../yum/__init__.py:1714
-#: ../yum/__init__.py:1719 ../yum/__init__.py:1774 ../yum/__init__.py:1778
+#: ../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 "Gruppen %s findes ikke"
 
-#: ../yum/__init__.py:1697 ../yum/__init__.py:1790
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr "pakken %s var ikke markeret i gruppen %s"
 
-#: ../yum/__init__.py:1736
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr "TilfÃ¸jer pakken %s fra gruppen %s"
 
-#: ../yum/__init__.py:1740
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr "Pakken %s er ikke tilgÃ¦ngelig for installation"
 
-#: ../yum/__init__.py:1815
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr "Pakken %s blev ikke fundet i de tilgÃ¦ngelige pakker"
 
-#: ../yum/__init__.py:1883 ../yum/__init__.py:1926
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr "Invalidt versioneret afhÃ¦ngighedsstreng."
 
-#: ../yum/__init__.py:1885 ../yum/__init__.py:1928
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Forkert versions-flag"
 
-#: ../yum/__init__.py:1900 ../yum/__init__.py:1904
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "%s pakken blev ikke fundet"
 
-#: ../yum/__init__.py:2034
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr "Pakkeobjektet er ikke af en korrekt type"
 
-#: ../yum/__init__.py:2038
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr "Ingenting angivet til installering"
 
 #. only one in there
-#: ../yum/__init__.py:2051
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr "Checker for virtual leverandÃ¸r eller fil-leverandÃ¸r for %s"
 
-#: ../yum/__init__.py:2057 ../yum/__init__.py:2323
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr "Ingen match for argumenter: %s"
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2114
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr "Ingen pakker er tilgÃ¦ngelige til installation"
 
-#: ../yum/__init__.py:2126
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr "Pakken: %s findes allerede i transaktionen"
 
-#: ../yum/__init__.py:2139
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr "%s er allerede installeret i den nyeste version"
 
+#: ../yum/__init__.py:2178
+#, fuzzy, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr "Pakken %s er allerede installeret"
+
 #. update everything (the easy case)
-#: ../yum/__init__.py:2180
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Opdaterer alting"
 
-#: ../yum/__init__.py:2264
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Pakken: %s.%s %s:%s-%s er allerede overflÃ¸diggjort"
 
-#: ../yum/__init__.py:2320
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../yum/__init__.py:2335
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Ingen pakker fundet til sletning"
 
-#: ../yum/__init__.py:2369
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Kan ikke Ã¥bne filen: %s. Springer den over."
 
-#: ../yum/__init__.py:2372
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "UndersÃ¸ger %s: %s"
 
-#: ../yum/__init__.py:2379
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
 "instead."
-msgstr "Pakken %s er ikke installeret, sÃ¥ den kan ikke opdateres. KÃ¸r 'yum install' for at installere den"
+msgstr ""
+"Pakken %s er ikke installeret, sÃ¥ den kan ikke opdateres. KÃ¸r 'yum install' "
+"for at installere den"
 
-#: ../yum/__init__.py:2411
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Ekskluderer %s"
 
-#: ../yum/__init__.py:2416
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Markerer %s til installation"
 
-#: ../yum/__init__.py:2422
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr "Markerer %s som en opdatering til %s"
 
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr "%s kan ikke opdatere nogen installeret pakke"
 
-#: ../yum/__init__.py:2447
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr "Problem med geninstallation, ingen pakke fundet til at blive slettet"
 
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2515
+#, fuzzy, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr "Pakken %s er allerede installeret"
+
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr "Problem med geninstallation: ingen pakke fundet til at installere"
 
-#: ../yum/__init__.py:2514
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr "Henter GPG-nÃ¸gle fra %s"
 
-#: ../yum/__init__.py:2520
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "Hentning af GPG-nÃ¸glen fejlede:"
 
-#: ../yum/__init__.py:2533
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "Check af GPG-nÃ¸glen fejlede"
 
-#: ../yum/__init__.py:2537
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr "FÃ¸lgende GPG-nÃ¸gle %s (0x%s) er allerede installeret"
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2542
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr "Importerer GPG-nÃ¸glen 0x%s \"%s\" fra %s"
 
-#: ../yum/__init__.py:2554
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "NÃ¸glen blev ikke installeret"
 
-#: ../yum/__init__.py:2560
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "Import af nÃ¸glen fejlede (returkode %d)"
 
-#: ../yum/__init__.py:2563
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "NÃ¸glen blev importet med succes"
 
-#: ../yum/__init__.py:2568
+#: ../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 ""
-"GPG-nÃ¸glen angivet for \"%s\" kilden er allerede installet, men den er ikke korrekt for denne pakke.\n"
+"GPG-nÃ¸glen angivet for \"%s\" kilden er allerede installet, men den er ikke "
+"korrekt for denne pakke.\n"
 "Check at konfigurationen af nÃ¸gle-URL'er er korrekt for denne kilde."
 
-#: ../yum/__init__.py:2577
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr "Import af nÃ¸gle(r) hjalp ikke, mÃ¥ske er nÃ¸glerne forkerte?"
 
-#: ../yum/__init__.py:2651
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "Kunne ikke finde et passende mirror."
 
-#: ../yum/__init__.py:2653
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr "FÃ¸lgende fejl blev fundet under download af pakker."
 
-#: ../yum/__init__.py:2717
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Fejl i testtransaktionen:"
 
-#: ../yum/__init__.py:2752
-#, python-format
-msgid "Package %s needs %s, this is not available."
-msgstr "Pakken %s behÃ¸ver %s,  som ikke er tilgÃ¦ngelig."
-
-#: ../yum/__init__.py:2757
-#, python-format
-msgid "Package %s conflicts with %s."
-msgstr "Pakken %s konflikter med %s."
-
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:193
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "IndlÃ¦ser plugins: "
 
-#: ../yum/plugins.py:210
+#: ../yum/plugins.py:206
+#, fuzzy, python-format
+msgid "No plugin match for: %s"
+msgstr "Ingen match for argumenter: %s"
+
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "\"%s\" plugin er deaktiveret"
 
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr "Plugin \"%s\" angiver ikke hvilken API-version som det behÃ¸ver"
 
-#: ../yum/plugins.py:226
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr "Plugin \"%s\" behÃ¸ver API %s. UnderstÃ¸ttet API er %s."
 
-#: ../yum/plugins.py:253
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "IndlÃ¦ser \"%s\" plugin"
 
-#: ../yum/plugins.py:260
+#: ../yum/plugins.py:271
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
 msgstr "En eller flere plugins med navnet \"%s\" er fundet i plugin-sÃ¸gestien"
 
-#: ../yum/plugins.py:280
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr "Konfigurationsfilen %s er ikke fundet"
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:283
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr "Kunne ikke finde konfigurationsfilen for fÃ¸lgende plugin: %s"
 
-#: ../yum/plugins.py:437
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "Registring af kommandolinie-komandoer er ikke supporteret"
 
@@ -1825,7 +1907,8 @@ msgstr "RPM %s fejlede md5 checksum"
 
 #: ../rpmUtils/oldUtils.py:144
 msgid "Could not open RPM database for reading. Perhaps it is already in use?"
-msgstr "Kan ikke Ã¥bne RPM-databasen, MÃ¥ske er den i brug af en anden applikation"
+msgstr ""
+"Kan ikke Ã¥bne RPM-databasen, MÃ¥ske er den i brug af en anden applikation"
 
 #: ../rpmUtils/oldUtils.py:174
 msgid "Got an empty Header, something has gone wrong"
@@ -1842,6 +1925,27 @@ msgstr "Ã˜delagt header %s"
 msgid "Error opening rpm %s - error %s"
 msgstr "Fejl ved Ã¥bning af rpm %s - fejl %s"
 
+#~ msgid "Looking for Obsoletes for %s"
+#~ msgstr "SÃ¸ger efter overflÃ¸diggÃ¸relse for %s"
+
+#~ msgid "unable to find newer package for %s"
+#~ msgstr "Kunne ikke fine en nyere pakke for %s"
+
+#~ msgid "TSINFO: Updating %s to resolve conflict."
+#~ msgstr "TSINFO: Opdaterer %s for at lÃ¸se en konflikt."
+
+#~ msgid "%s conflicts: %s"
+#~ msgstr "%s konflikter med: %s"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s konflikter med %s"
+
+#~ msgid "Package %s needs %s, this is not available."
+#~ msgstr "Pakken %s behÃ¸ver %s,  som ikke er tilgÃ¦ngelig."
+
+#~ msgid "Package %s conflicts with %s."
+#~ msgstr "Pakken %s konflikter med %s."
+
 #~ msgid "Running \"%s\" handler for \"%s\" plugin"
 #~ msgstr "KÃ¸rer \"%s\" handler for \"%s\" plugin"
 
diff --git a/po/de.po b/po/de.po
index c909cce..5899e75 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-09 10:13+0000\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-03-09 17:31+0100\n"
 "Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
 "Language-Team: German <fedora-trans-de at redhat.com>\n"
@@ -14,8 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: German\n"
 
-#: ../callback.py:48
-#: ../output.py:500
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Aktualisieren"
 
@@ -23,20 +22,15 @@ msgstr "Aktualisieren"
 msgid "Erasing"
 msgstr "LÃ¶schen"
 
-#: ../callback.py:50
-#: ../callback.py:51
-#: ../callback.py:53
-#: ../output.py:499
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Installieren"
 
-#: ../callback.py:52
-#: ../callback.py:58
+#: ../callback.py:52 ../callback.py:58
 msgid "Obsoleted"
 msgstr "Veraltet"
 
-#: ../callback.py:54
-#: ../output.py:546
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Aktualisiert"
 
@@ -44,10 +38,7 @@ msgstr "Aktualisiert"
 msgid "Erased"
 msgstr "GelÃ¶scht"
 
-#: ../callback.py:56
-#: ../callback.py:57
-#: ../callback.py:59
-#: ../output.py:544
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "Installiert"
 
@@ -69,8 +60,7 @@ msgstr "Fehler: UngÃ¼ltiger Ausgabe-Zustand: %s for %s"
 msgid "Erased: %s"
 msgstr "GelÃ¶scht: %s"
 
-#: ../callback.py:217
-#: ../output.py:501
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Entfernen"
 
@@ -91,15 +81,12 @@ msgstr "Repositories konfigurieren"
 msgid "Reading repository metadata in from local files"
 msgstr "Lesen Repository Metadaten ein aus lokalen Dateien"
 
-#: ../cli.py:183
-#: ../utils.py:72
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "Konfigurationsfehler: %s"
 
-#: ../cli.py:186
-#: ../cli.py:1050
-#: ../utils.py:75
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Optionen Fehler: %s"
@@ -143,18 +130,15 @@ msgstr "Lade Pakete herunter:"
 msgid "Error Downloading Packages:\n"
 msgstr "Fehler beim Herunterladen der Pakete:\n"
 
-#: ../cli.py:370
-#: ../yum/__init__.py:2699
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "FÃ¼hre rpm_check_debug durch"
 
-#: ../cli.py:373
-#: ../yum/__init__.py:2702
+#: ../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:377
-#: ../yum/__init__.py:2704
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Bitte melden Sie diesen Fehler in Bugzilla"
 
@@ -183,7 +167,8 @@ msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
 msgstr ""
-"Verweigern des automatischen Import der SchlÃ¼ssel, wenn unbeaufsichtigt augefÃ¼hrt.\n"
+"Verweigern des automatischen Import der SchlÃ¼ssel, wenn unbeaufsichtigt "
+"augefÃ¼hrt.\n"
 "Benutze \"-y\" zum Ãœberschreiben."
 
 #: ../cli.py:491
@@ -195,23 +180,16 @@ msgstr "Analysiere Installationsargumente des Pakets"
 msgid "No package %s available."
 msgstr "Kein Paket %s verfÃ¼gbar."
 
-#: ../cli.py:505
-#: ../cli.py:623
-#: ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Paket(e) zum Installieren"
 
-#: ../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 "Nichts zu tun"
 
-#: ../cli.py:536
-#: ../yum/__init__.py:2212
-#: ../yum/__init__.py:2291
-#: ../yum/__init__.py:2303
+#: ../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 "Nicht aktualisiertes Paket, da es bereits veraltet ist: %s.%s %s:%s-%s"
@@ -248,181 +226,194 @@ msgstr "Keine Pakete bereitgestellt"
 msgid "Matching packages for package list to user args"
 msgstr "Ãœbereinstimmende Pakete fÃ¼r Paket-Liste nach Benutzer-Argument"
 
-#: ../cli.py:692
+#: ../cli.py:701
+#, fuzzy, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "Kein Paket gefunden fÃ¼r %s"
+
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Keine Ãœbereinstimmungen gefunden"
 
-#: ../cli.py:729
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Kein Paket gefunden fÃ¼r %s"
 
-#: ../cli.py:741
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "RÃ¤ume alles auf"
 
-#: ../cli.py:755
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "RÃ¤ume Headers auf"
 
-#: ../cli.py:758
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "RÃ¤ume Pakete auf"
 
-#: ../cli.py:761
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "RÃ¤ume Plugins auf"
 
-#: ../cli.py:764
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "RÃ¤ume Datenbank-Speicher auf"
 
-#: ../cli.py:767
+#: ../cli.py:783
+#, fuzzy
+msgid "Cleaning up expire-cache metadata"
+msgstr "RÃ¤ume Plugins auf"
+
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "RÃ¤ume Plugins auf"
 
-#: ../cli.py:789
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Installierte Gruppen:"
 
-#: ../cli.py:796
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "VerfÃ¼gbare Gruppen:"
 
-#: ../cli.py:802
+#: ../cli.py:820
 msgid "Done"
 msgstr "Fertig"
 
-#: ../cli.py:811
-#: ../cli.py:823
-#: ../cli.py:829
+#: ../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:835
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
-msgstr "Keine Packete in irgendeiner Gruppe verfÃ¼gbar zum Installieren oder Aktualisieren"
+msgstr ""
+"Keine Packete in irgendeiner Gruppe verfÃ¼gbar zum Installieren oder "
+"Aktualisieren"
 
-#: ../cli.py:837
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d Paket(e) zum Installieren"
 
-#: ../cli.py:847
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Keine Gruppe existiert mit dem Namen %s"
 
-#: ../cli.py:853
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Keine Pakete zum Entfernen aus dem Gruppen gefunden"
 
-#: ../cli.py:855
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d Paket(e) zum Entfernen"
 
-#: ../cli.py:897
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "Paket %s ist bereits installiert, Ã¼berspringen"
 
-#: ../cli.py:908
+#: ../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:934
+#: ../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:953
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "Kommandozeilen-Fehler: %s"
 
-#: ../cli.py:1083
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "fehlertolerant sein"
 
-#: ../cli.py:1085
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
-msgstr "laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischen-Speicher nicht"
+msgstr ""
+"laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischen-Speicher nicht"
 
-#: ../cli.py:1087
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "Konfigurationsdatei-Ort"
 
-#: ../cli.py:1089
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "maximale Befehlswartezeit"
 
-#: ../cli.py:1091
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "Debugging-Ausgabe-Stufe"
 
-#: ../cli.py:1095
+#: ../cli.py:1113
 msgid "show duplicates, in repos, in list/search commands"
 msgstr "Zeige Dublikate, in Repos, in Listen/Such-Befehlen"
 
-#: ../cli.py:1097
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "Fehler-Ausgabe-Stufe"
 
-#: ../cli.py:1100
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "Stiller Arbeitsgang"
 
-#: ../cli.py:1104
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "Beantworte alle Fragen mit 'ja'"
 
-#: ../cli.py:1106
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "Versionsinformationen anzeigen und Programm beenden"
 
-#: ../cli.py:1107
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "Wurzel-Installationsverzeichnis setzen"
 
-#: ../cli.py:1111
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "aktiviere eines oder mehrere Repositories (Wildcards erlaubt)"
 
-#: ../cli.py:1115
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr "deaktiviere eines oder mehrere Repositories (Wildcards erlaubt)"
 
-#: ../cli.py:1118
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr "schliesse Paket(e) nach Namen oder global aus"
 
-#: ../cli.py:1120
+#: ../cli.py:1138
 #, fuzzy
 msgid "disable exclude from main, for a repo or for everything"
 msgstr "deaktiviere Ausschluss von Haupt, von einem Repository oder allem"
 
-#: ../cli.py:1123
+#: ../cli.py:1141
 #, fuzzy
 msgid "enable obsoletes processing during updates"
 msgstr "aktiviere veraltetes Verarbeiten wÃ¤hrend Aktualisierung"
 
-#: ../cli.py:1125
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "deaktivieren Yum-Plugins"
 
-#: ../cli.py:1127
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "deaktiviere GPG-Signatur-PrÃ¼fung"
 
-#: ../cli.py:1129
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "deaktiviere Plugins nach Namen"
 
-#: ../cli.py:1132
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "Ã¼berspringe Spakete mit AbhÃ¤ngigkeitsauflÃ¶sungsproblemen"
 
@@ -478,87 +469,85 @@ msgstr "Dez"
 msgid "Trying other mirror."
 msgstr "Versuche einen aderen Spiegel-Server"
 
-#: ../output.py:281
+#: ../output.py:293
 #, python-format
 msgid "Name       : %s"
 msgstr "Name       : %s"
 
-#: ../output.py:282
+#: ../output.py:294
 #, python-format
 msgid "Arch       : %s"
 msgstr "Architektur : %s"
 
-#: ../output.py:284
+#: ../output.py:296
 #, python-format
 msgid "Epoch      : %s"
 msgstr "Zeitraum      : %s"
 
-#: ../output.py:285
+#: ../output.py:297
 #, python-format
 msgid "Version    : %s"
 msgstr "Version    : %s"
 
-#: ../output.py:286
+#: ../output.py:298
 #, python-format
 msgid "Release    : %s"
 msgstr "Version    : %s"
 
-#: ../output.py:287
+#: ../output.py:299
 #, python-format
 msgid "Size       : %s"
 msgstr "GrÃ¶sse     : %s"
 
-#: ../output.py:288
+#: ../output.py:300
 #, python-format
 msgid "Repo       : %s"
 msgstr "Repo       : %s"
 
-#: ../output.py:290
+#: ../output.py:302
 #, python-format
 msgid "Committer  : %s"
 msgstr "Ãœbermittler  : %s"
 
-#: ../output.py:291
+#: ../output.py:303
 msgid "Summary    : "
 msgstr "Zusammenfassung    : "
 
-#: ../output.py:293
+#: ../output.py:305
 #, python-format
 msgid "URL        : %s"
 msgstr "URL        : %s"
 
-#: ../output.py:294
+#: ../output.py:306
 #, python-format
 msgid "License    : %s"
 msgstr "Lizenz     : %s"
 
-#: ../output.py:295
+#: ../output.py:307
 msgid "Description: "
 msgstr "Beschreibung:"
 
-#: ../output.py:339
+#: ../output.py:351
 msgid "Is this ok [y/N]: "
 msgstr "Ist dies richtig? [y/N] :"
 
-#: ../output.py:345
-#: ../output.py:348
+#: ../output.py:357 ../output.py:360
 msgid "y"
 msgstr "j"
 
-#: ../output.py:345
+#: ../output.py:357
 msgid "n"
 msgstr "j"
 
-#: ../output.py:345
-#: ../output.py:348
+#: ../output.py:357 ../output.py:360
 msgid "yes"
 msgstr "ja"
 
-#: ../output.py:345
+#: ../output.py:357
 msgid "no"
 msgstr "nein"
 
-#: ../output.py:355
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -567,96 +556,96 @@ msgstr ""
 "\n"
 "Gruppe: %s"
 
-#: ../output.py:357
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " Beschreibung: %s"
 
-#: ../output.py:359
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr " Obligatorische Pakete:"
 
-#: ../output.py:364
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr " Standard-Pakete:"
 
-#: ../output.py:369
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr " Optionale Pakete:"
 
-#: ../output.py:374
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr " Zwangsbedingte Pakete:"
 
-#: ../output.py:382
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "Paket: %s"
 
-#: ../output.py:384
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr "  Keine AbhÃ¤ngigkeiten fÃ¼r dieses Paket"
 
-#: ../output.py:389
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr "  AbhÃ¤ngigkeit: %s"
 
-#: ../output.py:391
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr "   Unbefriedigte AbhÃ¤ngigkeit"
 
-#: ../output.py:449
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Ãœbereinstimmung von:"
 
-#: ../output.py:475
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr "Beim Berechnen der Gesamt-DownloadgrÃ¶sse"
 
-#: ../output.py:480
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "GesamtgrÃ¶sse: %s"
 
-#: ../output.py:483
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "Gesamte DownloadgrÃ¶sse: %s"
 
-#: ../output.py:495
+#: ../output.py:507
 msgid "Package"
 msgstr "Paket"
 
-#: ../output.py:495
+#: ../output.py:507
 msgid "Arch"
 msgstr "Arch"
 
-#: ../output.py:495
+#: ../output.py:507
 msgid "Version"
 msgstr "Version"
 
-#: ../output.py:495
+#: ../output.py:507
 msgid "Repository"
 msgstr "Repository"
 
-#: ../output.py:495
+#: ../output.py:507
 msgid "Size"
 msgstr "GrÃ¶sse"
 
-#: ../output.py:502
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Installiert fÃ¼r AbhÃ¤ngigkeiten"
 
-#: ../output.py:503
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Aktualisiert fÃ¼r AbhÃ¤ngigkeiten"
 
-#: ../output.py:504
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Entfernt fÃ¼r AbhÃ¤ngigkeiten"
 
-#: ../output.py:516
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
@@ -665,7 +654,7 @@ msgstr ""
 "     ersetzt  %s.%s %s\n"
 "\n"
 
-#: ../output.py:524
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -682,92 +671,94 @@ msgstr ""
 "Aktualisieren   %5.5s Pakete(e)         \n"
 "Enfernen      %5.5s Paket(e)         \n"
 
-#: ../output.py:542
+#: ../output.py:554
 msgid "Removed"
 msgstr "Entfernt"
 
-#: ../output.py:543
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "AbhÃ¤ngigkeiten entfernt"
 
-#: ../output.py:545
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "AbhÃ¤ngigkeit installiert"
 
-#: ../output.py:547
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "AbhÃ¤ngigkeit aktualisiert."
 
-#: ../output.py:548
+#: ../output.py:560
 msgid "Replaced"
 msgstr "Ersetzt       "
 
-#: ../output.py:606
+#: ../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 interrupt (ctrl-c) gegen %s innerhalb %s%s%s Sekunden bis Verlassen.\n"
+" Aktueller Download abgebrochen, %s interrupt (ctrl-c) gegen %s innerhalb %s%"
+"s%s Sekunden bis Verlassen.\n"
 
-#: ../output.py:616
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "Benutzer-Unterbrechung"
 
-#: ../output.py:627
+#: ../output.py:639
 msgid "installed"
 msgstr "installiert"
 
-#: ../output.py:628
+#: ../output.py:640
 msgid "updated"
 msgstr "aktualisiert"
 
-#: ../output.py:629
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "veraltet"
 
-#: ../output.py:630
+#: ../output.py:642
 msgid "erased"
 msgstr "gelÃ¶scht"
 
-#: ../output.py:634
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> Paket %s.%s %s:%s-%s gesetzt zum Sein %s"
 
-#: ../output.py:641
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> FÃ¼hre TransaktionsprÃ¼fung aus"
 
-#: ../output.py:646
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr "--> Starte AbhÃ¤ngigkeitsauflÃ¶sung mit den neuen Ã„nderungen neu."
 
-#: ../output.py:651
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> Beende AbhÃ¤ngigkeitsauflÃ¶sung"
 
-#: ../output.py:656
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr "--> Verarbeite AbhÃ¤ngigkeiten: %s fÃ¼r Paket: %s"
 
-#: ../output.py:661
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> Nicht aufgelÃ¶ste AbhÃ¤ngigkeiten: %s"
 
-#: ../output.py:667
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Verabeite Konflikte: %s kollidiert %s"
 
-#: ../output.py:670
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr "--> FÃ¼lle Transaktionsset mit ausgewÃ¤hlten Paketen. Bitte warten."
 
-#: ../output.py:674
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr "---> Lade Header fÃ¼r %s herunter zum Packen in Transaktionsset."
@@ -780,7 +771,8 @@ msgstr "Sie mÃ¼ssen root sein, um diesen Befehl auszufÃ¼hren."
 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"
@@ -793,18 +785,22 @@ 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"
 "\n"
 "\n"
 "Alternativ kÃ¶nnten Sie den URL zum SchlÃ¼ssel, welcher Sie benutzen wollen\n"
-"fÃ¼r ein Repository, durch die 'gpgkey'-Option in einem Repository-Bereich angeben und yum \n"
+"fÃ¼r ein Repository, durch die 'gpgkey'-Option in einem Repository-Bereich "
+"angeben und yum \n"
 "wird ihn fÃ¼r Sie installieren.\n"
 "\n"
-"FÃ¼r weitere Informationen kontaktieren Sie Ihren Distribution oder Paket-Bereitsteller.\n"
+"FÃ¼r weitere Informationen kontaktieren Sie Ihren Distribution oder Paket-"
+"Bereitsteller.\n"
 
 #: ../yumcommands.py:63
 #, python-format
@@ -891,8 +887,7 @@ msgstr "Extra-Pakete"
 msgid "Updated Packages"
 msgstr "Aktualisierte Pakete"
 
-#: ../yumcommands.py:221
-#: ../yumcommands.py:225
+#: ../yumcommands.py:221 ../yumcommands.py:225
 msgid "Obsoleting Packages"
 msgstr "Veraltete Pakete"
 
@@ -1098,17 +1093,18 @@ msgstr ""
 "Verlasse wegen defekter Pipe"
 
 #: ../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 auf sie zum Verlassen..."
+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 auf sie zum "
+"Verlassen..."
 
-#: ../yummain.py:132
-#: ../yummain.py:171
+#: ../yummain.py:132 ../yummain.py:171
 #, python-format
 msgid "Error: %s"
 msgstr "Fehler: %s"
 
-#: ../yummain.py:142
-#: ../yummain.py:178
+#: ../yummain.py:142 ../yummain.py:178
 #, python-format
 msgid "Unknown Error(s): Exit Code: %d:"
 msgstr "Unbekannte(r) Fehlercode: Exit Code: %d:"
@@ -1146,231 +1142,225 @@ msgstr "doTsSetup() wird verschwinden in zukÃ¼nfigen Version von Yum.\n"
 
 #: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
-msgstr "Konfiguriere TransactionSets bevor die Konfigurationsklasse ist gestartet"
+msgstr ""
+"Konfiguriere TransactionSets bevor die Konfigurationsklasse ist gestartet"
 
-#: ../yum/depsolve.py:135
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr "UngÃ¼ltigestsflag in Konfigurationsdatei: %s"
 
-#: ../yum/depsolve.py:146
+#: ../yum/depsolve.py:147
 #, python-format
 msgid "Searching pkgSack for dep: %s"
 msgstr "Suche pkgSack fÃ¼r AbhÃ¤ngigkeiten: %s"
 
-#: ../yum/depsolve.py:175
+#: ../yum/depsolve.py:170
 #, python-format
 msgid "Potential match for %s from %s"
 msgstr "Potentielle Ãœbereinstimmung fÃ¼r %s von %s"
 
-#: ../yum/depsolve.py:183
+#: ../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:224
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "Mitglied: %s"
 
-#: ../yum/depsolve.py:238
-#: ../yum/depsolve.py:701
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s konvertiert zum Installieren"
 
-#: ../yum/depsolve.py:245
+#: ../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:255
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Entferne Paket %s"
 
-#: ../yum/depsolve.py:266
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s benÃ¶tigt: %s"
 
-#: ../yum/depsolve.py:317
+#: ../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:327
+#: ../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:334
+#: ../yum/depsolve.py:329
 #, python-format
 msgid "Potential Provider: %s"
 msgstr "Potentieller Bereitsteller: %s"
 
-#: ../yum/depsolve.py:357
+#: ../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:361
+#: ../yum/depsolve.py:356
 #, python-format
 msgid "Mode for pkg providing %s: %s"
 msgstr "Modus fÃ¼r pkg-Bereitstellung %s: %s"
 
-#: ../yum/depsolve.py:365
+#: ../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:377
+#: ../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:380
+#: ../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:383
+#: ../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:393
+#: ../yum/depsolve.py:388
 #, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr "UnlÃ¶sbare Anforderung %s fÃ¼r %s"
 
 #. is it already installed?
-#: ../yum/depsolve.py:439
+#: ../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:454
+#: ../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:465
+#: ../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:473
-#: ../yum/depsolve.py:529
+#: ../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:486
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr "%s bereits in ts, Ã¼berspringe dies"
 
-#: ../yum/depsolve.py:512
+#: ../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"
+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:539
+#: ../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:546
+#: ../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:637
-#: ../yum/depsolve.py:719
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Erfolg - Leere Transaktion"
 
-#: ../yum/depsolve.py:678
-#: ../yum/depsolve.py:691
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Starte Schleife neu"
 
-#: ../yum/depsolve.py:707
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "AbhÃ¤ngigkeitsverarbeitung beendet"
 
-#: ../yum/depsolve.py:713
+#: ../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:720
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "Erfolg - AbhÃ¤ngigkeiten aufgelÃ¶st"
 
-#: ../yum/depsolve.py:734
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "PrÃ¼fe AbhÃ¤ngigkeiten fÃ¼r %s"
 
-#: ../yum/depsolve.py:787
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr "schauen nach %s als eien Anforderung von %s"
 
-#: ../yum/depsolve.py:942
+#: ../yum/depsolve.py:933
 #, python-format
 msgid "Comparing best: %s to po: %s"
 msgstr "Vergleiche besseres: %s zu po: %s"
 
-#: ../yum/depsolve.py:946
+#: ../yum/depsolve.py:937
 #, python-format
 msgid "Same: best %s == po: %s"
 msgstr "Gleich: besser %s == po: %s"
 
-#: ../yum/depsolve.py:961
-#: ../yum/depsolve.py:972
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
 #, python-format
 msgid "best %s obsoletes po: %s"
 msgstr "bessere %s veraltete po: %s"
 
-#: ../yum/depsolve.py:964
+#: ../yum/depsolve.py:955
 #, python-format
 msgid "po %s obsoletes best: %s"
 msgstr "po %s veraltetes besser: %s"
 
-#: ../yum/depsolve.py:981
-#: ../yum/depsolve.py:988
-#: ../yum/depsolve.py:1045
+#: ../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:997
-#: ../yum/depsolve.py:1019
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
 #, python-format
 msgid "po %s shares a sourcerpm with %s"
 msgstr "po %s teilen ein Quellen-RPM mit %s"
 
-#: ../yum/depsolve.py:1001
-#: ../yum/depsolve.py:1024
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
 #, python-format
 msgid "best %s shares a sourcerpm with %s"
 msgstr "besseres %s teilen ein Quellen-RPM mit %s"
 
-#: ../yum/depsolve.py:1008
-#: ../yum/depsolve.py:1029
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
 #, python-format
 msgid "po %s shares more of the name prefix with %s"
 msgstr "po %s teilt mehr als den Prefixnamen mit %s"
 
-#: ../yum/depsolve.py:1012
-#: ../yum/depsolve.py:1038
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
 #, python-format
 msgid "po %s has a shorter name than best %s"
 msgstr "po %s hat einen kÃ¼rzeren Namen als das bessere %s"
 
-#: ../yum/depsolve.py:1034
+#: ../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"
@@ -1426,43 +1416,43 @@ msgstr "doUpdateSetup() wird verschwinden in zukÃ¼nfigen Version von Yum.\n"
 msgid "Building updates object"
 msgstr "Baue Aktualisierungsobjekt"
 
-#: ../yum/__init__.py:499
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr "doGroupSetup() wird verschwinden in zukÃ¼nfigen Version von Yum.\n"
 
-#: ../yum/__init__.py:523
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Beziehe Gruppen-Metadaten"
 
-#: ../yum/__init__.py:549
+#: ../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:558
+#: ../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:564
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Keine Gruppen in irgendeinem Repository verfÃ¼gbar"
 
-#: ../yum/__init__.py:616
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Importiere zusÃ¤tzlichen Dateilisten-Informationen"
 
-#: ../yum/__init__.py:661
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Ãœberspringe defekte Runde %i"
 
-#: ../yum/__init__.py:684
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr "Ãœberspringe defekte brachte %i Runden"
 
-#: ../yum/__init__.py:685
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
@@ -1470,440 +1460,456 @@ msgstr ""
 "\n"
 "Pakete Ã¼bersprungen wegen AbhÃ¤ngigkeitsproblemen:"
 
-#: ../yum/__init__.py:689
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s von %s"
 
-#: ../yum/__init__.py:777
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "Entfernen Transaktionsdatei %s fehlgeschlagen"
 
-#: ../yum/__init__.py:817
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "Aussschluss fÃ¼r Kosten: %s from %s"
 
-#: ../yum/__init__.py:848
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Schliessen Pakete aus globaler Ausschlussliste aus"
 
-#: ../yum/__init__.py:850
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Schliesse Pakete aus von %s"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Reduziere %s nur zum Einbeziehen der Pakete"
 
-#: ../yum/__init__.py:883
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Behalte integriertes Paket %s"
 
-#: ../yum/__init__.py:889
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Entferne nicht Ã¼bereinstimmendes Paket %s"
 
-#: ../yum/__init__.py:892
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "Fertig"
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:922
+#: ../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:926
+#: ../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:973
-#: ../yum/__init__.py:980
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "Paket stimmt nicht mit dem vorgesehenden Download Ã¼berein."
 
-#: ../yum/__init__.py:994
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "Konnte PrÃ¼fsumme nicht ausgefÃ¼hren"
 
-#: ../yum/__init__.py:997
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "Paket stimmt nicht mit der PrÃ¼fsumme Ã¼berein"
 
-#: ../yum/__init__.py:1039
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
-msgstr "Paket bei Checksumme-PrÃ¼fung durgefallen, aber Zwischenspeicherung ist aktiviert fÃ¼r %s"
+msgstr ""
+"Paket bei Checksumme-PrÃ¼fung durgefallen, aber Zwischenspeicherung ist "
+"aktiviert fÃ¼r %s"
 
-#: ../yum/__init__.py:1045
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "benutze lokale Kopie von %s"
 
-#: ../yum/__init__.py:1064
+#: ../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:1097
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "Header ist nicht vollstÃ¤ndig."
 
-#: ../yum/__init__.py:1137
+#: ../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:1192
+#: ../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:1196
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Problem beim Ã–ffnen des Paketes %s"
 
-#: ../yum/__init__.py:1204
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr "Ã–ffentlicher SchlÃ¼sse fÃ¼r %s ist nicht vertrauenswÃ¼rdig"
 
-#: ../yum/__init__.py:1208
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Paket %s ist nicht unterschrieben"
 
-#: ../yum/__init__.py:1246
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Kann %s nicht entfernen"
 
-#: ../yum/__init__.py:1250
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "%s entfernt"
 
-#: ../yum/__init__.py:1282
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Kann %s Datei nicht entfernt %s"
 
-#: ../yum/__init__.py:1286
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "%s Datei %s entfernt"
 
-#: ../yum/__init__.py:1288
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d %s Dateien entfernt"
 
-#: ../yum/__init__.py:1328
+#: ../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:1334
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr "Keien Ãœbereinstimmungen  %s.%s %s:%s-%s mit der Aktualisierung"
 
-#: ../yum/__init__.py:1527
-msgid "searchPackages() will go away in a future version of Yum.                      Use searchGenerator() instead. \n"
-msgstr "searchPackages() wird verschwinden in zukÃ¼nfigen 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Ã¼nfigen Version von "
+"Yum.                      Benutze stattdessen searchGenerator(). \n"
 
-#: ../yum/__init__.py:1564
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "Suche %d Pakete"
 
-#: ../yum/__init__.py:1568
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "Suche Paket %s"
 
-#: ../yum/__init__.py:1580
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "Suche in Datei-EintrÃ¤gen"
 
-#: ../yum/__init__.py:1587
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "suche in bereitgestellen EintrÃ¤gen"
 
-#: ../yum/__init__.py:1617
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Stelle Ãœbereinstimmung bereit: %s"
 
-#: ../yum/__init__.py:1686
-#: ../yum/__init__.py:1704
-#: ../yum/__init__.py:1732
-#: ../yum/__init__.py:1737
-#: ../yum/__init__.py:1792
-#: ../yum/__init__.py:1796
+#: ../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:1715
-#: ../yum/__init__.py:1808
+#: ../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:1754
+#: ../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:1758
+#: ../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:1833
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr "Paket-Tubel %s kann nicht gefunden werden im Paket-BehÃ¤lter"
 
-#: ../yum/__init__.py:1901
-#: ../yum/__init__.py:1944
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr "UngÃ¼ltig versionierter AbhÃ¤ngigkeitsstring, versuche es zu notieren."
 
-#: ../yum/__init__.py:1903
-#: ../yum/__init__.py:1946
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "UngÃ¼ltiges Versionsflag"
 
-#: ../yum/__init__.py:1918
-#: ../yum/__init__.py:1922
+#: ../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:2052
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr "Paketobjekt war keine Paketobjektinstanz"
 
-#: ../yum/__init__.py:2056
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr "Nichts angegeben zum Installieren"
 
 #. only one in there
-#: ../yum/__init__.py:2071
+#: ../yum/__init__.py:2085
 #, fuzzy, 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:2077
-#: ../yum/__init__.py:2343
+#: ../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:2134
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr "Kein Paket(e) zum Installieren verfÃ¼gbar."
 
-#: ../yum/__init__.py:2146
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr "Paket: %s - bereits im Transaktionsset"
 
-#: ../yum/__init__.py:2159
+#: ../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:2178
+#, fuzzy, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr "Paket %s ist bereits installiert, Ã¼berspringen"
 
 #. update everything (the easy case)
-#: ../yum/__init__.py:2200
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Aktualisiere alles"
 
-#: ../yum/__init__.py:2284
+#: ../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:2340
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../yum/__init__.py:2355
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Kein Paket stimmt zum Entfernen Ã¼berein"
 
-#: ../yum/__init__.py:2389
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Kann Datei nicht Ã¶ffnen: %s. Ãœberspringen."
 
-#: ../yum/__init__.py:2392
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Untersuche %s: %s"
 
-#: ../yum/__init__.py:2399
+#: ../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:2431
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Exklusive %s"
 
-#: ../yum/__init__.py:2436
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Markiere %s zum Installieren"
 
-#: ../yum/__init__.py:2442
+#: ../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:2449
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr "%s: aktualisiert installierte Pakete nicht."
 
-#: ../yum/__init__.py:2467
+#: ../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:2476
+#: ../yum/__init__.py:2515
+#, fuzzy, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr "Paket %s ist bereits installiert, Ã¼berspringen"
+
+#: ../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:2524
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr "GPG-SchlÃ¼ssel abrufen von %s"
 
-#: ../yum/__init__.py:2530
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "GPG-SchlÃ¼ssel-Abruf fehlgeschlagen:"
 
-#: ../yum/__init__.py:2543
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "GPG-SchlÃ¼ssel-Analyse fehlgeschlagen: "
 
-#: ../yum/__init__.py:2547
+#: ../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:2552
+#: ../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:2564
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "Nicht installierter SchlÃ¼ssel"
 
-#: ../yum/__init__.py:2570
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "SchlÃ¼ssel-Import fehlgeschlagen (Code %d)"
 
-#: ../yum/__init__.py:2573
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "SchlÃ¼ssel erfolgreich importiert"
 
-#: ../yum/__init__.py:2578
+#: ../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 augelisteten 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 augelisteten 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:2587
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr "Importieren der SchlÃ¼ssel hat nicht geholfen, falsch(e) SchlÃ¼ssel?"
 
-#: ../yum/__init__.py:2661
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "Es kann kein geeigneter Mirror gefunden werden."
 
-#: ../yum/__init__.py:2663
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr "Beim Herunterladen der Pakete sind Fehler aufgetreten."
 
-#: ../yum/__init__.py:2727
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Test-Transaktion-Fehler"
 
-#: ../yum/__init__.py:2762
-#, python-format
-msgid "Package %s needs %s, this is not available."
-msgstr "Paket %s braucht %s, dies ist nicht verfÃ¼gbar."
-
-#: ../yum/__init__.py:2767
-#, python-format
-msgid "Package %s conflicts with %s."
-msgstr "Paket %s kollidiert mit %s."
-
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:193
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "Geladene Plugins: "
 
-#: ../yum/plugins.py:210
+#: ../yum/plugins.py:206
+#, fuzzy, python-format
+msgid "No plugin match for: %s"
+msgstr "Kein Ãœbereinstimmung fÃ¼r Argument: %s"
+
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "\"%s\" Plugin ist deaktiviert"
 
-#: ../yum/plugins.py:222
+#: ../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:226
+#: ../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:253
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Lade \"%s\" Plugins"
 
-#: ../yum/plugins.py:260
+#: ../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 Names \"%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 Names \"%s\" existieren im Plugin-Suchpfad"
 
-#: ../yum/plugins.py:280
+#: ../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:283
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr "UnfÃ¤hig zum Finden der Konfigurationsdatei fÃ¼r Plugin %s"
 
-#: ../yum/plugins.py:437
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "Registration von Befehlen nicht unterstÃ¼tzt"
 
@@ -1925,10 +1931,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"
@@ -1938,12 +1942,20 @@ msgstr "Defekter Header %s"
 msgid "Error opening rpm %s - error %s"
 msgstr "Fehler bei Ã–ffnen des RPM %s - Fehler %s"
 
+#~ 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 998fbe7..6bf38a8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-08 09:51-0700\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-03-02 13:07+0100\n"
 "Last-Translator: Johan Cwiklinski <johan at x-tnd.be>\n"
 "Language-Team: fr_FR <fedora-trans-fr at redhat.com>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../callback.py:48 ../output.py:487
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Mise Ã  jour"
 
@@ -24,7 +24,7 @@ msgstr "Mise Ã  jour"
 msgid "Erasing"
 msgstr "Suppression"
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:486
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Installation"
 
@@ -32,7 +32,7 @@ msgstr "Installation"
 msgid "Obsoleted"
 msgstr "ObsolÃ¨te"
 
-#: ../callback.py:54 ../output.py:533
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Mis Ã  jour"
 
@@ -40,7 +40,7 @@ msgstr "Mis Ã  jour"
 msgid "Erased"
 msgstr "SupprimÃ©"
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:531
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "InstallÃ©"
 
@@ -62,7 +62,7 @@ msgstr "Erreur : statut de sortie invalide : %s pour %s"
 msgid "Erased: %s"
 msgstr "SupprimÃ© : %s"
 
-#: ../callback.py:217 ../output.py:488
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Suppression"
 
@@ -83,12 +83,12 @@ msgstr "Configuration des dÃ©pÃ´ts"
 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:183 ../utils.py:57
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "Erreur de configuration : %s"
 
-#: ../cli.py:186 ../cli.py:1040 ../utils.py:60
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Erreur d'options : %s"
@@ -118,7 +118,9 @@ msgstr ""
 
 #: ../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."
+msgstr ""
+"Tentative d'exÃ©cution de la transaction mais aucune tÃ¢che Ã  effectuer. "
+"Sortie."
 
 #: ../cli.py:347
 msgid "Exiting on user Command"
@@ -132,267 +134,289 @@ msgstr "TÃ©lÃ©chargement des paquetages :"
 msgid "Error Downloading Packages:\n"
 msgstr "Erreur durant le tÃ©lÃ©chargement des paquetages :\n"
 
-#: ../cli.py:369 ../yum/__init__.py:2689
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "Lancement de rpm_check_debug"
 
-#: ../cli.py:372 ../yum/__init__.py:2692
+#: ../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:376 ../yum/__init__.py:2694
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Veuillez reporter cette erreur dans le bugzilla"
 
-#: ../cli.py:380
+#: ../cli.py:383
 msgid "Running Transaction Test"
 msgstr "Lancement de la transaction de test"
 
-#: ../cli.py:396
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr "Transaction de test terminÃ©e"
 
-#: ../cli.py:398
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr "Erreur du contrÃ´le de transaction :\n"
 
-#: ../cli.py:405
+#: ../cli.py:408
 msgid "Transaction Test Succeeded"
 msgstr "Transaction de test rÃ©ussie"
 
-#: ../cli.py:423
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr "Lancement de la transaction"
 
-#: ../cli.py:452
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
 msgstr ""
-"Refus de l'importation automatique des clÃ©s lors d'une exÃ©cution inattendue.\n"
+"Refus de l'importation automatique des clÃ©s lors d'une exÃ©cution "
+"inattendue.\n"
 "Utilisez l'option Â« -y Â» pour passer outre."
 
-#: ../cli.py:484
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr "Traitement des options d'installation des paquetages"
 
-#: ../cli.py:494
+#: ../cli.py:501
 #, python-format
 msgid "No package %s available."
 msgstr "Aucun paquetage %s disponible."
 
-#: ../cli.py:498 ../cli.py:616 ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Paquetage(s) Ã  installer"
 
-#: ../cli.py:499 ../cli.py:617 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr "Rien Ã  faire"
 
-#: ../cli.py:529 ../yum/__init__.py:2192 ../yum/__init__.py:2271
-#: ../yum/__init__.py:2283
+#: ../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"
+msgstr ""
+"Pas de mise Ã  jour des paquetages qui ont dÃ©jÃ  Ã©tÃ© rendus obsolÃ¨tes : %s.%s %"
+"s:%s-%s"
 
-#: ../cli.py:561
+#: ../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:573
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr "%d paquetages marquÃ©s pour mise Ã  jour"
 
-#: ../cli.py:576
+#: ../cli.py:583
 msgid "No Packages marked for Update"
 msgstr "Aucun paquetage marquÃ© pour mise Ã  jour"
 
-#: ../cli.py:592
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr "%d paquetages marquÃ©s pour suppression"
 
-#: ../cli.py:595
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr "Aucun paquetage marquÃ© pour suppression"
 
-#: ../cli.py:607
+#: ../cli.py:614
 msgid "No Packages Provided"
 msgstr "Pas de paquetage fourni"
 
-#: ../cli.py:647
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr "Liste des paquetages correspondant Ã  la demande de l'utilisateur"
 
-#: ../cli.py:685
+#: ../cli.py:701
+#, fuzzy, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "Aucun paquetage trouvÃ© pour %s"
+
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Aucune correspondance trouvÃ©e"
 
-#: ../cli.py:722
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Aucun paquetage trouvÃ© pour %s"
 
-#: ../cli.py:734
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "Nettoyage complet"
 
-#: ../cli.py:748
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "Nettoyage des en-tÃªtes"
 
-#: ../cli.py:751
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "Nettoyage des paquetages"
 
-#: ../cli.py:754
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "Nettoyage des mÃ©ta donnÃ©es xml"
 
-#: ../cli.py:757
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "Nettoyage du cache de la base de donnÃ©es"
 
-#: ../cli.py:760
+#: ../cli.py:783
+#, fuzzy
+msgid "Cleaning up expire-cache metadata"
+msgstr "Nettoyage des mÃ©ta donnÃ©es xml"
+
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "Nettoyage des modules complÃ©mentaires"
 
-#: ../cli.py:782
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Groupes installÃ©s :"
 
-#: ../cli.py:789
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "Groupes disponibles :"
 
-#: ../cli.py:795
+#: ../cli.py:820
 msgid "Done"
 msgstr "EffectuÃ©"
 
-#: ../cli.py:804 ../cli.py:816 ../cli.py:822
+#: ../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:828
+#: ../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"
+msgstr ""
+"Aucun paquetage disponible pour installation ou mise Ã  jour dans les groupes "
+"demandÃ©s"
 
-#: ../cli.py:830
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d paquetage(s) Ã  installer"
 
-#: ../cli.py:840
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Aucun groupe nommÃ© %s n'existe"
 
-#: ../cli.py:846
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Aucun paquetage du groupe Ã  supprimer"
 
-#: ../cli.py:848
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d paquetage(s) Ã  supprimer"
 
-#: ../cli.py:890
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "Le paquetage %s est dÃ©jÃ  installÃ©, omission"
 
-#: ../cli.py:901
+#: ../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:927
+#: ../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"
+msgstr ""
+"Pas d'autre %s installÃ©, ajout Ã  la liste pour installation potentielle"
 
-#: ../cli.py:946
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "Erreur sur la ligne de commande : %s"
 
-#: ../cli.py:1073
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "tolÃ©rer les erreurs"
 
-#: ../cli.py:1075
+#: ../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:1077
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "emplacement du fichier de configuration"
 
-#: ../cli.py:1079
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "temps d'attente maximum de la commande"
 
-#: ../cli.py:1081
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "niveau de dÃ©boguage pour la sortie"
 
-#: ../cli.py:1084
+#: ../cli.py:1113
+msgid "show duplicates, in repos, in list/search commands"
+msgstr ""
+
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "niveau d'erreur pour la sortie"
 
-#: ../cli.py:1087
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "opÃ©ration silencieuse"
 
-#: ../cli.py:1091
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "rÃ©pondre oui Ã  toutes les questions"
 
-#: ../cli.py:1093
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "affiche la version de Yum et quitte"
 
-#: ../cli.py:1094
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "dÃ©finit la racine d'installation"
 
-#: ../cli.py:1098
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "active un ou plusieurs dÃ©pÃ´ts (jokers autorisÃ©s)"
 
-#: ../cli.py:1102
+#: ../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:1105
+#: ../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:1107
+#: ../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"
+msgstr ""
+"dÃ©sactive l'exclusion pour le dÃ©pÃ´t principal, pour un dÃ©pÃ´t particulier ou "
+"pour tout"
 
-#: ../cli.py:1110
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr "active le traitement des paquetages obsolÃ¨tes pendant les mises Ã  jour"
 
-#: ../cli.py:1112
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "dÃ©sactive les modules complÃ©mentaires Yum"
 
-#: ../cli.py:1114
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "dÃ©sactive la vÃ©rification de clÃ© gpg"
 
-#: ../cli.py:1116
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "dÃ©sactive les modules complÃ©mentaires par nom"
 
-#: ../cli.py:1119
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "omettre les paquetages qui ont des problÃ¨mes de dÃ©pendances"
 
@@ -448,69 +472,85 @@ msgstr "DÃ©c"
 msgid "Trying other mirror."
 msgstr "Essai d'un autre miroir."
 
-#: ../output.py:273
+#: ../output.py:293
 #, python-format
 msgid "Name       : %s"
 msgstr "Nom           : %s"
 
-#: ../output.py:274
+#: ../output.py:294
 #, python-format
 msgid "Arch       : %s"
 msgstr "Architecture  : %s"
 
-#: ../output.py:276
+#: ../output.py:296
 #, python-format
 msgid "Epoch      : %s"
 msgstr "Date          : %s"
 
-#: ../output.py:277
+#: ../output.py:297
 #, python-format
 msgid "Version    : %s"
 msgstr "Version       : %s"
 
-#: ../output.py:278
+#: ../output.py:298
 #, python-format
 msgid "Release    : %s"
 msgstr "RÃ©vision      : %s"
 
-#: ../output.py:279
+#: ../output.py:299
 #, python-format
 msgid "Size       : %s"
 msgstr "Taille        : %s"
 
-#: ../output.py:280
+#: ../output.py:300
 #, python-format
 msgid "Repo       : %s"
 msgstr "DÃ©pÃ´t         : %s"
 
-#: ../output.py:282
+#: ../output.py:302
 #, python-format
 msgid "Committer  : %s"
 msgstr "Auteur        : %s"
 
-#: ../output.py:283
+#: ../output.py:303
 msgid "Summary    : "
 msgstr "RÃ©sumÃ©        : "
 
-#: ../output.py:285
+#: ../output.py:305
 #, python-format
 msgid "URL        : %s"
 msgstr "URL           : %s"
 
-#: ../output.py:286
+#: ../output.py:306
 #, python-format
 msgid "License    : %s"
 msgstr "Licence       : %s"
 
-#: ../output.py:287
+#: ../output.py:307
 msgid "Description: "
 msgstr "Description :"
 
-#: ../output.py:331
+#: ../output.py:351
 msgid "Is this ok [y/N]: "
 msgstr "Est-ce correct [y/N] : "
 
-#: ../output.py:345
+#: ../output.py:357 ../output.py:360
+msgid "y"
+msgstr ""
+
+#: ../output.py:357
+msgid "n"
+msgstr ""
+
+#: ../output.py:357 ../output.py:360
+msgid "yes"
+msgstr ""
+
+#: ../output.py:357
+msgid "no"
+msgstr ""
+
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -519,96 +559,98 @@ msgstr ""
 "\n"
 "Groupe : %s"
 
-#: ../output.py:347
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " Description : %s"
 
-#: ../output.py:349
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr " Paquetages mandataires :"
 
-#: ../output.py:354
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr "Paquetages par dÃ©faut :"
 
-#: ../output.py:359
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr "Paquetages optionnels :"
 
-#: ../output.py:364
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr " Paquetages conditionnels :"
 
-#: ../output.py:372
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "paquetage : %s"
 
-#: ../output.py:374
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr "Pas de dÃ©pendances pour ce paquetage"
 
-#: ../output.py:379
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr "  dÃ©pendence : %s"
 
-#: ../output.py:381
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr "   DÃ©pendence non satisfaite"
 
-#: ../output.py:436
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Correspondance depuis :"
 
-#: ../output.py:462
+#: ../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"
+msgstr ""
+"Une erreur est survenue pendant le calcul de la taille totale des "
+"tÃ©lÃ©chargements"
 
-#: ../output.py:467
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "Taille totale : %s"
 
-#: ../output.py:470
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "Taille totale des tÃ©lÃ©chargement : %s"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Package"
 msgstr "Paquetage"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Arch"
 msgstr "Architecture"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Version"
 msgstr "Version"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Repository"
 msgstr "DÃ©pÃ´t"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Size"
 msgstr "Taille"
 
-#: ../output.py:489
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Installation pour dÃ©pendance"
 
-#: ../output.py:490
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Mise Ã  jour pour dÃ©pendance"
 
-#: ../output.py:491
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Suppression pour dÃ©pendance"
 
-#: ../output.py:503
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
@@ -617,7 +659,7 @@ msgstr ""
 "     remplace  %s.%s %s\n"
 "\n"
 
-#: ../output.py:511
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -634,27 +676,27 @@ msgstr ""
 "Mise Ã  jour   %5.5s Package(s)         \n"
 "Suppression   %5.5s Package(s)         \n"
 
-#: ../output.py:529
+#: ../output.py:554
 msgid "Removed"
 msgstr "SupprimÃ©"
 
-#: ../output.py:530
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "DÃ©pendance supprimÃ©e"
 
-#: ../output.py:532
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "DÃ©pendance installÃ©e"
 
-#: ../output.py:534
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "DÃ©pendence mise Ã  jour"
 
-#: ../output.py:535
+#: ../output.py:560
 msgid "Replaced"
 msgstr "RemplacÃ©"
 
-#: ../output.py:593
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
@@ -662,65 +704,70 @@ msgid ""
 "seconds to exit.\n"
 msgstr ""
 "\n"
-"TÃ©lÃ©chargement courant annulÃ©, interruption %s (crtl-c), %s de nouveau dans %s%s%s secondes pour quitter.\n"
+"TÃ©lÃ©chargement courant annulÃ©, interruption %s (crtl-c), %s de nouveau dans %"
+"s%s%s secondes pour quitter.\n"
 
-#: ../output.py:603
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "interruption par l'utilisateur"
 
-#: ../output.py:614
+#: ../output.py:639
 msgid "installed"
 msgstr "installÃ©"
 
-#: ../output.py:615
+#: ../output.py:640
 msgid "updated"
 msgstr "mis Ã  jour"
 
-#: ../output.py:616
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "obsolÃ¨te"
 
-#: ../output.py:617
+#: ../output.py:642
 msgid "erased"
 msgstr "effacÃ©"
 
-#: ../output.py:621
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> Paquetage %s.%s %s:%s-%s devenu %s "
 
-#: ../output.py:628
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> Lancement de la transaction de test"
 
-#: ../output.py:633
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
-msgstr "--> RedÃ©marrage de la rÃ©solution des dÃ©pendances avec les nouveaux changements."
+msgstr ""
+"--> RedÃ©marrage de la rÃ©solution des dÃ©pendances avec les nouveaux "
+"changements."
 
-#: ../output.py:638
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> RÃ©solution des dÃ©pendances terminÃ©e"
 
-#: ../output.py:643
+#: ../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:648
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> DÃ©pendance non rÃ©solue : %s"
 
-#: ../output.py:654
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Traitement du conflit : %s entre en conflit avec %s"
 
-#: ../output.py:657
+#: ../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."
+msgstr ""
+"--> Peuplement du jeu de transaction avec les paquetages sÃ©lectionnÃ©s. Merci "
+"de patienter."
 
-#: ../output.py:661
+#: ../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."
@@ -747,18 +794,22 @@ msgid ""
 "For more information contact your distribution or package provider.\n"
 msgstr ""
 "\n"
-"Vous avez activÃ© la vÃ©rification des paquetages via clÃ©s GPG. C'est une bonne chose. \n"
-"Cependant, vous n'avez aucune clÃ© GPG publique installÃ©e. Vous devez tÃ©lÃ©charger\n"
+"Vous avez activÃ© la vÃ©rification des paquetages via clÃ©s GPG. C'est une "
+"bonne chose. \n"
+"Cependant, vous n'avez aucune clÃ© GPG publique installÃ©e. Vous devez "
+"tÃ©lÃ©charger\n"
 "et installer les clÃ©s pour les paquetages que vous souhaitez installer..\n"
 "Vous pouvez le faire en lanÃ§ant la commande :\n"
 "    rpm --import public.gpg.key\n"
 "\n"
 "\n"
-"Alternativement, vous pouvez spÃ©cifier l'URL de la clÃ© que vous souhaitez utiliser\n"
+"Alternativement, vous pouvez spÃ©cifier l'URL de la clÃ© que vous souhaitez "
+"utiliser\n"
 "pour un dÃ©pÃ´t dans l'option 'gpgkey' dans une section du dÃ©pÃ´t et yum\n"
 "l'installera pour vous.\n"
 "\n"
-"Pour plus de renseignements, contactez le fournisseur de paquetages de votre distribution.\n"
+"Pour plus de renseignements, contactez le fournisseur de paquetages de votre "
+"distribution.\n"
 
 #: ../yumcommands.py:63
 #, python-format
@@ -1051,8 +1102,11 @@ msgstr ""
 "Sortie suite Ã  une redirection cassÃ©e"
 
 #: ../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..."
+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:132 ../yummain.py:171
 #, python-format
@@ -1077,11 +1131,11 @@ msgstr ""
 "\n"
 "DÃ©pendences rÃ©solues"
 
-#: ../yummain.py:199
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr "ComplÃ©tÃ© !"
 
-#: ../yummain.py:246
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
@@ -1091,302 +1145,326 @@ msgstr ""
 "\n"
 "Sortie sur annulation par l'utilisateur."
 
-#: ../yum/depsolve.py:70
+#: ../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"
+msgstr "doTsSetup() sera supprimÃ© dans une future version de Yum.\n"
 
-#: ../yum/depsolve.py:83
+#: ../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:123
+#: ../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:134
+#: ../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:163
+#: ../yum/depsolve.py:170
 #, python-format
 msgid "Potential match for %s from %s"
 msgstr "Correspondance potentielle pour %s depuis %s"
 
-#: ../yum/depsolve.py:171
+#: ../yum/depsolve.py:178
 #, python-format
 msgid "Matched %s to require for %s"
 msgstr "Correspondance %s trouvÃ© pour %s "
 
-#: ../yum/depsolve.py:212
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "Membre : %s"
 
-#: ../yum/depsolve.py:226 ../yum/depsolve.py:788
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s converti pour installation"
 
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "Ajout du paquetage %s en mode %s"
 
-#: ../yum/depsolve.py:243
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Suppression du paquetage %s"
 
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s requiert : %s"
 
-#: ../yum/depsolve.py:300
+#: ../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:310
+#: ../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:317
+#: ../yum/depsolve.py:329
 #, python-format
 msgid "Potential Provider: %s"
 msgstr "Fournisseur potentiel : %s"
 
-#: ../yum/depsolve.py:340
+#: ../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:344
+#: ../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:348
+#: ../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:361
-#, python-format
-msgid "Looking for Obsoletes for %s"
-msgstr "Recherche d'obsolescence pour %s"
-
-#: ../yum/depsolve.py:373
+#: ../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:404
+#: ../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."
 
-#. if there's no update then pass this over to requringFromTransaction()
-#: ../yum/depsolve.py:408
+#: ../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"
+msgstr ""
+"Impossible de trouver un chemin de mise Ã  jour pour la dÃ©pendance de : %s"
 
-#: ../yum/depsolve.py:420
+#: ../yum/depsolve.py:388
 #, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr "Impossible de rÃ©soudre le prÃ©requis  %s pour %s"
 
 #. is it already installed?
-#: ../yum/depsolve.py:466
+#: ../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."
+msgstr ""
+"%s est dans les paquetages fournis mais est dÃ©jÃ  installÃ©, suppression."
 
-#: ../yum/depsolve.py:481
+#: ../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."
+msgstr ""
+"ts contient une version plus rÃ©cente du paquetage %s susceptible de rÃ©soudre "
+"la dÃ©pendance."
 
-#: ../yum/depsolve.py:492
+#: ../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."
+msgstr ""
+"Le paquetage susceptible de rÃ©soudre la dÃ©pedence %s est dÃ©jÃ  installÃ© dans "
+"une version plus rÃ©cente."
 
-#: ../yum/depsolve.py:500 ../yum/depsolve.py:568
+#: ../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:513
+#: ../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:578
+#: ../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:585
+#: ../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:647 ../yum/depsolve.py:654
-#, python-format
-msgid "unable to find newer package for %s"
-msgstr "impossible de trouver un paquetage plus rÃ©cent pour %s"
-
-#: ../yum/depsolve.py:661
-#, python-format
-msgid "TSINFO: Updating %s to resolve conflict."
-msgstr "TSINFO : mise Ã  jour de %s pour rÃ©soudre le conflit."
-
-#: ../yum/depsolve.py:671
-#, python-format
-msgid "%s conflicts: %s"
-msgstr "%s entre en conflit avec : %s"
-
-#: ../yum/depsolve.py:681
-#, python-format
-msgid "%s conflicts with %s"
-msgstr "%s entre en conflit avec %s"
-
-#: ../yum/depsolve.py:720 ../yum/depsolve.py:806
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "SuccÃ¨s - transaction vide"
 
-#: ../yum/depsolve.py:765 ../yum/depsolve.py:778
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Re-dÃ©marrage de la boucle"
 
-#: ../yum/depsolve.py:794
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "Finalisation du processus de dÃ©pendance"
 
-#: ../yum/depsolve.py:800
+#: ../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:807
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "SuccÃ¨s - dÃ©pendances rÃ©solues"
 
-#: ../yum/depsolve.py:824
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "Recherche des dÃ©pendances pour %s"
 
-#: ../yum/depsolve.py:880
+#: ../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:933
+#, python-format
+msgid "Comparing best: %s to po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, python-format
+msgid "best %s obsoletes po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:955
+#, python-format
+msgid "po %s obsoletes best: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#, fuzzy, python-format
+msgid "better arch in po %s"
+msgstr "recherche du paquetage %s"
+
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#, python-format
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#, python-format
+msgid "best %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#, python-format
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#, python-format
+msgid "po %s has a shorter name than best %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
+
 #: ../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"
+msgstr "doConfigSetup() sera supprimÃ© dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:311
+#: ../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"
+msgstr ""
+"Il manque le nom du dÃ©pÃ´t %r dans la configuration, utilisation de "
+"l'identifiant"
 
-#: ../yum/__init__.py:347
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr "modules complÃ©mentaires dÃ©jÃ  initialisÃ©s"
 
-#: ../yum/__init__.py:354
+#: ../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"
+msgstr "doRpmDBSetup() sera supprimÃ© dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:363
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr "Lecture de la base de donnÃ©es RPM locale"
 
-#: ../yum/__init__.py:381
+#: ../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"
+msgstr "doRepoSetup() sera supprimÃ© dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:399
+#: ../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"
+msgstr "doSackSetup() sera supprimÃ© dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:416
+#: ../yum/__init__.py:404
 msgid "Setting up Package Sacks"
 msgstr "Configuration du groupe de paquetages"
 
-#: ../yum/__init__.py:458
+#: ../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:459
+#: ../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:464
+#: ../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"
+msgstr "doUpdateSetup() sera supprimÃ© dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:476
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr "Construction de l'objet de mises Ã  jour"
 
-#: ../yum/__init__.py:499
+#: ../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"
+msgstr "doGroupSetup() sera supprimÃ© dans une future version de Yum.\n"
 
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Obtention des mÃ©ta donnÃ©es du groupe"
 
-#: ../yum/__init__.py:548
+#: ../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:557
+#: ../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:563
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Aucun groupe disponible dans les dÃ©pÃ´ts"
 
-#: ../yum/__init__.py:614
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Import d'informations additionnelles sur la liste de fichiers"
 
-#: ../yum/__init__.py:646
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Cycle %i d'Ã©vitement des dÃ©pendances cassÃ©es"
 
-#: ../yum/__init__.py:674
+#: ../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:675
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
@@ -1394,153 +1472,160 @@ msgstr ""
 "\n"
 "Paquetages ignorÃ©s en raison de problÃ¨mes de dÃ©pendances :"
 
-#: ../yum/__init__.py:679
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s depuis %s"
 
-#: ../yum/__init__.py:767
+#: ../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:807
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "exclusion pour coÃ»t : %s depuis %s"
 
-#: ../yum/__init__.py:838
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Exclusion des paquetages dans la liste globale d'exclusion"
 
-#: ../yum/__init__.py:840
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Exclusion des paquetages depuis %s"
 
-#: ../yum/__init__.py:867
+#: ../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:872
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Conservation du paquetage inclus %s"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Suppression du paquetage non concordant %s"
 
-#: ../yum/__init__.py:881
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "TerminÃ©"
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:911
+#: ../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:915
+#: ../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:962 ../yum/__init__.py:969
+#: ../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:983
+#: ../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:986
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "Le paquetage ne correspond pas Ã  sa somme de contrÃ´le"
 
-#: ../yum/__init__.py:1028
+#: ../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"
+msgstr ""
+"Le paquetage ne correspond pas Ã  la somme de contrÃ´le mais le cache est "
+"activÃ© pour %s"
 
-#: ../yum/__init__.py:1034
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "utilisation de la copie locale de %s"
 
-#: ../yum/__init__.py:1053
+#: ../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"
+msgstr ""
+"Espace disque insuffisant dans le dossier de tÃ©lÃ©chargement %s pour "
+"tÃ©lÃ©charger"
 
-#: ../yum/__init__.py:1086
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "L'en-tÃªte est incomplet."
 
-#: ../yum/__init__.py:1126
+#: ../yum/__init__.py:1134
 #, python-format
-msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
-msgstr "L'en-tÃªte n'est pas dans le cache et le mode cache uniquement est activÃ©. Impossible de tÃ©lÃ©charger %s"
+msgid ""
+"Header not in local cache and caching-only mode enabled. Cannot download %s"
+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:1181
+#: ../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:1185
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "ProblÃ¨me Ã  l'ouverture du paquetage %s"
 
-#: ../yum/__init__.py:1193
+#: ../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:1197
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Le paquetage %s n'est pas signÃ©"
 
-#: ../yum/__init__.py:1235
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Impossible de supprimer %s"
 
-#: ../yum/__init__.py:1239
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "%s supprimÃ©"
 
-#: ../yum/__init__.py:1271
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Impossible de supprimer depuis %s le fichier %s"
 
-#: ../yum/__init__.py:1275
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "fichier de %s : %s supprimÃ©"
 
-#: ../yum/__init__.py:1277
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d fichiers de %s supprimÃ©s"
 
-#: ../yum/__init__.py:1317
+#: ../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:1323
+#: ../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:1513
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
@@ -1548,284 +1633,304 @@ msgstr ""
 "searchPackages() sera supprimÃ© dans une future version de "
 "Yum.                      Utilisez searchGenerator() Ã  la place. \n"
 
-#: ../yum/__init__.py:1550
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "Recherche de %d paquetages"
 
-#: ../yum/__init__.py:1554
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "recherche du paquetage %s"
 
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "recherche dans les entrÃ©es de fichiers"
 
-#: ../yum/__init__.py:1569
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "recherche dans les entrÃ©es de correspondance"
 
-#: ../yum/__init__.py:1599
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Correspondance fournie : %s"
 
-#: ../yum/__init__.py:1668 ../yum/__init__.py:1686 ../yum/__init__.py:1714
-#: ../yum/__init__.py:1719 ../yum/__init__.py:1774 ../yum/__init__.py:1778
+#: ../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:1697 ../yum/__init__.py:1790
+#: ../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:1736
+#: ../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:1740
+#: ../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:1815
+#: ../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:1883 ../yum/__init__.py:1926
+#: ../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:1885 ../yum/__init__.py:1928
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Drapeau de version invalide"
 
-#: ../yum/__init__.py:1900 ../yum/__init__.py:1904
+#: ../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:2034
+#: ../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:2038
+#: ../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:2051
+#: ../yum/__init__.py:2085
 #, python-format
-# Aucune idÃ©e
 msgid "Checking for virtual provide or file-provide for %s"
-msgstr "Recherche de correspondance virtuelle ou de correspondance fichier pour %s"
+msgstr ""
+"Recherche de correspondance virtuelle ou de correspondance fichier pour %s"
 
-#: ../yum/__init__.py:2057 ../yum/__init__.py:2323
+#: ../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:2114
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr "Aucun paquetage disponible pour installation"
 
-#: ../yum/__init__.py:2126
+#: ../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:2139
+#: ../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:2178
+#, fuzzy, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr "Le paquetage %s est dÃ©jÃ  installÃ©, omission"
+
 #. update everything (the easy case)
-#: ../yum/__init__.py:2180
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Mise Ã  jour complÃ¨te"
 
-#: ../yum/__init__.py:2264
+#: ../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:2320
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../yum/__init__.py:2335
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Aucun paquetage sÃ©lectionnÃ© pour suppression"
 
-#: ../yum/__init__.py:2369
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Impossible d'ouvrir le fichier : %s. Omission."
 
-#: ../yum/__init__.py:2372
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Examen de %s : %s"
 
-#: ../yum/__init__.py:2379
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
 "instead."
-msgstr "Le paquetage %s n'est pas installÃ©, il est impossible de le mettre Ã  jour. Lancez plutÃ´t yum install pour l'installer."
+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:2411
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Exclusion de %s"
 
-#: ../yum/__init__.py:2416
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "SÃ©lection de %s pour installation "
 
-#: ../yum/__init__.py:2422
+#: ../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:2429
+#: ../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:2447
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
-msgstr "ProblÃ¨me dans la rÃ©installation : aucun paquetage correspondant Ã  supprimer"
+msgstr ""
+"ProblÃ¨me dans la rÃ©installation : aucun paquetage correspondant Ã  supprimer"
+
+#: ../yum/__init__.py:2515
+#, fuzzy, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr "Le paquetage %s est dÃ©jÃ  installÃ©, omission"
 
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
-msgstr "ProblÃ¨me dans la rÃ©installation : aucun paquetage correspondant Ã  installer"
+msgstr ""
+"ProblÃ¨me dans la rÃ©installation : aucun paquetage correspondant Ã  installer"
 
-#: ../yum/__init__.py:2514
+#: ../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:2520
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "Ã‰chec de la rÃ©cupÃ©ration de la clÃ© GPG : "
 
-#: ../yum/__init__.py:2533
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "Ã‰chec d'analyse de la clÃ© GPG : "
 
-#: ../yum/__init__.py:2537
+#: ../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:2542
+#: ../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:2554
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "N'installe pas la clÃ©"
 
-#: ../yum/__init__.py:2560
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "L'import de la clÃ© Ã  Ã©chouÃ© (code %d)"
 
-#: ../yum/__init__.py:2563
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "La clÃ© a Ã©tÃ© importÃ©e avec succÃ¨s"
 
-#: ../yum/__init__.py:2568
+#: ../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 ""
-"Les clÃ©s GPG listÃ©es pour le dÃ©pÃ´t Â« %s Â» sont dÃ©jÃ  installÃ©es mais sont incorrectes pour ce paquetage.\n"
+"Les clÃ©s GPG listÃ©es pour le dÃ©pÃ´t Â« %s Â» sont dÃ©jÃ  installÃ©es mais sont "
+"incorrectes pour ce paquetage.\n"
 "VÃ©rifiez que les URL des clÃ©s pour ce dÃ©pÃ´t soient correctes."
 
-#: ../yum/__init__.py:2577
+#: ../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) ?"
+msgstr ""
+"L'import de la (des) clÃ©(s) n'a pas rÃ©solu le problÃ¨me, mauvaise(s) clÃ©(s) ?"
 
-#: ../yum/__init__.py:2651
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "Impossible de trouver un miroir adaptÃ©."
 
-#: ../yum/__init__.py:2653
+#: ../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."
+msgstr ""
+"Des erreurs ont Ã©tÃ© rencontrÃ©e durant le tÃ©lÃ©chargement des paquetages."
 
-#: ../yum/__init__.py:2717
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Erreurs de la transaction de test : "
 
-#: ../yum/__init__.py:2752
-#, python-format
-msgid "Package %s needs %s, this is not available."
-msgstr "Le paquetage %s requiert %s qui n'est pas disponible."
-
-#: ../yum/__init__.py:2757
-#, python-format
-msgid "Package %s conflicts with %s."
-msgstr "Le paquetage %s entre en conflit avec %s."
-
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:193
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "Modules complÃ©mentaires chargÃ©s : "
 
-#: ../yum/plugins.py:210
+#: ../yum/plugins.py:206
+#, fuzzy, python-format
+msgid "No plugin match for: %s"
+msgstr "Aucune correspondance pour l'argument : %s"
+
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "le module complÃ©mentaire Â« %s Â» est dÃ©sactivÃ©"
 
-#: ../yum/plugins.py:222
+#: ../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"
+msgstr ""
+"Le module complÃ©mentaire Â« %s Â» ne spÃ©cifie pas la version de l'API requise"
 
-#: ../yum/plugins.py:226
+#: ../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."
+msgstr ""
+"Le module complÃ©mentaire Â« %s Â» requiert l'API %s. L'API supportÃ©e est %s."
 
-#: ../yum/plugins.py:253
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Chargement du module complÃ©mentaire Â« %s Â»"
 
-#: ../yum/plugins.py:260
+#: ../yum/plugins.py:271
 #, python-format
-msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
-msgstr "Au moins deux modules complÃ©mentaires avec le mÃªme nom Â« %s Â» existent dans le chemin de recherche des modules complÃ©mentaires"
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+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:280
+#: ../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:283
+#: ../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"
+msgstr ""
+"Impossible de trouver le fichier de configuration pour le module "
+"complÃ©mentaire %s"
 
-#: ../yum/plugins.py:437
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "enregistrement de commandes non supportÃ©"
 
@@ -1841,7 +1946,8 @@ msgstr "Ã‰chec du contrÃ´le MD5 pour le RPM %s"
 
 #: ../rpmUtils/oldUtils.py:144
 msgid "Could not open RPM database for reading. Perhaps it is already in use?"
-msgstr "Impossible de lire la base de donnÃ©es RPM. Peut Ãªtre est-elle dÃ©jÃ  utilisÃ©e ?"
+msgstr ""
+"Impossible de lire la base de donnÃ©es RPM. Peut Ãªtre est-elle dÃ©jÃ  utilisÃ©e ?"
 
 #: ../rpmUtils/oldUtils.py:174
 msgid "Got an empty Header, something has gone wrong"
@@ -1858,3 +1964,23 @@ msgstr "En-tÃªte endommagÃ© %s"
 msgid "Error opening rpm %s - error %s"
 msgstr "Erreur d'ouverture du rpm %s - erreur %s"
 
+#~ msgid "Looking for Obsoletes for %s"
+#~ msgstr "Recherche d'obsolescence pour %s"
+
+#~ msgid "unable to find newer package for %s"
+#~ msgstr "impossible de trouver un paquetage plus rÃ©cent pour %s"
+
+#~ msgid "TSINFO: Updating %s to resolve conflict."
+#~ msgstr "TSINFO : mise Ã  jour de %s pour rÃ©soudre le conflit."
+
+#~ msgid "%s conflicts: %s"
+#~ msgstr "%s entre en conflit avec : %s"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s entre en conflit avec %s"
+
+#~ msgid "Package %s needs %s, this is not available."
+#~ msgstr "Le paquetage %s requiert %s qui n'est pas disponible."
+
+#~ msgid "Package %s conflicts with %s."
+#~ msgstr "Le paquetage %s entre en conflit avec %s."
diff --git a/po/it.po b/po/it.po
index e65301d..13fe516 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum-it 3.2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 10:21+0000\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-03-14 15:13+0100\n"
 "Last-Translator: Silvio Pierro <perplesso82 at gmail.com>\n"
 "Language-Team: Italian\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:500
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Aggiornamento"
 
@@ -26,7 +26,7 @@ msgstr "Aggiornamento"
 msgid "Erasing"
 msgstr "Cancellazione"
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:499
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Installazione"
 
@@ -34,7 +34,7 @@ msgstr "Installazione"
 msgid "Obsoleted"
 msgstr "Reso obsoleto"
 
-#: ../callback.py:54 ../output.py:546
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Aggiornato"
 
@@ -42,7 +42,7 @@ msgstr "Aggiornato"
 msgid "Erased"
 msgstr "Cancellato"
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:544
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "Installato"
 
@@ -64,7 +64,7 @@ msgstr "Errore: stato di output non valido: %s per %s"
 msgid "Erased: %s"
 msgstr "Cancellato: %s"
 
-#: ../callback.py:217 ../output.py:501
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Rimozione in corso"
 
@@ -90,7 +90,7 @@ msgstr "Lettura dei metadati dei repository dai file locali"
 msgid "Config Error: %s"
 msgstr "Errore di configurazione: %s"
 
-#: ../cli.py:186 ../cli.py:1050 ../utils.py:75
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Errore opzioni: %s"
@@ -134,15 +134,15 @@ msgstr "Download dei pacchetti:"
 msgid "Error Downloading Packages:\n"
 msgstr "Errore nel download dei pacchetti:\n"
 
-#: ../cli.py:370 ../yum/__init__.py:2724
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "Esecuzione rpm_check_debug"
 
-#: ../cli.py:373 ../yum/__init__.py:2727
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr "ERRORE con rpm_check_debug su depsolve:"
 
-#: ../cli.py:377 ../yum/__init__.py:2729
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Riportare questo errore in bugzilla"
 
@@ -192,8 +192,8 @@ msgstr "Pacchetto(i) da installare"
 msgid "Nothing to do"
 msgstr "Niente da fare"
 
-#: ../cli.py:536 ../yum/__init__.py:2220 ../yum/__init__.py:2299
-#: ../yum/__init__.py:2328
+#: ../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 "I pacchetti giÃ  resi obsoleti non verranno aggiornati: %s.%s %s:%s-%s"
@@ -230,180 +230,190 @@ msgid "Matching packages for package list to user args"
 msgstr ""
 "Ricerca corrispondenza degli argomenti dell'utente nella lista dei pacchetti"
 
-#: ../cli.py:692
+#: ../cli.py:701
+#, fuzzy, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "Nessun pacchetto trovato per %s"
+
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Nessuna corrispondenza trovata"
 
-#: ../cli.py:729
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Nessun pacchetto trovato per %s"
 
-#: ../cli.py:741
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "Pulizia completa"
 
-#: ../cli.py:755
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "Pulizia headers"
 
-#: ../cli.py:758
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "Pulizia pacchetti"
 
-#: ../cli.py:761
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "Pulizia metadati xml"
 
-#: ../cli.py:764
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "Pulizia database cache"
 
-#: ../cli.py:767
+#: ../cli.py:783
+#, fuzzy
+msgid "Cleaning up expire-cache metadata"
+msgstr "Pulizia metadati xml"
+
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "Pulizia plugins"
 
-#: ../cli.py:789
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Gruppi installati:"
 
-#: ../cli.py:796
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "Gruppi disponibili:"
 
-#: ../cli.py:802
+#: ../cli.py:820
 msgid "Done"
 msgstr "Fatto"
 
-#: ../cli.py:811 ../cli.py:823 ../cli.py:829
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "Attenzione: Il gruppo %s non esiste."
 
-#: ../cli.py:835
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
 msgstr ""
 "Nessun pacchetto in alcun gruppo richiesto Ã¨ disponibile per l'installazione "
 "o l'aggiornamento"
 
-#: ../cli.py:837
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d pacchetto(i) da installare"
 
-#: ../cli.py:847
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Non esiste nessun gruppo di nome %s"
 
-#: ../cli.py:853
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Nessun pacchetto da rimuovere dai gruppi"
 
-#: ../cli.py:855
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d pacchetto(i) da rimuovere"
 
-#: ../cli.py:897
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "Il pacchetto %s Ã¨ giÃ  installato, lo salto"
 
-#: ../cli.py:908
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr "Escludendo il pacchetto non comparabile %s.%s"
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:934
+#: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
 msgstr ""
 "Nessun altro %s installato, inserimento in lista per potenziale installazione"
 
-#: ../cli.py:953
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "Errore di linea di comando: %s"
 
-#: ../cli.py:1083
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "tollera gli errori"
 
-#: ../cli.py:1085
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr "esecuzione esclusivamente in cache, senza aggiornarla"
 
-#: ../cli.py:1087
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "configurazione locazione dei file"
 
-#: ../cli.py:1089
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "tempo di attesa comando massima"
 
-#: ../cli.py:1091
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "livello output di debug"
 
-#: ../cli.py:1095
+#: ../cli.py:1113
 msgid "show duplicates, in repos, in list/search commands"
 msgstr "Mostra comandi duplicati, nei repo, in lista/cerca"
 
-#: ../cli.py:1097
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "livello output per gli errori"
 
-#: ../cli.py:1100
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "modalitÃ  silenziosa"
 
-#: ../cli.py:1104
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "risponde si a tutte le domande"
 
-#: ../cli.py:1106
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "mostra la versione di Yum e esce"
 
-#: ../cli.py:1107
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "imposta il percorso d'installazione"
 
-#: ../cli.py:1111
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "abilita uno o piÃ¹ repository (wildcard consentite)"
 
-#: ../cli.py:1115
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr "disabilita uno o piÃ¹ repository (wildcardÂ·consentite)"
 
-#: ../cli.py:1118
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr "esclude pacchetto(i) per nome o glob"
 
-#: ../cli.py:1120
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
 msgstr "disabilita l'esclusione dal main, per un repo o per tutto"
 
-#: ../cli.py:1123
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr "abilita l'elaborazione degli obsoleti durante l'aggiornamento"
 
-#: ../cli.py:1125
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "disabilita i plugin di Yum"
 
-#: ../cli.py:1127
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "disabilita il controllo della firma gpg"
 
-#: ../cli.py:1129
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "disabilita i plugin per nome"
 
-#: ../cli.py:1132
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "Salto pacchetti con problemi di risoluzione dipendenze"
 
@@ -459,85 +469,85 @@ msgstr "Dic"
 msgid "Trying other mirror."
 msgstr "Connessione ad un altro mirror in corso."
 
-#: ../output.py:281
+#: ../output.py:293
 #, python-format
 msgid "Name       : %s"
 msgstr "Nome       : %s"
 
-#: ../output.py:282
+#: ../output.py:294
 #, python-format
 msgid "Arch       : %s"
 msgstr "Arch       : %s"
 
-#: ../output.py:284
+#: ../output.py:296
 #, python-format
 msgid "Epoch      : %s"
 msgstr "Periodo      : %s"
 
-#: ../output.py:285
+#: ../output.py:297
 #, python-format
 msgid "Version    : %s"
 msgstr "Versione    : %s"
 
-#: ../output.py:286
+#: ../output.py:298
 #, python-format
 msgid "Release    : %s"
 msgstr "Release    : %s"
 
-#: ../output.py:287
+#: ../output.py:299
 #, python-format
 msgid "Size       : %s"
 msgstr "Dimensione       : %s"
 
-#: ../output.py:288
+#: ../output.py:300
 #, python-format
 msgid "Repo       : %s"
 msgstr "Repo        : %s"
 
-#: ../output.py:290
+#: ../output.py:302
 #, python-format
 msgid "Committer  : %s"
 msgstr "Committer  : %s"
 
-#: ../output.py:291
+#: ../output.py:303
 msgid "Summary    : "
 msgstr "Sommario    : "
 
-#: ../output.py:293
+#: ../output.py:305
 #, python-format
 msgid "URL        : %s"
 msgstr "URL        : %s"
 
-#: ../output.py:294
+#: ../output.py:306
 #, python-format
 msgid "License    : %s"
 msgstr "Licenza    : %s"
 
-#: ../output.py:295
+#: ../output.py:307
 msgid "Description: "
 msgstr "Descrizione: "
 
-#: ../output.py:339
+#: ../output.py:351
 msgid "Is this ok [y/N]: "
 msgstr "Ãˆ corretto [y/N]: "
 
-#: ../output.py:345 ../output.py:348
+#: ../output.py:357 ../output.py:360
 msgid "y"
 msgstr "s"
 
-#: ../output.py:345
+#: ../output.py:357
 msgid "n"
 msgstr "n"
 
-#: ../output.py:345 ../output.py:348
+#: ../output.py:357 ../output.py:360
 msgid "yes"
 msgstr "si"
 
-#: ../output.py:345
+#: ../output.py:357
 msgid "no"
 msgstr "no"
 
-#: ../output.py:355
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -546,97 +556,97 @@ msgstr ""
 "\n"
 "Gruppo: %s"
 
-#: ../output.py:357
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " Descrizione: %s"
 
-#: ../output.py:359
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr " Pacchetti necessari:"
 
-#: ../output.py:364
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr " Pacchetti di default:"
 
-#: ../output.py:369
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr "Pacchetti opzionali:"
 
-#: ../output.py:374
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr " Pacchetti condizionali:"
 
-#: ../output.py:382
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "pacchetto: %s"
 
-#: ../output.py:384
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr "  Nessuna dipendenza per questo pacchetto"
 
-#: ../output.py:389
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr "  dipendenze: %s"
 
-#: ../output.py:391
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr "   Dipendenza non soddisfatte"
 
-#: ../output.py:449
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Corrispondenza trovata in:"
 
-#: ../output.py:475
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr ""
 "Si Ã¨ verificato un errore nel calcolo della dimensione totale di download"
 
-#: ../output.py:480
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "Dimensione totale: %s"
 
-#: ../output.py:483
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "Dimensione totale del download: %s"
 
-#: ../output.py:495
+#: ../output.py:507
 msgid "Package"
 msgstr "Pacchetto"
 
-#: ../output.py:495
+#: ../output.py:507
 msgid "Arch"
 msgstr "Arch"
 
-#: ../output.py:495
+#: ../output.py:507
 msgid "Version"
 msgstr "Versione"
 
-#: ../output.py:495
+#: ../output.py:507
 msgid "Repository"
 msgstr "Repository"
 
-#: ../output.py:495
+#: ../output.py:507
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../output.py:502
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Installazioni per dipendenze"
 
-#: ../output.py:503
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Aggiornamenti per dipendenze"
 
-#: ../output.py:504
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Rimozioni per dipendenze"
 
-#: ../output.py:516
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
@@ -645,7 +655,7 @@ msgstr ""
 "     sostituzione %s.%s %s\n"
 "\n"
 
-#: ../output.py:524
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -662,27 +672,27 @@ msgstr ""
 "Aggiornamento  %5.5s Pacchetto(i)         \n"
 "Rimozione   %5.5s Pacchetto(i)         \n"
 
-#: ../output.py:542
+#: ../output.py:554
 msgid "Removed"
 msgstr "Rimosso"
 
-#: ../output.py:543
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "Dipendenza rimossa"
 
-#: ../output.py:545
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "Dipendenza installata"
 
-#: ../output.py:547
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "Dipendenza aggiornata"
 
-#: ../output.py:548
+#: ../output.py:560
 msgid "Replaced"
 msgstr "Sostituito"
 
-#: ../output.py:606
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
@@ -693,66 +703,66 @@ msgstr ""
 " Download in corso interrotto, %spremi (ctrl-c) nuovamente%s entro %s%s%s "
 "secondi per uscire\n"
 
-#: ../output.py:616
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "interruzione utente"
 
-#: ../output.py:627
+#: ../output.py:639
 msgid "installed"
 msgstr "installato"
 
-#: ../output.py:628
+#: ../output.py:640
 msgid "updated"
 msgstr "aggiornato"
 
-#: ../output.py:629
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "reso obsoleto"
 
-#: ../output.py:630
+#: ../output.py:642
 msgid "erased"
 msgstr "cancellato"
 
-#: ../output.py:634
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> Pacchetto %s.%s %s:%s-%s settato per essere %s"
 
-#: ../output.py:641
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> Esecuzione del controllo di transazione"
 
-#: ../output.py:646
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr ""
 "--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti."
 
-#: ../output.py:651
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> Risoluzione delle dipendenze terminata"
 
-#: ../output.py:656
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr "--> Esame delle dipendenze: %s per il pacchetto: %s"
 
-#: ../output.py:661
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> Dipendenze non risolte: %s"
 
-#: ../output.py:667
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Controllo conflitto: %s va in conflitto con %s"
 
-#: ../output.py:670
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr ""
 "--> Inizializzazione della transazione con i pacchetti selezionati. "
 "Attendere prego."
 
-#: ../output.py:674
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr ""
@@ -1149,123 +1159,123 @@ msgstr "tsflag non valido nel file di configurazione: %s"
 msgid "Searching pkgSack for dep: %s"
 msgstr "Ricerca di pkgSack per dip: %s"
 
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:170
 #, python-format
 msgid "Potential match for %s from %s"
 msgstr "Corrispondenza potenziale per %s da %s"
 
-#: ../yum/depsolve.py:184
+#: ../yum/depsolve.py:178
 #, python-format
 msgid "Matched %s to require for %s"
 msgstr "Individuato %s come requisito per %s"
 
-#: ../yum/depsolve.py:225
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "Membro: %s"
 
-#: ../yum/depsolve.py:239 ../yum/depsolve.py:705
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s convertito in installa"
 
-#: ../yum/depsolve.py:246
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "Aggiunto il pacchetto %s in modo %s"
 
-#: ../yum/depsolve.py:256
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Rimozione pacchetto %s"
 
-#: ../yum/depsolve.py:267
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s richiede: %s"
 
-#: ../yum/depsolve.py:318
+#: ../yum/depsolve.py:312
 msgid "Needed Require has already been looked up, cheating"
 msgstr "Il requisito necessario Ã¨ giÃ  stato controllato, imbroglio"
 
-#: ../yum/depsolve.py:328
+#: ../yum/depsolve.py:322
 #, python-format
 msgid "Needed Require is not a package name. Looking up: %s"
 msgstr "Il requisito necessario non Ã¨ il nome di un pacchetto. Guardando: %s"
 
-#: ../yum/depsolve.py:335
+#: ../yum/depsolve.py:329
 #, python-format
 msgid "Potential Provider: %s"
 msgstr "Provider potenziale: %s"
 
-#: ../yum/depsolve.py:358
+#: ../yum/depsolve.py:352
 #, python-format
 msgid "Mode is %s for provider of %s: %s"
 msgstr "La modalitÃ  Ã¨ %s per il provider di %s: %s"
 
-#: ../yum/depsolve.py:362
+#: ../yum/depsolve.py:356
 #, python-format
 msgid "Mode for pkg providing %s: %s"
 msgstr "ModalitÃ  per la fornitura del pacchetto %s: %s"
 
-#: ../yum/depsolve.py:366
+#: ../yum/depsolve.py:360
 #, python-format
 msgid "TSINFO: %s package requiring %s marked as erase"
 msgstr "TSINFO: il pacchetto %s richiede che %s sia marcato per la rimozione"
 
-#: ../yum/depsolve.py:378
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr ""
 "TSINFO: VerrÃ  reso obsoleto %s, sostituendolo con %s per risolvere una "
 "dipendenza."
 
-#: ../yum/depsolve.py:381
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr "TSINFO: Aggiornamento di %s per risolvere dip."
 
-#: ../yum/depsolve.py:384
+#: ../yum/depsolve.py:378
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr ""
 "Impossibile trovare un percorso di aggiornamento per dipendenze per: %s"
 
-#: ../yum/depsolve.py:394
+#: ../yum/depsolve.py:388
 #, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr "Requisito %s non risolvibile per %s"
 
 #. is it already installed?
-#: ../yum/depsolve.py:440
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr "%s Ã¨ nei pacchetti forniti ma Ã¨ giÃ  installato, Rimozione."
 
-#: ../yum/depsolve.py:455
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr ""
 "Potenziale risoluzione del pacchetto %s ha una instanza piu nuova in ts."
 
-#: ../yum/depsolve.py:466
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr ""
 "Potenziale risoluzione del pacchetto %s ha una istanza piu aggiornata "
 "installata."
 
-#: ../yum/depsolve.py:474 ../yum/depsolve.py:533
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr "Dipendenza mancante: %s Ã¨ necessario per il pacchetto %s"
 
-#: ../yum/depsolve.py:487
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr "%s Ã¨ gia nel set delle transazioni (ts), verrÃ  saltato"
 
-#: ../yum/depsolve.py:516
+#: ../yum/depsolve.py:510
 #, python-format
 msgid ""
 "Failure finding best provider of %s for %s, exceeded maximum loop length"
@@ -1273,93 +1283,93 @@ msgstr ""
 "Ricerca di un provider migliore di %s fallita per %s, superata la massima "
 "lunghezza del ciclo"
 
-#: ../yum/depsolve.py:543
+#: ../yum/depsolve.py:537
 #, python-format
 msgid "TSINFO: Marking %s as update for %s"
 msgstr "TSINFO: %s marcato come update per %s"
 
-#: ../yum/depsolve.py:550
+#: ../yum/depsolve.py:544
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr "TSINFO: %s marcato come installa per %s"
 
-#: ../yum/depsolve.py:641 ../yum/depsolve.py:723
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Successo - transazione vuota"
 
-#: ../yum/depsolve.py:682 ../yum/depsolve.py:695
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Riavvio del ciclo"
 
-#: ../yum/depsolve.py:711
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "Processo delle dipendenze terminato"
 
-#: ../yum/depsolve.py:717
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr "%s appartenente a %s ha problemi di dipendenze"
 
-#: ../yum/depsolve.py:724
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "Successo - dipendenze risolte"
 
-#: ../yum/depsolve.py:738
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "Controllo delle dipendenze per %s"
 
-#: ../yum/depsolve.py:791
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr "ricerca di %s come un requisito di %s"
 
-#: ../yum/depsolve.py:946
+#: ../yum/depsolve.py:933
 #, python-format
 msgid "Comparing best: %s to po: %s"
 msgstr "Comparando meglio: %s in po: %s"
 
-#: ../yum/depsolve.py:950
+#: ../yum/depsolve.py:937
 #, python-format
 msgid "Same: best %s == po: %s"
 msgstr "Idendico: meglio %s == po: %s"
 
-#: ../yum/depsolve.py:965 ../yum/depsolve.py:976
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
 #, python-format
 msgid "best %s obsoletes po: %s"
 msgstr "best %s obsoletes po: %s"
 
-#: ../yum/depsolve.py:968
+#: ../yum/depsolve.py:955
 #, python-format
 msgid "po %s obsoletes best: %s"
 msgstr "po %s Ã¨ reso piu obsoleto: %s"
 
-#: ../yum/depsolve.py:985 ../yum/depsolve.py:992 ../yum/depsolve.py:1049
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
 #, python-format
 msgid "better arch in po %s"
 msgstr "migliore architettura in po %s"
 
-#: ../yum/depsolve.py:1001 ../yum/depsolve.py:1023
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
 #, python-format
 msgid "po %s shares a sourcerpm with %s"
 msgstr "po %s condivide sourcerpm con %s"
 
-#: ../yum/depsolve.py:1005 ../yum/depsolve.py:1028
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
 #, python-format
 msgid "best %s shares a sourcerpm with %s"
 msgstr "best %s condivide un sourcerpm con %s"
 
-#: ../yum/depsolve.py:1012 ../yum/depsolve.py:1033
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
 #, python-format
 msgid "po %s shares more of the name prefix with %s"
 msgstr "po %s condivide piÃ¹ del prefisso del nome con %s"
 
-#: ../yum/depsolve.py:1016 ../yum/depsolve.py:1042
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
 #, python-format
 msgid "po %s has a shorter name than best %s"
 msgstr "po %s ha un nome piu corto del migliore %s"
 
-#: ../yum/depsolve.py:1038
+#: ../yum/depsolve.py:1025
 #, python-format
 msgid "bestpkg %s shares more of the name prefix with %s"
 msgstr "bestpkg %s condivide piu del prefisso del nome con %s"
@@ -1415,43 +1425,43 @@ msgstr "doUpdateSetup() verrÃ  eliminato in una futura versione di yum.\n"
 msgid "Building updates object"
 msgstr "Costruzione oggetto aggiornamenti"
 
-#: ../yum/__init__.py:499
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr "doGroupSetup() verrÃ  eliminato in una futura versione di Yum.\n"
 
-#: ../yum/__init__.py:523
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Scaricamento metadati del gruppo"
 
-#: ../yum/__init__.py:549
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr "Aggiunta file di gruppo dal repository: %s"
 
-#: ../yum/__init__.py:558
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr "Fallita l'aggiunta di file di gruppi per repository: %s - %s"
 
-#: ../yum/__init__.py:564
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Nessun gruppo disponibile in alcun repository"
 
-#: ../yum/__init__.py:616
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Import di informazioni addizionali sulla lista di file"
 
-#: ../yum/__init__.py:661
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Ciclo skip-broken %i"
 
-#: ../yum/__init__.py:684
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr "Raggiunti %i cicli skip-broken"
 
-#: ../yum/__init__.py:685
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
@@ -1459,93 +1469,93 @@ msgstr ""
 "\n"
 "Pacchetti saltati a causa di problemi di dipendenza:"
 
-#: ../yum/__init__.py:689
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s da %s"
 
-#: ../yum/__init__.py:777
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "Rimozione del file di transazione %s fallita"
 
-#: ../yum/__init__.py:817
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "escludendo per costo: %s da %s"
 
-#: ../yum/__init__.py:848
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Esclusione pacchetti nella lista globale di esclusione"
 
-#: ../yum/__init__.py:850
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Esclusione dei pacchetti da %s"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Riduzione %s ai soli pacchetti inclusi"
 
-#: ../yum/__init__.py:883
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Il pacchetto incluso %s verrÃ  mantenuto"
 
-#: ../yum/__init__.py:889
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Rimozione pacchetto non corrispondente %s"
 
-#: ../yum/__init__.py:892
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "Finito"
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:922
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "Non Ã¨ possibile controllare se il PID %s Ã¨ attivo"
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:926
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr "Lock %s attivo: altro processo in esecuzione con pid %s."
 
-#: ../yum/__init__.py:973 ../yum/__init__.py:980
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "Il pacchetto non corrisponde al download desiderato"
 
-#: ../yum/__init__.py:994
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "Non Ã¨ possibile calcolare il checksum"
 
-#: ../yum/__init__.py:997
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "Il pacchetto non corrisponde al checksum"
 
-#: ../yum/__init__.py:1039
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr "il pacchetto ha fallito il checksum ma la cache Ã¨ abilitata per %s"
 
-#: ../yum/__init__.py:1045
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "utilizzo di una copia locale di %s"
 
-#: ../yum/__init__.py:1064
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr "Spazio insufficiente nella cartella di download %s per scaricare"
 
-#: ../yum/__init__.py:1097
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "L'header non Ã¨ completo."
 
-#: ../yum/__init__.py:1137
+#: ../yum/__init__.py:1134
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1553,62 +1563,62 @@ msgstr ""
 "Header non presente in cache locale e modalita solo-cache abilitata. "
 "Impossibile scaricare %s"
 
-#: ../yum/__init__.py:1192
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr "La chiave pubblica per %s non Ã¨ installata"
 
-#: ../yum/__init__.py:1196
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Problemi nell'apertura di %s"
 
-#: ../yum/__init__.py:1204
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr "La chiave pubblica per %s non Ã¨ sicura"
 
-#: ../yum/__init__.py:1208
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Il pacchetto %s non Ã¨ firmato"
 
-#: ../yum/__init__.py:1246
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Non posso rimuovere %s"
 
-#: ../yum/__init__.py:1250
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "%s rimosso"
 
-#: ../yum/__init__.py:1282
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Impossibile rimuovere %s file %s"
 
-#: ../yum/__init__.py:1286
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "%s file %s rimosso"
 
-#: ../yum/__init__.py:1288
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d %s file rimossi"
 
-#: ../yum/__init__.py:1328
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr "Piu di una corrispondenza ugualein sack per %s"
 
-#: ../yum/__init__.py:1334
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr "Nessuna corrispondenza %s.%s %s:%s-%s dall'aggiornamento"
 
-#: ../yum/__init__.py:1527
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
@@ -1616,140 +1626,141 @@ msgstr ""
 "searchPackages() verrÃ  eliminato in una futura versione di yum.In "
 "sostituzione usare searchGenerator(). \n"
 
-#: ../yum/__init__.py:1564
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "Ricerca dei pacchetti %d"
 
-#: ../yum/__init__.py:1568
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "Ricerca del pacchetto %s"
 
-#: ../yum/__init__.py:1580
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "ricerca nelle voci dei file"
 
-#: ../yum/__init__.py:1587
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "ricerca nelle voci fornite"
 
-#: ../yum/__init__.py:1617
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Corrispondenza tra i forniti: %s"
 
-#: ../yum/__init__.py:1686 ../yum/__init__.py:1704 ../yum/__init__.py:1732
-#: ../yum/__init__.py:1737 ../yum/__init__.py:1792 ../yum/__init__.py:1796
+#: ../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 "Il gruppo %s non esiste"
 
-#: ../yum/__init__.py:1715 ../yum/__init__.py:1808
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr "Il pacchetto %s non Ã¨ marcato nel gruppo %s"
 
-#: ../yum/__init__.py:1754
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr "Aggiunta del pacchetto %s dal gruppo %s"
 
-#: ../yum/__init__.py:1758
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr "Nessun pacchetto di nome %s disponibile per l'installazione"
 
-#: ../yum/__init__.py:1833
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr "La tupla del pacchetto %s non puÃ² essere trovata nel pacchetto sack"
 
-#: ../yum/__init__.py:1901 ../yum/__init__.py:1944
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr ""
 "Stringa di versione della dipendenza non valida, provare a metterla tra "
 "virgolette."
 
-#: ../yum/__init__.py:1903 ../yum/__init__.py:1946
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Flag di versione non valido"
 
-#: ../yum/__init__.py:1918 ../yum/__init__.py:1922
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "Nessun pacchetto trovato per %s"
 
-#: ../yum/__init__.py:2052
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr "L'oggetto pacchetto non era un'istanza dell'oggetto pacchetto"
 
-#: ../yum/__init__.py:2056
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr "Non Ã¨ specificato niente da installare"
 
 #. only one in there
-#: ../yum/__init__.py:2071
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr "Controllo per provide virtuale o file-provide per %s"
 
-#: ../yum/__init__.py:2077 ../yum/__init__.py:2368
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr "Nessuna corrispondenza per l'argomento: %s"
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2134
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr "Nessun pacchetto disponibile per l'installazione"
 
-#: ../yum/__init__.py:2146
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr "Pacchetto: %s - giÃ  nel set di transizione"
 
-#: ../yum/__init__.py:2159
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr "Il pacchetto %s Ã¨ giÃ  aggiornato all'ultima versione"
 
-#: ../yum/__init__.py:2166
+#: ../yum/__init__.py:2178
 #, python-format
 msgid "Package matching %s already installed. Checking for update."
-msgstr "Corrispondenza del pacchetto %s giÃ  installato. Controllo aggiornamenti."
+msgstr ""
+"Corrispondenza del pacchetto %s giÃ  installato. Controllo aggiornamenti."
 
 #. update everything (the easy case)
-#: ../yum/__init__.py:2208
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Aggiornamento Sistema"
 
-#: ../yum/__init__.py:2292
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Il pacchetto Ã¨ gia obsoleto: %s.%s %s:%s-%s"
 
-#: ../yum/__init__.py:2365
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../yum/__init__.py:2380
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Nessun pacchetto corrispondente per la rimozione"
 
-#: ../yum/__init__.py:2414
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Non posso aprire il file %s. Lo salto."
 
-#: ../yum/__init__.py:2417
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Esame di %s: %s"
 
-#: ../yum/__init__.py:2424
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
@@ -1758,74 +1769,79 @@ msgstr ""
 "Non Ã¨ possibile aggiornare il pacchetto %s perchÃ¨ non Ã¨ installato. Eseguire "
 "yum install per installarlo."
 
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Esclusione di %s"
 
-#: ../yum/__init__.py:2461
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Marco %s per l'installazione"
 
-#: ../yum/__init__.py:2467
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr "%s marcato come aggiornamento di %s"
 
-#: ../yum/__init__.py:2474
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr "%s: non aggiornare il pacchetto installato"
 
-#: ../yum/__init__.py:2492
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr ""
 "Problema nella reinstallazione: nessun pacchetto marcato per la rimozione"
 
-#: ../yum/__init__.py:2501
+#: ../yum/__init__.py:2515
+#, fuzzy, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr "Il pacchetto %s Ã¨ giÃ  installato, lo salto"
+
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr ""
 "Problema nella reinstallazione: nessun pacchetto marcato per l'installazione"
 
-#: ../yum/__init__.py:2549
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr "Recupero chiavi GPG da %s"
 
-#: ../yum/__init__.py:2555
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "Recupero chiavi GPG fallito: "
 
-#: ../yum/__init__.py:2568
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "Analisi chiave GPG fallita: "
 
-#: ../yum/__init__.py:2572
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr "Chiave GPG in %s (0x%s) Ã¨ giÃ  installata"
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2577
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr "Importazione chiave GPG 0x%s \"%s\" da %s"
 
-#: ../yum/__init__.py:2589
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "Non installo le chiavi"
 
-#: ../yum/__init__.py:2595
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "Importazione chiave fallita (codice %d)"
 
-#: ../yum/__init__.py:2598
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "Chiave importata correttamente"
 
-#: ../yum/__init__.py:2603
+#: ../yum/__init__.py:2624
 #, python-format
 msgid ""
 "The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1837,77 +1853,72 @@ msgstr ""
 "Controllare che le URL delle chiavi di questo repository siano configurate "
 "correttamente."
 
-#: ../yum/__init__.py:2612
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr "Importazione della chiave(i) non utile, chiave(i) sbagliata?"
 
-#: ../yum/__init__.py:2686
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "Impossibile trovare un mirror adatto."
 
-#: ../yum/__init__.py:2688
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr "Sono stati riscontrati degli errori durante il download dei pacchetti."
 
-#: ../yum/__init__.py:2752
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Errori nel test di transazione: "
 
-#: ../yum/__init__.py:2787
-#, python-format
-msgid "Package %s needs %s, this is not available."
-msgstr "Il pacchetto %s necessita di %s, che non Ã¨ disponibile."
-
-#: ../yum/__init__.py:2792
-#, python-format
-msgid "Package %s conflicts with %s."
-msgstr "Il pacchetto %s va in conflitto con %s."
-
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:193
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "Plugin caricati:"
 
-#: ../yum/plugins.py:210
+#: ../yum/plugins.py:206
+#, fuzzy, python-format
+msgid "No plugin match for: %s"
+msgstr "Nessuna corrispondenza per l'argomento: %s"
+
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "Il plugin \"%s\" Ã¨ disabilitato"
 
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr "Il plugin \"%s\" non specifica la versione API richiesta"
 
-#: ../yum/plugins.py:226
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr "Il plugin \"%s\" richiede l'API %s. L'API supportata Ã¨ %s"
 
-#: ../yum/plugins.py:253
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Caricamento del plugin \"%s\""
 
-#: ../yum/plugins.py:260
+#: ../yum/plugins.py:271
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
 msgstr ""
 "Esistono due o piu plugin con il nome \"%s\" nel percorso di ricerca plugin"
 
-#: ../yum/plugins.py:280
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr "File di configurazione %s non trovato"
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:283
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr "Non posso trovare il file di configurazione per il plugin %s"
 
-#: ../yum/plugins.py:437
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "registrazione dei comandi non supportata"
 
@@ -1940,6 +1951,12 @@ msgstr "Header danneggiato %s"
 msgid "Error opening rpm %s - error %s"
 msgstr "Errore nell'apertura dell'rpm %s - errore %s"
 
+#~ msgid "Package %s needs %s, this is not available."
+#~ msgstr "Il pacchetto %s necessita di %s, che non Ã¨ disponibile."
+
+#~ msgid "Package %s conflicts with %s."
+#~ msgstr "Il pacchetto %s va in conflitto con %s."
+
 #~ msgid "Looking for Obsoletes for %s"
 #~ msgstr "Ricerca di obsoleti per %s"
 
diff --git a/po/ms.po b/po/ms.po
index 2f4986f..0e32c57 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-08 10:16+0100\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-02-12 21:06+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman at myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms at lists.sourceforge.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.1\n"
 
-#: ../callback.py:48 ../output.py:487
+#: ../callback.py:48 ../output.py:512
 #, fuzzy
 msgid "Updating"
 msgstr "Alat Mengemas Kini Menu"
@@ -24,7 +24,7 @@ msgstr "Alat Mengemas Kini Menu"
 msgid "Erasing"
 msgstr ""
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:486
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr ""
 
@@ -32,7 +32,7 @@ msgstr ""
 msgid "Obsoleted"
 msgstr ""
 
-#: ../callback.py:54 ../output.py:533
+#: ../callback.py:54 ../output.py:558
 #, fuzzy
 msgid "Updated"
 msgstr "dikemaskini pada %(date)s"
@@ -42,7 +42,7 @@ msgstr "dikemaskini pada %(date)s"
 msgid "Erased"
 msgstr "Nota Keluaran Fedora"
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:531
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgstr ""
 msgid "Erased: %s"
 msgstr "Nota Keluaran Fedora"
 
-#: ../callback.py:217 ../output.py:488
+#: ../callback.py:217 ../output.py:513
 #, fuzzy
 msgid "Removing"
 msgstr "RPM rosak %s, membuang."
@@ -88,12 +88,12 @@ msgstr "&Tetapan Halaman"
 msgid "Reading repository metadata in from local files"
 msgstr ""
 
-#: ../cli.py:183 ../utils.py:57
+#: ../cli.py:183 ../utils.py:72
 #, fuzzy, python-format
 msgid "Config Error: %s"
 msgstr "Ralat KMail"
 
-#: ../cli.py:186 ../cli.py:1040 ../utils.py:60
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, fuzzy, python-format
 msgid "Options Error: %s"
 msgstr "Ralat KMail"
@@ -139,291 +139,305 @@ msgstr "Stat Pakej"
 msgid "Error Downloading Packages:\n"
 msgstr "Ralat mengira nilai!"
 
-#: ../cli.py:369 ../yum/__init__.py:2689
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr ""
 
-#: ../cli.py:372 ../yum/__init__.py:2692
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr ""
 
-#: ../cli.py:376 ../yum/__init__.py:2694
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr ""
 
-#: ../cli.py:380
+#: ../cli.py:383
 #, fuzzy
 msgid "Running Transaction Test"
 msgstr "Test Dialog Tanya"
 
-#: ../cli.py:396
+#: ../cli.py:399
 #, fuzzy
 msgid "Finished Transaction Test"
 msgstr "Test Dialog Tanya"
 
-#: ../cli.py:398
+#: ../cli.py:401
 #, fuzzy
 msgid "Transaction Check Error:\n"
 msgstr "Ralat mengira nilai!"
 
-#: ../cli.py:405
+#: ../cli.py:408
 #, fuzzy
 msgid "Transaction Test Succeeded"
 msgstr "Test Dialog Tanya"
 
-#: ../cli.py:423
+#: ../cli.py:429
 #, fuzzy
 msgid "Running Transaction"
 msgstr "Test Dialog Tanya"
 
-#: ../cli.py:452
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
 msgstr ""
 
-#: ../cli.py:484
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr ""
 
-#: ../cli.py:494
+#: ../cli.py:501
 #, fuzzy, python-format
 msgid "No package %s available."
 msgstr "Fail Pakej RPM"
 
-#: ../cli.py:498 ../cli.py:616 ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 #, fuzzy
 msgid "Package(s) to install"
 msgstr "Akan Memasang"
 
-#: ../cli.py:499 ../cli.py:617 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 #, fuzzy
 msgid "Nothing to do"
 msgstr "-> Hendak buat apa ?"
 
-#: ../cli.py:529 ../yum/__init__.py:2192 ../yum/__init__.py:2271
-#: ../yum/__init__.py:2283
+#: ../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 ""
 
-#: ../cli.py:561
+#: ../cli.py:568
 #, python-format
 msgid "Could not find update match for %s"
 msgstr ""
 
-#: ../cli.py:573
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr ""
 
-#: ../cli.py:576
+#: ../cli.py:583
 #, fuzzy
 msgid "No Packages marked for Update"
 msgstr "Tiada skrip dijumpai"
 
-#: ../cli.py:592
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr ""
 
-#: ../cli.py:595
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr ""
 
-#: ../cli.py:607
+#: ../cli.py:614
 #, fuzzy
 msgid "No Packages Provided"
 msgstr "(tiada cadangan ejaan)"
 
-#: ../cli.py:647
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr ""
 
-#: ../cli.py:685
+#: ../cli.py:701
+#, fuzzy, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "Tiada Pakej dijumpai untuk %s"
+
+#: ../cli.py:704
 #, fuzzy
 msgid "No Matches found"
 msgstr "Tiada padanan dijumpai. :-("
 
-#: ../cli.py:722
+#: ../cli.py:745
 #, fuzzy, python-format
 msgid "No Package Found for %s"
 msgstr "Tiada Pakej %s"
 
-#: ../cli.py:734
+#: ../cli.py:757
 #, fuzzy
 msgid "Cleaning up Everything"
 msgstr "&Tetapan Halaman"
 
-#: ../cli.py:748
+#: ../cli.py:771
 #, fuzzy
 msgid "Cleaning up Headers"
 msgstr "Pengepala pembangunan VDR"
 
-#: ../cli.py:751
+#: ../cli.py:774
 #, fuzzy
 msgid "Cleaning up Packages"
 msgstr "&Tetapan Halaman"
 
-#: ../cli.py:754
+#: ../cli.py:777
 #, fuzzy
 msgid "Cleaning up xml metadata"
 msgstr "Pengepala pembangunan VDR"
 
-#: ../cli.py:757
+#: ../cli.py:780
 #, fuzzy
 msgid "Cleaning up database cache"
 msgstr "Membersihkan pakej"
 
-#: ../cli.py:760
+#: ../cli.py:783
+#, fuzzy
+msgid "Cleaning up expire-cache metadata"
+msgstr "Pengepala pembangunan VDR"
+
+#: ../cli.py:786
 #, fuzzy
 msgid "Cleaning up plugins"
 msgstr "Nyahaktif semua plugin"
 
-#: ../cli.py:782
+#: ../cli.py:807
 #, fuzzy
 msgid "Installed Groups:"
 msgstr "Pengguna dan Kumpulan"
 
-#: ../cli.py:789
+#: ../cli.py:814
 #, fuzzy
 msgid "Available Groups:"
 msgstr "Form&at yang ada:"
 
-#: ../cli.py:795
+#: ../cli.py:820
 #, fuzzy
 msgid "Done"
 msgstr "Selesai."
 
-#: ../cli.py:804 ../cli.py:816 ../cli.py:822
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, fuzzy, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "Amaran: tandabuku yang anda berikan [%s] tidak wujud."
 
-#: ../cli.py:828
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
 msgstr ""
 
-#: ../cli.py:830
+#: ../cli.py:855
 #, fuzzy, python-format
 msgid "%d Package(s) to Install"
 msgstr "Akan Memasang"
 
-#: ../cli.py:840
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr ""
 
-#: ../cli.py:846
+#: ../cli.py:871
 #, fuzzy
 msgid "No packages to remove from groups"
 msgstr "Tiada skrip dijumpai"
 
-#: ../cli.py:848
+#: ../cli.py:873
 #, fuzzy, python-format
 msgid "%d Package(s) to remove"
 msgstr "Buang perubahan yang dicadangkan"
 
-#: ../cli.py:890
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr ""
 
-#: ../cli.py:901
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr ""
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:927
+#: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
 msgstr ""
 
-#: ../cli.py:946
+#: ../cli.py:971
 #, fuzzy, python-format
 msgid "Command line error: %s"
 msgstr "Ralat mengira nilai!"
 
-#: ../cli.py:1073
+#: ../cli.py:1101
 #, fuzzy
 msgid "be tolerant of errors"
 msgstr "Ralat - %s tidak dijumpai"
 
-#: ../cli.py:1075
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr ""
 
-#: ../cli.py:1077
+#: ../cli.py:1105
 #, fuzzy
 msgid "config file location"
 msgstr "Fail Config Ruang Kerja"
 
-#: ../cli.py:1079
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr ""
 
-#: ../cli.py:1081
+#: ../cli.py:1109
 #, fuzzy
 msgid "debugging output level"
 msgstr "Gulung dibawah tahap 1"
 
-#: ../cli.py:1084
+#: ../cli.py:1113
+msgid "show duplicates, in repos, in list/search commands"
+msgstr ""
+
+#: ../cli.py:1115
 #, fuzzy
 msgid "error output level"
 msgstr "Gulung dibawah tahap 1"
 
-#: ../cli.py:1087
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr ""
 
-#: ../cli.py:1091
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr ""
 
-#: ../cli.py:1093
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr ""
 
-#: ../cli.py:1094
+#: ../cli.py:1125
 #, fuzzy
 msgid "set install root"
 msgstr "Pasang plugin baru"
 
-#: ../cli.py:1098
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr ""
 
-#: ../cli.py:1102
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr ""
 
-#: ../cli.py:1105
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr ""
 
-#: ../cli.py:1107
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
 msgstr ""
 
-#: ../cli.py:1110
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr ""
 
-#: ../cli.py:1112
+#: ../cli.py:1143
 #, fuzzy
 msgid "disable Yum plugins"
 msgstr "Nyahaktif semua plugin"
 
-#: ../cli.py:1114
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr ""
 
-#: ../cli.py:1116
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr ""
 
-#: ../cli.py:1119
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr ""
 
@@ -479,184 +493,200 @@ msgstr ""
 msgid "Trying other mirror."
 msgstr ""
 
-#: ../output.py:273
+#: ../output.py:293
 #, fuzzy, python-format
 msgid "Name       : %s"
 msgstr "&Nama:"
 
-#: ../output.py:274
+#: ../output.py:294
 #, fuzzy, python-format
 msgid "Arch       : %s"
 msgstr "Saat semenjak permulaan zaman"
 
-#: ../output.py:276
+#: ../output.py:296
 #, fuzzy, python-format
 msgid "Epoch      : %s"
 msgstr "Saat semenjak permulaan zaman"
 
-#: ../output.py:277
+#: ../output.py:297
 #, fuzzy, python-format
 msgid "Version    : %s"
 msgstr "Versi"
 
-#: ../output.py:278
+#: ../output.py:298
 #, fuzzy, python-format
 msgid "Release    : %s"
 msgstr "Nota Keluaran Fedora"
 
-#: ../output.py:279
+#: ../output.py:299
 #, fuzzy, python-format
 msgid "Size       : %s"
 msgstr "Saiz:"
 
-#: ../output.py:280
+#: ../output.py:300
 #, fuzzy, python-format
 msgid "Repo       : %s"
 msgstr "&Nama:"
 
-#: ../output.py:282
+#: ../output.py:302
 #, fuzzy, python-format
 msgid "Committer  : %s"
 msgstr "&Nama:"
 
-#: ../output.py:283
+#: ../output.py:303
 #, fuzzy
 msgid "Summary    : "
 msgstr "Ringkasan"
 
-#: ../output.py:285
+#: ../output.py:305
 #, python-format
 msgid "URL        : %s"
 msgstr ""
 
-#: ../output.py:286
+#: ../output.py:306
 #, fuzzy, python-format
 msgid "License    : %s"
 msgstr "Saiz:"
 
-#: ../output.py:287
+#: ../output.py:307
 #, fuzzy
 msgid "Description: "
 msgstr "Huraian"
 
-#: ../output.py:331
+#: ../output.py:351
 #, fuzzy
 msgid "Is this ok [y/N]: "
 msgstr "Format imej ini"
 
-#: ../output.py:345
+#: ../output.py:357 ../output.py:360
+msgid "y"
+msgstr ""
+
+#: ../output.py:357
+msgid "n"
+msgstr ""
+
+#: ../output.py:357 ../output.py:360
+msgid "yes"
+msgstr ""
+
+#: ../output.py:357
+msgid "no"
+msgstr ""
+
+#: ../output.py:367
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Group: %s"
 msgstr "Kumpulan: %s"
 
-#: ../output.py:347
+#: ../output.py:369
 #, fuzzy, python-format
 msgid " Description: %s"
 msgstr "Huraian"
 
-#: ../output.py:349
+#: ../output.py:371
 #, fuzzy
 msgid " Mandatory Packages:"
 msgstr "Stat Pakej"
 
-#: ../output.py:354
+#: ../output.py:376
 #, fuzzy
 msgid " Default Packages:"
 msgstr "Stat Pakej"
 
-#: ../output.py:359
+#: ../output.py:381
 #, fuzzy
 msgid " Optional Packages:"
 msgstr "Stat Pakej"
 
-#: ../output.py:364
+#: ../output.py:386
 #, fuzzy
 msgid " Conditional Packages:"
 msgstr "Stat Pakej"
 
-#: ../output.py:372
+#: ../output.py:394
 #, fuzzy, python-format
 msgid "package: %s"
 msgstr "Pelihat Pakej"
 
-#: ../output.py:374
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr ""
 
-#: ../output.py:379
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr ""
 
-#: ../output.py:381
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr ""
 
-#: ../output.py:436
+#: ../output.py:461
 #, fuzzy
 msgid "Matched from:"
 msgstr "Tiada padanan dijumpai. :-("
 
-#: ../output.py:462
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr ""
 
-#: ../output.py:467
+#: ../output.py:492
 #, fuzzy, python-format
 msgid "Total size: %s"
 msgstr "Jumlah saiz: "
 
-#: ../output.py:470
+#: ../output.py:495
 #, fuzzy, python-format
 msgid "Total download size: %s"
 msgstr "Saiz lajur automatik"
 
-#: ../output.py:482
+#: ../output.py:507
 #, fuzzy
 msgid "Package"
 msgstr "Pelihat Pakej"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Arch"
 msgstr ""
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Version"
 msgstr "Versi"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Repository"
 msgstr ""
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Size"
 msgstr "Saiz"
 
-#: ../output.py:489
+#: ../output.py:514
 #, fuzzy
 msgid "Installing for dependencies"
 msgstr "&Cari Bantuan"
 
-#: ../output.py:490
+#: ../output.py:515
 #, fuzzy
 msgid "Updating for dependencies"
 msgstr "&Cari Bantuan"
 
-#: ../output.py:491
+#: ../output.py:516
 #, fuzzy
 msgid "Removing for dependencies"
 msgstr "&Cari Bantuan"
 
-#: ../output.py:503
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
 "\n"
 msgstr ""
 
-#: ../output.py:511
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -667,28 +697,28 @@ msgid ""
 "Remove   %5.5s Package(s)         \n"
 msgstr ""
 
-#: ../output.py:529
+#: ../output.py:554
 msgid "Removed"
 msgstr ""
 
-#: ../output.py:530
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr ""
 
-#: ../output.py:532
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr ""
 
-#: ../output.py:534
+#: ../output.py:559
 #, fuzzy
 msgid "Dependency Updated"
 msgstr "dikemaskini pada %(date)s"
 
-#: ../output.py:535
+#: ../output.py:560
 msgid "Replaced"
 msgstr ""
 
-#: ../output.py:593
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
@@ -696,68 +726,68 @@ msgid ""
 "seconds to exit.\n"
 msgstr ""
 
-#: ../output.py:603
+#: ../output.py:628
 #, fuzzy
 msgid "user interrupt"
 msgstr "Maklumat Sampukan"
 
-#: ../output.py:614
+#: ../output.py:639
 #, fuzzy
 msgid "installed"
 msgstr "[pasang: %s]"
 
-#: ../output.py:615
+#: ../output.py:640
 #, fuzzy
 msgid "updated"
 msgstr "dikemaskini pada %(date)s"
 
-#: ../output.py:616
+#: ../output.py:641
 msgid "obsoleted"
 msgstr ""
 
-#: ../output.py:617
+#: ../output.py:642
 msgid "erased"
 msgstr ""
 
-#: ../output.py:621
+#: ../output.py:646
 #, fuzzy, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "Tetap imej ini untuk dikedudukan"
 
-#: ../output.py:628
+#: ../output.py:653
 #, fuzzy
 msgid "--> Running transaction check"
 msgstr "Periksa untuk &Kemaskini"
 
-#: ../output.py:633
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr ""
 
-#: ../output.py:638
+#: ../output.py:663
 #, fuzzy
 msgid "--> Finished Dependency Resolution"
 msgstr "Tukar resolusi skrin"
 
-#: ../output.py:643
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr ""
 
-#: ../output.py:648
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr ""
 
-#: ../output.py:654
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr ""
 
-#: ../output.py:657
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr ""
 
-#: ../output.py:661
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr ""
@@ -1112,662 +1142,702 @@ msgid ""
 "Dependencies Resolved"
 msgstr "dikemaskini pada %(date)s"
 
-#: ../yummain.py:199
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr ""
 
-#: ../yummain.py:246
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
 "Exiting on user cancel."
 msgstr ""
 
-#: ../yum/depsolve.py:70
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
 msgstr ""
 
-#: ../yum/depsolve.py:123
+#: ../yum/depsolve.py:136
 #, fuzzy, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr "Bersihkan Semua _Yum"
 
-#: ../yum/depsolve.py:134
+#: ../yum/depsolve.py:147
 #, python-format
 msgid "Searching pkgSack for dep: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:163
+#: ../yum/depsolve.py:170
 #, fuzzy, python-format
 msgid "Potential match for %s from %s"
 msgstr "Senarai untuk"
 
-#: ../yum/depsolve.py:171
+#: ../yum/depsolve.py:178
 #, python-format
 msgid "Matched %s to require for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:212
+#: ../yum/depsolve.py:219
 #, fuzzy, python-format
 msgid "Member: %s"
 msgstr "Pelayan: %s"
 
-#: ../yum/depsolve.py:226 ../yum/depsolve.py:788
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, fuzzy, python-format
 msgid "%s converted to install"
 msgstr "Akan Memasang"
 
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:240
 #, fuzzy, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "Lihat dokumen dalam mod skrin penuh"
 
-#: ../yum/depsolve.py:243
+#: ../yum/depsolve.py:250
 #, fuzzy, python-format
 msgid "Removing Package %s"
 msgstr "Pelihat Pakej"
 
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:300
+#: ../yum/depsolve.py:312
 msgid "Needed Require has already been looked up, cheating"
 msgstr ""
 
-#: ../yum/depsolve.py:310
+#: ../yum/depsolve.py:322
 #, python-format
 msgid "Needed Require is not a package name. Looking up: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:317
+#: ../yum/depsolve.py:329
 #, python-format
 msgid "Potential Provider: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:340
+#: ../yum/depsolve.py:352
 #, python-format
 msgid "Mode is %s for provider of %s: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:356
 #, python-format
 msgid "Mode for pkg providing %s: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:348
+#: ../yum/depsolve.py:360
 #, python-format
 msgid "TSINFO: %s package requiring %s marked as erase"
 msgstr ""
 
-#: ../yum/depsolve.py:361
-#, fuzzy, python-format
-msgid "Looking for Obsoletes for %s"
-msgstr "&Cari Bantuan"
-
-#: ../yum/depsolve.py:373
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr ""
 
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr ""
 
-#. if there's no update then pass this over to requringFromTransaction()
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:378
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:420
+#: ../yum/depsolve.py:388
 #, fuzzy, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr "&Cari Bantuan"
 
 #. is it already installed?
-#: ../yum/depsolve.py:466
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr ""
 
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr ""
 
-#: ../yum/depsolve.py:492
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr ""
 
-#: ../yum/depsolve.py:500 ../yum/depsolve.py:568
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr ""
 
-#: ../yum/depsolve.py:513
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr ""
 
-#: ../yum/depsolve.py:578
-#, python-format
-msgid "TSINFO: Marking %s as update for %s"
-msgstr ""
-
-#: ../yum/depsolve.py:585
-#, python-format
-msgid "TSINFO: Marking %s as install for %s"
-msgstr ""
-
-#: ../yum/depsolve.py:647 ../yum/depsolve.py:654
+#: ../yum/depsolve.py:510
 #, python-format
-msgid "unable to find newer package for %s"
+msgid ""
+"Failure finding best provider of %s for %s, exceeded maximum loop length"
 msgstr ""
 
-#: ../yum/depsolve.py:661
+#: ../yum/depsolve.py:537
 #, python-format
-msgid "TSINFO: Updating %s to resolve conflict."
+msgid "TSINFO: Marking %s as update for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:671
+#: ../yum/depsolve.py:544
 #, python-format
-msgid "%s conflicts: %s"
+msgid "TSINFO: Marking %s as install for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:681
-#, fuzzy, python-format
-msgid "%s conflicts with %s"
-msgstr "Dengan penghujung:"
-
-#: ../yum/depsolve.py:720 ../yum/depsolve.py:806
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 #, fuzzy
 msgid "Success - empty transaction"
 msgstr "Cipta dokumen kosong"
 
-#: ../yum/depsolve.py:765 ../yum/depsolve.py:778
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr ""
 
-#: ../yum/depsolve.py:794
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr ""
 
-#: ../yum/depsolve.py:800
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr ""
 
-#: ../yum/depsolve.py:807
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr ""
 
-#: ../yum/depsolve.py:824
+#: ../yum/depsolve.py:729
 #, fuzzy, python-format
 msgid "Checking deps for %s"
 msgstr "&Cari Bantuan"
 
-#: ../yum/depsolve.py:880
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr ""
 
+#: ../yum/depsolve.py:933
+#, python-format
+msgid "Comparing best: %s to po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, python-format
+msgid "best %s obsoletes po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:955
+#, python-format
+msgid "po %s obsoletes best: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#, fuzzy, python-format
+msgid "better arch in po %s"
+msgstr "mencari pakej %s"
+
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#, python-format
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#, python-format
+msgid "best %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#, python-format
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#, python-format
+msgid "po %s has a shorter name than best %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
+
 #: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:311
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr ""
 
-#: ../yum/__init__.py:347
+#: ../yum/__init__.py:332
 #, fuzzy
 msgid "plugins already initialised"
 msgstr "Nyahaktif semua plugin"
 
-#: ../yum/__init__.py:354
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:363
+#: ../yum/__init__.py:349
 #, fuzzy
 msgid "Reading Local RPMDB"
 msgstr "Layari Rangkaian Tempatan"
 
-#: ../yum/__init__.py:381
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:399
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:416
+#: ../yum/__init__.py:404
 #, fuzzy
 msgid "Setting up Package Sacks"
 msgstr "Membersihkan pakej"
 
-#: ../yum/__init__.py:458
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr ""
 
-#: ../yum/__init__.py:459
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr ""
 
-#: ../yum/__init__.py:464
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:476
+#: ../yum/__init__.py:465
 #, fuzzy
 msgid "Building updates object"
 msgstr "Salin Objek Embed"
 
-#: ../yum/__init__.py:499
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:520
 #, fuzzy
 msgid "Getting group metadata"
 msgstr "Mendapatkan akaun CVS"
 
-#: ../yum/__init__.py:548
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr ""
 
-#: ../yum/__init__.py:557
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr ""
 
-#: ../yum/__init__.py:563
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr ""
 
-#: ../yum/__init__.py:614
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr ""
 
-#: ../yum/__init__.py:646
+#: ../yum/__init__.py:657
 #, fuzzy, python-format
 msgid "Skip-broken round %i"
 msgstr "Langkau soalselidik pengguna"
 
-#: ../yum/__init__.py:674
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr ""
 
-#: ../yum/__init__.py:675
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
 msgstr ""
 
-#: ../yum/__init__.py:679
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr ""
 
-#: ../yum/__init__.py:767
+#: ../yum/__init__.py:774
 #, fuzzy, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "Gagal untuk mencari seksyen: %s"
 
-#: ../yum/__init__.py:807
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr ""
 
-#: ../yum/__init__.py:838
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr ""
 
-#: ../yum/__init__.py:840
+#: ../yum/__init__.py:847
 #, fuzzy, python-format
 msgid "Excluding Packages from %s"
 msgstr "Selit MathML dari fail"
 
-#: ../yum/__init__.py:867
+#: ../yum/__init__.py:875
 #, fuzzy, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Stat pakej Mandriva Linux"
 
-#: ../yum/__init__.py:872
+#: ../yum/__init__.py:880
 #, fuzzy, python-format
 msgid "Keeping included package %s"
 msgstr "Fail Pakej RPM"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Membuang pakej tidak sepadan %s"
 
-#: ../yum/__init__.py:881
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr ""
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:911
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr ""
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:915
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr ""
 
-#: ../yum/__init__.py:962 ../yum/__init__.py:969
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr ""
 
-#: ../yum/__init__.py:983
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "Tidak dapat melaksanakan checksum"
 
-#: ../yum/__init__.py:986
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr ""
 
-#: ../yum/__init__.py:1028
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr ""
 
-#: ../yum/__init__.py:1034
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "menggunakan salinan tempatan bagi %s"
 
-#: ../yum/__init__.py:1053
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr ""
 
-#: ../yum/__init__.py:1086
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "Pengepala tidak lengkap."
 
-#: ../yum/__init__.py:1126
+#: ../yum/__init__.py:1134
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
 msgstr ""
 
-#: ../yum/__init__.py:1181
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr ""
 
-#: ../yum/__init__.py:1185
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Masalah membuka pakej %s"
 
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr ""
 
-#: ../yum/__init__.py:1197
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Pakej %s tidak ditandatangan"
 
-#: ../yum/__init__.py:1235
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Tidak dapat membuang %s"
 
-#: ../yum/__init__.py:1239
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr ""
 
-#: ../yum/__init__.py:1271
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Tidak dapat membuang %s fail %s"
 
-#: ../yum/__init__.py:1275
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "%s fail %s dibuang"
 
-#: ../yum/__init__.py:1277
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d %s fail dibuang"
 
-#: ../yum/__init__.py:1317
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr ""
 
-#: ../yum/__init__.py:1323
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr ""
 
-#: ../yum/__init__.py:1513
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
 msgstr ""
 
-#: ../yum/__init__.py:1550
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "Mencari %d pakej"
 
-#: ../yum/__init__.py:1554
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "mencari pakej %s"
 
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr ""
 
-#: ../yum/__init__.py:1569
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr ""
 
-#: ../yum/__init__.py:1599
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Padanan Menyediakan: %s"
 
-#: ../yum/__init__.py:1668 ../yum/__init__.py:1686 ../yum/__init__.py:1714
-#: ../yum/__init__.py:1719 ../yum/__init__.py:1774 ../yum/__init__.py:1778
+#: ../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 ""
 
-#: ../yum/__init__.py:1697 ../yum/__init__.py:1790
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr ""
 
-#: ../yum/__init__.py:1736
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr ""
 
-#: ../yum/__init__.py:1740
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr ""
 
-#: ../yum/__init__.py:1815
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr ""
 
-#: ../yum/__init__.py:1883 ../yum/__init__.py:1926
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr ""
 
-#: ../yum/__init__.py:1885 ../yum/__init__.py:1928
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Bendera versi tidak sah"
 
-#: ../yum/__init__.py:1900 ../yum/__init__.py:1904
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "Tiada Pakej dijumpai untuk %s"
 
-#: ../yum/__init__.py:2034
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr ""
 
-#: ../yum/__init__.py:2038
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr ""
 
 #. only one in there
-#: ../yum/__init__.py:2051
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr ""
 
-#: ../yum/__init__.py:2057 ../yum/__init__.py:2323
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr ""
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2114
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr ""
 
-#: ../yum/__init__.py:2126
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr ""
 
-#: ../yum/__init__.py:2139
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr ""
 
+#: ../yum/__init__.py:2178
+#, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr ""
+
 #. update everything (the easy case)
-#: ../yum/__init__.py:2180
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Mengemaskini Semuanya"
 
-#: ../yum/__init__.py:2264
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr ""
 
-#: ../yum/__init__.py:2320
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../yum/__init__.py:2335
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr ""
 
-#: ../yum/__init__.py:2369
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Tidak dapat membuka fail: %s. Melangkau."
 
-#: ../yum/__init__.py:2372
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Memeriksa %s: %s"
 
-#: ../yum/__init__.py:2379
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
 "instead."
 msgstr ""
 
-#: ../yum/__init__.py:2411
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr ""
 
-#: ../yum/__init__.py:2416
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Menanda %s untuk dipasang"
 
-#: ../yum/__init__.py:2422
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr ""
 
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr ""
 
-#: ../yum/__init__.py:2447
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr ""
 
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2515
+#, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr ""
+
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr ""
 
-#: ../yum/__init__.py:2514
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr ""
 
-#: ../yum/__init__.py:2520
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr ""
 
-#: ../yum/__init__.py:2533
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr ""
 
-#: ../yum/__init__.py:2537
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr ""
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2542
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr ""
 
-#: ../yum/__init__.py:2554
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "Tidak memasang kekunci"
 
-#: ../yum/__init__.py:2560
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr ""
 
-#: ../yum/__init__.py:2563
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "Kekunci berjaya diimport"
 
-#: ../yum/__init__.py:2568
+#: ../yum/__init__.py:2624
 #, python-format
 msgid ""
 "The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1775,81 +1845,71 @@ msgid ""
 "Check that the correct key URLs are configured for this repository."
 msgstr ""
 
-#: ../yum/__init__.py:2577
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr ""
 
-#: ../yum/__init__.py:2651
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr ""
 
-#: ../yum/__init__.py:2653
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr ""
 
-#: ../yum/__init__.py:2717
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Ralat Ujian Transaksi:"
 
-#: ../yum/__init__.py:2752
-#, python-format
-msgid "Package %s needs %s, this is not available."
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:195
+msgid "Loaded plugins: "
 msgstr ""
 
-#: ../yum/__init__.py:2757
-#, python-format
-msgid "Package %s conflicts with %s."
-msgstr "Pakej %s berkonflik dengan %s."
-
-#: ../yum/plugins.py:168
+#: ../yum/plugins.py:206
 #, python-format
-msgid "Running \"%s\" handler for \"%s\" plugin"
-msgstr ""
-
-#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:193
-msgid "Loaded plugins: "
+msgid "No plugin match for: %s"
 msgstr ""
 
-#: ../yum/plugins.py:210
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr ""
 
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr ""
 
-#: ../yum/plugins.py:226
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr ""
 
-#: ../yum/plugins.py:253
+#: ../yum/plugins.py:264
 #, fuzzy, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Nyahaktif semua plugin"
 
-#: ../yum/plugins.py:260
+#: ../yum/plugins.py:271
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
 msgstr ""
 
-#: ../yum/plugins.py:280
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr ""
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:283
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr ""
 
-#: ../yum/plugins.py:437
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr ""
 
@@ -1883,6 +1943,17 @@ msgid "Error opening rpm %s - error %s"
 msgstr "Ralat membuka rpm %s - ralat %s"
 
 #, fuzzy
+#~ msgid "Looking for Obsoletes for %s"
+#~ msgstr "&Cari Bantuan"
+
+#, fuzzy
+#~ msgid "%s conflicts with %s"
+#~ msgstr "Dengan penghujung:"
+
+#~ msgid "Package %s conflicts with %s."
+#~ msgstr "Pakej %s berkonflik dengan %s."
+
+#, fuzzy
 #~ msgid ""
 #~ "Description:\n"
 #~ "%s"
diff --git a/po/nb.po b/po/nb.po
index a422234..a4214b1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum 3.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-08 10:16+0100\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-02-12 11:16+0100\n"
 "Last-Translator: Terje RÃ¸sten <terje.rosten at ntnu.no>\n"
 "Language-Team: Norwegian (bokmÃ¥l) <i18n-no at lister.ping.uio.no>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../callback.py:48 ../output.py:487
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Oppdaterer"
 
@@ -24,7 +24,7 @@ msgstr "Oppdaterer"
 msgid "Erasing"
 msgstr "Fjerner"
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:486
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Legger inn"
 
@@ -32,7 +32,7 @@ msgstr "Legger inn"
 msgid "Obsoleted"
 msgstr "Er utgÃ¥tt"
 
-#: ../callback.py:54 ../output.py:533
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Oppdatert"
 
@@ -40,7 +40,7 @@ msgstr "Oppdatert"
 msgid "Erased"
 msgstr "Fjernet"
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:531
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "Lagt inn"
 
@@ -62,7 +62,7 @@ msgstr "Feil: ugyldig tilstand ut: %s for %s"
 msgid "Erased: %s"
 msgstr "Fjernet: %s"
 
-#: ../callback.py:217 ../output.py:488
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Fjerner"
 
@@ -83,12 +83,12 @@ msgstr "Lager pakkeoversikt"
 msgid "Reading repository metadata in from local files"
 msgstr "Leser inn data om pakker fra lokale filer"
 
-#: ../cli.py:183 ../utils.py:57
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "Feil ved konfigurasjon: %s"
 
-#: ../cli.py:186 ../cli.py:1040 ../utils.py:60
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Feil med opsjoner: %s"
@@ -132,39 +132,39 @@ msgstr "Laster ned pakker:"
 msgid "Error Downloading Packages:\n"
 msgstr "Kunne ikke laste ned pakkene:\n"
 
-#: ../cli.py:369 ../yum/__init__.py:2689
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "KjÃ¸rer rpm-sjekker"
 
-#: ../cli.py:372 ../yum/__init__.py:2692
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr "Feil: en forskjell mellom rpm-sjekker og yum har oppstÃ¥tt"
 
-#: ../cli.py:376 ../yum/__init__.py:2694
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Vennligst send en feilrapport til bugzilla"
 
-#: ../cli.py:380
+#: ../cli.py:383
 msgid "Running Transaction Test"
 msgstr "GjennomfÃ¸rer en test av transaksjonen"
 
-#: ../cli.py:396
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr "Transaksjonstesten er fullfÃ¸rt"
 
-#: ../cli.py:398
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr "Feil ved sjekk av transaksjonen:\n"
 
-#: ../cli.py:405
+#: ../cli.py:408
 msgid "Transaction Test Succeeded"
 msgstr "Test av transaksjonen var vellykket"
 
-#: ../cli.py:423
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr "UtfÃ¸rer transaksjonen"
 
-#: ../cli.py:452
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
@@ -172,229 +172,243 @@ msgstr ""
 "Nekter og automatisk importere nÃ¸kler nÃ¥r man kjÃ¸rer uten oppsyn.\n"
 "Bruk \"-y\" for uansett Ã¥ godta import."
 
-#: ../cli.py:484
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr "Analyserer argumentene for pakkeinstallasjon"
 
-#: ../cli.py:494
+#: ../cli.py:501
 #, python-format
 msgid "No package %s available."
 msgstr "Ingen pakke: %s er tilgjengelig."
 
-#: ../cli.py:498 ../cli.py:616 ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Pakker som legges"
 
-#: ../cli.py:499 ../cli.py:617 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr "Ingenting og gjÃ¸re"
 
-#: ../cli.py:529 ../yum/__init__.py:2192 ../yum/__init__.py:2271
-#: ../yum/__init__.py:2283
+#: ../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 "Vil ikke oppdatere pakke som allerede er foreldet: %s.%s %s:%s-%s"
 
-#: ../cli.py:561
+#: ../cli.py:568
 #, python-format
 msgid "Could not find update match for %s"
 msgstr "Kunne ikke finne oppdatering som passet for %s"
 
-#: ../cli.py:573
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr "%d pakker er vil bli oppdatert"
 
-#: ../cli.py:576
+#: ../cli.py:583
 msgid "No Packages marked for Update"
 msgstr "Ingen pakker vil bli oppdatert"
 
-#: ../cli.py:592
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr "%d pakker vil bli fjernet"
 
-#: ../cli.py:595
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr "Ingen pakker vil bli fjernet"
 
-#: ../cli.py:607
+#: ../cli.py:614
 msgid "No Packages Provided"
 msgstr "Ingen pakker ble tilbudt"
 
-#: ../cli.py:647
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr "Tilpasser pakkeliste etter brukers Ã¸nske"
 
-#: ../cli.py:685
+#: ../cli.py:701
+#, fuzzy, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "Ingen pakke for %s er funnet"
+
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Ingen passende pakker ble funnet"
 
-#: ../cli.py:722
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Ingen pakke ble funnet for %s"
 
-#: ../cli.py:734
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "Rydder opp alt"
 
-#: ../cli.py:748
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "Rydder opp metadata"
 
-#: ../cli.py:751
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "Fjerner lagrede pakker"
 
-#: ../cli.py:754
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "Rydder opp i XML-metadata"
 
-#: ../cli.py:757
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "Rydder opp i databasen"
 
-#: ../cli.py:760
+#: ../cli.py:783
+#, fuzzy
+msgid "Cleaning up expire-cache metadata"
+msgstr "Rydder opp i XML-metadata"
+
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "Rydder opp i tillegg"
 
-#: ../cli.py:782
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Installerte grupper:"
 
-#: ../cli.py:789
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "Tilgjengelig grupper:"
 
-#: ../cli.py:795
+#: ../cli.py:820
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../cli.py:804 ../cli.py:816 ../cli.py:822
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "Advarsel: gruppe %s eksisterer ikke."
 
-#: ../cli.py:828
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
 msgstr "Ingen pakker i aktuelle grupper er tilgjengelig"
 
-#: ../cli.py:830
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d pakker vil bli installert"
 
-#: ../cli.py:840
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Ingen gruppe med navn %s er tilgjengelig"
 
-#: ../cli.py:846
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Ingen pakker og fjerne fra gruppe"
 
-#: ../cli.py:848
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d pakker vil bli fjernet"
 
-#: ../cli.py:890
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "Pakke %s er allerede lagt inn, hopper over"
 
-#: ../cli.py:901
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr "Vraker pakke som ikke sammenlignes %s.%s"
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:927
+#: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
 msgstr ""
 "Ingen annen pakke %s er lagt inn, legger til pakke til liste over "
 "potensielle pakker"
 
-#: ../cli.py:946
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "Feil ved kommandolinje: %s"
 
-#: ../cli.py:1073
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "vÃ¦r tolerant ved feil"
 
-#: ../cli.py:1075
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr "bruk kun lagrede filer ved kjÃ¸ring, ikke oppdater lagrede filer"
 
-#: ../cli.py:1077
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "plassering av konfigurasjonsfil"
 
-#: ../cli.py:1079
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "maksimaltid for Ã¥ vente pÃ¥ kommando"
 
-#: ../cli.py:1081
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "mengde tilbakemelding ved avlusing"
 
-#: ../cli.py:1084
+#: ../cli.py:1113
+msgid "show duplicates, in repos, in list/search commands"
+msgstr ""
+
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "mengde tilbakemelding ved feil"
 
-#: ../cli.py:1087
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "utfÃ¸rer med minimalt av tilbakemelding"
 
-#: ../cli.py:1091
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "svar Ja til alle eventuelle spÃ¸rsmÃ¥l som kan oppstÃ¥"
 
-#: ../cli.py:1093
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "vis versjon til Yum og avslutt deretter"
 
-#: ../cli.py:1094
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "setter laveste filtre-nivÃ¥ for intallering (standard er /)"
 
-#: ../cli.py:1098
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "legger til en eller flere pakkeoversikter (jokertegn er tillatt)"
 
-#: ../cli.py:1102
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr "fjernet en eller flere pakkeoversikter (jokertegn er tillatt)"
 
-#: ../cli.py:1105
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr "overse pakke(r) ved navn eller glob"
 
-#: ../cli.py:1107
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
 msgstr "fjerner ekskludering av pakker, for en pakkeoversikt eller fullstendig"
 
-#: ../cli.py:1110
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr "ta med foreldede pakker i beregningen ved oppdatering"
 
-#: ../cli.py:1112
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "ikke bruk tillegg til Yum"
 
-#: ../cli.py:1114
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "ikke gjennomfÃ¸r sjekk av GPG-signaturer"
 
-#: ../cli.py:1116
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "ikke bruk tillegg til yum ved navn"
 
-#: ../cli.py:1119
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "hoppe over pakker som har problemer med avhengigheter"
 
@@ -450,69 +464,85 @@ msgstr "des"
 msgid "Trying other mirror."
 msgstr "PrÃ¸ver et annet speil."
 
-#: ../output.py:273
+#: ../output.py:293
 #, python-format
 msgid "Name       : %s"
 msgstr "Navn       : %s"
 
-#: ../output.py:274
+#: ../output.py:294
 #, python-format
 msgid "Arch       : %s"
 msgstr "Arkitektur : %s"
 
-#: ../output.py:276
+#: ../output.py:296
 #, python-format
 msgid "Epoch      : %s"
 msgstr "Epoch      :%s"
 
-#: ../output.py:277
+#: ../output.py:297
 #, python-format
 msgid "Version    : %s"
 msgstr "Versjon    : %s"
 
-#: ../output.py:278
+#: ../output.py:298
 #, python-format
 msgid "Release    : %s"
 msgstr "Utgave     : %s"
 
-#: ../output.py:279
+#: ../output.py:299
 #, python-format
 msgid "Size       : %s"
 msgstr "StÃ¸rrelse  : %s"
 
-#: ../output.py:280
+#: ../output.py:300
 #, python-format
 msgid "Repo       : %s"
 msgstr "Kilde      : %s"
 
-#: ../output.py:282
+#: ../output.py:302
 #, python-format
 msgid "Committer  : %s"
 msgstr "Ansvarlig  : %s"
 
-#: ../output.py:283
+#: ../output.py:303
 msgid "Summary    : "
 msgstr "Oversikt   :"
 
-#: ../output.py:285
+#: ../output.py:305
 #, python-format
 msgid "URL        : %s"
 msgstr "URL        : %s"
 
-#: ../output.py:286
+#: ../output.py:306
 #, python-format
 msgid "License    : %s"
 msgstr "Lisens     : %s"
 
-#: ../output.py:287
+#: ../output.py:307
 msgid "Description: "
 msgstr "Beskrivelse:"
 
-#: ../output.py:331
+#: ../output.py:351
 msgid "Is this ok [y/N]: "
 msgstr "Er dette greit [y/N]:"
 
-#: ../output.py:345
+#: ../output.py:357 ../output.py:360
+msgid "y"
+msgstr ""
+
+#: ../output.py:357
+msgid "n"
+msgstr ""
+
+#: ../output.py:357 ../output.py:360
+msgid "yes"
+msgstr ""
+
+#: ../output.py:357
+msgid "no"
+msgstr ""
+
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -521,96 +551,96 @@ msgstr ""
 "\n"
 "Gruppe:%s"
 
-#: ../output.py:347
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " Beskrivelse: %s"
 
-#: ../output.py:349
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr "Obligatoriske pakker:"
 
-#: ../output.py:354
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr "Standard pakker:"
 
-#: ../output.py:359
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr "Valgfrie pakker:"
 
-#: ../output.py:364
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr "Betingede pakker:"
 
-#: ../output.py:372
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "pakke: %s"
 
-#: ../output.py:374
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr " Ingen avhengigheter for denne pakka"
 
-#: ../output.py:379
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr " avhengighet: %s"
 
-#: ../output.py:381
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr " avhengighet som ikke kunne tilfredstilles"
 
-#: ../output.py:436
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Treff fra:"
 
-#: ../output.py:462
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr "Kunne ikke finne ut stÃ¸rrelse pÃ¥ det som skal hentes ned"
 
-#: ../output.py:467
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "Totale stÃ¸rrelse: %s"
 
-#: ../output.py:470
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "Totale stÃ¸rrelse pÃ¥ pakker som hentes: %s"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Package"
 msgstr "Pakke"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Arch"
 msgstr "Arkitektur"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Version"
 msgstr "Versjon"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Repository"
 msgstr "Pakkeoversikt"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Size"
 msgstr "StÃ¸rrelse"
 
-#: ../output.py:489
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Legges inn pÃ¥ grunn avhengigheter"
 
-#: ../output.py:490
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Oppdateres pÃ¥ grunn avhengigheter"
 
-#: ../output.py:491
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Fjernes pÃ¥ grunn avhengigheter"
 
-#: ../output.py:503
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
@@ -619,7 +649,7 @@ msgstr ""
 "     erstatter   %s.%s %s\"\n"
 "\n"
 
-#: ../output.py:511
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -636,27 +666,27 @@ msgstr ""
 "Oppdaterer %5.5s pakker\n"
 "Fjerner    %5.5s pakker\n"
 
-#: ../output.py:529
+#: ../output.py:554
 msgid "Removed"
 msgstr "Fjernet"
 
-#: ../output.py:530
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "Fjernet pÃ¥ grunn avhengighet"
 
-#: ../output.py:532
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "Lagt inn pÃ¥ grunn av avhengighet"
 
-#: ../output.py:534
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "Oppdatert pÃ¥ grunn avhengighet"
 
-#: ../output.py:535
+#: ../output.py:560
 msgid "Replaced"
 msgstr "Erstattet"
 
-#: ../output.py:593
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
@@ -667,63 +697,63 @@ msgstr ""
 " PÃ¥gÃ¥ende nedlastning er avbrutt, %s avbryt (ved Ã¥ trykke Ctrl-C) %s ganger "
 "til innen %s%s%s sekunder for Ã¥ avslutte helt.\n"
 
-#: ../output.py:603
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "avbryt av bruker"
 
-#: ../output.py:614
+#: ../output.py:639
 msgid "installed"
 msgstr "lagt inn"
 
-#: ../output.py:615
+#: ../output.py:640
 msgid "updated"
 msgstr "oppdatert"
 
-#: ../output.py:616
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "foreldet"
 
-#: ../output.py:617
+#: ../output.py:642
 msgid "erased"
 msgstr "fjernet"
 
-#: ../output.py:621
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> pakke %s.%s %s:%s-%s er satt til %s"
 
-#: ../output.py:628
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> UtfÃ¸rer sjekk av transaksjonen"
 
-#: ../output.py:633
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr "--> Starter lÃ¸sning av avhengigheter pÃ¥ nytt"
 
-#: ../output.py:638
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> Alle avhengigheter er lÃ¸st"
 
-#: ../output.py:643
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr "--> Beregner avhengighet: %s for pakke: %s"
 
-#: ../output.py:648
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> Avhengigheter som ikke kunne bli tilfredstilt: %s"
 
-#: ../output.py:654
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Beregner konflikter: %s er i konflikt med %s"
 
-#: ../output.py:657
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr "--> Fyller transaksjonen med valgt pakker. Vennligst vent."
 
-#: ../output.py:661
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr "---> Henter ned filhode for pakke %s for Ã¥ fylle transaksjonen."
@@ -1081,11 +1111,11 @@ msgstr ""
 "\n"
 "Alle avhengigheter er opplÃ¸st"
 
-#: ../yummain.py:199
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr "Ferdig!"
 
-#: ../yummain.py:246
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
@@ -1095,289 +1125,319 @@ msgstr ""
 "\n"
 "Avslutter etter Ã¸nske"
 
-#: ../yum/depsolve.py:70
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr "doTsSetup() vil forsvinne i en kommende utgave av Yum.\n"
 
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
 msgstr "Setter opp transaksjons-sett fÃ¸r config klassen er klar"
 
-#: ../yum/depsolve.py:123
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr "Ugyldig tsflag in konfigurasjonsfil: %s"
 
-#: ../yum/depsolve.py:134
+#: ../yum/depsolve.py:147
 #, python-format
 msgid "Searching pkgSack for dep: %s"
 msgstr "SÃ¸ker i pkgSack etter avhengighet: %s"
 
-#: ../yum/depsolve.py:163
+#: ../yum/depsolve.py:170
 #, python-format
 msgid "Potential match for %s from %s"
 msgstr "Potensielt treff for %s i %s"
 
-#: ../yum/depsolve.py:171
+#: ../yum/depsolve.py:178
 #, python-format
 msgid "Matched %s to require for %s"
 msgstr "Passende %s for Ã¥ tilfredstille %s"
 
-#: ../yum/depsolve.py:212
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "Medlem: %s"
 
-#: ../yum/depsolve.py:226 ../yum/depsolve.py:788
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s ble omdannet til installering"
 
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "Legger til pakke %s in modus %s"
 
-#: ../yum/depsolve.py:243
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Fjerner pakke %s"
 
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s avhenger av: %s"
 
-#: ../yum/depsolve.py:300
+#: ../yum/depsolve.py:312
 msgid "Needed Require has already been looked up, cheating"
 msgstr "NÃ¸dvendig avhengighet har allerede blitt plukket opp, jukser"
 
-#: ../yum/depsolve.py:310
+#: ../yum/depsolve.py:322
 #, python-format
 msgid "Needed Require is not a package name. Looking up: %s"
 msgstr "NÃ¸dvendig avhengighet er ikke et navn pÃ¥ pakke. Ser etter: %s"
 
-#: ../yum/depsolve.py:317
+#: ../yum/depsolve.py:329
 #, python-format
 msgid "Potential Provider: %s"
 msgstr "Potensiell tilbyder: %s"
 
-#: ../yum/depsolve.py:340
+#: ../yum/depsolve.py:352
 #, python-format
 msgid "Mode is %s for provider of %s: %s"
 msgstr "Modus er %s for tilbyder av %s: %s"
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:356
 #, python-format
 msgid "Mode for pkg providing %s: %s"
 msgstr "Modus for pakke som tilbyr %s: %s"
 
-#: ../yum/depsolve.py:348
+#: ../yum/depsolve.py:360
 #, python-format
 msgid "TSINFO: %s package requiring %s marked as erase"
 msgstr "TSINFO: pakke %s som er nÃ¸dvendig for %s vil bli fjernet"
 
-#: ../yum/depsolve.py:361
-#, python-format
-msgid "Looking for Obsoletes for %s"
-msgstr "Leter opp informasjon utgÃ¥tte pakker for %s"
-
-#: ../yum/depsolve.py:373
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr "TSINFO: Bytter ut %s med %s for Ã¥ lÃ¸se opp i avhengighet."
 
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr "TSINFO: Oppdaterer %s for Ã¥ lÃ¸se opp i avhengighet."
 
-#. if there's no update then pass this over to requringFromTransaction()
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:378
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr "Kunne ikke finne mÃ¥te Ã¥ oppdatere sti for avhengighet: %s."
 
-#: ../yum/depsolve.py:420
+#: ../yum/depsolve.py:388
 #, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr "Avhengighet %s kan ikke lÃ¸ses opp: %s"
 
 #. is it already installed?
-#: ../yum/depsolve.py:466
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr "%s tilbyr pakker, men er allerede installert, fjerner denne."
 
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr ""
 "Pakke %s som potensielt tilbyder lÃ¸sning har allerede nyere instans in ts."
 
-#: ../yum/depsolve.py:492
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr "Pakke %s som potensielt lÃ¸ser opp avhengighet er allerde installert."
 
-#: ../yum/depsolve.py:500 ../yum/depsolve.py:568
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr "UlÃ¸st avhengighet: %s trengs av pakke %s"
 
-#: ../yum/depsolve.py:513
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr "%s er allerde i ts, hopper over denne"
 
-#: ../yum/depsolve.py:578
+#: ../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: Setter opp %s som oppdatering av %s"
 
-#: ../yum/depsolve.py:585
+#: ../yum/depsolve.py:544
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr "TSINFO: Setter opp %s som pakke for installering av %s"
 
-#: ../yum/depsolve.py:647 ../yum/depsolve.py:654
-#, python-format
-msgid "unable to find newer package for %s"
-msgstr "kunne ikke finne nyere pakke for %s"
-
-#: ../yum/depsolve.py:661
-#, python-format
-msgid "TSINFO: Updating %s to resolve conflict."
-msgstr "TSINFO: Oppdaterer %s for Ã¥ lÃ¸se opp i konflikt."
-
-#: ../yum/depsolve.py:671
-#, python-format
-msgid "%s conflicts: %s"
-msgstr "%s er i konflikt med: %s"
-
-#: ../yum/depsolve.py:681
-#, python-format
-msgid "%s conflicts with %s"
-msgstr "%s er i konflikt med %s"
-
-#: ../yum/depsolve.py:720 ../yum/depsolve.py:806
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Suksess- transaksjonen er tom"
 
-#: ../yum/depsolve.py:765 ../yum/depsolve.py:778
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Starter slÃ¸yfe pÃ¥ nytt"
 
-#: ../yum/depsolve.py:794
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "Beregning av avhengighet avsluttes"
 
-#: ../yum/depsolve.py:800
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr "%s to %s har problemer med avhengigheter"
 
-#: ../yum/depsolve.py:807
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "Suksess - alle avhengigheter er tilfredstilt"
 
-#: ../yum/depsolve.py:824
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "Sjekker avhengigheter for %s"
 
-#: ../yum/depsolve.py:880
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr "leter etter %s som en nÃ¸dvendighet fra %s"
 
+#: ../yum/depsolve.py:933
+#, python-format
+msgid "Comparing best: %s to po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, python-format
+msgid "best %s obsoletes po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:955
+#, python-format
+msgid "po %s obsoletes best: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#, fuzzy, python-format
+msgid "better arch in po %s"
+msgstr "sÃ¸ker etter pakke %s"
+
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#, python-format
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#, python-format
+msgid "best %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#, python-format
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#, python-format
+msgid "po %s has a shorter name than best %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
+
 #: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr "doConfigSetup() vil forsvinne i en kommende utgave av Yum.\n"
 
-#: ../yum/__init__.py:311
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr "Pakkeoversikt %r har intet navn i konfigurasjonsfilen(e), bruker id"
 
-#: ../yum/__init__.py:347
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr "tillegg til yum er allerede satt opp"
 
-#: ../yum/__init__.py:354
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr "doRepoSetup() vil forsvinne i en kommende utgave av Yum.\n"
 
-#: ../yum/__init__.py:363
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr "Leser inn lokale RPM-database"
 
-#: ../yum/__init__.py:381
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr "doRepoSetup() vil forsvinne i en kommende utgave av Yum\n"
 
-#: ../yum/__init__.py:399
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr "doSackSetup() vil forsvinne i en kommende utgave av Yum\n"
 
-#: ../yum/__init__.py:416
+#: ../yum/__init__.py:404
 msgid "Setting up Package Sacks"
 msgstr "Lager sekker med pakker"
 
-#: ../yum/__init__.py:458
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr "objekt for pakkesoversikt %s mangler metoden _resetSack\n"
 
-#: ../yum/__init__.py:459
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr "derfor kan ikke denne pakkeoversikten bli nullstilt\n"
 
-#: ../yum/__init__.py:464
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr "doUpdateSetup() vil forsvinne i en kommende utgave av Yum.\n"
 
-#: ../yum/__init__.py:476
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr "Bygger opp oppdateringobject"
 
-#: ../yum/__init__.py:499
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr "doGroupSetup() vil forsvinne i en kommende utgave av Yum.\n"
 
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Henter metadata om grupper"
 
-#: ../yum/__init__.py:548
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr "Legger til gruppefil fra pakkeoversikt: %s"
 
-#: ../yum/__init__.py:557
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr "Kunne ike legge til gruppefil for pakkeoversikt: %s - %s"
 
-#: ../yum/__init__.py:563
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Ingen grupper overhode tilgjengelig"
 
-#: ../yum/__init__.py:614
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Henter ytterligere informasjon om fil-lister"
 
-#: ../yum/__init__.py:646
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Runde %i pÃ¥ grunn av Ã¸delagte avhengigheter."
 
-#: ../yum/__init__.py:674
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr "PÃ¥ grunn Ã¸delagte avhengigheter ble det gjennomfÃ¸rt %i runder "
 
-#: ../yum/__init__.py:675
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
@@ -1385,94 +1445,94 @@ msgstr ""
 "\n"
 "Pakker som ble oversett pÃ¥ grunn av problemer med avhengigheter:"
 
-#: ../yum/__init__.py:679
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s fra %s"
 
-#: ../yum/__init__.py:767
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "Kunne ikke fjerne transaksjonsfil %s"
 
-#: ../yum/__init__.py:807
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "ekskluderer pÃ¥ grunn av kostnad: %s fra %s"
 
-#: ../yum/__init__.py:838
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Ekskluderer pakker som er i global liste av ekskluderte pakker"
 
-#: ../yum/__init__.py:840
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Ekskluderer pakker fra %s"
 
-#: ../yum/__init__.py:867
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Reduserer %s til kun inkluderte pakker"
 
-#: ../yum/__init__.py:872
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Tar vare pÃ¥ inkludert pakke %s"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Fjerner upassende pakke: %s"
 
-#: ../yum/__init__.py:881
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "Ferdig"
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:911
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "Kunne ikke sjekke om PID %s er aktiv"
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:915
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr ""
 "Det fins allerede en lÃ¥sefil: %s, en annen Yum kjÃ¸rer med PID %s allerede."
 
-#: ../yum/__init__.py:962 ../yum/__init__.py:969
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "Det er forskjell mellom nedlastet og forventet stÃ¸rrelse"
 
-#: ../yum/__init__.py:983
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "Kunne ikke beregne tverrsum"
 
-#: ../yum/__init__.py:986
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "Pakka har ikke korrekt tverrsum"
 
-#: ../yum/__init__.py:1028
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr "tverrsummen til pakka er feil, men mellomlagring er satt pÃ¥ for %s"
 
-#: ../yum/__init__.py:1034
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "bruker lokal kop av %s"
 
-#: ../yum/__init__.py:1053
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr "Det er ikke nok ledig plass i katalogen %s hvor pakkene blir lagret"
 
-#: ../yum/__init__.py:1086
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "Filhode er ikke komplett."
 
-#: ../yum/__init__.py:1126
+#: ../yum/__init__.py:1134
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1480,62 +1540,62 @@ msgstr ""
 "Filhode er ikke tilgjengelig lokalt og i vi er mellomlager-modes. Kan ikke "
 "hente ned %s"
 
-#: ../yum/__init__.py:1181
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr "Offentlig nÃ¸kkel for %s er ikke lagt inn"
 
-#: ../yum/__init__.py:1185
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Kunne ved Ã¥pning av pakke %s"
 
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr "Offentlig nÃ¸kkel %s er ikke til Ã¥ stole pÃ¥"
 
-#: ../yum/__init__.py:1197
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Pakka %s er ikke signert"
 
-#: ../yum/__init__.py:1235
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Kunne ikke fjern %s"
 
-#: ../yum/__init__.py:1239
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "%s fjernet"
 
-#: ../yum/__init__.py:1271
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Kan ikke fjerne %s fra fila %s"
 
-#: ../yum/__init__.py:1275
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "%s fila %s er fjernet"
 
-#: ../yum/__init__.py:1277
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d %s filer er fjernet"
 
-#: ../yum/__init__.py:1317
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr "Mer enn en identisk passende treff i sekken %s"
 
-#: ../yum/__init__.py:1323
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr "Ingenting passer %s.%s %s:%s-%s fra oppdatering"
 
-#: ../yum/__init__.py:1513
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
@@ -1543,135 +1603,140 @@ msgstr ""
 "searchPackages() vil forsvinne i en kommende utgave av Yum.\n"
 "Bruk heller searchGenerator()\n"
 
-#: ../yum/__init__.py:1550
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "SÃ¸ker etter %d pakker"
 
-#: ../yum/__init__.py:1554
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "sÃ¸ker etter pakke %s"
 
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "sÃ¸ker i filoversikt"
 
-#: ../yum/__init__.py:1569
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "sÃ¸ker i oppfÃ¸ringer av tilbydere"
 
-#: ../yum/__init__.py:1599
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Tilbyder-treff: %s"
 
-#: ../yum/__init__.py:1668 ../yum/__init__.py:1686 ../yum/__init__.py:1714
-#: ../yum/__init__.py:1719 ../yum/__init__.py:1774 ../yum/__init__.py:1778
+#: ../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 "Ikke gruppe med navn %s er tilgjengelig"
 
-#: ../yum/__init__.py:1697 ../yum/__init__.py:1790
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr "pakka %s var ikke med i gruppa %s"
 
-#: ../yum/__init__.py:1736
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr "Legger til pakke %s fra gruppe %s"
 
-#: ../yum/__init__.py:1740
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr "Ingen pakke med navn %s er tilgjendelig for installering"
 
-#: ../yum/__init__.py:1815
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr "Pakke tuppel %s ble ikke funnet i sekken med pakker"
 
-#: ../yum/__init__.py:1883 ../yum/__init__.py:1926
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr ""
 "Den versjonerte strengen med avhengigheter er ugyldig, prÃ¸v og sette den i "
 "anfÃ¸relsestegn."
 
-#: ../yum/__init__.py:1885 ../yum/__init__.py:1928
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Ugyldig versjonsflagg"
 
-#: ../yum/__init__.py:1900 ../yum/__init__.py:1904
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "Ingen pakke for %s er funnet"
 
-#: ../yum/__init__.py:2034
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr "Pakkeobjekt var ikke en pakkeobjekt instans"
 
-#: ../yum/__init__.py:2038
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr "Det ble ikke bedt om og installere noe som helst"
 
 #. only one in there
-#: ../yum/__init__.py:2051
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr "Sjekker for virtuelle tilbydere eller tilbydere av filer for %s"
 
-#: ../yum/__init__.py:2057 ../yum/__init__.py:2323
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr "Intet treff for argument: %s"
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2114
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr "Ingen pakke(r) er tilgjengelig for installering"
 
-#: ../yum/__init__.py:2126
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr "Pakke: %s - allerede i transaksjonensettet"
 
-#: ../yum/__init__.py:2139
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr "Pakke %s er allerede installert i siste og beste versjon"
 
+#: ../yum/__init__.py:2178
+#, fuzzy, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr "Pakke %s er allerede lagt inn, hopper over"
+
 #. update everything (the easy case)
-#: ../yum/__init__.py:2180
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Oppdaterer alt"
 
-#: ../yum/__init__.py:2264
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Pakka er allerede foreldet:  %s.%s %s:%s-%s"
 
-#: ../yum/__init__.py:2320
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../yum/__init__.py:2335
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Kunne ikke finne noen passende pakke for fjerning"
 
-#: ../yum/__init__.py:2369
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Kunne ikke Ã¥pne fil: %s. Hopper over."
 
-#: ../yum/__init__.py:2372
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Gransker: %s: %s"
 
-#: ../yum/__init__.py:2379
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
@@ -1680,72 +1745,77 @@ msgstr ""
 "Pakka %s er ikke installert, sÃ¥ den kan ikke oppdateres. Bruk kommandoen yum "
 "install for Ã¥ legge den inn."
 
-#: ../yum/__init__.py:2411
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Ekskluderer %s"
 
-#: ../yum/__init__.py:2416
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Setter av %s for kommende installering"
 
-#: ../yum/__init__.py:2422
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr "Setter av %s som en oppdatering av %s"
 
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr "%s: vil ikke oppdatere installert pakke."
 
-#: ../yum/__init__.py:2447
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr "Problem ved reinstall: kunne ikke finne passende pakke og fjerne"
 
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2515
+#, fuzzy, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr "Pakke %s er allerede lagt inn, hopper over"
+
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr "Problem ved reinstall: kunne ikke finne passende pakke og installere "
 
-#: ../yum/__init__.py:2514
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr "Henter GPG-nÃ¸kkel fra %s"
 
-#: ../yum/__init__.py:2520
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "Henting av GPG-nÃ¸kkel feilet: "
 
-#: ../yum/__init__.py:2533
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "Analyse av GPG-nÃ¸kkel feilet: "
 
-#: ../yum/__init__.py:2537
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr "GPG-nÃ¸kkel ved %s (0x%s) er allerede lagt inn"
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2542
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr "Legger inn GPG-nÃ¸kkel 0x%s \"%s\" fra %s"
 
-#: ../yum/__init__.py:2554
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "Legger ikke inn nÃ¸kkel"
 
-#: ../yum/__init__.py:2560
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "Import av nÃ¸kkel feilet (kode %d)"
 
-#: ../yum/__init__.py:2563
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "NÃ¸kler ble lagt inn med suksess"
 
-#: ../yum/__init__.py:2568
+#: ../yum/__init__.py:2624
 #, python-format
 msgid ""
 "The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1757,81 +1827,71 @@ msgstr ""
 "Sjekk at korrekt URL (gpgkey opsjonen) er oppgitt for denne\n"
 "pakkeoversikten."
 
-#: ../yum/__init__.py:2577
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr "Import av nÃ¸kler hjalp ikke, feil nÃ¸kler?"
 
-#: ../yum/__init__.py:2651
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "Kunne ikke finne passende filspeil"
 
-#: ../yum/__init__.py:2653
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr "Det oppstod feil ved nedlastning av pakker."
 
-#: ../yum/__init__.py:2717
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Feil ved testtransaksjon: "
 
-#: ../yum/__init__.py:2752
-#, python-format
-msgid "Package %s needs %s, this is not available."
-msgstr "Pakke %s trenger %s, dessverre er denne ikke tilgjengelig."
-
-#: ../yum/__init__.py:2757
-#, python-format
-msgid "Package %s conflicts with %s."
-msgstr "Pakke %s er i konflikt med %s."
-
-#: ../yum/plugins.py:168
-#, python-format
-msgid "Running \"%s\" handler for \"%s\" plugin"
-msgstr "UtfÃ¸rer \"%s\" for tillegget \"%s\""
-
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:193
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "Tillegg som er i bruk:"
 
-#: ../yum/plugins.py:210
+#: ../yum/plugins.py:206
+#, fuzzy, python-format
+msgid "No plugin match for: %s"
+msgstr "Intet treff for argument: %s"
+
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "Tillegg: %s er ikke aktiv."
 
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr "Tillegg \"%s\" tilfredstiller ikke versjonskravene fra Yum."
 
-#: ../yum/plugins.py:226
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr "Tillegg \"%s\" krever API versjon: %s. Men stÃ¸ttet API versjon er %s."
 
-#: ../yum/plugins.py:253
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Laster tillegg \"%s\""
 
-#: ../yum/plugins.py:260
+#: ../yum/plugins.py:271
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
 msgstr "To eller flere tillegg har samme navn."
 
-#: ../yum/plugins.py:280
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr "Konfigurasjonsfila %s ble ikke funnet"
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:283
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr "Kunne ikke finne konfigurasjon for tillegg %s"
 
-#: ../yum/plugins.py:437
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "registering av kommandoer er ikke stÃ¸ttet"
 
@@ -1863,3 +1923,27 @@ msgstr "Filhode til %s er Ã¸delagt"
 #, python-format
 msgid "Error opening rpm %s - error %s"
 msgstr "Kunne ikke Ã¥pen rpm pakke %s - feilen er %s"
+
+#~ msgid "Looking for Obsoletes for %s"
+#~ msgstr "Leter opp informasjon utgÃ¥tte pakker for %s"
+
+#~ msgid "unable to find newer package for %s"
+#~ msgstr "kunne ikke finne nyere pakke for %s"
+
+#~ msgid "TSINFO: Updating %s to resolve conflict."
+#~ msgstr "TSINFO: Oppdaterer %s for Ã¥ lÃ¸se opp i konflikt."
+
+#~ msgid "%s conflicts: %s"
+#~ msgstr "%s er i konflikt med: %s"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s er i konflikt med %s"
+
+#~ msgid "Package %s needs %s, this is not available."
+#~ msgstr "Pakke %s trenger %s, dessverre er denne ikke tilgjengelig."
+
+#~ msgid "Package %s conflicts with %s."
+#~ msgstr "Pakke %s er i konflikt med %s."
+
+#~ msgid "Running \"%s\" handler for \"%s\" plugin"
+#~ msgstr "UtfÃ¸rer \"%s\" for tillegget \"%s\""
diff --git a/po/pl.po b/po/pl.po
index 1cf7606..b04ad6f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-08 10:16+0100\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-02-08 23:12+0200\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../callback.py:48 ../output.py:487
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr "Aktualizowanie"
 
@@ -21,7 +21,7 @@ msgstr "Aktualizowanie"
 msgid "Erasing"
 msgstr "Usuwanie"
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:486
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr "Instalowanie"
 
@@ -29,7 +29,7 @@ msgstr "Instalowanie"
 msgid "Obsoleted"
 msgstr "PrzestarzaÅ‚e"
 
-#: ../callback.py:54 ../output.py:533
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr "Zaktualizowano"
 
@@ -37,7 +37,7 @@ msgstr "Zaktualizowano"
 msgid "Erased"
 msgstr "UsuniÄ™to"
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:531
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr "Zainstalowano"
 
@@ -59,7 +59,7 @@ msgstr "BÅ‚Ä…d: nieprawidÅ‚owy stan wyjÅ›cia: %s dla %s"
 msgid "Erased: %s"
 msgstr "UsuniÄ™to: %s"
 
-#: ../callback.py:217 ../output.py:488
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr "Usuwanie"
 
@@ -80,12 +80,12 @@ msgstr "Ustawianie repozytoriÃ³w"
 msgid "Reading repository metadata in from local files"
 msgstr "Odczytywanie metadanych repozytoriÃ³w z lokalnych plikÃ³w"
 
-#: ../cli.py:183 ../utils.py:57
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "BÅ‚Ä…d konfiguracji: %s"
 
-#: ../cli.py:186 ../cli.py:1040 ../utils.py:60
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "BÅ‚Ä…d opcji: %s"
@@ -103,6 +103,8 @@ msgstr "Wymagana przestrzeÅ„ na dysku:\n"
 msgid "  At least %dMB needed on the %s filesystem.\n"
 msgstr "  Na systemie plikÃ³w %s potrzeba co najmniej %d MB.\n"
 
+#. TODO: simplify the dependency errors?
+#. Fixup the summary
 #: ../cli.py:278
 msgid ""
 "Error Summary\n"
@@ -127,39 +129,39 @@ msgstr "Pobieranie pakietÃ³w:"
 msgid "Error Downloading Packages:\n"
 msgstr "BÅ‚Ä…d podczas pobierania pakietÃ³w:\n"
 
-#: ../cli.py:369 ../yum/__init__.py:2689
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "Uruchamianie rpm_check_debug"
 
-#: ../cli.py:372 ../yum/__init__.py:2692
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr "BÅÄ„D rpm_check_debug i rozwiÄ…zywania zaleÅ¼noÅ›ci:"
 
-#: ../cli.py:376 ../yum/__init__.py:2694
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "ZgÅ‚oÅ› ten bÅ‚Ä…d w Bugzilli"
 
-#: ../cli.py:380
+#: ../cli.py:383
 msgid "Running Transaction Test"
 msgstr "Uruchamianie testu transakcji"
 
-#: ../cli.py:396
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr "ZakoÅ„czono test transakcji"
 
-#: ../cli.py:398
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr "BÅ‚Ä…d podczas sprawdzania transakcji:\n"
 
-#: ../cli.py:405
+#: ../cli.py:408
 msgid "Transaction Test Succeeded"
 msgstr "Test transakcji zostaÅ‚ zakoÅ„czony powodzeniem"
 
-#: ../cli.py:423
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr "Uruchamianie transakcji"
 
-#: ../cli.py:452
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
@@ -168,229 +170,244 @@ msgstr ""
 "uruchomienia.\n"
 "UÅ¼yj \"-y\", aby wymusiÄ‡."
 
-#: ../cli.py:484
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr "Analizowanie argumentÃ³w instalacji pakietÃ³w"
 
-#: ../cli.py:494
+#: ../cli.py:501
 #, python-format
 msgid "No package %s available."
 msgstr "Pakiet %s jest niedostÄ™pny."
 
-#: ../cli.py:498 ../cli.py:616 ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Pakiety do zainstalowania"
 
-#: ../cli.py:499 ../cli.py:617 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr "Nie ma nic do zrobienia"
 
-#: ../cli.py:529 ../yum/__init__.py:2192 ../yum/__init__.py:2271
-#: ../yum/__init__.py:2283
+#: ../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 "PrzestarzaÅ‚y pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s"
 
-#: ../cli.py:561
+#: ../cli.py:568
 #, python-format
 msgid "Could not find update match for %s"
 msgstr "Nie moÅ¼na znaleÅºÄ‡ pasujÄ…cych aktualizacji dla %s"
 
-#: ../cli.py:573
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr "%d pakietÃ³w oznaczonych do aktualizacji"
 
-#: ../cli.py:576
+#: ../cli.py:583
 msgid "No Packages marked for Update"
 msgstr "Brak pakietÃ³w oznaczonych do aktualizacji"
 
-#: ../cli.py:592
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr "%d pakietÃ³w oznaczonych do usuniÄ™cia"
 
-#: ../cli.py:595
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr "Brak pakietÃ³w oznaczonych do usuniÄ™cia"
 
-#: ../cli.py:607
+#: ../cli.py:614
 msgid "No Packages Provided"
 msgstr "Nie podano pakietÃ³w"
 
-#: ../cli.py:647
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr "Dopasowywanie listy pakietÃ³w do argumentÃ³w uÅ¼ytkownika"
 
-#: ../cli.py:685
+#: ../cli.py:701
+#, fuzzy, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "Nie znaleziono pakietu %s"
+
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Brak wynikÃ³w"
 
-#: ../cli.py:722
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Nie znaleziono pakietÃ³w dla %s"
 
-#: ../cli.py:734
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "Czyszczenie wszystkiego"
 
-#: ../cli.py:748
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "Czyszczenie nagÅ‚Ã³wkÃ³w"
 
-#: ../cli.py:751
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "Czyszczenie pakietÃ³w"
 
-#: ../cli.py:754
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "Czytanie metadanych XML"
 
-#: ../cli.py:757
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "Czyszczenie pamiÄ™ci podrÄ™cznej bazy danych"
 
-#: ../cli.py:760
+#: ../cli.py:783
+#, fuzzy
+msgid "Cleaning up expire-cache metadata"
+msgstr "Czytanie metadanych XML"
+
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "Czyszczenie wtyczek"
 
-#: ../cli.py:782
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Zainstalowane grupy:"
 
-#: ../cli.py:789
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "DostÄ™pne grupy:"
 
-#: ../cli.py:795
+#: ../cli.py:820
 msgid "Done"
 msgstr "ZakoÅ„czono"
 
-#: ../cli.py:804 ../cli.py:816 ../cli.py:822
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "OstrzeÅ¼enie: grupa %s nie istnieje."
 
-#: ../cli.py:828
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
 msgstr ""
 "Brak pakietÃ³w dostÄ™pnych do instalacji lub aktualizacji w Å¼adnej z Å¼Ä…danych "
 "grup"
 
-#: ../cli.py:830
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d pakietÃ³w do instalacji"
 
-#: ../cli.py:840
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Grupa o nazwie %s nie istnieje"
 
-#: ../cli.py:846
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Brak pakietÃ³w do usuniÄ™cia z grup"
 
-#: ../cli.py:848
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d pakietÃ³w do usuniÄ™cia"
 
-#: ../cli.py:890
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "Pakiet %s jest juÅ¼ zainstalowany, pomijanie"
 
-#: ../cli.py:901
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr "Odrzucanie pakietÃ³w %s.%s, ktÃ³rych nie moÅ¼na porÃ³wnaÄ‡"
 
-#: ../cli.py:927
+#. 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 ""
 "Inne %s nie sÄ… zainstalowane, dodawanie do listy potencjalnie instalowanych"
 
-#: ../cli.py:946
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "BÅ‚Ä…d wiersza poleceÅ„: %s"
 
-#: ../cli.py:1073
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "toleruje bÅ‚Ä™dy"
 
-#: ../cli.py:1075
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr "uruchamia wyÅ‚Ä…cznie z pamiÄ™ci podrÄ™cznej i nie aktualizuje jej"
 
-#: ../cli.py:1077
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "poÅ‚oÅ¼enie pliku konfiguracji"
 
-#: ../cli.py:1079
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "maksymalny czas oczekiwania na polecenie"
 
-#: ../cli.py:1081
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "poziom wyjÅ›cia debugowania"
 
-#: ../cli.py:1084
+#: ../cli.py:1113
+msgid "show duplicates, in repos, in list/search commands"
+msgstr ""
+
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "poziom wyjÅ›cia bÅ‚Ä™dÃ³w"
 
-#: ../cli.py:1087
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "cicha praca"
 
-#: ../cli.py:1091
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "odpowiada tak na wszystkie pytania"
 
-#: ../cli.py:1093
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "wyÅ›wietla wersjÄ™ yuma i wyÅ‚Ä…cza"
 
-#: ../cli.py:1094
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "ustawia roota instalacji"
 
-#: ../cli.py:1098
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "wÅ‚Ä…cza jedno lub wiÄ™cej repozytoriÃ³w (wieloznaczniki sÄ… dozwolone)"
 
-#: ../cli.py:1102
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr "wyÅ‚Ä…cza jedno lub wiÄ™cej repozytoriÃ³w (wieloznaczniki sÄ… dozwolone)"
 
-#: ../cli.py:1105
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr "wyklucza pakiety po nazwie lub wyraÅ¼eniu regularnym"
 
-#: ../cli.py:1107
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
 msgstr "wyÅ‚Ä…cza wykluczanie z gÅ‚Ã³wnego, dla repozytorium lub wszystkiego"
 
-#: ../cli.py:1110
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr "wÅ‚Ä…cza przetwarzanie przestarzaÅ‚ych pakietÃ³w podczas aktualizacji"
 
-#: ../cli.py:1112
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "wyÅ‚Ä…cza wtyczki yuma"
 
-#: ../cli.py:1114
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "wyÅ‚Ä…cza sprawdzanie podpisu GPG"
 
-#: ../cli.py:1116
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "wyÅ‚Ä…cza wtyczki po nazwie"
 
-#: ../cli.py:1119
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "pomija pakiety majÄ…ce problemy z rozwiÄ…zaniem zaleÅ¼noÅ›ci"
 
@@ -446,69 +463,85 @@ msgstr "gru"
 msgid "Trying other mirror."
 msgstr "PrÃ³bowanie innego serwera lustrzanego."
 
-#: ../output.py:273
+#: ../output.py:293
 #, python-format
 msgid "Name       : %s"
 msgstr "Nazwa       : %s"
 
-#: ../output.py:274
+#: ../output.py:294
 #, python-format
 msgid "Arch       : %s"
 msgstr "Architektura: %s"
 
-#: ../output.py:276
+#: ../output.py:296
 #, python-format
 msgid "Epoch      : %s"
 msgstr "Epoch       : %s"
 
-#: ../output.py:277
+#: ../output.py:297
 #, python-format
 msgid "Version    : %s"
 msgstr "Wersja      : %s"
 
-#: ../output.py:278
+#: ../output.py:298
 #, python-format
 msgid "Release    : %s"
 msgstr "Wydanie     : %s"
 
-#: ../output.py:279
+#: ../output.py:299
 #, python-format
 msgid "Size       : %s"
 msgstr "Rozmiar     : %s"
 
-#: ../output.py:280
+#: ../output.py:300
 #, python-format
 msgid "Repo       : %s"
 msgstr "Repozytorium: %s"
 
-#: ../output.py:282
+#: ../output.py:302
 #, python-format
 msgid "Committer  : %s"
 msgstr "TwÃ³rca      : %s"
 
-#: ../output.py:283
+#: ../output.py:303
 msgid "Summary    : "
 msgstr "Podsumowanie: %s"
 
-#: ../output.py:285
+#: ../output.py:305
 #, python-format
 msgid "URL        : %s"
 msgstr "URL         : %s"
 
-#: ../output.py:286
+#: ../output.py:306
 #, python-format
 msgid "License    : %s"
 msgstr "Licencja    : %s"
 
-#: ../output.py:287
+#: ../output.py:307
 msgid "Description: "
 msgstr "Opis        : %s"
 
-#: ../output.py:331
+#: ../output.py:351
 msgid "Is this ok [y/N]: "
 msgstr "W porzÄ…dku? [y/N]: "
 
-#: ../output.py:345
+#: ../output.py:357 ../output.py:360
+msgid "y"
+msgstr ""
+
+#: ../output.py:357
+msgid "n"
+msgstr ""
+
+#: ../output.py:357 ../output.py:360
+msgid "yes"
+msgstr ""
+
+#: ../output.py:357
+msgid "no"
+msgstr ""
+
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -517,96 +550,96 @@ msgstr ""
 "\n"
 "Grupa: %s"
 
-#: ../output.py:347
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " Opis: %s"
 
-#: ../output.py:349
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr " Pakiety obowiÄ…zkowe:"
 
-#: ../output.py:354
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr " DomyÅ›lne pakiety:"
 
-#: ../output.py:359
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr " Pakiety opcjonalne:"
 
-#: ../output.py:364
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr " Pakiety warunkowe:"
 
-#: ../output.py:372
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "pakiet: %s"
 
-#: ../output.py:374
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr "  Brak zaleÅ¼noÅ›ci dla tego pakietu"
 
-#: ../output.py:379
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr "  zaleÅ¼noÅ›Ä‡: %s"
 
-#: ../output.py:381
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr "   NierozwiÄ…zana zaleÅ¼noÅ›Ä‡"
 
-#: ../output.py:436
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Wyniki z:"
 
-#: ../output.py:462
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr "WystÄ…piÅ‚ bÅ‚Ä…d podczas obliczania caÅ‚kowitego rozmiaru pobierania"
 
-#: ../output.py:467
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "CaÅ‚kowity rozmiar: %s"
 
-#: ../output.py:470
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "CaÅ‚kowity rozmiar pobierania: %s"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Package"
 msgstr "Pakiet"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Arch"
 msgstr "Architektura"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Version"
 msgstr "Wersja"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Repository"
 msgstr "Repozytorium"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Size"
 msgstr "Rozmiar"
 
-#: ../output.py:489
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Instalowanie zaleÅ¼noÅ›ci"
 
-#: ../output.py:490
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Aktualizowanie zaleÅ¼noÅ›ci"
 
-#: ../output.py:491
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Usuwanie zaleÅ¼noÅ›ci"
 
-#: ../output.py:503
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
@@ -615,7 +648,7 @@ msgstr ""
 "     zastÄ™puje  %s.%s %s\n"
 "\n"
 
-#: ../output.py:511
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -632,27 +665,27 @@ msgstr ""
 "Aktualizowanie %5.5s pakietÃ³w     \n"
 "Usuwanie       %5.5s pakietÃ³w     \n"
 
-#: ../output.py:529
+#: ../output.py:554
 msgid "Removed"
 msgstr "UsuniÄ™to"
 
-#: ../output.py:530
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "UsuniÄ™to zaleÅ¼noÅ›Ä‡"
 
-#: ../output.py:532
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "Zainstalowano zaleÅ¼noÅ›Ä‡"
 
-#: ../output.py:534
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "Zaktualizowano zaleÅ¼noÅ›Ä‡"
 
-#: ../output.py:535
+#: ../output.py:560
 msgid "Replaced"
 msgstr "ZastÄ…piono"
 
-#: ../output.py:593
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
@@ -663,63 +696,63 @@ msgstr ""
 " Obecne pobieranie zostaÅ‚o anulowane, %sprzerwane (ctrl-c) ponownie%s w %s%s%"
 "s sekund do zakoÅ„czenia.\n"
 
-#: ../output.py:603
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "przerwane przez uÅ¼ytkownika"
 
-#: ../output.py:614
+#: ../output.py:639
 msgid "installed"
 msgstr "zainstalowania"
 
-#: ../output.py:615
+#: ../output.py:640
 msgid "updated"
 msgstr "zaktualizowania"
 
-#: ../output.py:616
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "zastÄ…pienia"
 
-#: ../output.py:617
+#: ../output.py:642
 msgid "erased"
 msgstr "usuniÄ™cia"
 
-#: ../output.py:621
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> Pakiet %s.%s %s:%s-%s ustawiony do %s"
 
-#: ../output.py:628
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> Uruchamianie sprawdzania transakcji"
 
-#: ../output.py:633
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr "--> Ponowne uruchamianie rozwiÄ…zywania zaleÅ¼noÅ›ci z nowymi zmianami."
 
-#: ../output.py:638
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> ZakoÅ„czono rozwiÄ…zywanie zaleÅ¼noÅ›ci"
 
-#: ../output.py:643
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr "--> Przetwarzanie zaleÅ¼noÅ›ci: %s dla pakietu: %s"
 
-#: ../output.py:648
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> NierozwiÄ…zana zaleÅ¼noÅ›Ä‡: %s"
 
-#: ../output.py:654
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Przetwarzanie konfliktÃ³w: %s jest w konflikcie z %s"
 
-#: ../output.py:657
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr "--> UkÅ‚adanie zestawu transakcji z wybranymi pakietami. ProszÄ™ czekaÄ‡."
 
-#: ../output.py:661
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr "---> Pobieranie nagÅ‚Ã³wka dla %s do umieszczenia w zestawie transakcji."
@@ -1064,6 +1097,7 @@ msgstr "BÅ‚Ä…d: %s"
 msgid "Unknown Error(s): Exit Code: %d:"
 msgstr "Nieznane bÅ‚Ä™dy: kod wyjÅ›cia: %d:"
 
+#. Depsolve stage
 #: ../yummain.py:149
 msgid "Resolving Dependencies"
 msgstr "RozwiÄ…zywanie zaleÅ¼noÅ›ci"
@@ -1076,11 +1110,11 @@ msgstr ""
 "\n"
 "RozwiÄ…zano zaleÅ¼noÅ›ci"
 
-#: ../yummain.py:199
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr "ZakoÅ„czono!"
 
-#: ../yummain.py:246
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
@@ -1090,290 +1124,322 @@ msgstr ""
 "\n"
 "Zamykanie na polecenie uÅ¼ytkownika."
 
-#: ../yum/depsolve.py:70
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr "doTsSetup() zostanie usuniÄ™te w przyszÅ‚ych wersjach yuma.\n"
 
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
 msgstr "Ustawianie zestawÃ³w transakcji przed wÅ‚Ä…czeniem klasy konfiguracji"
 
-#: ../yum/depsolve.py:123
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr "NieprawidÅ‚owa flaga zestawu transakcji tsflag w pliku konfiguracji: %s"
 
-#: ../yum/depsolve.py:134
+#: ../yum/depsolve.py:147
 #, python-format
 msgid "Searching pkgSack for dep: %s"
 msgstr "Wyszukiwanie zestawu pakietÃ³w dla zaleÅ¼noÅ›ci: %s"
 
-#: ../yum/depsolve.py:163
+#: ../yum/depsolve.py:170
 #, python-format
 msgid "Potential match for %s from %s"
 msgstr "Potencjalny wynik dla %s z %s"
 
-#: ../yum/depsolve.py:171
+#: ../yum/depsolve.py:178
 #, python-format
 msgid "Matched %s to require for %s"
 msgstr "%s pasuje jako wymaganie dla %s"
 
-#: ../yum/depsolve.py:212
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "CzÅ‚onek: %s"
 
-#: ../yum/depsolve.py:226 ../yum/depsolve.py:788
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s przekonwertowano do zainstalowania"
 
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "Dodawanie pakietu %s w trybie %s"
 
-#: ../yum/depsolve.py:243
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Usuwanie pakietu %s"
 
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s wymaga: %s"
 
-#: ../yum/depsolve.py:300
+#: ../yum/depsolve.py:312
 msgid "Needed Require has already been looked up, cheating"
 msgstr "Wymagana zaleÅ¼noÅ›Ä‡ zostaÅ‚a juÅ¼ znaleziona, oszukiwanie"
 
-#: ../yum/depsolve.py:310
+#: ../yum/depsolve.py:322
 #, python-format
 msgid "Needed Require is not a package name. Looking up: %s"
 msgstr "Wymagana zaleÅ¼noÅ›Ä‡ nie jest nazwÄ… pakietu. Wyszukiwanie: %s"
 
-#: ../yum/depsolve.py:317
+#: ../yum/depsolve.py:329
 #, python-format
 msgid "Potential Provider: %s"
 msgstr "Potencjalny dostawca: %s"
 
-#: ../yum/depsolve.py:340
+#: ../yum/depsolve.py:352
 #, python-format
 msgid "Mode is %s for provider of %s: %s"
 msgstr "Tryb to %s dla dostawcy %s: %s"
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:356
 #, python-format
 msgid "Mode for pkg providing %s: %s"
 msgstr "Tryb dla pakietu dostarczajÄ…cego %s: %s"
 
-#: ../yum/depsolve.py:348
+#: ../yum/depsolve.py:360
 #, python-format
 msgid "TSINFO: %s package requiring %s marked as erase"
 msgstr "TSINFO: pakiet %s wymagajÄ…cy %s zostaÅ‚ oznaczony jako do usuniÄ™cia"
 
-#: ../yum/depsolve.py:361
-#, python-format
-msgid "Looking for Obsoletes for %s"
-msgstr "Wyszukiwanie przestarzaÅ‚ych dla %s"
-
-#: ../yum/depsolve.py:373
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr ""
 "TSINFO: zastÄ™powanie przestarzaÅ‚ego pakietu %s pakietem %s, aby rozwiÄ…zaÄ‡ "
 "zaleÅ¼noÅ›Ä‡."
 
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr "TSINFO: aktualizowanie %s, aby rozwiÄ…zaÄ‡ zaleÅ¼noÅ›Ä‡."
 
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:378
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr "Nie moÅ¼na znaleÅºÄ‡ Å›cieÅ¼ki aktualizacji dla zaleÅ¼noÅ›ci dla: %s"
 
-#: ../yum/depsolve.py:420
+#: ../yum/depsolve.py:388
 #, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr "Nie moÅ¼na rozwiÄ…zaÄ‡ wymagania %s dla %s"
 
-#: ../yum/depsolve.py:466
+#. is it already installed?
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr ""
 "%s jest w dostarczajÄ…cych pakietach, ale jest juÅ¼ zainstalowany, usuwanie."
 
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr ""
 "Pakiet %s potencjalnie rozwiÄ…zujÄ…cy ma nowszÄ… wersjÄ™ w zestawie transakcji."
 
-#: ../yum/depsolve.py:492
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr "Pakiet %s potencjalnie rozwiÄ…zujÄ…cy ma zainstalowanÄ… nowszÄ… wersjÄ™."
 
-#: ../yum/depsolve.py:500 ../yum/depsolve.py:568
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr "BrakujÄ…ca zaleÅ¼noÅ›Ä‡: %s jest wymagane przez pakiet %s"
 
-#: ../yum/depsolve.py:513
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr "%s jest juÅ¼ w zestawie transakcji, pomijanie"
 
-#: ../yum/depsolve.py:578
+#: ../yum/depsolve.py: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: oznaczanie %s jako aktualizacji dla %s"
 
-#: ../yum/depsolve.py:585
+#: ../yum/depsolve.py:544
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr "TSINFO: oznaczanie %s jako do zainstalowania dla %s"
 
-#: ../yum/depsolve.py:647 ../yum/depsolve.py:654
-#, python-format
-msgid "unable to find newer package for %s"
-msgstr "nie moÅ¼na znaleÅºÄ‡ nowszego pakietu dla %s"
-
-#: ../yum/depsolve.py:661
-#, python-format
-msgid "TSINFO: Updating %s to resolve conflict."
-msgstr "TSINFO: aktualizowanie %s, aby rozwiÄ…zaÄ‡ konflikt."
-
-#: ../yum/depsolve.py:671
-#, python-format
-msgid "%s conflicts: %s"
-msgstr "%s jest w konflikcie z: %s"
-
-#: ../yum/depsolve.py:681
-#, python-format
-msgid "%s conflicts with %s"
-msgstr "%s jest w konflikcie z %s"
-
-#: ../yum/depsolve.py:720 ../yum/depsolve.py:806
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Powodzenie - pusta transakcja"
 
-#: ../yum/depsolve.py:765 ../yum/depsolve.py:778
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Ponowne uruchamianie pÄ™tli"
 
-#: ../yum/depsolve.py:794
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "KoÅ„czenie procesu zaleÅ¼noÅ›ci"
 
-#: ../yum/depsolve.py:800
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr "%s z %s ma problemy z rozwiÄ…zywaniem zaleÅ¼noÅ›ci"
 
-#: ../yum/depsolve.py:807
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "Powodzenie - rozwiÄ…zano zaleÅ¼noÅ›ci"
 
-#: ../yum/depsolve.py:824
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "Sprawdzanie zaleÅ¼noÅ›ci dla %s"
 
-#: ../yum/depsolve.py:880
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr "wyszukiwanie %s jako wymagania %s"
 
+#: ../yum/depsolve.py:933
+#, python-format
+msgid "Comparing best: %s to po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, python-format
+msgid "best %s obsoletes po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:955
+#, python-format
+msgid "po %s obsoletes best: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#, fuzzy, python-format
+msgid "better arch in po %s"
+msgstr "wyszukiwanie pakietu %s"
+
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#, python-format
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#, python-format
+msgid "best %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#, python-format
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#, python-format
+msgid "po %s has a shorter name than best %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
+
 #: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr "doConfigSetup() zostanie usuniÄ™te w przyszÅ‚ych wersjach yuma.\n"
 
-#: ../yum/__init__.py:311
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr "Repozytorium %r nie posiada nazwy w konfiguracji, uÅ¼ywanie ID"
 
-#: ../yum/__init__.py:347
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr "wtyczki zostaÅ‚y juÅ¼ zainicjowane"
 
-#: ../yum/__init__.py:354
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr "doRpmDBSetup() zostanie usuniÄ™te w przyszÅ‚ych wersjach yuma.\n"
 
-#: ../yum/__init__.py:363
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr "Odczytywanie lokalnej bazy danych RPM"
 
-#: ../yum/__init__.py:381
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr "doRepoSetup() zostanie usuniÄ™te w przyszÅ‚ych wersjach yuma.\n"
 
-#: ../yum/__init__.py:399
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr "doSackSetup() zostanie usuniÄ™te w przyszÅ‚ych wersjach yuma.\n"
 
-#: ../yum/__init__.py:416
+#: ../yum/__init__.py:404
 msgid "Setting up Package Sacks"
 msgstr "Ustawianie zestawÃ³w pakietÃ³w"
 
-#: ../yum/__init__.py:458
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr "obiekt repozytorium %s nie posiada metody _resetSack\n"
 
-#: ../yum/__init__.py:459
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr "wiÄ™c to repozytorium nie moÅ¼e zostaÄ‡ przywrÃ³cone.\n"
 
-#: ../yum/__init__.py:464
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr "doUpdateSetup() zostanie usuniÄ™te w przyszÅ‚ych wersjach yuma.\n"
 
-#: ../yum/__init__.py:476
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr "Budowanie obiektu aktualizacji"
 
-#: ../yum/__init__.py:499
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr "doGroupSetup() zostanie usuniÄ™te w przyszÅ‚ych wersjach yuma.\n"
 
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Pobieranie metadanych grup"
 
-#: ../yum/__init__.py:548
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr "Dodawanie pliku grup z repozytorium: %s"
 
-#: ../yum/__init__.py:557
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr "Dodanie pliku grup dla repozytorium nie powiodÅ‚o siÄ™: %s - %s"
 
-#: ../yum/__init__.py:563
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Brak dostÄ™pnych grup we wszystkich repozytoriach"
 
-#: ../yum/__init__.py:614
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Importowanie dodatkowych informacji o liÅ›cie plikÃ³w"
 
-#: ../yum/__init__.py:646
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Pierwsza runda pomijania uszkodzonych %i"
 
-#: ../yum/__init__.py:674
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr "Pomijanie uszkodzonych zajÄ™Å‚o %i rund "
 
-#: ../yum/__init__.py:675
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
@@ -1381,93 +1447,95 @@ msgstr ""
 "\n"
 "Pakiety pominiÄ™to z powodu problemÃ³w z zaleÅ¼noÅ›ciami:"
 
-#: ../yum/__init__.py:679
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s z %s"
 
-#: ../yum/__init__.py:767
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "UsuniÄ™cie pliku transakcji %s nie powiodÅ‚o siÄ™"
 
-#: ../yum/__init__.py:807
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "wykluczanie z kosztÃ³w: %s z %s"
 
-#: ../yum/__init__.py:838
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Wykluczanie pakietÃ³w na globalnej liÅ›cie wykluczonych pakietÃ³w"
 
-#: ../yum/__init__.py:840
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Wykluczanie pakietÃ³w z %s"
 
-#: ../yum/__init__.py:867
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Zmniejszanie %s tylko do doÅ‚Ä…czonych pakietÃ³w"
 
-#: ../yum/__init__.py:872
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Utrzymywanie doÅ‚Ä…czonego pakietu %s"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Usuwanie niepasujÄ…cego pakietu %s"
 
-#: ../yum/__init__.py:881
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "ZakoÅ„czono"
 
-#: ../yum/__init__.py:911
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "Nie moÅ¼na sprawdziÄ‡, czy PID %s jest aktywny"
 
-#: ../yum/__init__.py:915
+#. Another copy seems to be running.
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr "Istnieje blokada %s: inna kopia jest uruchomiona jako PID %s."
 
-#: ../yum/__init__.py:962 ../yum/__init__.py:969
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "Pakiet nie zgadza siÄ™ z zamierzonym pobieraniem"
 
-#: ../yum/__init__.py:983
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "Nie moÅ¼na wykonaÄ‡ sprawdzenia sum kontrolnych"
 
-#: ../yum/__init__.py:986
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "Sumy kontrolne pakietu nie zgadzajÄ… siÄ™"
 
-#: ../yum/__init__.py:1028
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr ""
 "sprawdzenie sum kontrolnych pakietu nie powiodÅ‚o siÄ™, ale zapisywanie w "
 "pamiÄ™ci podrÄ™cznej dla %s jest wÅ‚Ä…czone"
 
-#: ../yum/__init__.py:1034
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "uÅ¼ywanie lokalnej kopii %s"
 
-#: ../yum/__init__.py:1053
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr "NiewystarczajÄ…ca iloÅ›Ä‡ miejsca w folderze pobierania %s, aby pobraÄ‡"
 
-#: ../yum/__init__.py:1086
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "NagÅ‚Ã³wek nie jest kompletny."
 
-#: ../yum/__init__.py:1126
+#: ../yum/__init__.py:1134
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1475,62 +1543,62 @@ msgstr ""
 "NagÅ‚Ã³wek nie jest w lokalnej pamiÄ™ci podrÄ™cznej, a tryb uÅ¼ywania tylko "
 "pamiÄ™ci podrÄ™cznej jest wÅ‚Ä…czony. Nie moÅ¼na pobraÄ‡ %s"
 
-#: ../yum/__init__.py:1181
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr "Klucz publiczny dla %s nie jest zainstalowany"
 
-#: ../yum/__init__.py:1185
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Podczas otwierania pakietu %s wystÄ…piÅ‚ problem"
 
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr "Klucz publiczny dla %s nie jest zaufany"
 
-#: ../yum/__init__.py:1197
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "Pakiet %s nie jest podpisany"
 
-#: ../yum/__init__.py:1235
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "Nie moÅ¼na usunÄ…Ä‡ %s"
 
-#: ../yum/__init__.py:1239
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "UsuniÄ™to %s"
 
-#: ../yum/__init__.py:1271
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "Nie moÅ¼na usunÄ…Ä‡ %s pliku %s"
 
-#: ../yum/__init__.py:1275
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "UsuniÄ™to %s plik %s"
 
-#: ../yum/__init__.py:1277
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "UsuniÄ™to %d %s plikÃ³w"
 
-#: ../yum/__init__.py:1317
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr "WiÄ™cej niÅ¼ jeden identyczny wynik znajduje siÄ™ w zestawie dla %s"
 
-#: ../yum/__init__.py:1323
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr "Nic nie pasuje do %s.%s %s:%s-%s z aktualizacji"
 
-#: ../yum/__init__.py:1513
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
@@ -1538,129 +1606,138 @@ msgstr ""
 "searchPackages()  zostanie usuniÄ™te w przyszÅ‚ych wersjach "
 "yuma.                      Zamiast tego uÅ¼yj searchGenerator(). \n"
 
-#: ../yum/__init__.py:1550
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "Wyszukiwanie %d pakietÃ³w"
 
-#: ../yum/__init__.py:1554
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "wyszukiwanie pakietu %s"
 
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "wyszukiwanie we wpisach plikÃ³w"
 
-#: ../yum/__init__.py:1569
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "wyszukiwanie we wpisach dostarczania"
 
-#: ../yum/__init__.py:1599
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Wyniki dostarczania: %s"
 
-#: ../yum/__init__.py:1668 ../yum/__init__.py:1686 ../yum/__init__.py:1714
-#: ../yum/__init__.py:1719 ../yum/__init__.py:1774 ../yum/__init__.py:1778
+#: ../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 "Grupa o nazwie %s nie istnieje"
 
-#: ../yum/__init__.py:1697 ../yum/__init__.py:1790
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr "pakiet %s nie zostaÅ‚ oznaczony w grupie %s"
 
-#: ../yum/__init__.py:1736
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr "Dodawanie pakietu %s z grupy %s"
 
-#: ../yum/__init__.py:1740
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr "Brak dostÄ™pnego pakietu o nazwie %s do zainstalowania"
 
-#: ../yum/__init__.py:1815
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr "Nie moÅ¼na znaleÅºÄ‡ krotki pakietu %s w zestawie pakietÃ³w"
 
-#: ../yum/__init__.py:1883 ../yum/__init__.py:1926
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr "NieprawidÅ‚owy Å‚aÅ„cuch tekstowy wersji, sprÃ³buj go zacytowaÄ‡."
 
-#: ../yum/__init__.py:1885 ../yum/__init__.py:1928
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "NieprawidÅ‚owa flaga wersji"
 
-#: ../yum/__init__.py:1900 ../yum/__init__.py:1904
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "Nie znaleziono pakietu %s"
 
-#: ../yum/__init__.py:2034
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr "Obiekt pakietu nie byÅ‚ instancjÄ… obiektu pakietu"
 
-#: ../yum/__init__.py:2038
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr "Nie podano nic do zainstalowania"
 
-#: ../yum/__init__.py:2051
+#. only one in there
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr "Sprawdzanie wirtualnych zaleÅ¼noÅ›ci lub plikÃ³w dla %s"
 
-#: ../yum/__init__.py:2057 ../yum/__init__.py:2323
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr "Brak wynikÃ³w dla argumentu: %s"
 
-#: ../yum/__init__.py:2114
+#. 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 "Brak pakietÃ³w dostÄ™pnych do instalacji"
 
-#: ../yum/__init__.py:2126
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr "Pakiet: %s  - jest juÅ¼ w zestawie transakcji"
 
-#: ../yum/__init__.py:2139
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr "Pakiet %s jest juÅ¼ zainstalowany w najnowszej wersji"
 
-#: ../yum/__init__.py:2180
+#: ../yum/__init__.py:2178
+#, fuzzy, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr "Pakiet %s jest juÅ¼ zainstalowany, pomijanie"
+
+#. update everything (the easy case)
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Aktualizowanie wszystkiego"
 
-#: ../yum/__init__.py:2264
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr "Pakiet zostaÅ‚ juÅ¼ zastÄ…piony: %s.%s %s:%s-%s"
 
-#: ../yum/__init__.py:2320
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../yum/__init__.py:2335
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Brak pasujÄ…cych pakietÃ³w do usuniÄ™cia"
 
-#: ../yum/__init__.py:2369
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "Nie moÅ¼na otworzyÄ‡ pliku: %s. Pomijanie."
 
-#: ../yum/__init__.py:2372
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Sprawdzanie %s: %s"
 
-#: ../yum/__init__.py:2379
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
@@ -1669,75 +1746,81 @@ msgstr ""
 "Pakiet %s nie jest zainstalowany, nie moÅ¼na go zaktualizowaÄ‡. Uruchom yum "
 "install, aby do zainstalowaÄ‡."
 
-#: ../yum/__init__.py:2411
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Wykluczanie %s"
 
-#: ../yum/__init__.py:2416
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Oznaczanie %s do zainstalowania"
 
-#: ../yum/__init__.py:2422
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr "Oznaczanie %s jako aktualizacji %s"
 
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr "%s: nie aktualizuj zainstalowanego pakietu."
 
-#: ../yum/__init__.py:2447
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr ""
 "Podczas ponownego instalowania wystÄ…piÅ‚ problem: brak pasujÄ…cych pakietÃ³w do "
 "usuniÄ™cia"
 
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2515
+#, fuzzy, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr "Pakiet %s jest juÅ¼ zainstalowany, pomijanie"
+
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr ""
 "Podczas ponownego instalowania wystÄ…piÅ‚ problem: brak pasujÄ…cych pakietÃ³w do "
 "zainstalowania"
 
-#: ../yum/__init__.py:2514
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr "Pobieranie klucza GPG z %s"
 
-#: ../yum/__init__.py:2520
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "Pobranie klucza GPG nie powiodÅ‚o siÄ™: "
 
-#: ../yum/__init__.py:2533
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "Przeanalizowanie klucza GPG nie powiodÅ‚o siÄ™: "
 
-#: ../yum/__init__.py:2537
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr "Klucz GPG %s (0x%s) jest juÅ¼ zainstalowany"
 
-#: ../yum/__init__.py:2542
+#. Try installing/updating GPG key
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr "Importowanie klucza GPG 0x%s \"%s\" z %s"
 
-#: ../yum/__init__.py:2554
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "Klucz nie zostanie zainstalowany"
 
-#: ../yum/__init__.py:2560
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "Zaimportowanie klucza nie powiodÅ‚o siÄ™ (kod %d)"
 
-#: ../yum/__init__.py:2563
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "Klucz zostaÅ‚ pomyÅ›lnie zaimportowany"
 
-#: ../yum/__init__.py:2568
+#: ../yum/__init__.py:2624
 #, python-format
 msgid ""
 "The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1749,62 +1832,53 @@ msgstr ""
 "SprawdÅº, czy dla tego repozytorium skonfigurowane sÄ… poprawne adresy do "
 "kluczy."
 
-#: ../yum/__init__.py:2577
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr "Zaimportowanie kluczy nie pomogÅ‚o, bÅ‚Ä™dne klucze?"
 
-#: ../yum/__init__.py:2651
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "Nie moÅ¼na znaleÅºÄ‡ odpowiedniego serwera lustrzanego."
 
-#: ../yum/__init__.py:2653
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr "Podczas pobierania pakietÃ³w wystÄ…piÅ‚y bÅ‚Ä™dy."
 
-#: ../yum/__init__.py:2717
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "BÅ‚Ä™dy testu transakcji: "
 
-#: ../yum/__init__.py:2752
-#, python-format
-msgid "Package %s needs %s, this is not available."
-msgstr "Pakiet %s wymaga %s, ktÃ³ry nie jest dostÄ™pny."
-
-#: ../yum/__init__.py:2757
-#, python-format
-msgid "Package %s conflicts with %s."
-msgstr "Pakiet %s jest w konflikcie z %s."
-
-#: ../yum/plugins.py:168
-#, python-format
-msgid "Running \"%s\" handler for \"%s\" plugin"
-msgstr "Uruchamianie obsÅ‚ugi \"%s\" dla wtyczki \"%s\""
-
-#: ../yum/plugins.py:193
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "Wczytane wtyczki: "
 
-#: ../yum/plugins.py:210
+#: ../yum/plugins.py:206
+#, fuzzy, python-format
+msgid "No plugin match for: %s"
+msgstr "Brak wynikÃ³w dla argumentu: %s"
+
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "Wtyczka \"%s\" jest wyÅ‚Ä…czona"
 
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr "Wtyczka \"%s\" nie okreÅ›la wymaganej wersji API"
 
-#: ../yum/plugins.py:226
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr "Wtyczka \"%s\" wymaga API %s. ObsÅ‚ugiwane API to %s."
 
-#: ../yum/plugins.py:253
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Wczytywanie wtyczki \"%s\""
 
-#: ../yum/plugins.py:260
+#: ../yum/plugins.py:271
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
@@ -1812,17 +1886,19 @@ msgstr ""
 "IstniejÄ… dwie lub wiÄ™cej wtyczek o nazwie \"%s\" w Å›cieÅ¼ce wyszukiwania "
 "wtyczek"
 
-#: ../yum/plugins.py:280
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr "Nie znaleziono pliku konfiguracji %s"
 
-#: ../yum/plugins.py:283
+#. for
+#. Configuration files for the plugin not found
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr "Nie moÅ¼na naleÅºÄ‡ pliku konfiguracji dla wtyczki %s"
 
-#: ../yum/plugins.py:437
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "rejestracja poleceÅ„ nie jest obsÅ‚ugiwana"
 
@@ -1855,3 +1931,27 @@ msgstr "Uszkodzony nagÅ‚Ã³wek %s"
 #, python-format
 msgid "Error opening rpm %s - error %s"
 msgstr "BÅ‚Ä…d podczas otwierania RPM-a %s - bÅ‚Ä…d %s"
+
+#~ msgid "Looking for Obsoletes for %s"
+#~ msgstr "Wyszukiwanie przestarzaÅ‚ych dla %s"
+
+#~ msgid "unable to find newer package for %s"
+#~ msgstr "nie moÅ¼na znaleÅºÄ‡ nowszego pakietu dla %s"
+
+#~ msgid "TSINFO: Updating %s to resolve conflict."
+#~ msgstr "TSINFO: aktualizowanie %s, aby rozwiÄ…zaÄ‡ konflikt."
+
+#~ msgid "%s conflicts: %s"
+#~ msgstr "%s jest w konflikcie z: %s"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s jest w konflikcie z %s"
+
+#~ msgid "Package %s needs %s, this is not available."
+#~ msgstr "Pakiet %s wymaga %s, ktÃ³ry nie jest dostÄ™pny."
+
+#~ msgid "Package %s conflicts with %s."
+#~ msgstr "Pakiet %s jest w konflikcie z %s."
+
+#~ msgid "Running \"%s\" handler for \"%s\" plugin"
+#~ msgstr "Uruchamianie obsÅ‚ugi \"%s\" dla wtyczki \"%s\""
diff --git a/po/pt.po b/po/pt.po
index 7b5c88e..1780c50 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,6 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: yum\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2006-05-25 02:05+0100\n"
 "Last-Translator: JosÃ© Nuno Coelho Pires <jncp at netcabo.pt>\n"
 "Language-Team: pt <kde-i18n-pt at kde.org>\n"
@@ -14,1026 +16,2421 @@ msgstr ""
 "X-POFile-SpellExtra: arch SRPM installroot info md iupi name grubby SO\n"
 "X-POFile-SpellExtra: clean gzip retrygrab fich sum\n"
 
-#: ../yummain.py:277
-#, c-format
-msgid "Dependencies resolved"
-msgstr "DependÃªncias resolvidas"
+#: ../callback.py:48 ../output.py:512
+msgid "Updating"
+msgstr ""
 
-#: ../pullheaders.py:86
-#, c-format
-msgid "Directory of rpms must exist"
-msgstr "A pasta de RPMs deverÃ¡ existir"
+#: ../callback.py:49
+msgid "Erasing"
+msgstr ""
 
-#: ../config.py:44
-#, c-format
-msgid "Error accessing URL: %s"
-msgstr "Erro ao aceder ao URL: %s"
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
+#, fuzzy
+msgid "Installing"
+msgstr "Instalado: "
 
-#: ../urlgrabber.py:313 ../urlgrabber.py:346
-#, c-format
-msgid "OSError: %s"
-msgstr "Erro SO: %s"
+#: ../callback.py:52 ../callback.py:58
+msgid "Obsoleted"
+msgstr ""
 
-#: ../clientStuff.py:919
-#, c-format
-msgid "No Packages installed not included in a repository"
-msgstr "NÃ£o foram instalados pacotes nÃ£o incluÃdos num repositÃ³rio"
+#: ../callback.py:54 ../output.py:558
+#, fuzzy
+msgid "Updated"
+msgstr "Actualizado: "
 
-#: ../pullheaders.py:293
-#, c-format
-msgid ""
-"\n"
-"   Total: %d\n"
-"   Used: %d\n"
-"   Src: %d"
+#: ../callback.py:55
+#, fuzzy
+msgid "Erased"
+msgstr "Removido: "
+
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
+#, fuzzy
+msgid "Installed"
+msgstr "Instalado: "
+
+#: ../callback.py:130
+msgid "No header - huh?"
+msgstr "Sem cabeÃ§alho - hÃ£?"
+
+#: ../callback.py:168
+#, fuzzy
+msgid "Repackage"
+msgstr "A limpar os pacotes"
+
+#: ../callback.py:189
+#, python-format
+msgid "Error: invalid output state: %s for %s"
 msgstr ""
-"\n"
-"   Total: %d\n"
-"   Usado: %d\n"
-"   Origem: %d"
 
-#: ../serverStuff.py:82
-#, c-format
-msgid "ignoring srpm: %s"
-msgstr "a ignorar o SRPM: %s"
+#: ../callback.py:212
+#, fuzzy, python-format
+msgid "Erased: %s"
+msgstr "Removido: "
 
-#: ../lilocfg.py:49
-#, c-format
-msgid ""
-"Error restoring the backup of lilo.conf  The backup was:\n"
-msgstr "Erro ao repor a cÃ³pia de seguranÃ§a do lilo.conf. A cÃ³pia de seguranÃ§a era:\n"
+#: ../callback.py:217 ../output.py:513
+msgid "Removing"
+msgstr ""
 
-#: ../clientStuff.py:842 ../clientStuff.py:854
-#, c-format
-msgid "Looking in available packages for a providing package"
-msgstr "A procurar nos pacotes disponÃveis por um pacote conveniente"
+#: ../callback.py:219
+msgid "Cleanup"
+msgstr ""
 
-#: ../yummain.py:315
-#, c-format
-msgid "Errors installing:"
-msgstr "Erros na instalaÃ§Ã£o:"
+#: ../cli.py:103
+#, python-format
+msgid "Command \"%s\" already defined"
+msgstr ""
+
+#: ../cli.py:115
+#, fuzzy
+msgid "Setting up repositories"
+msgstr "a obter os grupos do servidor: %s"
+
+#: ../cli.py:126
+msgid "Reading repository metadata in from local files"
+msgstr ""
+
+#: ../cli.py:183 ../utils.py:72
+#, fuzzy, python-format
+msgid "Config Error: %s"
+msgstr "Erro nas OpÃ§Ãµes: %s"
+
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
+#, python-format
+msgid "Options Error: %s"
+msgstr "Erro nas OpÃ§Ãµes: %s"
+
+#: ../cli.py:229
+#, fuzzy
+msgid "You need to give some command"
+msgstr "TerÃ¡ de ser 'root' para executar estes comandos"
+
+#: ../cli.py:271
+msgid "Disk Requirements:\n"
+msgstr ""
 
-#: ../clientStuff.py:1140
-#, c-format
+#: ../cli.py:273
+#, python-format
+msgid "  At least %dMB needed on the %s filesystem.\n"
+msgstr ""
+
+#. TODO: simplify the dependency errors?
+#. Fixup the summary
+#: ../cli.py:278
 msgid ""
-"retrygrab() failed for:\n"
-"  %s%s\n"
-"  Executing failover method"
-msgstr ""
-"O retrygrab() falhou para o:\n"
-"  %s%s\n"
-"  A executar o mÃ©todo de contingÃªncia"
-
-#: ../clientStuff.py:498
-#, c-format
-msgid "I will install/upgrade these to satisfy the dependencies:"
-msgstr "SerÃ¡ instalado/actualizado o seguinte para satisfazer as dependÃªncias:"
-
-#: ../pullheaders.py:232
-#, c-format
-msgid "Cannot delete %s - check perms"
-msgstr "NÃ£o Ã© possÃvel remover o %s - verifique as permissÃµes"
-
-#: ../clientStuff.py:881
-#, c-format
-msgid "Need to pass a list of pkgs to erase"
-msgstr "Tem de passar uma lista de pacotes a remover"
+"Error Summary\n"
+"-------------\n"
+msgstr ""
+
+#: ../cli.py:317
+msgid "Trying to run the transaction but nothing to do. Exiting."
+msgstr ""
+
+#: ../cli.py:347
+#, fuzzy
+msgid "Exiting on user Command"
+msgstr "A sair por ordem do utilizador."
+
+#: ../cli.py:351
+#, fuzzy
+msgid "Downloading Packages:"
+msgstr "A limpar os pacotes"
+
+#: ../cli.py:356
+#, fuzzy
+msgid "Error Downloading Packages:\n"
+msgstr "Erro: O Pacote %s nÃ£o EstÃ¡ Assinado"
 
-#: ../clientStuff.py:839
-#, c-format
-msgid "Need a provides to match"
-msgstr "Ã‰ necessÃ¡ria uma oferta correspondente"
+#: ../cli.py:370 ../yum/__init__.py:2746
+msgid "Running rpm_check_debug"
+msgstr ""
 
-#: ../lilocfg.py:67
-#, c-format
+#: ../cli.py:373 ../yum/__init__.py:2749
+msgid "ERROR with rpm_check_debug vs depsolve:"
+msgstr ""
+
+#: ../cli.py:377 ../yum/__init__.py:2751
+msgid "Please report this error in bugzilla"
+msgstr ""
+
+#: ../cli.py:383
+#, fuzzy
+msgid "Running Transaction Test"
+msgstr "A executar a transacÃ§Ã£o de teste:"
+
+#: ../cli.py:399
+msgid "Finished Transaction Test"
+msgstr ""
+
+#: ../cli.py:401
+msgid "Transaction Check Error:\n"
+msgstr ""
+
+#: ../cli.py:408
+#, fuzzy
+msgid "Transaction Test Succeeded"
+msgstr "A transacÃ§Ã£o de testes teve sucesso!"
+
+#: ../cli.py:429
+#, fuzzy
+msgid "Running Transaction"
+msgstr "A executar a transacÃ§Ã£o de teste:"
+
+#: ../cli.py:459
 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"
-msgstr "As opÃ§Ãµes do 'lilo' nÃ£o suportadas pelo YUM sÃ£o usadas no 'lilo.conf' predefinido. Este ficheiro nÃ£o serÃ¡ modificado. As opÃ§Ãµes incluem:\n"
+"Refusing to automatically import keys when running unattended.\n"
+"Use \"-y\" to override."
+msgstr ""
+
+#: ../cli.py:491
+#, fuzzy
+msgid "Parsing package install arguments"
+msgstr "Erro ao processar os argumentos da linha de comandos: %s"
+
+#: ../cli.py:501
+#, fuzzy, python-format
+msgid "No package %s available."
+msgstr "NÃ£o EstÃ£o DisponÃveis Pacotes para Listar"
+
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
+#, fuzzy
+msgid "Package(s) to install"
+msgstr "NÃ£o EstÃ£o DisponÃveis Pacotes para Listar"
+
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
+msgid "Nothing to do"
+msgstr ""
+
+#: ../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 ""
+
+#: ../cli.py:568
+#, fuzzy, python-format
+msgid "Could not find update match for %s"
+msgstr "NÃ£o foi detectado um pacote correspondente ao %s"
+
+#: ../cli.py:580
+#, fuzzy, python-format
+msgid "%d packages marked for Update"
+msgstr "NÃ£o HÃ¡ Pacotes DisponÃveis para Actualizar"
+
+#: ../cli.py:583
+#, fuzzy
+msgid "No Packages marked for Update"
+msgstr "NÃ£o HÃ¡ Pacotes DisponÃveis para Actualizar"
+
+#: ../cli.py:599
+#, python-format
+msgid "%d packages marked for removal"
+msgstr ""
+
+#: ../cli.py:602
+#, fuzzy
+msgid "No Packages marked for removal"
+msgstr "NÃ£o HÃ¡ Pacotes DisponÃveis para Actualizar"
+
+#: ../cli.py:614
+#, fuzzy
+msgid "No Packages Provided"
+msgstr "NÃ£o foram encontrados pacotes"
+
+#: ../cli.py:654
+msgid "Matching packages for package list to user args"
+msgstr ""
+
+#: ../cli.py:701
+#, fuzzy, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "Remover: Nada corresponde ao %s"
+
+#: ../cli.py:704
+#, fuzzy
+msgid "No Matches found"
+msgstr "NÃ£o foram encontrados pacotes"
+
+#: ../cli.py:745
+#, fuzzy, python-format
+msgid "No Package Found for %s"
+msgstr "NÃ£o Existe o Pacote %s"
 
-#: ../clientStuff.py:520 ../clientStuff.py:559
-#, c-format
-msgid "Installed: "
+#: ../cli.py:757
+msgid "Cleaning up Everything"
+msgstr ""
+
+#: ../cli.py:771
+#, fuzzy
+msgid "Cleaning up Headers"
+msgstr "A limpar os cabeÃ§alhos antigos"
+
+#: ../cli.py:774
+#, fuzzy
+msgid "Cleaning up Packages"
+msgstr "A limpar os pacotes"
+
+#: ../cli.py:777
+#, fuzzy
+msgid "Cleaning up xml metadata"
+msgstr "A limpar os cabeÃ§alhos antigos"
+
+#: ../cli.py:780
+#, fuzzy
+msgid "Cleaning up database cache"
+msgstr "A limpar os pacotes"
+
+#: ../cli.py:783
+msgid "Cleaning up expire-cache metadata"
+msgstr ""
+
+#: ../cli.py:786
+#, fuzzy
+msgid "Cleaning up plugins"
+msgstr "A limpar os pacotes"
+
+#: ../cli.py:807
+#, fuzzy
+msgid "Installed Groups:"
 msgstr "Instalado: "
 
-#: ../clientStuff.py:715 ../clientStuff.py:751 ../clientStuff.py:804
-#: ../clientStuff.py:1017
-#, c-format
-msgid "Error getting file %s"
-msgstr "Erro ao obter o ficheiro %s"
+#: ../cli.py:814
+msgid "Available Groups:"
+msgstr ""
 
-#: ../yummain.py:51 ../yummain.py:106
-#, c-format
-msgid "Options Error: %s"
-msgstr "Erro nas OpÃ§Ãµes: %s"
+#: ../cli.py:820
+msgid "Done"
+msgstr ""
 
-#: ../pullheaders.py:200
-#, c-format
-msgid "%s is not writable"
-msgstr "O %s nÃ£o tem permissÃµes de escrita"
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
+#, fuzzy, python-format
+msgid "Warning: Group %s does not exist."
+msgstr "O grupo %s nÃ£o existe"
 
-#: ../pullheaders.py:281
-#, c-format
-msgid ""
-"\n"
-"Already found tuple: %s %s:\n"
-"%s "
+#: ../cli.py:853
+msgid "No packages in any requested group available to install or update"
 msgstr ""
-"\n"
-"JÃ¡ foi encontrado o tuplo: %s %s:\n"
-"%s "
 
-#: ../rpmUtils.py:132
-#, c-format
-msgid "Could not open RPM database for reading. Perhaps it is already in use?"
-msgstr "NÃ£o foi ler a base de dados do RPM. Talvez jÃ¡ esteja a ser usada?"
+#: ../cli.py:855
+#, python-format
+msgid "%d Package(s) to Install"
+msgstr ""
+
+#: ../cli.py:865
+#, python-format
+msgid "No group named %s exists"
+msgstr ""
+
+#: ../cli.py:871
+#, fuzzy
+msgid "No packages to remove from groups"
+msgstr "NÃ£o foram encontrados pacotes"
+
+#: ../cli.py:873
+#, python-format
+msgid "%d Package(s) to remove"
+msgstr ""
+
+#: ../cli.py:915
+#, python-format
+msgid "Package %s is already installed, skipping"
+msgstr ""
+
+#: ../cli.py:926
+#, python-format
+msgid "Discarding non-comparable pkg %s.%s"
+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 ""
+
+#: ../cli.py:971
+#, python-format
+msgid "Command line error: %s"
+msgstr ""
+
+#: ../cli.py:1101
+msgid "be tolerant of errors"
+msgstr ""
+
+#: ../cli.py:1103
+msgid "run entirely from cache, don't update cache"
+msgstr ""
+
+#: ../cli.py:1105
+msgid "config file location"
+msgstr ""
+
+#: ../cli.py:1107
+msgid "maximum command wait time"
+msgstr ""
+
+#: ../cli.py:1109
+msgid "debugging output level"
+msgstr ""
 
-#: ../serverStuff.py:88
-#, c-format
-msgid "errors found"
-msgstr "erros encontrados"
+#: ../cli.py:1113
+msgid "show duplicates, in repos, in list/search commands"
+msgstr ""
+
+#: ../cli.py:1115
+msgid "error output level"
+msgstr ""
+
+#: ../cli.py:1118
+msgid "quiet operation"
+msgstr ""
+
+#: ../cli.py:1122
+msgid "answer yes for all questions"
+msgstr ""
+
+#: ../cli.py:1124
+msgid "show Yum version and exit"
+msgstr ""
+
+#: ../cli.py:1125
+msgid "set install root"
+msgstr ""
+
+#: ../cli.py:1129
+msgid "enable one or more repositories (wildcards allowed)"
+msgstr ""
+
+#: ../cli.py:1133
+msgid "disable one or more repositories (wildcards allowed)"
+msgstr ""
+
+#: ../cli.py:1136
+msgid "exclude package(s) by name or glob"
+msgstr ""
+
+#: ../cli.py:1138
+msgid "disable exclude from main, for a repo or for everything"
+msgstr ""
+
+#: ../cli.py:1141
+msgid "enable obsoletes processing during updates"
+msgstr ""
+
+#: ../cli.py:1143
+msgid "disable Yum plugins"
+msgstr ""
+
+#: ../cli.py:1145
+msgid "disable gpg signature checking"
+msgstr ""
+
+#: ../cli.py:1147
+msgid "disable plugins by name"
+msgstr ""
+
+#: ../cli.py:1150
+msgid "skip packages with depsolving problems"
+msgstr ""
+
+#: ../output.py:229
+msgid "Jan"
+msgstr ""
+
+#: ../output.py:229
+msgid "Feb"
+msgstr ""
+
+#: ../output.py:229
+msgid "Mar"
+msgstr ""
+
+#: ../output.py:229
+msgid "Apr"
+msgstr ""
+
+#: ../output.py:229
+msgid "May"
+msgstr ""
+
+#: ../output.py:229
+msgid "Jun"
+msgstr ""
+
+#: ../output.py:230
+msgid "Jul"
+msgstr ""
+
+#: ../output.py:230
+msgid "Aug"
+msgstr ""
+
+#: ../output.py:230
+msgid "Sep"
+msgstr ""
+
+#: ../output.py:230
+msgid "Oct"
+msgstr ""
 
-#: ../pkgaction.py:314
-#, c-format
-msgid "Size   : %s"
+#: ../output.py:230
+msgid "Nov"
+msgstr ""
+
+#: ../output.py:230
+msgid "Dec"
+msgstr ""
+
+#: ../output.py:240
+msgid "Trying other mirror."
+msgstr ""
+
+#: ../output.py:293
+#, fuzzy, python-format
+msgid "Name       : %s"
+msgstr "Nome   : %s"
+
+#: ../output.py:294
+#, fuzzy, python-format
+msgid "Arch       : %s"
+msgstr "Arquit.: %s"
+
+#: ../output.py:296
+#, fuzzy, python-format
+msgid "Epoch      : %s"
+msgstr "Repo   : %s"
+
+#: ../output.py:297
+#, fuzzy, python-format
+msgid "Version    : %s"
+msgstr "VersÃ£o: %s"
+
+#: ../output.py:298
+#, fuzzy, python-format
+msgid "Release    : %s"
+msgstr "VersÃ£o: %s"
+
+#: ../output.py:299
+#, fuzzy, python-format
+msgid "Size       : %s"
 msgstr "Tamanho   : %s"
 
-#: ../clientStuff.py:523 ../clientStuff.py:562
-#, c-format
-msgid "Erased: "
-msgstr "Removido: "
+#: ../output.py:300
+#, fuzzy, python-format
+msgid "Repo       : %s"
+msgstr "Repo   : %s"
 
-#: ../checkbootloader.py:167
-#, c-format
-msgid "Unable to determine boot loader."
-msgstr "NÃ£o Ã© possÃvel descobrir o gestor de arranque."
-
-#: ../clientStuff.py:799
-#, c-format
-msgid "getting %s"
-msgstr "a obter o %s"
-
-#: ../clientStuff.py:1033
-#, c-format
-msgid "Error Reading Header on %s"
-msgstr "Erro ao Ler o CabeÃ§alho do %s"
-
-#: ../config.py:50
-#, c-format
-msgid "Error accessing File: %s"
-msgstr "Erro ao aceder ao ficheiro: %s"
-
-#: ../yummain.py:330
-#, c-format
-msgid "You're not root, we can't install things"
-msgstr "VocÃª nÃ£o Ã© o 'root', como tal nÃ£o pode instalar nada"
-
-#: ../yummain.py:72
-#, c-format
-msgid "Cannot find any conf file."
-msgstr "NÃ£o Ã© possÃvel encontrar um ficheiro de configuraÃ§Ã£o."
-
-#: ../urlgrabber.py:291
-#, c-format
-msgid "Local file does not exist: %s"
-msgstr "O ficheiro local nÃ£o existe: %s"
-
-#: ../config.py:193
-#, c-format
-msgid "using ftp, http[s], or file for servers, Aborting - %s"
-msgstr "a usar o ftp, http[s] ou o file nos servidores. A interromper - %s"
-
-#: ../checkbootloader.py:165
-#, c-format
-msgid "Found %s."
-msgstr "O %s foi encontrado."
-
-#: ../yummain.py:203
-#, c-format
-msgid "Finding updated packages"
-msgstr "A procurar os pacotes actualizados"
+#: ../output.py:302
+#, fuzzy, python-format
+msgid "Committer  : %s"
+msgstr "Tamanho   : %s"
 
-#: ../yummain.py:333
-#, c-format
-msgid "Transaction(s) Complete"
-msgstr "TransacÃ§Ã£o Completa"
-
-#: ../urlgrabber.py:311 ../urlgrabber.py:344
-#, c-format
-msgid "IOError: %s"
-msgstr "Erro E/S: %s"
-
-#: ../clientStuff.py:958
-#, c-format
-msgid "Cleaning packages and old headers"
-msgstr "A limpar os pacotes e os cabeÃ§alhos antigos"
-
-#: ../clientStuff.py:809
-#, c-format
-msgid "Cannot download %s in caching only mode or when running as non-root user."
-msgstr "NÃ£o Ã© possÃvel transferir o %s no modo apenas de 'cache' ou a correr como nÃ£o-'root'."
-
-#: ../clientStuff.py:1029 ../clientStuff.py:1034 ../clientStuff.py:1038
-#: ../clientStuff.py:1043
-#, c-format
-msgid ""
-"Error: You may want to run yum clean or remove the file: \n"
-" %s"
+#: ../output.py:303
+#, fuzzy
+msgid "Summary    : "
+msgstr "Resumo: %s"
+
+#: ../output.py:305
+#, fuzzy, python-format
+msgid "URL        : %s"
+msgstr "Repo   : %s"
+
+#: ../output.py:306
+#, fuzzy, python-format
+msgid "License    : %s"
+msgstr "Tamanho   : %s"
+
+#: ../output.py:307
+#, fuzzy
+msgid "Description: "
 msgstr ""
-"Erro: deverÃ¡ querer correr o 'yum clean' ou remover o ficheiro: \n"
+"DescriÃ§Ã£o:\n"
 " %s"
 
-#: ../bin/yum:49
-#, c-format
-msgid "Unable to check if PID %s is active"
-msgstr "NÃ£o Ã© possÃvel verificar se o PID %s estÃ¡ activo"
+#: ../output.py:351
+msgid "Is this ok [y/N]: "
+msgstr ""
 
-#: ../lilocfg.py:61
-#, c-format
-msgid ""
-"Error reading lilo.conf: The messages was:\n"
-msgstr "Erro ao ler o lilo.conf. A mensagem foi:\n"
-
-#: ../yummain.py:232
-#, c-format
-msgid "No groups provided or accessible on any server."
-msgstr "NÃ£o foram indicados grupos em qualquer servidor, ou estÃ£o inacessÃveis."
-
-#: ../pkgaction.py:464
-#, c-format
-msgid "%s results returned"
-msgstr "%s resultados devolvidos"
-
-#: ../pullheaders.py:170 ../pullheaders.py:176
-#, c-format
-msgid "Error moving %s to %s, fatal"
-msgstr "Erro ao mover o %s para %s - fatal"
-
-#: ../yummain.py:294
-#, c-format
-msgid "Running test transaction:"
-msgstr "A executar a transacÃ§Ã£o de teste:"
+#: ../output.py:357 ../output.py:360
+msgid "y"
+msgstr ""
+
+#: ../output.py:357
+msgid "n"
+msgstr ""
 
-#: ../pullheaders.py:262
-#, c-format
+#: ../output.py:357 ../output.py:360
+msgid "yes"
+msgstr ""
+
+#: ../output.py:357
+msgid "no"
+msgstr ""
+
+#: ../output.py:367
+#, fuzzy, python-format
 msgid ""
 "\n"
-"ignoring bad rpm: %s"
-msgstr "\na ignorar o RPM invÃ¡lido: %s"
-
-#: ../clientStuff.py:495
-#, c-format
-msgid "[erase: %s]"
-msgstr "[remover: %s]"
-
-#: ../pullheaders.py:196
-#, c-format
-msgid "%s is not a dir"
-msgstr "O %s nÃ£o Ã© uma pasta"
-
-#: ../nevral.py:349
-#, c-format
-msgid "bestarch = %s for %s"
-msgstr "bestarch = %s para %s"
+"Group: %s"
+msgstr "Grupo  : %s"
+
+#: ../output.py:369
+#, fuzzy, python-format
+msgid " Description: %s"
+msgstr ""
+"DescriÃ§Ã£o:\n"
+" %s"
+
+#: ../output.py:371
+#, fuzzy
+msgid " Mandatory Packages:"
+msgstr "NÃ£o Existe o Pacote %s"
 
-#: ../clientStuff.py:419 ../nevral.py:237
-#, c-format
-msgid "Best version for %s is %s:%s-%s"
-msgstr "A melhor versÃ£o do %s Ã© a %s:%s-%s"
+#: ../output.py:376
+msgid " Default Packages:"
+msgstr ""
+
+#: ../output.py:381
+#, fuzzy
+msgid " Optional Packages:"
+msgstr "NÃ£o Existe o Pacote %s"
+
+#: ../output.py:386
+#, fuzzy
+msgid " Conditional Packages:"
+msgstr "Ã€ Procura de Pacotes DisponÃveis:"
+
+#: ../output.py:394
+#, fuzzy, python-format
+msgid "package: %s"
+msgstr "NÃ£o Existe o Pacote %s"
+
+#: ../output.py:396
+msgid "  No dependencies for this package"
+msgstr ""
+
+#: ../output.py:401
+#, python-format
+msgid "  dependency: %s"
+msgstr ""
+
+#: ../output.py:403
+msgid "   Unsatisfied dependency"
+msgstr ""
 
-#: ../clientStuff.py:506 ../clientStuff.py:517
-#, c-format
-msgid "[deps: %s]"
-msgstr "[deps: %s]"
+#: ../output.py:461
+msgid "Matched from:"
+msgstr ""
+
+#: ../output.py:487
+msgid "There was an error calculating total download size"
+msgstr ""
+
+#: ../output.py:492
+#, fuzzy, python-format
+msgid "Total size: %s"
+msgstr "NÃ£o Ã© um ficheiro normal: %s"
+
+#: ../output.py:495
+#, fuzzy, python-format
+msgid "Total download size: %s"
+msgstr "NÃ£o Ã© um ficheiro normal: %s"
+
+#: ../output.py:507
+#, fuzzy
+msgid "Package"
+msgstr "NÃ£o Existe o Pacote %s"
+
+#: ../output.py:507
+msgid "Arch"
+msgstr "Arq."
 
-#: ../pkgaction.py:267
-#, c-format
+#: ../output.py:507
 msgid "Version"
 msgstr "VersÃ£o"
 
-#: ../clientStuff.py:921
-#, c-format
-msgid "Looking in Available Packages:"
-msgstr "Ã€ Procura de Pacotes DisponÃveis:"
+#: ../output.py:507
+msgid "Repository"
+msgstr ""
+
+#: ../output.py:507
+msgid "Size"
+msgstr ""
+
+#: ../output.py:514
+#, fuzzy
+msgid "Installing for dependencies"
+msgstr "A resolver as dependÃªncias"
 
-#: ../pullheaders.py:268
-#, c-format
+#: ../output.py:515
+#, fuzzy
+msgid "Updating for dependencies"
+msgstr "A resolver as dependÃªncias"
+
+#: ../output.py:516
+#, fuzzy
+msgid "Removing for dependencies"
+msgstr "A resolver as dependÃªncias"
+
+#: ../output.py:528
+#, python-format
 msgid ""
+"     replacing  %s.%s %s\n"
 "\n"
-"ignoring srpm: %s"
-msgstr "\na ignorar o SRPM: %s"
-
-#: ../serverStuff.py:77
-#, c-format
-msgid "Checking deps %d/%d complete"
-msgstr "A verificaÃ§Ã£o das dependÃªncias %d/%d estÃ¡ completa"
+msgstr ""
 
-#: ../pkgaction.py:457
-#, c-format
+#: ../output.py:536
+#, python-format
 msgid ""
-"Installed package: %s.%s %s:%s-%s matches with\n"
-" %s"
+"\n"
+"Transaction Summary\n"
+"=============================================================================\n"
+"Install  %5.5s Package(s)         \n"
+"Update   %5.5s Package(s)         \n"
+"Remove   %5.5s Package(s)         \n"
 msgstr ""
-"O pacote instalado: %s.%s %s:%s-%s corresponde com o\n"
-" %s"
 
-#: ../pullheaders.py:122
-#, c-format
+#: ../output.py:554
+msgid "Removed"
+msgstr ""
+
+#: ../output.py:555
+#, fuzzy
+msgid "Dependency Removed"
+msgstr "DependÃªncias resolvidas"
+
+#: ../output.py:557
+#, fuzzy
+msgid "Dependency Installed"
+msgstr "Dep. Instalada: "
+
+#: ../output.py:559
+#, fuzzy
+msgid "Dependency Updated"
+msgstr "DependÃªncias resolvidas"
+
+#: ../output.py:560
+msgid "Replaced"
+msgstr ""
+
+#: ../output.py:618
+#, python-format
 msgid ""
-"Errors within the dir(s):\n"
-" %s"
+"\n"
+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
+"seconds to exit.\n"
 msgstr ""
-"Erros nas pastas:\n"
+
+#: ../output.py:628
+msgid "user interrupt"
+msgstr ""
+
+#: ../output.py:639
+#, fuzzy
+msgid "installed"
+msgstr "Instalado: "
+
+#: ../output.py:640
+#, fuzzy
+msgid "updated"
+msgstr "Actualizado: "
+
+#: ../output.py:641
+msgid "obsoleted"
+msgstr ""
+
+#: ../output.py:642
+#, fuzzy
+msgid "erased"
+msgstr "Removido: "
+
+#: ../output.py:646
+#, fuzzy, python-format
+msgid "---> Package %s.%s %s:%s-%s set to be %s"
+msgstr ""
+"O pacote instalado: %s.%s %s:%s-%s corresponde com o\n"
 " %s"
 
-#: ../pkgaction.py:317
-#, c-format
-msgid "Summary: %s"
-msgstr "Resumo: %s"
+#: ../output.py:653
+#, fuzzy
+msgid "--> Running transaction check"
+msgstr "A executar a transacÃ§Ã£o de teste:"
 
-#: ../rpmUtils.py:260
-#, c-format
-msgid "Error opening rpm %s - error %s"
-msgstr "Erro ao abrir o RPM %s - erro %s"
+#: ../output.py:658
+msgid "--> Restarting Dependency Resolution with new changes."
+msgstr ""
 
-#: ../clientStuff.py:763 ../clientStuff.py:789
-#, c-format
-msgid "Please run yum in non-caching mode to correct this header."
-msgstr "Execute por favor o 'yum' no modo sem 'cache' para corrigir este cabeÃ§alho."
+#: ../output.py:663
+msgid "--> Finished Dependency Resolution"
+msgstr ""
 
-#: ../pullheaders.py:222
-#, c-format
-msgid "Cannot delete file %s"
-msgstr "NÃ£o Ã© possÃvel remover o ficheiro %s"
+#: ../output.py:668
+#, python-format
+msgid "--> Processing Dependency: %s for package: %s"
+msgstr ""
 
-#: ../lilocfg.py:43
-#, c-format
-msgid ""
-"Error installing lilo.conf  The message was:\n"
-msgstr "Erro ao instalar o lilo.conf. A mensagem foi:\n"
+#: ../output.py:673
+#, python-format
+msgid "--> Unresolved Dependency: %s"
+msgstr ""
 
-#: ../clientStuff.py:1037
-#, c-format
-msgid "Error: Untrusted GPG key on %s"
-msgstr "Erro: A chave de GPG nÃ£o Ã© fiÃ¡vel: %s"
+#: ../output.py:679
+#, python-format
+msgid "--> Processing Conflict: %s conflicts %s"
+msgstr ""
 
-#: ../clientStuff.py:923
-#, c-format
-msgid "Looking in Installed Packages:"
-msgstr "Ã€ Procura nos Pacotes Instalados:"
+#: ../output.py:682
+msgid "--> Populating transaction set with selected packages. Please wait."
+msgstr ""
 
-#: ../clientStuff.py:971
-#, c-format
-msgid "Invalid clean option %s"
-msgstr "A opÃ§Ã£o do 'clean' Ã© invÃ¡lida %s"
+#: ../output.py:686
+#, python-format
+msgid "---> Downloading header for %s to pack into transaction set."
+msgstr ""
+
+#: ../yumcommands.py:36
+#, fuzzy
+msgid "You need to be root to perform this command."
+msgstr "TerÃ¡ de ser 'root' para executar estes comandos"
 
-#: ../pullheaders.py:258
-#, c-format
+#: ../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"
-"Problem with gpg sig or md5sum on %s\n"
 "\n"
-msgstr "\n\nErro na assin. ou 'md5sum' do GPG em %s\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 ""
 
-#: ../pkgaction.py:313
-#, c-format
-msgid "Release: %s"
-msgstr "VersÃ£o: %s"
+#: ../yumcommands.py:63
+#, fuzzy, python-format
+msgid "Error: Need to pass a list of pkgs to %s"
+msgstr "Tem de passar uma lista de pacotes a remover"
 
-#: ../pkgaction.py:76
-#, c-format
-msgid "No Packages Available for Update or Install"
-msgstr "NÃ£o Existem Pacotes DisponÃveis para Actualizar ou Instalar"
+#: ../yumcommands.py:69
+#, fuzzy
+msgid "Error: Need an item to match"
+msgstr "Ã‰ necessÃ¡rio um item a procurar"
 
-#: ../pkgaction.py:56 ../pkgaction.py:67
-#, c-format
-msgid "%s is installed and is the latest version."
-msgstr "O %s estÃ¡ instalado e Ã© a Ãºltima versÃ£o."
+#: ../yumcommands.py:75
+#, fuzzy
+msgid "Error: Need a group or list of groups"
+msgstr "Ã‰ necessÃ¡ria uma lista de grupos a actualizar"
 
-#: ../nevral.py:261
-#, c-format
-msgid "Found best arch for install only pkg %s"
-msgstr "Descobriu-se a melhor arquitectura do pacote apenas de instalaÃ§Ã£o %s"
+#: ../yumcommands.py:84
+#, fuzzy, python-format
+msgid "Error: clean requires an option: %s"
+msgstr "Erro ao criar a pasta %s: %s"
 
-#: ../clientStuff.py:844 ../clientStuff.py:856
-#, c-format
-msgid "Looking in installed packages for a providing package"
-msgstr "Ã€ procura nos pacotes instalados por um pacote necessÃ¡rio"
+#: ../yumcommands.py:89
+#, fuzzy, python-format
+msgid "Error: invalid clean argument: %r"
+msgstr "Erro ao processar os argumentos da linha de comandos: %s"
 
-#: ../clientStuff.py:468
-#, c-format
-msgid "I will do the following:"
-msgstr "SerÃ¡ feito o seguinte:"
-
-#: ../urlgrabber.py:279 ../urlgrabber.py:309
-#, c-format
-msgid "Bad URL: %s"
-msgstr "URL invÃ¡lido: %s"
-
-#: ../clientStuff.py:1003
-#, c-format
-msgid "NonMatching RPM version, %s, removing."
-msgstr "A versÃ£o do RPM %s nÃ£o corresponde, a remover."
-
-#: ../clientStuff.py:509
-#, c-format
-msgid "I will erase these to satisfy the dependencies:"
-msgstr "SerÃ£o removidos os pacotes para satisfazer as dependÃªncias:"
-
-#: ../clientStuff.py:522 ../clientStuff.py:561
-#, c-format
-msgid "Updated: "
-msgstr "Actualizado: "
+#: ../yumcommands.py:102
+msgid "No argument to shell"
+msgstr ""
 
-#: ../lilocfg.py:407
-#, c-format
-msgid "Error parsing command line arguments: %s"
-msgstr "Erro ao processar os argumentos da linha de comandos: %s"
+#: ../yumcommands.py:105
+#, python-format
+msgid "Filename passed to shell: %s"
+msgstr ""
 
-#: ../yummain.py:214
-#, c-format
-msgid "Finding obsoleted packages"
-msgstr "A procurar os pacotes obsoletos"
+#: ../yumcommands.py:109
+#, python-format
+msgid "File %s given as argument to shell does not exist."
+msgstr ""
 
-#: ../urlgrabber.py:315 ../urlgrabber.py:348
-#, c-format
-msgid "HTTP Error (%s): %s"
-msgstr "Erro de HTTP (%s): %s"
+#: ../yumcommands.py:115
+msgid "Error: more than one file given as argument to shell."
+msgstr ""
 
-#: ../serverStuff.py:96
-#, c-format
-msgid "depcheck: package %s conflicts with %s"
-msgstr "depcheck: o pacote %s estÃ¡ em conflito com o %s"
+#: ../yumcommands.py:156
+msgid "PACKAGE..."
+msgstr ""
 
-#: ../clientStuff.py:761 ../clientStuff.py:787
-#, c-format
-msgid "Please ask your sysadmin to update the headers on this system."
-msgstr "PeÃ§a ao seu administrador para actualizar os cabeÃ§alhos neste sistema."
+#: ../yumcommands.py:159
+msgid "Install a package or packages on your system"
+msgstr ""
 
-#: ../clientStuff.py:851
-#, c-format
-msgid "Need an item to search"
-msgstr "Ã‰ necessÃ¡rio um item a procurar"
+#: ../yumcommands.py:168
+#, fuzzy
+msgid "Setting up Install Process"
+msgstr "Ã€ Procura nos Pacotes Instalados:"
 
-#: ../pullheaders.py:178
-#, c-format
-msgid "Putting back old headers"
-msgstr "A repor os cabeÃ§alhos antigos"
+#: ../yumcommands.py:179
+msgid "[PACKAGE...]"
+msgstr ""
+
+#: ../yumcommands.py:182
+msgid "Update a package or packages on your system"
+msgstr ""
 
-#: ../clientStuff.py:735
-#, c-format
-msgid "CacheDir: %s"
-msgstr "CacheDir: %s"
+#: ../yumcommands.py:190
+msgid "Setting up Update Process"
+msgstr ""
 
-#: ../callback.py:88
-#, c-format
-msgid "Completing update for %s  - %d/%d"
-msgstr "A terminar a actualizaÃ§Ã£o do %s  - %d/%d"
+#: ../yumcommands.py:204
+msgid "Display details about a package or group of packages"
+msgstr ""
 
-#: ../clientStuff.py:1044
-#, c-format
-msgid ""
-"Error: You may need to disable gpg checking to install this package\n"
-msgstr "Erro: PoderÃ¡ ter de desactivar a verificaÃ§Ã£o do GPG para instalar este pacote\n"
+#: ../yumcommands.py:212
+#, fuzzy
+msgid "Installed Packages"
+msgstr "Ã€ Procura nos Pacotes Instalados:"
 
-#: ../yummain.py:128
-#, c-format
-msgid "Options Error: no commands found"
-msgstr "Erro nas OpÃ§Ãµes: nÃ£o foram indicados comandos"
+#: ../yumcommands.py:213
+#, fuzzy
+msgid "Available Packages"
+msgstr "Ã€ Procura de Pacotes DisponÃveis:"
 
-#: ../serverStuff.py:85
-#, c-format
-msgid "adding %s"
-msgstr "a adicionar o %s"
+#: ../yumcommands.py:214
+#, fuzzy
+msgid "Extra Packages"
+msgstr "NÃ£o Existe o Pacote %s"
 
-#: ../grubcfg.py:22
-#, c-format
-msgid ""
-"Unable to run grubby correctly: the message was:\n"
-msgstr "NÃ£o foi possÃvel executar correctamente o grubby; a mensagem foi:\n"
+#: ../yumcommands.py:215
+#, fuzzy
+msgid "Updated Packages"
+msgstr "A procurar os pacotes actualizados"
 
-#: ../urlgrabber.py:293
-#, c-format
-msgid "Not a normal file: %s"
-msgstr "NÃ£o Ã© um ficheiro normal: %s"
+#: ../yumcommands.py:221 ../yumcommands.py:225
+#, fuzzy
+msgid "Obsoleting Packages"
+msgstr "A limpar os pacotes"
+
+#: ../yumcommands.py:226
+msgid "Recently Added Packages"
+msgstr ""
+
+#: ../yumcommands.py:232
+#, fuzzy
+msgid "No matching Packages to list"
+msgstr "NÃ£o EstÃ£o DisponÃveis Pacotes para Listar"
 
-#: ../bin/yum:71
-#, c-format
-msgid "IOError - # %s - %s"
-msgstr "Erro E/S - # %s - %s"
+#: ../yumcommands.py:246
+#, fuzzy
+msgid "List a package or groups of packages"
+msgstr "Ã€ procura nos pacotes instalados por um pacote necessÃ¡rio"
+
+#: ../yumcommands.py:258
+msgid "Remove a package or packages from your system"
+msgstr ""
+
+#: ../yumcommands.py:266
+msgid "Setting up Remove Process"
+msgstr ""
+
+#: ../yumcommands.py:278
+msgid "Setting up Group Process"
+msgstr ""
+
+#: ../yumcommands.py:284
+msgid "No Groups on which to run command"
+msgstr ""
+
+#: ../yumcommands.py:297
+#, fuzzy
+msgid "List available package groups"
+msgstr "Ã€ Procura de Pacotes DisponÃveis:"
+
+#: ../yumcommands.py:314
+msgid "Install the packages in a group on your system"
+msgstr ""
+
+#: ../yumcommands.py:336
+msgid "Remove the packages in a group from your system"
+msgstr ""
+
+#: ../yumcommands.py:360
+msgid "Display details about a package group"
+msgstr ""
+
+#: ../yumcommands.py:384
+msgid "Generate the metadata cache"
+msgstr ""
+
+#: ../yumcommands.py:390
+msgid "Making cache files for all metadata files."
+msgstr ""
 
-#: ../pkgaction.py:510
-#, c-format
-msgid "Kernel Updated/Installed, checking for bootloader"
-msgstr "O 'Kernel' foi Instalado/Actualizado, a verificar o gestor de arranque"
+#: ../yumcommands.py:391
+msgid "This may take a while depending on the speed of this computer"
+msgstr ""
 
-#: ../clientStuff.py:828
-#, c-format
-msgid "Need to pass a list of pkgs to install"
-msgstr "Ã‰ necessÃ¡rio indicar uma lista de pacotes a instalar"
+#: ../yumcommands.py:412
+msgid "Metadata Cache Created"
+msgstr ""
 
-#: ../clientStuff.py:790 ../clientStuff.py:810
-#, c-format
-msgid "Deleting entry from Available packages"
+#: ../yumcommands.py:426
+msgid "Remove cached data"
+msgstr ""
+
+#: ../yumcommands.py:447
+msgid "Find what package provides the given value"
+msgstr ""
+
+#: ../yumcommands.py:467
+#, fuzzy
+msgid "Check for available package updates"
 msgstr "A remover o item dos pacotes disponÃveis"
 
-#: ../pullheaders.py:256
-#, c-format
+#: ../yumcommands.py:490
+msgid "Search package details for the given string"
+msgstr ""
+
+#: ../yumcommands.py:496
+#, fuzzy
+msgid "Searching Packages: "
+msgstr "A limpar os pacotes"
+
+#: ../yumcommands.py:513
+msgid "Update packages taking obsoletes into account"
+msgstr ""
+
+#: ../yumcommands.py:522
+msgid "Setting up Upgrade Process"
+msgstr ""
+
+#: ../yumcommands.py:536
+msgid "Install a local RPM"
+msgstr ""
+
+#: ../yumcommands.py:545
+msgid "Setting up Local Package Process"
+msgstr ""
+
+#: ../yumcommands.py:564
+msgid "Determine which package provides the given dependency"
+msgstr ""
+
+#: ../yumcommands.py:567
+msgid "Searching Packages for Dependency:"
+msgstr ""
+
+#: ../yumcommands.py:581
+msgid "Run an interactive yum shell"
+msgstr ""
+
+#: ../yumcommands.py:587
+msgid "Setting up Yum Shell"
+msgstr ""
+
+#: ../yumcommands.py:605
+msgid "List a package's dependencies"
+msgstr ""
+
+#: ../yumcommands.py:611
+#, fuzzy
+msgid "Finding dependencies: "
+msgstr "A resolver as dependÃªncias"
+
+#: ../yumcommands.py:627
+msgid "Display the configured software repositories"
+msgstr ""
+
+#: ../yumcommands.py:645
+msgid "repo id"
+msgstr ""
+
+#: ../yumcommands.py:645
+msgid "repo name"
+msgstr ""
+
+#: ../yumcommands.py:645
+msgid "status"
+msgstr ""
+
+#: ../yumcommands.py:651
+msgid "enabled"
+msgstr ""
+
+#: ../yumcommands.py:654
+msgid "disabled"
+msgstr ""
+
+#: ../yumcommands.py:671
+msgid "Display a helpful usage message"
+msgstr ""
+
+#: ../yumcommands.py:705
+#, fuzzy, python-format
+msgid "No help available for %s"
+msgstr "NÃ£o HÃ¡ Pacotes DisponÃveis para Actualizar"
+
+#: ../yumcommands.py:710
 msgid ""
 "\n"
-"Checking sig on %s"
-msgstr "\nA verificar a assinatura no %s"
+"\n"
+"aliases: "
+msgstr ""
+
+#: ../yumcommands.py:712
+msgid ""
+"\n"
+"\n"
+"alias: "
+msgstr ""
 
-#: ../config.py:205
-#, c-format
-msgid "Insufficient server config - no servers found. Aborting."
-msgstr "ConfiguraÃ§Ã£o de servidores insuficiente - nenhum servidor detectado. A interromper."
+#: ../yumcommands.py:741
+msgid "Setting up Reinstall Process"
+msgstr ""
 
-#: ../yummain.py:271
-#, c-format
-msgid "Resolving dependencies"
-msgstr "A resolver as dependÃªncias"
+#: ../yumcommands.py:755
+#, fuzzy
+msgid "reinstall a package"
+msgstr "A limpar os pacotes"
 
-#: ../pkgaction.py:312
-#, c-format
-msgid "Version: %s"
-msgstr "VersÃ£o: %s"
+#: ../yummain.py:41
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr "A Sair por Ordem do Utilizador"
 
-#: ../yummain.py:338
-#, c-format
+#: ../yummain.py:47
+#, fuzzy
 msgid ""
 "\n"
-"    Usage:  yum [options] <update | upgrade | install | info | remove | list |\n"
-"            clean | provides | search | check-update | groupinstall | groupupdate |\n"
-"            grouplist >\n"
-"                \n"
-"         Options:\n"
-"          -c [config file] - specify the config file to use\n"
-"          -e [error level] - set the error logging level\n"
-"          -d [debug level] - set the debugging level\n"
-"          -y answer yes to all questions\n"
-"          -t be tolerant about errors in package commands\n"
-"          -R [time in minutes] - set the max amount of time to randomly run in.\n"
-"          -C run from cache only - do not update the cache\n"
-"          --installroot=[path] - set the install root (default '/')\n"
-"          --version - output the version of yum\n"
-"          -h, --help this screen\n"
-"    "
+"\n"
+"Exiting on Broken Pipe"
+msgstr "A Sair por Ordem do Utilizador"
+
+#: ../yummain.py:105
+msgid ""
+"Another app is currently holding the yum lock; waiting for it to exit..."
 msgstr ""
+
+#: ../yummain.py:132 ../yummain.py:171
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Erro SO: %s"
+
+#: ../yummain.py:142 ../yummain.py:178
+#, python-format
+msgid "Unknown Error(s): Exit Code: %d:"
+msgstr ""
+
+#. Depsolve stage
+#: ../yummain.py:149
+#, fuzzy
+msgid "Resolving Dependencies"
+msgstr "A resolver as dependÃªncias"
+
+#: ../yummain.py:184
+#, fuzzy
+msgid ""
 "\n"
-"    UtilizaÃ§Ã£o:  yum [opÃ§Ãµes] <update | upgrade | install | info | remove | list |\n"
-"            clean | provides | search | check-update | groupinstall | groupupdate |\n"
-"            grouplist >\n"
-"                \n"
-"         OpÃ§Ãµes:\n"
-"          -c [fich. configuraÃ§Ã£o] - indicar o ficheiro de configuraÃ§Ã£o a usar\n"
-"          -e [nÃvel erros] - indicar o nÃvel de registo de erros\n"
-"          -d [nÃvel depuraÃ§Ã£o] - indicar o nÃvel de depuraÃ§Ã£o\n"
-"          -y responder 'sim' a todas as perguntas\n"
-"          -t ser tolerante com os erros nos comandos dos pacotes\n"
-"          -R [tempo em minutos] - define o tempo mÃ¡ximo de execuÃ§Ã£o aleatÃ³ria.\n"
-"          -C usar apenas a 'cache' - esta nÃ£o Ã© actualizada\n"
-"          --installroot=[pasta] - pasta de instalaÃ§Ã£o de base (por omissÃ£o '/')\n"
-"          --version - devolver a versÃ£o do 'yum'\n"
-"          -h, --help este ecrÃ£\n"
-"    "
-
-#: ../pkgaction.py:259
-#, c-format
-msgid "From %s installing %s"
-msgstr "A partir do %s instalar o %s"
-
-#: ../pkgaction.py:538
-#, c-format
-msgid "No bootloader found, Cannot configure kernel, continuing."
-msgstr "NÃ£o foi encontrado um gestor de arranque, nÃ£o Ã© possÃvel configurar o 'kernel', a continuar."
-
-#: ../clientStuff.py:688 ../clientStuff.py:695
-#, c-format
-msgid "Attempt to delete a missing file %s - ignoring."
-msgstr "A tentar remover um ficheiro inexistente %s - a ignorar."
-
-#: ../rpmUtils.py:25
-#, c-format
-msgid "Header cannot be opened or does not match %s, %s."
-msgstr "O cabeÃ§alho nÃ£o pÃ´de ser aberto ou nÃ£o corresponde ao %s, %s."
+"Dependencies Resolved"
+msgstr "DependÃªncias resolvidas"
 
-#: ../bin/yum:66
-#, c-format
-msgid "Exiting on User Cancel"
+#: ../yummain.py:198
+msgid "Complete!"
+msgstr ""
+
+#: ../yummain.py:245
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel."
 msgstr "A Sair por Ordem do Utilizador"
 
-#: ../clientStuff.py:1011
-#, c-format
-msgid "Getting %s"
-msgstr "A obter o %s"
+#: ../yum/depsolve.py:82
+msgid "doTsSetup() will go away in a future version of Yum.\n"
+msgstr ""
+
+#: ../yum/depsolve.py:95
+msgid "Setting up TransactionSets before config class is up"
+msgstr ""
+
+#: ../yum/depsolve.py:136
+#, fuzzy, python-format
+msgid "Invalid tsflag in config file: %s"
+msgstr "A opÃ§Ã£o do 'clean' Ã© invÃ¡lida %s"
+
+#: ../yum/depsolve.py:147
+#, python-format
+msgid "Searching pkgSack for dep: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:170
+#, fuzzy, python-format
+msgid "Potential match for %s from %s"
+msgstr "bestarch = %s para %s"
+
+#: ../yum/depsolve.py:178
+#, python-format
+msgid "Matched %s to require for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:219
+#, fuzzy, python-format
+msgid "Member: %s"
+msgstr "Servidor: %s"
+
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
+#, python-format
+msgid "%s converted to install"
+msgstr ""
+
+#: ../yum/depsolve.py:240
+#, fuzzy, python-format
+msgid "Adding Package %s in mode %s"
+msgstr "NÃ£o Existe o Pacote %s, %s"
 
-#: ../pullheaders.py:150
-#, c-format
+#: ../yum/depsolve.py:250
+#, fuzzy, python-format
+msgid "Removing Package %s"
+msgstr "NÃ£o Existe o Pacote %s"
+
+#: ../yum/depsolve.py:261
+#, python-format
+msgid "%s requires: %s"
+msgstr ""
+
+#: ../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
+#, python-format
+msgid "Potential Provider: %s"
+msgstr ""
+
+#: ../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 ""
+
+#: ../yum/depsolve.py:372
+#, python-format
+msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+msgstr ""
+
+#: ../yum/depsolve.py:375
+#, python-format
+msgid "TSINFO: Updating %s to resolve dep."
+msgstr ""
+
+#: ../yum/depsolve.py:378
+#, fuzzy, python-format
+msgid "Cannot find an update path for dep for: %s"
+msgstr "NÃ£o foi detectado um pacote correspondente ao %s"
+
+#: ../yum/depsolve.py:388
+#, python-format
+msgid "Unresolvable requirement %s for %s"
+msgstr ""
+
+#. is it already installed?
+#: ../yum/depsolve.py:434
+#, python-format
+msgid "%s is in providing packages but it is already installed, removing."
+msgstr ""
+
+#: ../yum/depsolve.py:449
+#, python-format
+msgid "Potential resolving package %s has newer instance in ts."
+msgstr ""
+
+#: ../yum/depsolve.py:460
+#, python-format
+msgid "Potential resolving package %s has newer instance installed."
+msgstr ""
+
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
+#, python-format
+msgid "Missing Dependency: %s is needed by package %s"
+msgstr ""
+
+#: ../yum/depsolve.py:481
+#, python-format
+msgid "%s already in ts, skipping this one"
+msgstr ""
+
+#: ../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 ""
+
+#: ../yum/depsolve.py:544
+#, python-format
+msgid "TSINFO: Marking %s as install for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
+#, fuzzy
+msgid "Success - empty transaction"
+msgstr "A executar a transacÃ§Ã£o de teste:"
+
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
+msgid "Restarting Loop"
+msgstr ""
+
+#: ../yum/depsolve.py:702
+#, fuzzy
+msgid "Dependency Process ending"
+msgstr "DependÃªncias resolvidas"
+
+#: ../yum/depsolve.py:708
+#, python-format
+msgid "%s from %s has depsolving problems"
+msgstr ""
+
+#: ../yum/depsolve.py:715
+msgid "Success - deps resolved"
+msgstr ""
+
+#: ../yum/depsolve.py:729
+#, fuzzy, python-format
+msgid "Checking deps for %s"
+msgstr ""
 "\n"
-"Writing header.info file"
-msgstr "\nA gravar o ficheiro header.info"
+"A verificar a assinatura no %s"
 
-#: ../pullheaders.py:208
-#, c-format
-msgid "Error creating dir %s: %s"
-msgstr "Erro ao criar a pasta %s: %s"
+#: ../yum/depsolve.py:782
+#, python-format
+msgid "looking for %s as a requirement of %s"
+msgstr ""
 
-#: ../pkgaction.py:267
-#, c-format
-msgid "Arch"
-msgstr "Arq."
+#: ../yum/depsolve.py:933
+#, python-format
+msgid "Comparing best: %s to po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
 
-#: ../clientStuff.py:729
-#, c-format
-msgid "Gathering header information file(s) from server(s)"
-msgstr "A obter os ficheiros de dados dos cabeÃ§alhos dos servidores"
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, python-format
+msgid "best %s obsoletes po: %s"
+msgstr ""
 
-#: ../clientStuff.py:756
-#, c-format
-msgid "Using cached header.info file"
-msgstr "A usar o ficheiro 'header.info' na 'cache'"
+#: ../yum/depsolve.py:955
+#, python-format
+msgid "po %s obsoletes best: %s"
+msgstr ""
 
-#: ../pkgaction.py:300
-#, c-format
-msgid "No Packages Available to List"
-msgstr "NÃ£o EstÃ£o DisponÃveis Pacotes para Listar"
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#, fuzzy, python-format
+msgid "better arch in po %s"
+msgstr "bestarch = %s para %s"
 
-#: ../clientStuff.py:1042
-#, c-format
-msgid "Error: Unsigned Package %s"
-msgstr "Erro: O Pacote %s nÃ£o EstÃ¡ Assinado"
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#, python-format
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#, python-format
+msgid "best %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#, python-format
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#, python-format
+msgid "po %s has a shorter name than best %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
+
+#: ../yum/__init__.py:119
+msgid "doConfigSetup() will go away in a future version of Yum.\n"
+msgstr ""
+
+#: ../yum/__init__.py:296
+#, python-format
+msgid "Repository %r is missing name in configuration, using id"
+msgstr ""
+
+#: ../yum/__init__.py:332
+msgid "plugins already initialised"
+msgstr ""
+
+#: ../yum/__init__.py:339
+msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+msgstr ""
+
+#: ../yum/__init__.py:349
+msgid "Reading Local RPMDB"
+msgstr ""
+
+#: ../yum/__init__.py:367
+msgid "doRepoSetup() will go away in a future version of Yum.\n"
+msgstr ""
+
+#: ../yum/__init__.py:387
+msgid "doSackSetup() will go away in a future version of Yum.\n"
+msgstr ""
+
+#: ../yum/__init__.py:404
+#, fuzzy
+msgid "Setting up Package Sacks"
+msgstr "A limpar os pacotes"
+
+#: ../yum/__init__.py:447
+#, python-format
+msgid "repo object for repo %s lacks a _resetSack method\n"
+msgstr ""
+
+#: ../yum/__init__.py:448
+msgid "therefore this repo cannot be reset.\n"
+msgstr ""
+
+#: ../yum/__init__.py:453
+msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+msgstr ""
+
+#: ../yum/__init__.py:465
+msgid "Building updates object"
+msgstr ""
+
+#: ../yum/__init__.py:496
+msgid "doGroupSetup() will go away in a future version of Yum.\n"
+msgstr ""
+
+#: ../yum/__init__.py:520
+msgid "Getting group metadata"
+msgstr ""
 
-#: ../pkgaction.py:461
-#, c-format
-msgid "localrpmdb not defined"
-msgstr "O localrpmdb nÃ£o estÃ¡ definido"
+#: ../yum/__init__.py:546
+#, fuzzy, python-format
+msgid "Adding group file from repository: %s"
+msgstr "a obter os grupos do servidor: %s"
+
+#: ../yum/__init__.py:555
+#, python-format
+msgid "Failed to add groups file for repository: %s - %s"
+msgstr ""
+
+#: ../yum/__init__.py:561
+msgid "No Groups Available in any repository"
+msgstr ""
+
+#: ../yum/__init__.py:611
+msgid "Importing additional filelist information"
+msgstr ""
 
-#: ../lilocfg.py:55
-#, c-format
+#: ../yum/__init__.py:657
+#, python-format
+msgid "Skip-broken round %i"
+msgstr ""
+
+#: ../yum/__init__.py:680
+#, python-format
+msgid "Skip-broken took %i rounds "
+msgstr ""
+
+#: ../yum/__init__.py:681
 msgid ""
-"Error installing the new bootloader: \n"
-msgstr "Erro ao instalar o novo gestor de arranque:  \n"
+"\n"
+"Packages skipped because of dependency problems:"
+msgstr ""
 
-#: ../clientStuff.py:1028
-#, c-format
-msgid "Error: Could not find the GPG Key necessary to validate pkg %s"
-msgstr "Erro: NÃ£o foi encontrada a chave de GPG necessÃ¡ria para validar o pacote %s"
+#: ../yum/__init__.py:685
+#, python-format
+msgid "    %s from %s"
+msgstr ""
+
+#: ../yum/__init__.py:774
+#, fuzzy, python-format
+msgid "Failed to remove transaction file %s"
+msgstr "NÃ£o Ã© possÃvel encontrar a secÃ§Ã£o: %s"
+
+#: ../yum/__init__.py:814
+#, python-format
+msgid "excluding for cost: %s from %s"
+msgstr ""
+
+#: ../yum/__init__.py:845
+msgid "Excluding Packages in global exclude list"
+msgstr ""
+
+#: ../yum/__init__.py:847
+#, python-format
+msgid "Excluding Packages from %s"
+msgstr ""
 
-#: ../yummain.py:259
-#, c-format
-msgid "No actions to take"
-msgstr "NÃ£o existem acÃ§Ãµes a tomar"
+#: ../yum/__init__.py:875
+#, fuzzy, python-format
+msgid "Reducing %s to included packages only"
+msgstr "A procurar os pacotes obsoletos"
+
+#: ../yum/__init__.py:880
+#, fuzzy, python-format
+msgid "Keeping included package %s"
+msgstr "A procurar os pacotes actualizados"
 
-#: ../pkgaction.py:431
-#, c-format
+#: ../yum/__init__.py:886
+#, fuzzy, python-format
+msgid "Removing unmatched package %s"
+msgstr "A procurar os pacotes actualizados"
+
+#: ../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 "NÃ£o Ã© possÃvel verificar se o PID %s estÃ¡ activo"
+
+#. Another copy seems to be running.
+#: ../yum/__init__.py:923
+#, fuzzy, python-format
+msgid "Existing lock %s: another copy is running as pid %s."
+msgstr "Bloqueio %s existente: estÃ¡ outra cÃ³pia a correr. A sair."
+
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
+msgid "Package does not match intended download"
+msgstr ""
+
+#: ../yum/__init__.py:991
+msgid "Could not perform checksum"
+msgstr ""
+
+#: ../yum/__init__.py:994
+msgid "Package does not match checksum"
+msgstr ""
+
+#: ../yum/__init__.py:1036
+#, python-format
+msgid "package fails checksum but caching is enabled for %s"
+msgstr ""
+
+#: ../yum/__init__.py:1042
+#, python-format
+msgid "using local copy of %s"
+msgstr ""
+
+#: ../yum/__init__.py:1061
+#, python-format
+msgid "Insufficient space in download directory %s to download"
+msgstr ""
+
+#: ../yum/__init__.py:1094
+msgid "Header is not complete."
+msgstr ""
+
+#: ../yum/__init__.py:1134
+#, python-format
 msgid ""
-"Available package: %s.%s %s:%s-%s from %s matches with\n"
-" %s"
+"Header not in local cache and caching-only mode enabled. Cannot download %s"
 msgstr ""
-"Pacote disponÃvel: %s.%s %s:%s-%s de %s corresponde ao\n"
-" %s"
 
-#: ../pkgaction.py:201
-#, c-format
-msgid "Erase: No matches for %s"
-msgstr "Remover: Nada corresponde ao %s"
+#: ../yum/__init__.py:1189
+#, python-format
+msgid "Public key for %s is not installed"
+msgstr ""
 
-#: ../pullheaders.py:124
-#, c-format
-msgid "   "
-msgstr "   "
-
-#: ../config.py:203
-#, c-format
-msgid "Error: Cannot find baseurl or name for server '%s'. Skipping"
-msgstr "Erro: NÃ£o existe um 'baseurl' ou 'name' para o servidor '%s'. A ignorar"
-
-#: ../pullheaders.py:224
-#, c-format
-msgid "Odd header %s suddenly disappeared"
-msgstr "O cabeÃ§alho estranho %s desapareceu de repente"
-
-#: ../pullheaders.py:127
-#, c-format
-msgid "All dependencies resolved and no conflicts detected"
-msgstr "Todas as dependÃªncias foram resolvidas sem detectar conflitos"
-
-#: ../pkgaction.py:215
-#, c-format
-msgid "Group %s does not exist"
-msgstr "O grupo %s nÃ£o existe"
+#: ../yum/__init__.py:1193
+#, fuzzy, python-format
+msgid "Problem opening package %s"
+msgstr "A limpar os pacotes"
 
-#: ../clientStuff.py:968
-#, c-format
-msgid "Cleaning old headers"
-msgstr "A limpar os cabeÃ§alhos antigos"
+#: ../yum/__init__.py:1201
+#, python-format
+msgid "Public key for %s is not trusted"
+msgstr ""
+
+#: ../yum/__init__.py:1205
+#, python-format
+msgid "Package %s is not signed"
+msgstr ""
+
+#: ../yum/__init__.py:1243
+#, fuzzy, python-format
+msgid "Cannot remove %s"
+msgstr "NÃ£o Ã© possÃvel remover o ficheiro %s"
+
+#: ../yum/__init__.py:1247
+#, python-format
+msgid "%s removed"
+msgstr ""
 
-#: ../pkgaction.py:318
-#, c-format
+#: ../yum/__init__.py:1283
+#, fuzzy, python-format
+msgid "Cannot remove %s file %s"
+msgstr "NÃ£o Ã© possÃvel remover o ficheiro %s"
+
+#: ../yum/__init__.py:1287
+#, python-format
+msgid "%s file %s removed"
+msgstr ""
+
+#: ../yum/__init__.py:1289
+#, python-format
+msgid "%d %s files removed"
+msgstr ""
+
+#: ../yum/__init__.py:1329
+#, python-format
+msgid "More than one identical match in sack for %s"
+msgstr ""
+
+#: ../yum/__init__.py:1335
+#, python-format
+msgid "Nothing matches %s.%s %s:%s-%s from update"
+msgstr ""
+
+#: ../yum/__init__.py:1543
 msgid ""
-"Description:\n"
-" %s"
+"searchPackages() will go away in a future version of "
+"Yum.                      Use searchGenerator() instead. \n"
 msgstr ""
-"DescriÃ§Ã£o:\n"
-" %s"
 
-#: ../clientStuff.py:933 ../clientStuff.py:949
-#, c-format
-msgid "Need a list of groups to update"
-msgstr "Ã‰ necessÃ¡ria uma lista de grupos a actualizar"
+#: ../yum/__init__.py:1580
+#, fuzzy, python-format
+msgid "Searching %d packages"
+msgstr "A limpar os pacotes"
 
-#: ../clientStuff.py:719
-#, c-format
-msgid "using cached groups from server: %s"
-msgstr "a usar os grupos em 'cache' do servidor: %s"
+#: ../yum/__init__.py:1584
+#, fuzzy, python-format
+msgid "searching package %s"
+msgstr "A limpar os pacotes"
 
-#: ../pkgaction.py:316
-#, c-format
-msgid "Repo   : %s"
-msgstr "Repo   : %s"
+#: ../yum/__init__.py:1596
+msgid "searching in file entries"
+msgstr ""
 
-#: ../clientStuff.py:711
-#, c-format
-msgid "getting groups from server: %s"
-msgstr "a obter os grupos do servidor: %s"
+#: ../yum/__init__.py:1603
+msgid "searching in provides entries"
+msgstr ""
 
-#: ../clientStuff.py:823
-#, c-format
-msgid "You need to be root to perform these commands"
-msgstr "TerÃ¡ de ser 'root' para executar estes comandos"
+#: ../yum/__init__.py:1633
+#, python-format
+msgid "Provides-match: %s"
+msgstr ""
+
+#: ../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 ""
+
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
+#, python-format
+msgid "package %s was not marked in group %s"
+msgstr ""
+
+#: ../yum/__init__.py:1770
+#, python-format
+msgid "Adding package %s from group %s"
+msgstr ""
+
+#: ../yum/__init__.py:1774
+#, fuzzy, python-format
+msgid "No package named %s available to be installed"
+msgstr "NÃ£o EstÃ£o DisponÃveis Pacotes para Listar"
+
+#: ../yum/__init__.py:1849
+#, python-format
+msgid "Package tuple %s could not be found in packagesack"
+msgstr ""
+
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
+msgid "Invalid versioned dependency string, try quoting it."
+msgstr ""
+
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
+#, fuzzy
+msgid "Invalid version flag"
+msgstr "A opÃ§Ã£o do 'clean' Ã© invÃ¡lida %s"
 
-#: ../pkgaction.py:466
-#, c-format
-msgid "No packages found"
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
+#, fuzzy, python-format
+msgid "No Package found for %s"
 msgstr "NÃ£o foram encontrados pacotes"
 
-#: ../yummain.py:233
-#, c-format
-msgid "Exiting."
-msgstr "A sair."
-
-#: ../nevral.py:183
-#, c-format
-msgid "asking for package %s.%s - does not exist in nevral - bailing out - check rpmdb for errors"
-msgstr "a pedir o pacote %s.%s - nÃ£o existe no 'nevral' - a sair - procure erros na 'rpmdb'"
-
-#: ../clientStuff.py:1068
-#, c-format
-msgid "Errors reported doing trial run"
-msgstr "Detectaram-se erros na execuÃ§Ã£o de teste"
-
-#: ../pkgaction.py:518
-#, c-format
-msgid "Lilo found - adding kernel to lilo and making it the default"
-msgstr "O LILO foi detectado - a adicionar o 'kernel ao LILO e a colocÃ¡-lo por omissÃ£o"
-
-#: ../pkgaction.py:310
-#, c-format
-msgid "Name   : %s"
-msgstr "Nome   : %s"
+#: ../yum/__init__.py:2066
+msgid "Package Object was not a package object instance"
+msgstr ""
 
-#: ../clientStuff.py:521 ../clientStuff.py:560
-#, c-format
-msgid "Dep Installed: "
-msgstr "Dep. Instalada: "
+#: ../yum/__init__.py:2070
+msgid "Nothing specified to install"
+msgstr ""
 
-#: ../clientStuff.py:486
-#, c-format
-msgid "[update: %s]"
-msgstr "[actualizar: %s]"
+#. only one in there
+#: ../yum/__init__.py:2085
+#, python-format
+msgid "Checking for virtual provide or file-provide for %s"
+msgstr ""
 
-#: ../pkgaction.py:71
-#, c-format
-msgid "Cannot find a package matching %s"
-msgstr "NÃ£o foi detectado um pacote correspondente ao %s"
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
+#, python-format
+msgid "No Match for argument: %s"
+msgstr ""
 
-#: ../urlgrabber.py:325
-#, c-format
-msgid "ERROR: Url Return no Content-Length  - something is wrong"
-msgstr "ERRO: O URL nÃ£o devolveu um Content-Length  - passa-se algo de errado"
+#. FIXME - this is where we could check to see if it already installed
+#. for returning better errors
+#: ../yum/__init__.py:2146
+#, fuzzy
+msgid "No package(s) available to install"
+msgstr "NÃ£o EstÃ£o DisponÃveis Pacotes para Listar"
 
-#: ../clientStuff.py:721
-#, c-format
-msgid "Got a file - yay"
-msgstr "Foi obtido um ficheiro - iupi"
+#: ../yum/__init__.py:2158
+#, python-format
+msgid "Package: %s  - already in transaction set"
+msgstr ""
 
-#: ../pkgaction.py:257
-#, c-format
-msgid "From %s updating %s"
-msgstr "A partir do %s a actualizar o %s"
+#: ../yum/__init__.py:2171
+#, fuzzy, python-format
+msgid "Package %s already installed and latest version"
+msgstr "O %s estÃ¡ instalado e Ã© a Ãºltima versÃ£o."
 
-#: ../yummain.py:298
-#, c-format
-msgid "Test transaction complete, Success!"
-msgstr "A transacÃ§Ã£o de testes teve sucesso!"
+#: ../yum/__init__.py:2178
+#, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr ""
 
-#: ../serverStuff.py:52
-#, c-format
+#. update everything (the easy case)
+#: ../yum/__init__.py:2220
+msgid "Updating Everything"
+msgstr ""
+
+#: ../yum/__init__.py:2304
+#, python-format
+msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:2377
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../yum/__init__.py:2392
+msgid "No package matched to remove"
+msgstr ""
+
+#: ../yum/__init__.py:2426
+#, fuzzy, python-format
+msgid "Cannot open file: %s. Skipping."
+msgstr "NÃ£o Ã© possÃvel remover o ficheiro %s"
+
+#: ../yum/__init__.py:2429
+#, fuzzy, python-format
+msgid "Examining %s: %s"
+msgstr "a ignorar o SRPM: %s"
+
+#: ../yum/__init__.py:2436
+#, python-format
 msgid ""
-"Usage:\n"
-"yum-arch [-v] [-z] [-l] [-c] [-n] [-d] [-q] [-vv] (path of dir where headers/ should/does live)\n"
-"   -d  = check dependencies and conflicts in tree\n"
-"   -v  = more verbose output\n"
-"   -vv = even more verbose output\n"
-"   -n  = don't generate headers\n"
-"   -c  = check pkgs with gpg and md5 checksums - cannot be used with -n\n"
-"   -z  = gzip compress the headers (default, deprecated as an option)\n"
-"   -s  = generate headers for source packages too\n"
-"   -l  = use symlinks as valid rpms when building headers\n"
-"   -q  = make the display more quiet"
-msgstr ""
-"UtilizaÃ§Ã£o\n"
-"yum-arch [-v] [-z] [-l] [-c] [-n] [-d] [-q] [-vv] (pasta onde os cabeÃ§alhos existem/devem existir)\n"
-"   -d  = verificar as dependÃªncias e conflitos na Ã¡rvore\n"
-"   -v  = resultado mais descritivo\n"
-"   -vv = resultado ainda mais descritivo\n"
-"   -n  = nÃ£o gerar os cabeÃ§alhos\n"
-"   -c  = verificar o GPG e os cÃ³digos MD5 dos pacotes - nÃ£o usar com o -n\n"
-"   -z  = comprime os cabeÃ§alhos c/ o gzip (p/ omissÃ£o, descontinuado como opÃ§Ã£o)\n"
-"   -s  = gerar os cabeÃ§alhos tambÃ©m para os pacotes de cÃ³digo-fonte\n"
-"   -l  = usar ligaÃ§Ãµes simbÃ³licas como RPMs vÃ¡lidos ao criar os cabeÃ§alhos\n"
-"   -q  = tornar o resultado mais silencioso"
-
-#: ../clientStuff.py:785
-#, c-format
-msgid "The file %s is damaged."
-msgstr "O ficheiro %s estÃ¡ corrompido."
-
-#: ../pkgaction.py:267
-#, c-format
-msgid "Repo"
-msgstr "Repo"
-
-#: ../bin/yum:53
-#, c-format
-msgid "Existing lock %s: another copy is running. Aborting."
-msgstr "Bloqueio %s existente: estÃ¡ outra cÃ³pia a correr. A sair."
+"Package %s not installed, cannot update it. Run yum install to install it "
+"instead."
+msgstr ""
 
-#: ../clientStuff.py:188 ../clientStuff.py:195 ../rpmUtils.py:232
-#: ../rpmUtils.py:239 ../rpmUtils.py:242 ../rpmUtils.py:245
-#, c-format
-msgid "Damaged Header %s"
-msgstr "CabeÃ§alho %s Danificado"
+#: ../yum/__init__.py:2468
+#, fuzzy, python-format
+msgid "Excluding %s"
+msgstr "a adicionar o %s"
 
-#: ../clientStuff.py:962
-#, c-format
-msgid "Cleaning packages"
-msgstr "A limpar os pacotes"
+#: ../yum/__init__.py:2473
+#, python-format
+msgid "Marking %s to be installed"
+msgstr ""
 
-#: ../pkgaction.py:315
-#, c-format
-msgid "Group  : %s"
-msgstr "Grupo  : %s"
+#: ../yum/__init__.py:2479
+#, python-format
+msgid "Marking %s as an update to %s"
+msgstr ""
 
-#: ../clientStuff.py:734
-#, c-format
-msgid "Server: %s"
-msgstr "Servidor: %s"
+#: ../yum/__init__.py:2486
+#, python-format
+msgid "%s: does not update installed package."
+msgstr ""
 
-#: ../pkgaction.py:539
-#, c-format
-msgid "No bootloader found, Cannot configure kernel."
-msgstr "NÃ£o foi detectado um gestor de arranque; o 'kernel' nÃ£o serÃ¡ configurado."
+#: ../yum/__init__.py:2504
+msgid "Problem in reinstall: no package matched to remove"
+msgstr ""
 
-#: ../pkgaction.py:267
-#, c-format
-msgid "Name"
-msgstr "Nome"
+#: ../yum/__init__.py:2515
+#, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr ""
 
-#: ../clientStuff.py:477
-#, c-format
-msgid "[install: %s]"
-msgstr "[instalar: %s]"
+#: ../yum/__init__.py:2522
+msgid "Problem in reinstall: no package matched to install"
+msgstr ""
 
-#: ../yummain.py:207
-#, c-format
-msgid "Downloading needed headers"
-msgstr "A obter os cabeÃ§alhos necessÃ¡rios"
+#: ../yum/__init__.py:2570
+#, python-format
+msgid "Retrieving GPG key from %s"
+msgstr ""
 
-#: ../nevral.py:72
-#, c-format
-msgid "Header for pkg %s not found"
-msgstr "O cabeÃ§alho do pacote %s nÃ£o foi encontrado"
+#: ../yum/__init__.py:2576
+msgid "GPG key retrieval failed: "
+msgstr ""
 
-#: ../callback.py:55
-#, c-format
-msgid "No header - huh?"
-msgstr "Sem cabeÃ§alho - hÃ£?"
+#: ../yum/__init__.py:2589
+msgid "GPG key parsing failed: "
+msgstr ""
 
-#: ../clientStuff.py:965
-#, c-format
-msgid "Cleaning all headers"
-msgstr "A limpar todos os cabeÃ§alhos"
+#: ../yum/__init__.py:2593
+#, python-format
+msgid "GPG key at %s (0x%s) is already installed"
+msgstr ""
 
-#: ../serverStuff.py:93
-#, c-format
-msgid "depcheck: package %s needs %s"
-msgstr "depcheck: o pacote %s necessita do %s"
+#. Try installing/updating GPG key
+#: ../yum/__init__.py:2598
+#, python-format
+msgid "Importing GPG key 0x%s \"%s\" from %s"
+msgstr ""
 
-#: ../clientStuff.py:759
-#, c-format
-msgid "Error - %s cannot be found"
-msgstr "Erro - o %s nÃ£o foi encontrado"
+#: ../yum/__init__.py:2610
+#, fuzzy
+msgid "Not installing key"
+msgstr "Erros na instalaÃ§Ã£o:"
 
-#: ../rpmUtils.py:45
-#, c-format
-msgid "RPM %s fails md5 check"
-msgstr "O RPM %s falha no cÃ³digo MD5"
+#: ../yum/__init__.py:2616
+#, python-format
+msgid "Key import failed (code %d)"
+msgstr ""
 
-#: ../callback.py:85
-#, c-format
-msgid "Erasing: %s %d/%d"
-msgstr "A remover: %s %d/%d"
+#: ../yum/__init__.py:2619
+msgid "Key imported successfully"
+msgstr ""
 
-#: ../pkgaction.py:261
-#, c-format
-msgid "Nothing in any group to update or install"
-msgstr "NÃ£o hÃ¡ nada em nenhum grupo para instalar ou actualizar"
+#: ../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 ""
 
-#: ../pkgaction.py:311
-#, c-format
-msgid "Arch   : %s"
-msgstr "Arquit.: %s"
+#: ../yum/__init__.py:2633
+msgid "Import of key(s) didn't help, wrong key(s)?"
+msgstr ""
 
-#: ../nevral.py:52
-#, c-format
-msgid "No Package %s, %s"
-msgstr "NÃ£o Existe o Pacote %s, %s"
+#: ../yum/__init__.py:2707
+msgid "Unable to find a suitable mirror."
+msgstr ""
 
-#: ../pkgaction.py:84
-#, c-format
-msgid "No Packages Available for Update"
-msgstr "NÃ£o HÃ¡ Pacotes DisponÃveis para Actualizar"
+#: ../yum/__init__.py:2709
+msgid "Errors were encountered while downloading packages."
+msgstr ""
 
-#: ../pkgaction.py:535
-#, c-format
-msgid "Grub found - making this kernel the default"
-msgstr "O GRUB foi detectado - a tornar este 'kernel' o predefinido"
-
-#: ../pullheaders.py:250
-#, c-format
-msgid "Digesting rpm - %s - %d/%d"
-msgstr "A validar o RPM - %s - %d/%d"
-
-#: ../clientStuff.py:994
-#, c-format
-msgid "Damaged RPM %s, removing."
-msgstr "O RPM %s estÃ¡ danificado, a removÃª-lo."
-
-#: ../nevral.py:86
-#, c-format
-msgid "Bad Header for pkg %s.%s trying to get headers for the nevral - exiting"
-msgstr "O cabeÃ§alho do pacote %s.%s Ã© invÃ¡lido ao obter os cabeÃ§alhos do 'nevral' - a sair"
-
-#: ../clientStuff.py:1030 ../clientStuff.py:1039
-#, c-format
-msgid "Error: You may also check that you have the correct GPG keys installed"
-msgstr "Erro: PoderÃ¡ verificar tambÃ©m se tem as chaves de GPG correctas instaladas"
-
-#: ../pullheaders.py:115
-#, c-format
-msgid "No rpms to work with and no header dir. Exiting."
-msgstr "NÃ£o existem RPMs nem pasta de cabeÃ§alhos com que lidar. A sair."
-
-#: ../yummain.py:288
-#, c-format
-msgid "Exiting on user command."
-msgstr "A sair por ordem do utilizador."
+#: ../yum/__init__.py:2774
+#, fuzzy
+msgid "Test Transaction Errors: "
+msgstr "A executar a transacÃ§Ã£o de teste:"
 
-#: ../config.py:212
-#, c-format
-msgid "Failed to find section: %s"
-msgstr "NÃ£o Ã© possÃvel encontrar a secÃ§Ã£o: %s"
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:195
+msgid "Loaded plugins: "
+msgstr ""
+
+#: ../yum/plugins.py:206
+#, fuzzy, python-format
+msgid "No plugin match for: %s"
+msgstr "Remover: Nada corresponde ao %s"
+
+#: ../yum/plugins.py:219
+#, python-format
+msgid "\"%s\" plugin is disabled"
+msgstr ""
+
+#: ../yum/plugins.py:231
+#, python-format
+msgid "Plugin \"%s\" doesn't specify required API version"
+msgstr ""
+
+#: ../yum/plugins.py:235
+#, python-format
+msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+msgstr ""
+
+#: ../yum/plugins.py:264
+#, python-format
+msgid "Loading \"%s\" plugin"
+msgstr ""
 
-#: ../rpmUtils.py:162
-#, c-format
+#: ../yum/plugins.py:271
+#, python-format
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr ""
+
+#: ../yum/plugins.py:291
+#, python-format
+msgid "Configuration file %s not found"
+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 ""
+
+#: ../yum/plugins.py:448
+msgid "registration of commands not supported"
+msgstr ""
+
+#: ../rpmUtils/oldUtils.py:26
+#, python-format
+msgid "Header cannot be opened or does not match %s, %s."
+msgstr "O cabeÃ§alho nÃ£o pÃ´de ser aberto ou nÃ£o corresponde ao %s, %s."
+
+#: ../rpmUtils/oldUtils.py:46
+#, python-format
+msgid "RPM %s fails md5 check"
+msgstr "O RPM %s falha no cÃ³digo MD5"
+
+#: ../rpmUtils/oldUtils.py:144
+msgid "Could not open RPM database for reading. Perhaps it is already in use?"
+msgstr "NÃ£o foi ler a base de dados do RPM. Talvez jÃ¡ esteja a ser usada?"
+
+#: ../rpmUtils/oldUtils.py:174
 msgid "Got an empty Header, something has gone wrong"
 msgstr "Foi obtido um cabeÃ§alho vazio; algo se passa de errado"
 
-#: ../serverStuff.py:80
-#, c-format
-msgid "ignoring bad rpm: %s"
-msgstr "a ignorar o RPM invÃ¡lido: %s"
-
-#: ../pullheaders.py:89
-#, c-format
-msgid "Directory of rpms must be a directory."
-msgstr "A pasta dos RPMs deverÃ¡ ser uma pasta."
-
-#: ../clientStuff.py:1149
-#, c-format
-msgid "failover: out of servers to try"
-msgstr "contingÃªncia: sem mais servidores para experimentar"
-
-#: ../clientStuff.py:746
-#, c-format
-msgid "Getting header.info from server"
-msgstr "A obter o 'header.info' do servidor"
-
-#: ../nevral.py:50
-#, c-format
-msgid "No Package %s"
-msgstr "NÃ£o Existe o Pacote %s"
+#: ../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"
+
+#: ../rpmUtils/oldUtils.py:272
+#, python-format
+msgid "Error opening rpm %s - error %s"
+msgstr "Erro ao abrir o RPM %s - erro %s"
 
+#~ msgid "Directory of rpms must exist"
+#~ msgstr "A pasta de RPMs deverÃ¡ existir"
+
+#~ msgid "Error accessing URL: %s"
+#~ msgstr "Erro ao aceder ao URL: %s"
+
+#~ msgid "No Packages installed not included in a repository"
+#~ msgstr "NÃ£o foram instalados pacotes nÃ£o incluÃdos num repositÃ³rio"
+
+#~ msgid ""
+#~ "\n"
+#~ "   Total: %d\n"
+#~ "   Used: %d\n"
+#~ "   Src: %d"
+#~ msgstr ""
+#~ "\n"
+#~ "   Total: %d\n"
+#~ "   Usado: %d\n"
+#~ "   Origem: %d"
+
+#~ msgid "Error restoring the backup of lilo.conf  The backup was:\n"
+#~ msgstr ""
+#~ "Erro ao repor a cÃ³pia de seguranÃ§a do lilo.conf. A cÃ³pia de seguranÃ§a "
+#~ "era:\n"
+
+#~ msgid "Looking in available packages for a providing package"
+#~ msgstr "A procurar nos pacotes disponÃveis por um pacote conveniente"
+
+#~ msgid ""
+#~ "retrygrab() failed for:\n"
+#~ "  %s%s\n"
+#~ "  Executing failover method"
+#~ msgstr ""
+#~ "O retrygrab() falhou para o:\n"
+#~ "  %s%s\n"
+#~ "  A executar o mÃ©todo de contingÃªncia"
+
+#~ msgid "I will install/upgrade these to satisfy the dependencies:"
+#~ msgstr ""
+#~ "SerÃ¡ instalado/actualizado o seguinte para satisfazer as dependÃªncias:"
+
+#~ msgid "Cannot delete %s - check perms"
+#~ msgstr "NÃ£o Ã© possÃvel remover o %s - verifique as permissÃµes"
+
+#~ msgid "Need a provides to match"
+#~ msgstr "Ã‰ necessÃ¡ria uma oferta correspondente"
+
+#~ 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"
+#~ msgstr ""
+#~ "As opÃ§Ãµes do 'lilo' nÃ£o suportadas pelo YUM sÃ£o usadas no 'lilo.conf' "
+#~ "predefinido. Este ficheiro nÃ£o serÃ¡ modificado. As opÃ§Ãµes incluem:\n"
+
+#~ msgid "Error getting file %s"
+#~ msgstr "Erro ao obter o ficheiro %s"
+
+#~ msgid "%s is not writable"
+#~ msgstr "O %s nÃ£o tem permissÃµes de escrita"
+
+#~ msgid ""
+#~ "\n"
+#~ "Already found tuple: %s %s:\n"
+#~ "%s "
+#~ msgstr ""
+#~ "\n"
+#~ "JÃ¡ foi encontrado o tuplo: %s %s:\n"
+#~ "%s "
+
+#~ msgid "errors found"
+#~ msgstr "erros encontrados"
+
+#~ msgid "Unable to determine boot loader."
+#~ msgstr "NÃ£o Ã© possÃvel descobrir o gestor de arranque."
+
+#~ msgid "getting %s"
+#~ msgstr "a obter o %s"
+
+#~ msgid "Error Reading Header on %s"
+#~ msgstr "Erro ao Ler o CabeÃ§alho do %s"
+
+#~ msgid "Error accessing File: %s"
+#~ msgstr "Erro ao aceder ao ficheiro: %s"
+
+#~ msgid "You're not root, we can't install things"
+#~ msgstr "VocÃª nÃ£o Ã© o 'root', como tal nÃ£o pode instalar nada"
+
+#~ msgid "Cannot find any conf file."
+#~ msgstr "NÃ£o Ã© possÃvel encontrar um ficheiro de configuraÃ§Ã£o."
+
+#~ msgid "Local file does not exist: %s"
+#~ msgstr "O ficheiro local nÃ£o existe: %s"
+
+#~ msgid "using ftp, http[s], or file for servers, Aborting - %s"
+#~ msgstr "a usar o ftp, http[s] ou o file nos servidores. A interromper - %s"
+
+#~ msgid "Found %s."
+#~ msgstr "O %s foi encontrado."
+
+#~ msgid "Transaction(s) Complete"
+#~ msgstr "TransacÃ§Ã£o Completa"
+
+#~ msgid "IOError: %s"
+#~ msgstr "Erro E/S: %s"
+
+#~ msgid "Cleaning packages and old headers"
+#~ msgstr "A limpar os pacotes e os cabeÃ§alhos antigos"
+
+#~ msgid ""
+#~ "Cannot download %s in caching only mode or when running as non-root user."
+#~ msgstr ""
+#~ "NÃ£o Ã© possÃvel transferir o %s no modo apenas de 'cache' ou a correr como "
+#~ "nÃ£o-'root'."
+
+#~ msgid ""
+#~ "Error: You may want to run yum clean or remove the file: \n"
+#~ " %s"
+#~ msgstr ""
+#~ "Erro: deverÃ¡ querer correr o 'yum clean' ou remover o ficheiro: \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 ""
+#~ "NÃ£o foram indicados grupos em qualquer servidor, ou estÃ£o inacessÃveis."
+
+#~ msgid "%s results returned"
+#~ msgstr "%s resultados devolvidos"
+
+#~ msgid "Error moving %s to %s, fatal"
+#~ msgstr "Erro ao mover o %s para %s - fatal"
+
+#~ msgid ""
+#~ "\n"
+#~ "ignoring bad rpm: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "a ignorar o RPM invÃ¡lido: %s"
+
+#~ msgid "[erase: %s]"
+#~ msgstr "[remover: %s]"
+
+#~ msgid "%s is not a dir"
+#~ msgstr "O %s nÃ£o Ã© uma pasta"
+
+#~ msgid "Best version for %s is %s:%s-%s"
+#~ msgstr "A melhor versÃ£o do %s Ã© a %s:%s-%s"
+
+#~ msgid "[deps: %s]"
+#~ msgstr "[deps: %s]"
+
+#~ msgid ""
+#~ "\n"
+#~ "ignoring srpm: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "a ignorar o SRPM: %s"
+
+#~ msgid "Checking deps %d/%d complete"
+#~ msgstr "A verificaÃ§Ã£o das dependÃªncias %d/%d estÃ¡ completa"
+
+#~ msgid ""
+#~ "Errors within the dir(s):\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Erros nas pastas:\n"
+#~ " %s"
+
+#~ msgid "Please run yum in non-caching mode to correct this header."
+#~ msgstr ""
+#~ "Execute por favor 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: A chave de GPG nÃ£o Ã© fiÃ¡vel: %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Problem with gpg sig or md5sum on %s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Erro na assin. ou 'md5sum' do GPG em %s\n"
+#~ "\n"
+
+#~ msgid "No Packages Available for Update or Install"
+#~ msgstr "NÃ£o Existem Pacotes DisponÃveis para Actualizar ou Instalar"
+
+#~ msgid "Found best arch for install only pkg %s"
+#~ msgstr ""
+#~ "Descobriu-se a melhor arquitectura do pacote apenas de instalaÃ§Ã£o %s"
+
+#~ msgid "I will do the following:"
+#~ msgstr "SerÃ¡ feito o seguinte:"
+
+#~ msgid "Bad URL: %s"
+#~ msgstr "URL invÃ¡lido: %s"
+
+#~ msgid "NonMatching RPM version, %s, removing."
+#~ msgstr "A versÃ£o do RPM %s nÃ£o corresponde, a remover."
+
+#~ msgid "I will erase these to satisfy the dependencies:"
+#~ msgstr "SerÃ£o removidos os pacotes para satisfazer as dependÃªncias:"
+
+#~ msgid "HTTP Error (%s): %s"
+#~ msgstr "Erro de HTTP (%s): %s"
+
+#~ msgid "depcheck: package %s conflicts with %s"
+#~ msgstr "depcheck: o pacote %s estÃ¡ em conflito com o %s"
+
+#~ msgid "Please ask your sysadmin to update the headers on this system."
+#~ msgstr ""
+#~ "PeÃ§a ao seu administrador para actualizar os cabeÃ§alhos neste sistema."
+
+#~ msgid "Putting back old headers"
+#~ msgstr "A repor os cabeÃ§alhos antigos"
+
+#~ msgid "CacheDir: %s"
+#~ msgstr "CacheDir: %s"
+
+#~ msgid "Completing update for %s  - %d/%d"
+#~ msgstr "A terminar a actualizaÃ§Ã£o do %s  - %d/%d"
+
+#~ msgid ""
+#~ "Error: You may need to disable gpg checking to install this package\n"
+#~ msgstr ""
+#~ "Erro: PoderÃ¡ ter de desactivar a verificaÃ§Ã£o do GPG para instalar este "
+#~ "pacote\n"
+
+#~ msgid "Options Error: no commands found"
+#~ msgstr "Erro nas OpÃ§Ãµes: nÃ£o foram indicados comandos"
+
+#~ msgid "Unable to run grubby correctly: the message was:\n"
+#~ msgstr "NÃ£o foi possÃvel executar correctamente o grubby; a mensagem foi:\n"
+
+#~ msgid "IOError - # %s - %s"
+#~ msgstr "Erro E/S - # %s - %s"
+
+#~ msgid "Kernel Updated/Installed, checking for bootloader"
+#~ msgstr ""
+#~ "O 'Kernel' foi Instalado/Actualizado, a verificar o gestor de arranque"
+
+#~ msgid "Need to pass a list of pkgs to install"
+#~ msgstr "Ã‰ necessÃ¡rio indicar uma lista de pacotes a instalar"
+
+#~ msgid "Insufficient server config - no servers found. Aborting."
+#~ msgstr ""
+#~ "ConfiguraÃ§Ã£o de servidores insuficiente - nenhum servidor detectado. A "
+#~ "interromper."
+
+#~ msgid ""
+#~ "\n"
+#~ "    Usage:  yum [options] <update | upgrade | install | info | remove | "
+#~ "list |\n"
+#~ "            clean | provides | search | check-update | groupinstall | "
+#~ "groupupdate |\n"
+#~ "            grouplist >\n"
+#~ "                \n"
+#~ "         Options:\n"
+#~ "          -c [config file] - specify the config file to use\n"
+#~ "          -e [error level] - set the error logging level\n"
+#~ "          -d [debug level] - set the debugging level\n"
+#~ "          -y answer yes to all questions\n"
+#~ "          -t be tolerant about errors in package commands\n"
+#~ "          -R [time in minutes] - set the max amount of time to randomly "
+#~ "run in.\n"
+#~ "          -C run from cache only - do not update the cache\n"
+#~ "          --installroot=[path] - set the install root (default '/')\n"
+#~ "          --version - output the version of yum\n"
+#~ "          -h, --help this screen\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    UtilizaÃ§Ã£o:  yum [opÃ§Ãµes] <update | upgrade | install | info | remove "
+#~ "| list |\n"
+#~ "            clean | provides | search | check-update | groupinstall | "
+#~ "groupupdate |\n"
+#~ "            grouplist >\n"
+#~ "                \n"
+#~ "         OpÃ§Ãµes:\n"
+#~ "          -c [fich. configuraÃ§Ã£o] - indicar o ficheiro de configuraÃ§Ã£o a "
+#~ "usar\n"
+#~ "          -e [nÃvel erros] - indicar o nÃvel de registo de erros\n"
+#~ "          -d [nÃvel depuraÃ§Ã£o] - indicar o nÃvel de depuraÃ§Ã£o\n"
+#~ "          -y responder 'sim' a todas as perguntas\n"
+#~ "          -t ser tolerante com os erros nos comandos dos pacotes\n"
+#~ "          -R [tempo em minutos] - define o tempo mÃ¡ximo de execuÃ§Ã£o "
+#~ "aleatÃ³ria.\n"
+#~ "          -C usar apenas a 'cache' - esta nÃ£o Ã© actualizada\n"
+#~ "          --installroot=[pasta] - pasta de instalaÃ§Ã£o de base (por "
+#~ "omissÃ£o '/')\n"
+#~ "          --version - devolver a versÃ£o do 'yum'\n"
+#~ "          -h, --help este ecrÃ£\n"
+#~ "    "
+
+#~ msgid "From %s installing %s"
+#~ msgstr "A partir do %s instalar o %s"
+
+#~ msgid "No bootloader found, Cannot configure kernel, continuing."
+#~ msgstr ""
+#~ "NÃ£o foi encontrado um gestor de arranque, nÃ£o Ã© possÃvel configurar o "
+#~ "'kernel', a continuar."
+
+#~ msgid "Attempt to delete a missing file %s - ignoring."
+#~ msgstr "A tentar remover um ficheiro inexistente %s - a ignorar."
+
+#~ msgid "Getting %s"
+#~ msgstr "A obter o %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Writing header.info file"
+#~ msgstr ""
+#~ "\n"
+#~ "A gravar o ficheiro header.info"
+
+#~ msgid "Gathering header information file(s) from server(s)"
+#~ msgstr "A obter os ficheiros de dados dos cabeÃ§alhos dos servidores"
+
+#~ msgid "Using cached header.info file"
+#~ msgstr "A usar o ficheiro 'header.info' na 'cache'"
+
+#~ msgid "localrpmdb not defined"
+#~ msgstr "O localrpmdb nÃ£o estÃ¡ definido"
+
+#~ msgid "Error installing the new bootloader: \n"
+#~ msgstr "Erro ao instalar o novo gestor de arranque:  \n"
+
+#~ msgid "Error: Could not find the GPG Key necessary to validate pkg %s"
+#~ msgstr ""
+#~ "Erro: NÃ£o foi encontrada a chave de GPG necessÃ¡ria para validar o pacote %"
+#~ "s"
+
+#~ msgid "No actions to take"
+#~ msgstr "NÃ£o existem acÃ§Ãµes a tomar"
+
+#~ 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 corresponde ao\n"
+#~ " %s"
+
+#~ msgid "   "
+#~ msgstr "   "
+
+#~ msgid "Error: Cannot find baseurl or name for server '%s'. Skipping"
+#~ msgstr ""
+#~ "Erro: NÃ£o existe um 'baseurl' ou 'name' para o servidor '%s'. A ignorar"
+
+#~ msgid "Odd header %s suddenly disappeared"
+#~ msgstr "O cabeÃ§alho estranho %s desapareceu de repente"
+
+#~ msgid "All dependencies resolved and no conflicts detected"
+#~ msgstr "Todas as dependÃªncias foram resolvidas sem detectar conflitos"
+
+#~ msgid "using cached groups from server: %s"
+#~ msgstr "a usar os grupos em 'cache' do servidor: %s"
+
+#~ msgid "Exiting."
+#~ msgstr "A sair."
+
+#~ msgid ""
+#~ "asking for package %s.%s - does not exist in nevral - bailing out - check "
+#~ "rpmdb for errors"
+#~ msgstr ""
+#~ "a pedir o pacote %s.%s - nÃ£o existe no 'nevral' - a sair - procure erros "
+#~ "na 'rpmdb'"
+
+#~ msgid "Errors reported doing trial run"
+#~ msgstr "Detectaram-se erros na execuÃ§Ã£o de teste"
+
+#~ msgid "Lilo found - adding kernel to lilo and making it the default"
+#~ msgstr ""
+#~ "O LILO foi detectado - a adicionar o 'kernel ao LILO e a colocÃ¡-lo por "
+#~ "omissÃ£o"
+
+#~ msgid "[update: %s]"
+#~ msgstr "[actualizar: %s]"
+
+#~ msgid "ERROR: Url Return no Content-Length  - something is wrong"
+#~ msgstr ""
+#~ "ERRO: O URL nÃ£o devolveu um Content-Length  - passa-se algo de errado"
+
+#~ msgid "Got a file - yay"
+#~ msgstr "Foi obtido um ficheiro - iupi"
+
+#~ msgid "From %s updating %s"
+#~ msgstr "A partir do %s a actualizar o %s"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ "yum-arch [-v] [-z] [-l] [-c] [-n] [-d] [-q] [-vv] (path of dir where "
+#~ "headers/ should/does live)\n"
+#~ "   -d  = check dependencies and conflicts in tree\n"
+#~ "   -v  = more verbose output\n"
+#~ "   -vv = even more verbose output\n"
+#~ "   -n  = don't generate headers\n"
+#~ "   -c  = check pkgs with gpg and md5 checksums - cannot be used with -n\n"
+#~ "   -z  = gzip compress the headers (default, deprecated as an option)\n"
+#~ "   -s  = generate headers for source packages too\n"
+#~ "   -l  = use symlinks as valid rpms when building headers\n"
+#~ "   -q  = make the display more quiet"
+#~ msgstr ""
+#~ "UtilizaÃ§Ã£o\n"
+#~ "yum-arch [-v] [-z] [-l] [-c] [-n] [-d] [-q] [-vv] (pasta onde os "
+#~ "cabeÃ§alhos existem/devem existir)\n"
+#~ "   -d  = verificar as dependÃªncias e conflitos na Ã¡rvore\n"
+#~ "   -v  = resultado mais descritivo\n"
+#~ "   -vv = resultado ainda mais descritivo\n"
+#~ "   -n  = nÃ£o gerar os cabeÃ§alhos\n"
+#~ "   -c  = verificar o GPG e os cÃ³digos MD5 dos pacotes - nÃ£o usar com o -"
+#~ "n\n"
+#~ "   -z  = comprime os cabeÃ§alhos c/ o gzip (p/ omissÃ£o, descontinuado como "
+#~ "opÃ§Ã£o)\n"
+#~ "   -s  = gerar os cabeÃ§alhos tambÃ©m para os pacotes de cÃ³digo-fonte\n"
+#~ "   -l  = usar ligaÃ§Ãµes simbÃ³licas como RPMs vÃ¡lidos ao criar os "
+#~ "cabeÃ§alhos\n"
+#~ "   -q  = tornar o resultado mais silencioso"
+
+#~ msgid "The file %s is damaged."
+#~ msgstr "O ficheiro %s estÃ¡ corrompido."
+
+#~ msgid "Repo"
+#~ msgstr "Repo"
+
+#~ msgid "No bootloader found, Cannot configure kernel."
+#~ msgstr ""
+#~ "NÃ£o foi detectado um gestor de arranque; o 'kernel' nÃ£o serÃ¡ configurado."
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "[install: %s]"
+#~ msgstr "[instalar: %s]"
+
+#~ msgid "Downloading needed headers"
+#~ msgstr "A obter os cabeÃ§alhos necessÃ¡rios"
+
+#~ msgid "Header for pkg %s not found"
+#~ msgstr "O cabeÃ§alho do pacote %s nÃ£o foi encontrado"
+
+#~ msgid "Cleaning all headers"
+#~ msgstr "A limpar todos os cabeÃ§alhos"
+
+#~ msgid "depcheck: package %s needs %s"
+#~ msgstr "depcheck: o pacote %s necessita do %s"
+
+#~ msgid "Error - %s cannot be found"
+#~ msgstr "Erro - o %s nÃ£o foi encontrado"
+
+#~ msgid "Erasing: %s %d/%d"
+#~ msgstr "A remover: %s %d/%d"
+
+#~ msgid "Nothing in any group to update or install"
+#~ msgstr "NÃ£o hÃ¡ nada em nenhum grupo para instalar ou actualizar"
+
+#~ msgid "Grub found - making this kernel the default"
+#~ msgstr "O GRUB foi detectado - a tornar este 'kernel' o predefinido"
+
+#~ msgid "Digesting rpm - %s - %d/%d"
+#~ msgstr "A validar o RPM - %s - %d/%d"
+
+#~ msgid "Damaged RPM %s, removing."
+#~ msgstr "O RPM %s estÃ¡ danificado, a removÃª-lo."
+
+#~ msgid ""
+#~ "Bad Header for pkg %s.%s trying to get headers for the nevral - exiting"
+#~ msgstr ""
+#~ "O cabeÃ§alho do pacote %s.%s Ã© invÃ¡lido ao obter os cabeÃ§alhos do 'nevral' "
+#~ "- a sair"
+
+#~ msgid ""
+#~ "Error: You may also check that you have the correct GPG keys installed"
+#~ msgstr ""
+#~ "Erro: PoderÃ¡ verificar tambÃ©m se tem as chaves de GPG correctas instaladas"
+
+#~ msgid "No rpms to work with and no header dir. Exiting."
+#~ msgstr "NÃ£o existem RPMs nem pasta de cabeÃ§alhos com que lidar. A sair."
+
+#~ msgid "ignoring bad rpm: %s"
+#~ msgstr "a ignorar o RPM invÃ¡lido: %s"
+
+#~ msgid "Directory of rpms must be a directory."
+#~ msgstr "A pasta dos RPMs deverÃ¡ ser uma pasta."
+
+#~ msgid "failover: out of servers to try"
+#~ msgstr "contingÃªncia: sem mais servidores para experimentar"
+
+#~ msgid "Getting header.info from server"
+#~ msgstr "A obter o 'header.info' do servidor"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f87eb6b..638315c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Yum\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-08 10:16+0100\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2008-03-22 01:02-0300\n"
 "Last-Translator: Igor Pires Soares <igor at projetofedora.org>\n"
 "Language-Team: Brazilian Portuguese <fedora-trans-pt_br at redhat.com>\n"
@@ -17,8 +17,7 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../callback.py:48
-#: ../output.py:487
+#: ../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:486
+#: ../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:533
+#: ../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:531
+#: ../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:488
+#: ../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:57
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr "Erro de ConfiguraÃ§Ã£o: %s"
 
-#: ../cli.py:186
-#: ../cli.py:1040
-#: ../utils.py:60
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "Erro nas OpÃ§Ãµes: %s"
@@ -146,279 +133,288 @@ msgstr "Baixando Pacotes:"
 msgid "Error Downloading Packages:\n"
 msgstr "Erro ao Baixar Pacotes:\n"
 
-#: ../cli.py:369
-#: ../yum/__init__.py:2689
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr "Executando o rpm_check_debug"
 
-#: ../cli.py:372
-#: ../yum/__init__.py:2692
+#: ../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:376
-#: ../yum/__init__.py:2694
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr "Por favor, reporte esse erro ao bugzilla"
 
-#: ../cli.py:380
+#: ../cli.py:383
 msgid "Running Transaction Test"
 msgstr "Executando Teste de TransaÃ§Ã£o"
 
-#: ../cli.py:396
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr "Teste de TransaÃ§Ã£o Finalizado"
 
-#: ../cli.py:398
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr "Erro na VerificaÃ§Ã£o da TransaÃ§Ã£o:\n"
 
-#: ../cli.py:405
+#: ../cli.py:408
 msgid "Transaction Test Succeeded"
 msgstr "Teste de TransaÃ§Ã£o Completo"
 
-#: ../cli.py:423
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr "Executando a TransaÃ§Ã£o"
 
-#: ../cli.py:452
+#: ../cli.py:459
 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:484
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr "Analisando argumentos da instalaÃ§Ã£o de pacotes"
 
-#: ../cli.py:494
+#: ../cli.py:501
 #, python-format
 msgid "No package %s available."
 msgstr "Nenhum pacote %s disponÃvel."
 
-#: ../cli.py:498
-#: ../cli.py:616
-#: ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr "Pacotes a serem instalados"
 
-#: ../cli.py:499
-#: ../cli.py:617
-#: ../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:529
-#: ../yum/__init__.py:2192
-#: ../yum/__init__.py:2271
-#: ../yum/__init__.py:2283
+#: ../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 "Pacote jÃ¡ obsoleto nÃ£o serÃ¡ atualizado: %s.%s %s:%s-%s"
 
-#: ../cli.py:561
+#: ../cli.py:568
 #, python-format
 msgid "Could not find update match for %s"
 msgstr "NÃ£o foi possÃvel encontrar uma atualizaÃ§Ã£o correspondente ao %s"
 
-#: ../cli.py:573
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr "%d pacotes marcados para atualizaÃ§Ã£o"
 
-#: ../cli.py:576
+#: ../cli.py:583
 msgid "No Packages marked for Update"
 msgstr "Nenhum pacote marcado para atualizaÃ§Ã£o"
 
-#: ../cli.py:592
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr "%d pacotes marcados para remoÃ§Ã£o"
 
-#: ../cli.py:595
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr "Nenhum pacote marcado para remoÃ§Ã£o"
 
-#: ../cli.py:607
+#: ../cli.py:614
 msgid "No Packages Provided"
 msgstr "Nenhum Pacote Fornecido"
 
-#: ../cli.py:647
+#: ../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:685
+#: ../cli.py:701
+#, fuzzy, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "Apagar: Nenhum resultado para %s"
+
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr "Nenhum pacote encontrado"
 
-#: ../cli.py:722
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr "Nenhum Pacote Encontrado para %s"
 
-#: ../cli.py:734
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr "Limpando Tudo"
 
-#: ../cli.py:748
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr "Limpando CabeÃ§alhos"
 
-#: ../cli.py:751
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr "Limpando Pacotes"
 
-#: ../cli.py:754
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr "Limpando metadados em xml"
 
-#: ../cli.py:757
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr "Limpando cache do banco de dados"
 
-#: ../cli.py:760
+#: ../cli.py:783
+#, fuzzy
+msgid "Cleaning up expire-cache metadata"
+msgstr "Limpando metadados em xml"
+
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr "Limpando plugins"
 
-#: ../cli.py:782
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr "Grupos Instalados:"
 
-#: ../cli.py:789
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr "Grupos DisponÃveis:"
 
-#: ../cli.py:795
+#: ../cli.py:820
 msgid "Done"
 msgstr "ConcluÃdo"
 
-#: ../cli.py:804
-#: ../cli.py:816
-#: ../cli.py:822
+#: ../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:828
+#: ../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:830
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr "%d Pacote(s) a Ser(em) Instalado(s)"
 
-#: ../cli.py:840
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr "Nenhum grupo de nome %s existe"
 
-#: ../cli.py:846
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr "Nenhum pacote a ser removido a partir dos grupos"
 
-#: ../cli.py:848
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr "%d Pacote(s) a Ser(em) Removido(s)"
 
-#: ../cli.py:890
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "O pacote %s jÃ¡ estÃ¡ instalado, ignorando"
 
-#: ../cli.py:901
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr "Descartando pacote nÃ£o comparÃ¡vel %s.%s"
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:927
+#: ../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:946
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr "Erro na linha de comando: %s"
 
-#: ../cli.py:1073
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr "ser tolerante com os erros"
 
-#: ../cli.py:1075
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr "executar por completo a partir do cache, nÃ£o atualiza o cache"
 
-#: ../cli.py:1077
+#: ../cli.py:1105
 msgid "config file location"
 msgstr "configurar localizaÃ§Ã£o do arquivo"
 
-#: ../cli.py:1079
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr "Tempo mÃ¡ximo de espera do comando"
 
-#: ../cli.py:1081
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr "nÃvel de depuraÃ§Ã£o na saÃda"
 
-#: ../cli.py:1084
+#: ../cli.py:1113
+msgid "show duplicates, in repos, in list/search commands"
+msgstr ""
+
+#: ../cli.py:1115
 msgid "error output level"
 msgstr "nÃvel de erro na saÃda"
 
-#: ../cli.py:1087
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr "operaÃ§Ã£o discreta"
 
-#: ../cli.py:1091
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr "responder sim para todas as perguntas"
 
-#: ../cli.py:1093
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr "mostrar versÃ£o do Yum ao sair"
 
-#: ../cli.py:1094
+#: ../cli.py:1125
 msgid "set install root"
 msgstr "definir raiz de instalaÃ§Ã£o"
 
-#: ../cli.py:1098
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr "habilitar um ou mais repositÃ³rios (curingas sÃ£o permitidos)"
 
-#: ../cli.py:1102
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr "desabilitar um ou mais repositÃ³rios (curingas sÃ£o permitidos)"
 
-#: ../cli.py:1105
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr "excluir pacote(s) por nome ou glob"
 
-#: ../cli.py:1107
+#: ../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:1110
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr "Habilitar processo de obsolescÃªncia durante as atualizaÃ§Ãµes"
 
-#: ../cli.py:1112
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr "desabilitar plugins do Yum"
 
-#: ../cli.py:1114
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr "desabilitar verificaÃ§Ã£o de assinaturas gpg"
 
-#: ../cli.py:1116
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr "desabilitar plugins pelo nome"
 
-#: ../cli.py:1119
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr "ignorar pacotes com problemas de soluÃ§Ã£o de dependÃªncias"
 
@@ -474,69 +470,85 @@ msgstr "Dez"
 msgid "Trying other mirror."
 msgstr "Tentando outro espelho."
 
-#: ../output.py:273
+#: ../output.py:293
 #, python-format
 msgid "Name       : %s"
 msgstr "Nome       : %s"
 
-#: ../output.py:274
+#: ../output.py:294
 #, python-format
 msgid "Arch       : %s"
 msgstr "Arquitetura   : %s"
 
-#: ../output.py:276
+#: ../output.py:296
 #, python-format
 msgid "Epoch      : %s"
 msgstr "PerÃodo      : %s"
 
-#: ../output.py:277
+#: ../output.py:297
 #, python-format
 msgid "Version    : %s"
 msgstr "VersÃ£o    : %s"
 
-#: ../output.py:278
+#: ../output.py:298
 #, python-format
 msgid "Release    : %s"
 msgstr "LanÃ§amento  : %s"
 
-#: ../output.py:279
+#: ../output.py:299
 #, python-format
 msgid "Size       : %s"
 msgstr "Tamanho   : %s"
 
-#: ../output.py:280
+#: ../output.py:300
 #, python-format
 msgid "Repo       : %s"
 msgstr "Repo       : %s"
 
-#: ../output.py:282
+#: ../output.py:302
 #, python-format
 msgid "Committer  : %s"
 msgstr "Enviado por  : %s"
 
-#: ../output.py:283
+#: ../output.py:303
 msgid "Summary    : "
 msgstr "SumÃ¡rio    : "
 
-#: ../output.py:285
+#: ../output.py:305
 #, python-format
 msgid "URL        : %s"
 msgstr "URL        : %s"
 
-#: ../output.py:286
+#: ../output.py:306
 #, python-format
 msgid "License    : %s"
 msgstr "LicenÃ§a   : %s"
 
-#: ../output.py:287
+#: ../output.py:307
 msgid "Description: "
 msgstr "DescriÃ§Ã£o: "
 
-#: ../output.py:331
+#: ../output.py:351
 msgid "Is this ok [y/N]: "
 msgstr "EstÃ¡ ok? [y = Sim / N = NÃ£o]:"
 
-#: ../output.py:345
+#: ../output.py:357 ../output.py:360
+msgid "y"
+msgstr ""
+
+#: ../output.py:357
+msgid "n"
+msgstr ""
+
+#: ../output.py:357 ../output.py:360
+msgid "yes"
+msgstr ""
+
+#: ../output.py:357
+msgid "no"
+msgstr ""
+
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
@@ -545,96 +557,96 @@ msgstr ""
 "\n"
 "Grupo: %s"
 
-#: ../output.py:347
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr " DescriÃ§Ã£o: %s"
 
-#: ../output.py:349
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr " Pacotes ObrigatÃ³rios:"
 
-#: ../output.py:354
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr " Pacotes PadrÃ£o:"
 
-#: ../output.py:359
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr " Pacotes Opcionais:"
 
-#: ../output.py:364
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr " Pacotes Condicionais:"
 
-#: ../output.py:372
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr "pacote: %s"
 
-#: ../output.py:374
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr "  Nenhuma dependÃªncia para este pacote"
 
-#: ../output.py:379
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr "  dependÃªncia: %s"
 
-#: ../output.py:381
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr "   DependÃªncia nÃ£o satisfeita"
 
-#: ../output.py:436
+#: ../output.py:461
 msgid "Matched from:"
 msgstr "Resultado a partir de:"
 
-#: ../output.py:462
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr "Houve um erro no cÃ¡lculo do tamanho total do download"
 
-#: ../output.py:467
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr "Tamanho total: %s"
 
-#: ../output.py:470
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr "Tamanho total do download: %s"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Package"
 msgstr "Pacote"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Arch"
 msgstr "Arquitetura"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Version"
 msgstr "VersÃ£o"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Repository"
 msgstr "RepositÃ³rio"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../output.py:489
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr "Instalando para as dependÃªncias"
 
-#: ../output.py:490
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr "Atualizando para as dependÃªncias"
 
-#: ../output.py:491
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr "Removendo para as dependÃªncias"
 
-#: ../output.py:503
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
@@ -643,7 +655,7 @@ msgstr ""
 "     substituindo  %s.%s %s\n"
 "\n"
 
-#: ../output.py:511
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -660,92 +672,96 @@ msgstr ""
 "Atualizar   %5.5s Pacote(s)         \n"
 "Remover   %5.5s Pacote(s)         \n"
 
-#: ../output.py:529
+#: ../output.py:554
 msgid "Removed"
 msgstr "Removido(s)"
 
-#: ../output.py:530
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr "DependÃªncia Removida"
 
-#: ../output.py:532
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr "DependÃªncia Instalada"
 
-#: ../output.py:534
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr "DependÃªncia Atualizada"
 
-#: ../output.py:535
+#: ../output.py:560
 msgid "Replaced"
 msgstr "SubstituÃdo(s)"
 
-#: ../output.py:593
+#: ../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"
-" 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:603
+#: ../output.py:628
 msgid "user interrupt"
 msgstr "interrupÃ§Ã£o pelo usuÃ¡rio"
 
-#: ../output.py:614
+#: ../output.py:639
 msgid "installed"
 msgstr "instalados"
 
-#: ../output.py:615
+#: ../output.py:640
 msgid "updated"
 msgstr "atualizados"
 
-#: ../output.py:616
+#: ../output.py:641
 msgid "obsoleted"
 msgstr "obsoleto(s)"
 
-#: ../output.py:617
+#: ../output.py:642
 msgid "erased"
 msgstr "removidos"
 
-#: ../output.py:621
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr "---> Pacote %s.%s %s:%s-%s definido para ser %s"
 
-#: ../output.py:628
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr "--> Executando verificaÃ§Ã£o de transaÃ§Ã£o"
 
-#: ../output.py:633
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr "--> Reiniciando ResoluÃ§Ã£o de DependÃªncias com as novas alteraÃ§Ãµes."
 
-#: ../output.py:638
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr "--> ResoluÃ§Ã£o de DependÃªncias Finalizada"
 
-#: ../output.py:643
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr "--> Processando DependÃªncia: %s para o pacote: %s"
 
-#: ../output.py:648
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr "--> DependÃªncia NÃ£o Resolvida: %s"
 
-#: ../output.py:654
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr "--> Processando Conflito: %s conflita com %s"
 
-#: ../output.py:657
+#: ../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:661
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr "--> Baixando cabeÃ§alho do %s para inclusÃ£o no conjunto de transaÃ§Ãµes."
@@ -758,7 +774,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"
@@ -771,8 +788,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"
@@ -782,7 +801,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
@@ -869,8 +889,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"
 
@@ -1076,17 +1095,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:"
@@ -1104,11 +1124,11 @@ msgstr ""
 "\n"
 "DependÃªncias Resolvidas"
 
-#: ../yummain.py:199
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr "Completo!"
 
-#: ../yummain.py:246
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
@@ -1118,293 +1138,321 @@ msgstr ""
 "\n"
 "Saindo pelo cancelamento do usuÃ¡rio."
 
-#: ../yum/depsolve.py:70
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr "doTsSetup() serÃ¡ removida em uma futura versÃ£o do Yum.\n"
 
-#: ../yum/depsolve.py:83
+#: ../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:123
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr "tsflag invÃ¡lido no arquivo de configuraÃ§Ã£o: %s"
 
-#: ../yum/depsolve.py:134
+#: ../yum/depsolve.py:147
 #, python-format
 msgid "Searching pkgSack for dep: %s"
 msgstr "Pesquisando pkgSack para a dep.: %s"
 
-#: ../yum/depsolve.py:163
+#: ../yum/depsolve.py:170
 #, python-format
 msgid "Potential match for %s from %s"
 msgstr "CorrespondÃªncia potencial para o %s a partir de %s"
 
-#: ../yum/depsolve.py:171
+#: ../yum/depsolve.py:178
 #, python-format
 msgid "Matched %s to require for %s"
 msgstr "%s encontrado para solicitar o %s"
 
-#: ../yum/depsolve.py:212
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr "Membro: %s"
 
-#: ../yum/depsolve.py:226
-#: ../yum/depsolve.py:788
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr "%s convertido para instalar"
 
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "Adicionando Pacote %s ao modo %s"
 
-#: ../yum/depsolve.py:243
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr "Removendo Pacote %s"
 
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr "%s requer: %s"
 
-#: ../yum/depsolve.py:300
+#: ../yum/depsolve.py:312
 msgid "Needed Require has already been looked up, cheating"
 msgstr "O requerimento necessÃ¡rio jÃ¡ foi localizado, enganando"
 
-#: ../yum/depsolve.py:310
+#: ../yum/depsolve.py:322
 #, python-format
 msgid "Needed Require is not a package name. Looking up: %s"
 msgstr "O requerimento necessÃ¡rio nÃ£o Ã© o nome de um pacote. Localizando: %s"
 
-#: ../yum/depsolve.py:317
+#: ../yum/depsolve.py:329
 #, python-format
 msgid "Potential Provider: %s"
 msgstr "Fornecedor em potencial: %s"
 
-#: ../yum/depsolve.py:340
+#: ../yum/depsolve.py:352
 #, python-format
 msgid "Mode is %s for provider of %s: %s"
 msgstr "O modo Ã© %s para o fornecedor do %s: %s"
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:356
 #, python-format
 msgid "Mode for pkg providing %s: %s"
 msgstr "Modo para o pacote que fornece o %s: %s"
 
-#: ../yum/depsolve.py:348
+#: ../yum/depsolve.py:360
 #, python-format
 msgid "TSINFO: %s package requiring %s marked as erase"
 msgstr "TSINFO: o pacote %s que requer o %s foi marcado para remoÃ§Ã£o"
 
-#: ../yum/depsolve.py:361
-#, python-format
-msgid "Looking for Obsoletes for %s"
-msgstr "Localizando Obsoletos para %s"
-
-#: ../yum/depsolve.py:373
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr "TSINFO: Tornando %s obsoleto com o %s para resolver a dependÃªncia."
 
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr "TSINFO: Atualizando %s para resolver a dependÃªncia."
 
-#. if there's no update then pass this over to requringFromTransaction()
-#: ../yum/depsolve.py:408
+#: ../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:420
+#: ../yum/depsolve.py:388
 #, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr "Requerimento %s insolÃºvel para o %s"
 
 #. is it already installed?
-#: ../yum/depsolve.py:466
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr "%s estÃ¡ nos pacotes fornecedores mas jÃ¡ estÃ¡ instalado, removendo."
 
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr "O pacote de soluÃ§Ã£o em potencial %s tem uma instÃ¢ncia mais nova no ct."
 
-#: ../yum/depsolve.py:492
+#: ../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:500
-#: ../yum/depsolve.py:568
+#: ../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"
 
-#: ../yum/depsolve.py:513
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr "%s jÃ¡ estÃ¡ no ct, pulando esse"
 
-#: ../yum/depsolve.py:578
+#: ../yum/depsolve.py: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: Marcando %s como uma atualizaÃ§Ã£o para o %s"
 
-#: ../yum/depsolve.py:585
+#: ../yum/depsolve.py:544
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr "TSINFO: Marcando %s como uma instalaÃ§Ã£o para o %s"
 
-#: ../yum/depsolve.py:647
-#: ../yum/depsolve.py:654
-#, python-format
-msgid "unable to find newer package for %s"
-msgstr "nÃ£o foi possÃvel encontrar um pacote mais recente para o %s"
-
-#: ../yum/depsolve.py:661
-#, python-format
-msgid "TSINFO: Updating %s to resolve conflict."
-msgstr "TSINFO: Atualizando o %s para resolver o conflito."
-
-#: ../yum/depsolve.py:671
-#, python-format
-msgid "%s conflicts: %s"
-msgstr "%s conflita com: %s"
-
-#: ../yum/depsolve.py:681
-#, python-format
-msgid "%s conflicts with %s"
-msgstr "%s conflita com %s"
-
-#: ../yum/depsolve.py:720
-#: ../yum/depsolve.py:806
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr "Sucesso - transaÃ§Ã£o vazia"
 
-#: ../yum/depsolve.py:765
-#: ../yum/depsolve.py:778
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr "Reiniciando o Loop"
 
-#: ../yum/depsolve.py:794
+#: ../yum/depsolve.py:702
 msgid "Dependency Process ending"
 msgstr "TÃ©rmino do Processo de DependÃªncias"
 
-#: ../yum/depsolve.py:800
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr "%s a partir de %s tem problemas de resoluÃ§Ã£o de dependÃªncias"
 
-#: ../yum/depsolve.py:807
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr "Sucesso - dependÃªncias resolvidas"
 
-#: ../yum/depsolve.py:824
+#: ../yum/depsolve.py:729
 #, python-format
 msgid "Checking deps for %s"
 msgstr "Verificando dependÃªncias para %s"
 
-#: ../yum/depsolve.py:880
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr "procurando por %s como um requerimento do %s"
 
+#: ../yum/depsolve.py:933
+#, python-format
+msgid "Comparing best: %s to po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, python-format
+msgid "best %s obsoletes po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:955
+#, python-format
+msgid "po %s obsoletes best: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#, fuzzy, python-format
+msgid "better arch in po %s"
+msgstr "pesquisando pelo pacote %s"
+
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#, python-format
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#, python-format
+msgid "best %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#, python-format
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#, python-format
+msgid "po %s has a shorter name than best %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
+
 #: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr "doConfigSetup() serÃ¡ removida em uma futura versÃ£o do Yum.\n"
 
-#: ../yum/__init__.py:311
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr "O repositÃ³rio %r nÃ£o tem nome na configuraÃ§Ã£o, usando o id"
 
-#: ../yum/__init__.py:347
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr "plugins jÃ¡ inicializados"
 
-#: ../yum/__init__.py:354
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr "doRpmDBSetup() serÃ¡ removida em uma futura versÃ£o do Yum.\n"
 
-#: ../yum/__init__.py:363
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr "Lendo RPMDB Local"
 
-#: ../yum/__init__.py:381
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr "doRepoSetup() serÃ¡ removida em uma futura versÃ£o do Yum.\n"
 
-#: ../yum/__init__.py:399
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr "doSackSetup() serÃ¡ removida em uma futura versÃ£o do Yum.\n"
 
-#: ../yum/__init__.py:416
+#: ../yum/__init__.py:404
 msgid "Setting up Package Sacks"
 msgstr "Configurando Sacos de Pacotes"
 
-#: ../yum/__init__.py:458
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr "o objeto de repositÃ³rio para o %s necessita de um mÃ©todo _resetSack\n"
 
-#: ../yum/__init__.py:459
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr "conseqÃ¼entemente este repo nÃ£o pode ser restaurado.\n"
 
-#: ../yum/__init__.py:464
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr "doUpdateSetup() serÃ¡ removida em uma futura versÃ£o do Yum.\n"
 
-#: ../yum/__init__.py:476
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr "Construindo objeto de atualizaÃ§Ãµes"
 
-#: ../yum/__init__.py:499
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr "doGroupSetup() serÃ¡ removida em uma futura versÃ£o do Yum.\n"
 
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr "Obtendo metadados do grupo"
 
-#: ../yum/__init__.py:548
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr "Adicionando arquivo de grupo a partir do repositÃ³rio: %s"
 
-#: ../yum/__init__.py:557
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr "Falha ao adicionar o arquivo de grupos para o repositÃ³rio: %s - %s"
 
-#: ../yum/__init__.py:563
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr "Nenhum grupo disponÃvel em nenhum repositÃ³rio"
 
-#: ../yum/__init__.py:614
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr "Importando informaÃ§Ãµes adicionais da lista de arquivos"
 
-#: ../yum/__init__.py:646
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr "Rodada de ignoraÃ§Ã£o de dependÃªncias quebradas %i"
 
-#: ../yum/__init__.py:674
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr "A ignoraÃ§Ã£o de dependÃªncias quebradas levou %i rodadas"
 
-#: ../yum/__init__.py:675
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
@@ -1412,445 +1460,452 @@ msgstr ""
 "\n"
 "Pacotes ignorados devido a problemas de dependÃªncias:"
 
-#: ../yum/__init__.py:679
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr "    %s a partir de %s"
 
-#: ../yum/__init__.py:767
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "Falha ao remover o arquivo de transaÃ§Ã£o %s"
 
-#: ../yum/__init__.py:807
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr "excluindo para custo: %s a partir de %s"
 
-#: ../yum/__init__.py:838
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr "Excluindo pacotes na lista global de excluÃdos"
 
-#: ../yum/__init__.py:840
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr "Excluindo Pacotes de %s"
 
-#: ../yum/__init__.py:867
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr "Reduzindo %s apenas aos pacotes inclusos"
 
-#: ../yum/__init__.py:872
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr "Mantendo o pacote incluso %s"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr "Removendo pacote nÃ£o encontrado %s"
 
-#: ../yum/__init__.py:881
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr "ConcluÃdo"
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:911
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "NÃ£o foi possÃvel verificar se o PID %s estÃ¡ ativo"
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:915
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr "Bloqueio existente em %s: outra cÃ³pia estÃ¡ em execuÃ§Ã£o com o pid %s."
 
-#: ../yum/__init__.py:962
-#: ../yum/__init__.py:969
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr "O pacote nÃ£o corresponde ao download pretendido"
 
-#: ../yum/__init__.py:983
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr "NÃ£o foi possÃvel realizar a soma de verificaÃ§Ã£o"
 
-#: ../yum/__init__.py:986
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr "O pacote nÃ£o corresponde Ã  soma de verificaÃ§Ã£o"
 
-#: ../yum/__init__.py:1028
+#: ../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:1034
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr "usando cÃ³pia local do %s"
 
-#: ../yum/__init__.py:1053
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr "EspaÃ§o insuficiente no diretÃ³rio de download %s para baixar o arquivo"
 
-#: ../yum/__init__.py:1086
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr "O cabeÃ§alho nÃ£o estÃ¡ completo."
 
-#: ../yum/__init__.py:1126
+#: ../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:1181
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr "A chave pÃºblica para o %s nÃ£o estÃ¡ instalada"
 
-#: ../yum/__init__.py:1185
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr "Problema ao abrir o pacote %s"
 
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr "A chave pÃºblica para o %s nÃ£o Ã© confiÃ¡vel"
 
-#: ../yum/__init__.py:1197
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr "O pacote %s nÃ£o estÃ¡ assinado"
 
-#: ../yum/__init__.py:1235
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr "NÃ£o foi possÃvel remover %s"
 
-#: ../yum/__init__.py:1239
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr "%s removido"
 
-#: ../yum/__init__.py:1271
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr "NÃ£o foi possÃvel remover %s arquivo %s"
 
-#: ../yum/__init__.py:1275
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr "%s arquivo %s removido"
 
-#: ../yum/__init__.py:1277
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr "%d %s arquivos removidos"
 
-#: ../yum/__init__.py:1317
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr "Mais de uma correspondÃªncia idÃªntica no saco para %s"
 
-#: ../yum/__init__.py:1323
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr "Nada corresponde ao %s.%s %s:%s-%s a partir da atualizaÃ§Ã£o"
 
-#: ../yum/__init__.py:1513
-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: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"
 
-#: ../yum/__init__.py:1550
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr "Pesquisando por %d pacotes"
 
-#: ../yum/__init__.py:1554
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr "pesquisando pelo pacote %s"
 
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr "pesquisando nas entradas do arquivo"
 
-#: ../yum/__init__.py:1569
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr "pesquisando nas entradas dos fornecimentos"
 
-#: ../yum/__init__.py:1599
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr "Fornecimento combina com: %s"
 
-#: ../yum/__init__.py:1668
-#: ../yum/__init__.py:1686
-#: ../yum/__init__.py:1714
-#: ../yum/__init__.py:1719
-#: ../yum/__init__.py:1774
-#: ../yum/__init__.py:1778
+#: ../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:1697
-#: ../yum/__init__.py:1790
+#: ../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"
 
-#: ../yum/__init__.py:1736
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr "Adicionando o pacote %s do grupo %s"
 
-#: ../yum/__init__.py:1740
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr "Nenhum pacote de nome %s disponÃvel para ser instalado"
 
-#: ../yum/__init__.py:1815
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr "A tupla %s do pacote nÃ£o pÃ´de ser encontrada no packagesack"
 
-#: ../yum/__init__.py:1883
-#: ../yum/__init__.py:1926
+#: ../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:1885
-#: ../yum/__init__.py:1928
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr "Sinalizador de versÃ£o invÃ¡lido"
 
-#: ../yum/__init__.py:1900
-#: ../yum/__init__.py:1904
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr "Nenhum pacote encontrado para %s"
 
-#: ../yum/__init__.py:2034
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr "O Pacote de Objeto nÃ£o era uma instÃ¢ncia de pacote de objeto"
 
-#: ../yum/__init__.py:2038
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr "Nada especificado para instalar"
 
 #. only one in there
-#: ../yum/__init__.py:2051
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr "Verificando por fornecimento virtual ou de arquivo para %s"
 
-#: ../yum/__init__.py:2057
-#: ../yum/__init__.py:2323
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr "Nenhuma correspondÃªncia para o argumento: %s"
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2114
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr "Nenhum pacote disponÃvel para instalar"
 
-#: ../yum/__init__.py:2126
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr "Pacote: %s - jÃ¡ estÃ¡ no conjunto de transaÃ§Ãµes"
 
-#: ../yum/__init__.py:2139
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr "O pacote %s jÃ¡ estÃ¡ instalado em sua Ãºltima versÃ£o"
 
+#: ../yum/__init__.py:2178
+#, fuzzy, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr "O pacote %s jÃ¡ estÃ¡ instalado, ignorando"
+
 #. update everything (the easy case)
-#: ../yum/__init__.py:2180
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr "Atualizando Tudo"
 
-#: ../yum/__init__.py:2264
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr "O pacote jÃ¡ estÃ¡ obsoleto: %s.%s %s:%s-%s"
 
-#: ../yum/__init__.py:2320
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../yum/__init__.py:2335
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr "Nenhum pacote encontrado para remoÃ§Ã£o"
 
-#: ../yum/__init__.py:2369
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "NÃ£o foi possÃvel abrir o arquivo: %s. Ignorando."
 
-#: ../yum/__init__.py:2372
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr "Examinando %s: %s"
 
-#: ../yum/__init__.py:2379
+#: ../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:2411
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr "Excluindo %s"
 
-#: ../yum/__init__.py:2416
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr "Marcando %s para ser instalado"
 
-#: ../yum/__init__.py:2422
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr "Marcando %s como uma atualizaÃ§Ã£o do %s"
 
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr "%s: nÃ£o atualiza o pacote instalado."
 
-#: ../yum/__init__.py:2447
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr "Problema na reinstalaÃ§Ã£o: nenhum pacote encontrado para remoÃ§Ã£o"
 
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2515
+#, fuzzy, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr "O pacote %s jÃ¡ estÃ¡ instalado, ignorando"
+
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr "Problema na reinstalaÃ§Ã£o: nenhum pacote encontrado para instalaÃ§Ã£o"
 
-#: ../yum/__init__.py:2514
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr "Obtendo a chave GPG a partir de %s"
 
-#: ../yum/__init__.py:2520
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr "A obtenÃ§Ã£o da chave GPG falhou:"
 
-#: ../yum/__init__.py:2533
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr "A anÃ¡lise da chave GPG falhou:"
 
-#: ../yum/__init__.py:2537
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr "A chave GPG em %s (0x%s) jÃ¡ estÃ¡ instalada"
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2542
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr "Importando chave GPG 0x%s \"%s\" a partir de %s"
 
-#: ../yum/__init__.py:2554
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr "NÃ£o estÃ¡ instalando a chave"
 
-#: ../yum/__init__.py:2560
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr "Falha na importaÃ§Ã£o da chave (cÃ³digo %d)"
 
-#: ../yum/__init__.py:2563
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr "Chave importada com sucesso"
 
-#: ../yum/__init__.py:2568
+#: ../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:2577
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr "A importaÃ§Ã£o da(s) chave(s) nÃ£o ajudou, chave(s) errada(s)?"
 
-#: ../yum/__init__.py:2651
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr "NÃ£o foi possÃvel encontrar um espelho apropriado."
 
-#: ../yum/__init__.py:2653
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr "Foram encontrados erros ao baixar os pacotes."
 
-#: ../yum/__init__.py:2717
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr "Erros do Teste de TransaÃ§Ã£o:"
 
-#: ../yum/__init__.py:2752
-#, python-format
-msgid "Package %s needs %s, this is not available."
-msgstr "O pacote %s necessita do %s, que nÃ£o estÃ¡ disponÃvel."
-
-#: ../yum/__init__.py:2757
-#, python-format
-msgid "Package %s conflicts with %s."
-msgstr "O pacote %s conflita com %s."
-
-#: ../yum/plugins.py:168
-#, python-format
-msgid "Running \"%s\" handler for \"%s\" plugin"
-msgstr "Executando o manipulador \"%s\" para o plugin \"%s\""
-
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:193
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr "Plugins carregados:"
 
-#: ../yum/plugins.py:210
+#: ../yum/plugins.py:206
+#, fuzzy, python-format
+msgid "No plugin match for: %s"
+msgstr "Apagar: Nenhum resultado para %s"
+
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr "O plugin \"%s\" estÃ¡ desabilitado"
 
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr "O plugin \"%s\" nÃ£o especifica a versÃ£o requerida da API"
 
-#: ../yum/plugins.py:226
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr "O plugin \"%s\" requer a API %s. A API suportada Ã© a %s."
 
-#: ../yum/plugins.py:253
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr "Carregando o plugin \"%s\""
 
-#: ../yum/plugins.py:260
+#: ../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:280
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr "Arquivos de configuraÃ§Ã£o %s nÃ£o encontrado"
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:283
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr "NÃ£o foi possÃvel encontrar o arquivo de configuraÃ§Ã£o para o plugin %s"
 
-#: ../yum/plugins.py:437
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr "O registro de comandos nÃ£o Ã© suportado"
 
@@ -1866,16 +1921,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"
@@ -1885,12 +1940,39 @@ msgstr "CabeÃ§alho %s Danificado"
 msgid "Error opening rpm %s - error %s"
 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"
@@ -1901,10 +1983,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"
@@ -1913,12 +1998,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"
@@ -1926,10 +2015,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"
@@ -1938,86 +2030,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"
@@ -2028,50 +2151,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 | "
@@ -2117,78 +2259,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 "Erase: No matches for %s"
-#~ msgstr "Apagar: Nenhum resultado para %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 "
@@ -2218,56 +2384,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/ru.po b/po/ru.po
index dd18234..7d04794 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yum\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-08 10:16+0100\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: 2003-10-14 15:36+0400\n"
 "Last-Translator: Grigory Bakunov <black at asplinux.ru>\n"
 "Language-Team: Russian <ru at li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.1\n"
 
-#: ../callback.py:48 ../output.py:487
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr ""
 
@@ -24,7 +24,7 @@ msgstr ""
 msgid "Erasing"
 msgstr ""
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:486
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 #, fuzzy
 msgid "Installing"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸:"
@@ -33,7 +33,7 @@ msgstr "ÐžÑˆÐ¸Ð±ÐºÐ¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸:"
 msgid "Obsoleted"
 msgstr ""
 
-#: ../callback.py:54 ../output.py:533
+#: ../callback.py:54 ../output.py:558
 #, fuzzy
 msgid "Updated"
 msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾: "
@@ -43,7 +43,7 @@ msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾: "
 msgid "Erased"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾: "
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:531
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 #, fuzzy
 msgid "Installed"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÑÐ¼: "
@@ -67,7 +67,7 @@ msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ñ€Ð°Ð·Ð±Ð¾Ñ€Ðµ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾
 msgid "Erased: %s"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾: "
 
-#: ../callback.py:217 ../output.py:488
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr ""
 
@@ -88,12 +88,12 @@ msgstr ""
 msgid "Reading repository metadata in from local files"
 msgstr ""
 
-#: ../cli.py:183 ../utils.py:57
+#: ../cli.py:183 ../utils.py:72
 #, fuzzy, python-format
 msgid "Config Error: %s"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¾Ð¿Ñ†Ð¸Ð¸: %s"
 
-#: ../cli.py:186 ../cli.py:1040 ../utils.py:60
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¾Ð¿Ñ†Ð¸Ð¸: %s"
@@ -139,279 +139,293 @@ msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 msgid "Error Downloading Packages:\n"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°: ÐÐµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ð½Ñ‹Ð¹ Ð¿Ð°ÐºÐµÑ‚ %s"
 
-#: ../cli.py:369 ../yum/__init__.py:2689
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr ""
 
-#: ../cli.py:372 ../yum/__init__.py:2692
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr ""
 
-#: ../cli.py:376 ../yum/__init__.py:2694
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr ""
 
-#: ../cli.py:380
+#: ../cli.py:383
 #, fuzzy
 msgid "Running Transaction Test"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð² Ñ‚ÐµÑÑ‚Ð¾Ð¹ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ð¸:"
 
-#: ../cli.py:396
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr ""
 
-#: ../cli.py:398
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr ""
 
-#: ../cli.py:405
+#: ../cli.py:408
 #, fuzzy
 msgid "Transaction Test Succeeded"
 msgstr "Ð¢Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°"
 
-#: ../cli.py:423
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr ""
 
-#: ../cli.py:452
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
 msgstr ""
 
-#: ../cli.py:484
+#: ../cli.py:491
 #, fuzzy
 msgid "Parsing package install arguments"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ñ€Ð°Ð·Ð±Ð¾Ñ€Ðµ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑ‚Ñ€Ð¾ÐºÐ¸: %s"
 
-#: ../cli.py:494
+#: ../cli.py:501
 #, fuzzy, python-format
 msgid "No package %s available."
 msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../cli.py:498 ../cli.py:616 ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 #, fuzzy
 msgid "Package(s) to install"
 msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../cli.py:499 ../cli.py:617 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr ""
 
-#: ../cli.py:529 ../yum/__init__.py:2192 ../yum/__init__.py:2271
-#: ../yum/__init__.py:2283
+#: ../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 ""
 
-#: ../cli.py:561
+#: ../cli.py:568
 #, fuzzy, python-format
 msgid "Could not find update match for %s"
 msgstr "HÐµ ÑƒÐ´Ð°ÐµÑ‚ÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð°ÐºÐµÑ‚ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑŽÑ‰Ð¸Ð¹ Ñ %s"
 
-#: ../cli.py:573
+#: ../cli.py:580
 #, fuzzy, python-format
 msgid "%d packages marked for Update"
 msgstr "ÐÐµÑ‚ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
 
-#: ../cli.py:576
+#: ../cli.py:583
 #, fuzzy
 msgid "No Packages marked for Update"
 msgstr "ÐÐµÑ‚ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
 
-#: ../cli.py:592
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr ""
 
-#: ../cli.py:595
+#: ../cli.py:602
 #, fuzzy
 msgid "No Packages marked for removal"
 msgstr "ÐÐµÑ‚ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
 
-#: ../cli.py:607
+#: ../cli.py:614
 #, fuzzy
 msgid "No Packages Provided"
 msgstr "ÐŸÐ°ÐºÐµÑ‚Ñ‹ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹"
 
-#: ../cli.py:647
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr ""
 
-#: ../cli.py:685
+#: ../cli.py:701
+#, fuzzy, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ: ÐÐµÑ‚ ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹ Ñ %s"
+
+#: ../cli.py:704
 #, fuzzy
 msgid "No Matches found"
 msgstr "ÐŸÐ°ÐºÐµÑ‚Ñ‹ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹"
 
-#: ../cli.py:722
+#: ../cli.py:745
 #, fuzzy, python-format
 msgid "No Package Found for %s"
 msgstr "ÐŸÐ°ÐºÐµÑ‚ %s Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
-#: ../cli.py:734
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr ""
 
-#: ../cli.py:748
+#: ../cli.py:771
 #, fuzzy
 msgid "Cleaning up Headers"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ ÑÑ‚Ð°Ñ€Ñ‹Ñ… Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¾Ð²"
 
-#: ../cli.py:751
+#: ../cli.py:774
 #, fuzzy
 msgid "Cleaning up Packages"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../cli.py:754
+#: ../cli.py:777
 #, fuzzy
 msgid "Cleaning up xml metadata"
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð²"
 
-#: ../cli.py:757
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr ""
 
-#: ../cli.py:760
+#: ../cli.py:783
+#, fuzzy
+msgid "Cleaning up expire-cache metadata"
+msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð²"
+
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr ""
 
-#: ../cli.py:782
+#: ../cli.py:807
 #, fuzzy
 msgid "Installed Groups:"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾: "
 
-#: ../cli.py:789
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr ""
 
-#: ../cli.py:795
+#: ../cli.py:820
 msgid "Done"
 msgstr ""
 
-#: ../cli.py:804 ../cli.py:816 ../cli.py:822
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, fuzzy, python-format
 msgid "Warning: Group %s does not exist."
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° %s Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚"
 
-#: ../cli.py:828
+#: ../cli.py:853
 #, fuzzy
 msgid "No packages in any requested group available to install or update"
 msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../cli.py:830
+#: ../cli.py:855
 #, fuzzy, python-format
 msgid "%d Package(s) to Install"
 msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../cli.py:840
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr ""
 
-#: ../cli.py:846
+#: ../cli.py:871
 #, fuzzy
 msgid "No packages to remove from groups"
 msgstr "ÐŸÐ°ÐºÐµÑ‚Ñ‹ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹"
 
-#: ../cli.py:848
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr ""
 
-#: ../cli.py:890
+#: ../cli.py:915
 #, fuzzy, python-format
 msgid "Package %s is already installed, skipping"
 msgstr "%s ÑƒÐ¶Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸ ÑÑ‚Ð¾ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÑÑ Ð²ÐµÑ€ÑÐ¸Ñ."
 
-#: ../cli.py:901
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr ""
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:927
+#: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
 msgstr ""
 
-#: ../cli.py:946
+#: ../cli.py:971
 #, fuzzy, python-format
 msgid "Command line error: %s"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¾Ð¿Ñ†Ð¸Ð¸: %s"
 
-#: ../cli.py:1073
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr ""
 
-#: ../cli.py:1075
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr ""
 
-#: ../cli.py:1077
+#: ../cli.py:1105
 msgid "config file location"
 msgstr ""
 
-#: ../cli.py:1079
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr ""
 
-#: ../cli.py:1081
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr ""
 
-#: ../cli.py:1084
+#: ../cli.py:1113
+msgid "show duplicates, in repos, in list/search commands"
+msgstr ""
+
+#: ../cli.py:1115
 msgid "error output level"
 msgstr ""
 
-#: ../cli.py:1087
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr ""
 
-#: ../cli.py:1091
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr ""
 
-#: ../cli.py:1093
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr ""
 
-#: ../cli.py:1094
+#: ../cli.py:1125
 msgid "set install root"
 msgstr ""
 
-#: ../cli.py:1098
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr ""
 
-#: ../cli.py:1102
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr ""
 
-#: ../cli.py:1105
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr ""
 
-#: ../cli.py:1107
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
 msgstr ""
 
-#: ../cli.py:1110
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr ""
 
-#: ../cli.py:1112
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr ""
 
-#: ../cli.py:1114
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr ""
 
-#: ../cli.py:1116
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr ""
 
-#: ../cli.py:1119
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr ""
 
@@ -467,185 +481,201 @@ msgstr ""
 msgid "Trying other mirror."
 msgstr ""
 
-#: ../output.py:273
+#: ../output.py:293
 #, fuzzy, python-format
 msgid "Name       : %s"
 msgstr "Ð˜Ð¼Ñ    : %s"
 
-#: ../output.py:274
+#: ../output.py:294
 #, fuzzy, python-format
 msgid "Arch       : %s"
 msgstr "ÐÑ€Ñ….   : %s"
 
-#: ../output.py:276
+#: ../output.py:296
 #, fuzzy, python-format
 msgid "Epoch      : %s"
 msgstr "Ð ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ð¹: %s"
 
-#: ../output.py:277
+#: ../output.py:297
 #, fuzzy, python-format
 msgid "Version    : %s"
 msgstr "Ð’ÐµÑ€ÑÐ¸Ñ : %s"
 
-#: ../output.py:278
+#: ../output.py:298
 #, fuzzy, python-format
 msgid "Release    : %s"
 msgstr "Ð ÐµÐ»Ð¸Ð·  : %s"
 
-#: ../output.py:279
+#: ../output.py:299
 #, fuzzy, python-format
 msgid "Size       : %s"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€: %s"
 
-#: ../output.py:280
+#: ../output.py:300
 #, fuzzy, python-format
 msgid "Repo       : %s"
 msgstr "Ð ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ð¹: %s"
 
-#: ../output.py:282
+#: ../output.py:302
 #, fuzzy, python-format
 msgid "Committer  : %s"
 msgstr "Ð˜Ð¼Ñ    : %s"
 
-#: ../output.py:283
+#: ../output.py:303
 #, fuzzy
 msgid "Summary    : "
 msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ: %s"
 
-#: ../output.py:285
+#: ../output.py:305
 #, fuzzy, python-format
 msgid "URL        : %s"
 msgstr "Ð ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ð¹: %s"
 
-#: ../output.py:286
+#: ../output.py:306
 #, fuzzy, python-format
 msgid "License    : %s"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€: %s"
 
-#: ../output.py:287
+#: ../output.py:307
 #, fuzzy
 msgid "Description: "
 msgstr ""
 "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:\n"
 " %s"
 
-#: ../output.py:331
+#: ../output.py:351
 msgid "Is this ok [y/N]: "
 msgstr "Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ [y/N]: "
 
-#: ../output.py:345
+#: ../output.py:357 ../output.py:360
+msgid "y"
+msgstr ""
+
+#: ../output.py:357
+msgid "n"
+msgstr ""
+
+#: ../output.py:357 ../output.py:360
+msgid "yes"
+msgstr ""
+
+#: ../output.py:357
+msgid "no"
+msgstr ""
+
+#: ../output.py:367
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Group: %s"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð°: %s"
 
-#: ../output.py:347
+#: ../output.py:369
 #, fuzzy, python-format
 msgid " Description: %s"
 msgstr ""
 "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:\n"
 " %s"
 
-#: ../output.py:349
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr ""
 
-#: ../output.py:354
+#: ../output.py:376
 #, fuzzy
 msgid " Default Packages:"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../output.py:359
+#: ../output.py:381
 #, fuzzy
 msgid " Optional Packages:"
 msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../output.py:364
+#: ../output.py:386
 #, fuzzy
 msgid " Conditional Packages:"
 msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../output.py:372
+#: ../output.py:394
 #, fuzzy, python-format
 msgid "package: %s"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../output.py:374
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr ""
 
-#: ../output.py:379
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr ""
 
-#: ../output.py:381
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr ""
 
-#: ../output.py:436
+#: ../output.py:461
 #, fuzzy
 msgid "Matched from:"
 msgstr "ÐŸÐ°ÐºÐµÑ‚Ñ‹ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹"
 
-#: ../output.py:462
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr ""
 
-#: ../output.py:467
+#: ../output.py:492
 #, fuzzy, python-format
 msgid "Total size: %s"
 msgstr "ÐÐµ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¹ Ñ„Ð°Ð¹Ð»: %s"
 
-#: ../output.py:470
+#: ../output.py:495
 #, fuzzy, python-format
 msgid "Total download size: %s"
 msgstr "ÐÐµ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¹ Ñ„Ð°Ð¹Ð»: %s"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Package"
 msgstr ""
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Arch"
 msgstr "ÐÑ€Ñ…."
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Version"
 msgstr "Ð’ÐµÑ€ÑÐ¸Ñ"
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Repository"
 msgstr ""
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Size"
 msgstr ""
 
-#: ../output.py:489
+#: ../output.py:514
 #, fuzzy
 msgid "Installing for dependencies"
 msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÐµÐ¹"
 
-#: ../output.py:490
+#: ../output.py:515
 #, fuzzy
 msgid "Updating for dependencies"
 msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÐµÐ¹"
 
-#: ../output.py:491
+#: ../output.py:516
 #, fuzzy
 msgid "Removing for dependencies"
 msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÐµÐ¹"
 
-#: ../output.py:503
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
 "\n"
 msgstr ""
 
-#: ../output.py:511
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -656,30 +686,30 @@ msgid ""
 "Remove   %5.5s Package(s)         \n"
 msgstr ""
 
-#: ../output.py:529
+#: ../output.py:554
 msgid "Removed"
 msgstr ""
 
-#: ../output.py:530
+#: ../output.py:555
 #, fuzzy
 msgid "Dependency Removed"
 msgstr "Ð—Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ñ‹"
 
-#: ../output.py:532
+#: ../output.py:557
 #, fuzzy
 msgid "Dependency Installed"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÑÐ¼: "
 
-#: ../output.py:534
+#: ../output.py:559
 #, fuzzy
 msgid "Dependency Updated"
 msgstr "Ð—Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ñ‹"
 
-#: ../output.py:535
+#: ../output.py:560
 msgid "Replaced"
 msgstr ""
 
-#: ../output.py:593
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
@@ -687,69 +717,69 @@ msgid ""
 "seconds to exit.\n"
 msgstr ""
 
-#: ../output.py:603
+#: ../output.py:628
 msgid "user interrupt"
 msgstr ""
 
-#: ../output.py:614
+#: ../output.py:639
 #, fuzzy
 msgid "installed"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÑÐ¼: "
 
-#: ../output.py:615
+#: ../output.py:640
 #, fuzzy
 msgid "updated"
 msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾: "
 
-#: ../output.py:616
+#: ../output.py:641
 msgid "obsoleted"
 msgstr ""
 
-#: ../output.py:617
+#: ../output.py:642
 #, fuzzy
 msgid "erased"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾: "
 
-#: ../output.py:621
+#: ../output.py:646
 #, fuzzy, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr ""
 "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¹ Ð¿Ð°ÐºÐµÑ‚: %s.%s %s:%s-%s Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÑÐµÑ‚\n"
 " %s"
 
-#: ../output.py:628
+#: ../output.py:653
 #, fuzzy
 msgid "--> Running transaction check"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð² Ñ‚ÐµÑÑ‚Ð¾Ð¹ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ð¸:"
 
-#: ../output.py:633
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr ""
 
-#: ../output.py:638
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr ""
 
-#: ../output.py:643
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr ""
 
-#: ../output.py:648
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr ""
 
-#: ../output.py:654
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr ""
 
-#: ../output.py:657
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr ""
 
-#: ../output.py:661
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr ""
@@ -1110,11 +1140,11 @@ msgid ""
 "Dependencies Resolved"
 msgstr "Ð—Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ñ‹"
 
-#: ../yummain.py:199
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr ""
 
-#: ../yummain.py:246
+#: ../yummain.py:245
 #, fuzzy
 msgid ""
 "\n"
@@ -1122,653 +1152,693 @@ msgid ""
 "Exiting on user cancel."
 msgstr "Ð’Ñ‹Ñ…Ð¾Ð´ Ð¿Ð¾ Ñ‚Ñ€ÐµÐ±Ð¾Ð²Ð°Ð½Ð¸ÑŽ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: ../yum/depsolve.py:70
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
 msgstr ""
 
-#: ../yum/depsolve.py:123
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:134
+#: ../yum/depsolve.py:147
 #, fuzzy, python-format
 msgid "Searching pkgSack for dep: %s"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/depsolve.py:163
+#: ../yum/depsolve.py:170
 #, python-format
 msgid "Potential match for %s from %s"
 msgstr ""
 
-#: ../yum/depsolve.py:171
+#: ../yum/depsolve.py:178
 #, python-format
 msgid "Matched %s to require for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:212
+#: ../yum/depsolve.py:219
 #, fuzzy, python-format
 msgid "Member: %s"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€: %s"
 
-#: ../yum/depsolve.py:226 ../yum/depsolve.py:788
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr ""
 
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:240
 #, fuzzy, python-format
 msgid "Adding Package %s in mode %s"
 msgstr "ÐÐµÑ‚ Ð¿Ð°ÐºÐµÑ‚Ð° %s, %s"
 
-#: ../yum/depsolve.py:243
+#: ../yum/depsolve.py:250
 #, fuzzy, python-format
 msgid "Removing Package %s"
 msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:300
+#: ../yum/depsolve.py:312
 msgid "Needed Require has already been looked up, cheating"
 msgstr ""
 
-#: ../yum/depsolve.py:310
+#: ../yum/depsolve.py:322
 #, python-format
 msgid "Needed Require is not a package name. Looking up: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:317
+#: ../yum/depsolve.py:329
 #, python-format
 msgid "Potential Provider: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:340
+#: ../yum/depsolve.py:352
 #, python-format
 msgid "Mode is %s for provider of %s: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:356
 #, python-format
 msgid "Mode for pkg providing %s: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:348
+#: ../yum/depsolve.py:360
 #, python-format
 msgid "TSINFO: %s package requiring %s marked as erase"
 msgstr ""
 
-#: ../yum/depsolve.py:361
-#, python-format
-msgid "Looking for Obsoletes for %s"
-msgstr ""
-
-#: ../yum/depsolve.py:373
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr ""
 
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr ""
 
-#. if there's no update then pass this over to requringFromTransaction()
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:378
 #, fuzzy, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr "HÐµ ÑƒÐ´Ð°ÐµÑ‚ÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð°ÐºÐµÑ‚ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑŽÑ‰Ð¸Ð¹ Ñ %s"
 
-#: ../yum/depsolve.py:420
+#: ../yum/depsolve.py:388
 #, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr ""
 
 #. is it already installed?
-#: ../yum/depsolve.py:466
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr ""
 
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr ""
 
-#: ../yum/depsolve.py:492
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr ""
 
-#: ../yum/depsolve.py:500 ../yum/depsolve.py:568
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr ""
 
-#: ../yum/depsolve.py:513
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr ""
 
-#: ../yum/depsolve.py:578
+#: ../yum/depsolve.py:510
 #, python-format
-msgid "TSINFO: Marking %s as update for %s"
-msgstr ""
-
-#: ../yum/depsolve.py:585
-#, python-format
-msgid "TSINFO: Marking %s as install for %s"
+msgid ""
+"Failure finding best provider of %s for %s, exceeded maximum loop length"
 msgstr ""
 
-#: ../yum/depsolve.py:647 ../yum/depsolve.py:654
+#: ../yum/depsolve.py:537
 #, python-format
-msgid "unable to find newer package for %s"
+msgid "TSINFO: Marking %s as update for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:661
+#: ../yum/depsolve.py:544
 #, python-format
-msgid "TSINFO: Updating %s to resolve conflict."
+msgid "TSINFO: Marking %s as install for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:671
-#, fuzzy, python-format
-msgid "%s conflicts: %s"
-msgstr "Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸: Ð¿Ð°ÐºÐµÑ‚ %s ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚ÑƒÐµÑ‚ Ñ %s"
-
-#: ../yum/depsolve.py:681
-#, fuzzy, python-format
-msgid "%s conflicts with %s"
-msgstr "Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸: Ð¿Ð°ÐºÐµÑ‚ %s ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚ÑƒÐµÑ‚ Ñ %s"
-
-#: ../yum/depsolve.py:720 ../yum/depsolve.py:806
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
 msgid "Success - empty transaction"
 msgstr ""
 
-#: ../yum/depsolve.py:765 ../yum/depsolve.py:778
+#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
 msgid "Restarting Loop"
 msgstr ""
 
-#: ../yum/depsolve.py:794
+#: ../yum/depsolve.py:702
 #, fuzzy
 msgid "Dependency Process ending"
 msgstr "Ð—Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ñ‹"
 
-#: ../yum/depsolve.py:800
+#: ../yum/depsolve.py:708
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr ""
 
-#: ../yum/depsolve.py:807
+#: ../yum/depsolve.py:715
 msgid "Success - deps resolved"
 msgstr ""
 
-#: ../yum/depsolve.py:824
+#: ../yum/depsolve.py:729
 #, fuzzy, python-format
 msgid "Checking deps for %s"
 msgstr ""
 "\n"
 "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° ÑÐ¸Ð³Ð½Ð°Ñ‚ÑƒÑ€Ñ‹ %s"
 
-#: ../yum/depsolve.py:880
+#: ../yum/depsolve.py:782
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr ""
 
+#: ../yum/depsolve.py:933
+#, python-format
+msgid "Comparing best: %s to po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, python-format
+msgid "best %s obsoletes po: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:955
+#, python-format
+msgid "po %s obsoletes best: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#, fuzzy, python-format
+msgid "better arch in po %s"
+msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
+
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#, python-format
+msgid "po %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#, python-format
+msgid "best %s shares a sourcerpm with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#, python-format
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#, python-format
+msgid "po %s has a shorter name than best %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
+msgstr ""
+
 #: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:311
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr ""
 
-#: ../yum/__init__.py:347
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr ""
 
-#: ../yum/__init__.py:354
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:363
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr ""
 
-#: ../yum/__init__.py:381
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:399
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:416
+#: ../yum/__init__.py:404
 #, fuzzy
 msgid "Setting up Package Sacks"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/__init__.py:458
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr ""
 
-#: ../yum/__init__.py:459
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr ""
 
-#: ../yum/__init__.py:464
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:476
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr ""
 
-#: ../yum/__init__.py:499
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:520
 #, fuzzy
 msgid "Getting group metadata"
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð²"
 
-#: ../yum/__init__.py:548
+#: ../yum/__init__.py:546
 #, fuzzy, python-format
 msgid "Adding group file from repository: %s"
 msgstr "Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°: %s"
 
-#: ../yum/__init__.py:557
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr ""
 
-#: ../yum/__init__.py:563
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr ""
 
-#: ../yum/__init__.py:614
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr ""
 
-#: ../yum/__init__.py:646
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr ""
 
-#: ../yum/__init__.py:674
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr ""
 
-#: ../yum/__init__.py:675
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
 msgstr ""
 
-#: ../yum/__init__.py:679
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr ""
 
-#: ../yum/__init__.py:767
+#: ../yum/__init__.py:774
 #, fuzzy, python-format
 msgid "Failed to remove transaction file %s"
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð° ÑÐµÐºÑ†Ð¸Ñ: %s"
 
-#: ../yum/__init__.py:807
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr ""
 
-#: ../yum/__init__.py:838
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr ""
 
-#: ../yum/__init__.py:840
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr ""
 
-#: ../yum/__init__.py:867
+#: ../yum/__init__.py:875
 #, fuzzy, python-format
 msgid "Reducing %s to included packages only"
 msgstr "ÐŸÐ¾Ð¸ÑÐº ÑƒÑÑ‚Ð°Ñ€ÐµÐ²ÑˆÐ¸Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/__init__.py:872
+#: ../yum/__init__.py:880
 #, fuzzy, python-format
 msgid "Keeping included package %s"
 msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:886
 #, fuzzy, python-format
 msgid "Removing unmatched package %s"
 msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/__init__.py:881
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr ""
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:911
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ð°ÐºÑ‚Ð¸Ð²ÐµÐ½ Ð»Ð¸ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ %s"
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:915
+#: ../yum/__init__.py:923
 #, fuzzy, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr "Ð¤Ð°Ð¹Ð» %s ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚, Ð´Ñ€ÑƒÐ³Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ yum Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð°. Ð’Ñ‹Ñ…Ð¾Ð´."
 
-#: ../yum/__init__.py:962 ../yum/__init__.py:969
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr ""
 
-#: ../yum/__init__.py:983
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr ""
 
-#: ../yum/__init__.py:986
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr ""
 
-#: ../yum/__init__.py:1028
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr ""
 
-#: ../yum/__init__.py:1034
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr ""
 
-#: ../yum/__init__.py:1053
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr ""
 
-#: ../yum/__init__.py:1086
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr ""
 
-#: ../yum/__init__.py:1126
+#: ../yum/__init__.py:1134
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
 msgstr ""
 
-#: ../yum/__init__.py:1181
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr ""
 
-#: ../yum/__init__.py:1185
+#: ../yum/__init__.py:1193
 #, fuzzy, python-format
 msgid "Problem opening package %s"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr ""
 
-#: ../yum/__init__.py:1197
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr ""
 
-#: ../yum/__init__.py:1235
+#: ../yum/__init__.py:1243
 #, fuzzy, python-format
 msgid "Cannot remove %s"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» %s"
 
-#: ../yum/__init__.py:1239
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr ""
 
-#: ../yum/__init__.py:1271
+#: ../yum/__init__.py:1283
 #, fuzzy, python-format
 msgid "Cannot remove %s file %s"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» %s"
 
-#: ../yum/__init__.py:1275
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr ""
 
-#: ../yum/__init__.py:1277
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr ""
 
-#: ../yum/__init__.py:1317
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr ""
 
-#: ../yum/__init__.py:1323
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr ""
 
-#: ../yum/__init__.py:1513
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
 msgstr ""
 
-#: ../yum/__init__.py:1550
+#: ../yum/__init__.py:1580
 #, fuzzy, python-format
 msgid "Searching %d packages"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/__init__.py:1554
+#: ../yum/__init__.py:1584
 #, fuzzy, python-format
 msgid "searching package %s"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr ""
 
-#: ../yum/__init__.py:1569
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr ""
 
-#: ../yum/__init__.py:1599
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr ""
 
-#: ../yum/__init__.py:1668 ../yum/__init__.py:1686 ../yum/__init__.py:1714
-#: ../yum/__init__.py:1719 ../yum/__init__.py:1774 ../yum/__init__.py:1778
+#: ../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 ""
 
-#: ../yum/__init__.py:1697 ../yum/__init__.py:1790
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr ""
 
-#: ../yum/__init__.py:1736
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr ""
 
-#: ../yum/__init__.py:1740
+#: ../yum/__init__.py:1774
 #, fuzzy, python-format
 msgid "No package named %s available to be installed"
 msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/__init__.py:1815
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr ""
 
-#: ../yum/__init__.py:1883 ../yum/__init__.py:1926
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr ""
 
-#: ../yum/__init__.py:1885 ../yum/__init__.py:1928
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 #, fuzzy
 msgid "Invalid version flag"
 msgstr "HÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ñ‡Ð¸ÑÑ‚ÐºÐ¸ %s"
 
-#: ../yum/__init__.py:1900 ../yum/__init__.py:1904
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, fuzzy, python-format
 msgid "No Package found for %s"
 msgstr "ÐŸÐ°ÐºÐµÑ‚ %s Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
-#: ../yum/__init__.py:2034
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr ""
 
-#: ../yum/__init__.py:2038
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr ""
 
 #. only one in there
-#: ../yum/__init__.py:2051
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr ""
 
-#: ../yum/__init__.py:2057 ../yum/__init__.py:2323
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr ""
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2114
+#: ../yum/__init__.py:2146
 #, fuzzy
 msgid "No package(s) available to install"
 msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: ../yum/__init__.py:2126
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr ""
 
-#: ../yum/__init__.py:2139
+#: ../yum/__init__.py:2171
 #, fuzzy, python-format
 msgid "Package %s already installed and latest version"
 msgstr "%s ÑƒÐ¶Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸ ÑÑ‚Ð¾ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÑÑ Ð²ÐµÑ€ÑÐ¸Ñ."
 
+#: ../yum/__init__.py:2178
+#, fuzzy, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr "%s ÑƒÐ¶Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸ ÑÑ‚Ð¾ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÑÑ Ð²ÐµÑ€ÑÐ¸Ñ."
+
 #. update everything (the easy case)
-#: ../yum/__init__.py:2180
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr ""
 
-#: ../yum/__init__.py:2264
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr ""
 
-#: ../yum/__init__.py:2320
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../yum/__init__.py:2335
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr ""
 
-#: ../yum/__init__.py:2369
+#: ../yum/__init__.py:2426
 #, fuzzy, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» %s"
 
-#: ../yum/__init__.py:2372
+#: ../yum/__init__.py:2429
 #, fuzzy, python-format
 msgid "Examining %s: %s"
 msgstr "Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€ÑƒÐµÑ‚ÑÑ src Ð¿Ð°ÐºÐµÑ‚: %s"
 
-#: ../yum/__init__.py:2379
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
 "instead."
 msgstr ""
 
-#: ../yum/__init__.py:2411
+#: ../yum/__init__.py:2468
 #, fuzzy, python-format
 msgid "Excluding %s"
 msgstr "Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ %s"
 
-#: ../yum/__init__.py:2416
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr ""
 
-#: ../yum/__init__.py:2422
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr ""
 
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr ""
 
-#: ../yum/__init__.py:2447
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr ""
 
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2515
+#, fuzzy, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr "%s ÑƒÐ¶Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸ ÑÑ‚Ð¾ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÑÑ Ð²ÐµÑ€ÑÐ¸Ñ."
+
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr ""
 
-#: ../yum/__init__.py:2514
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr ""
 
-#: ../yum/__init__.py:2520
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr ""
 
-#: ../yum/__init__.py:2533
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr ""
 
-#: ../yum/__init__.py:2537
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr ""
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2542
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr ""
 
-#: ../yum/__init__.py:2554
+#: ../yum/__init__.py:2610
 #, fuzzy
 msgid "Not installing key"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸:"
 
-#: ../yum/__init__.py:2560
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr ""
 
-#: ../yum/__init__.py:2563
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr ""
 
-#: ../yum/__init__.py:2568
+#: ../yum/__init__.py:2624
 #, python-format
 msgid ""
 "The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1776,81 +1846,71 @@ msgid ""
 "Check that the correct key URLs are configured for this repository."
 msgstr ""
 
-#: ../yum/__init__.py:2577
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr ""
 
-#: ../yum/__init__.py:2651
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr ""
 
-#: ../yum/__init__.py:2653
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr ""
 
-#: ../yum/__init__.py:2717
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr ""
 
-#: ../yum/__init__.py:2752
-#, python-format
-msgid "Package %s needs %s, this is not available."
-msgstr ""
-
-#: ../yum/__init__.py:2757
-#, fuzzy, python-format
-msgid "Package %s conflicts with %s."
-msgstr "Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸: Ð¿Ð°ÐºÐµÑ‚ %s ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚ÑƒÐµÑ‚ Ñ %s"
-
-#: ../yum/plugins.py:168
-#, python-format
-msgid "Running \"%s\" handler for \"%s\" plugin"
-msgstr ""
-
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:193
+#: ../yum/plugins.py:195
 msgid "Loaded plugins: "
 msgstr ""
 
-#: ../yum/plugins.py:210
+#: ../yum/plugins.py:206
+#, fuzzy, python-format
+msgid "No plugin match for: %s"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ: ÐÐµÑ‚ ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹ Ñ %s"
+
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr ""
 
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr ""
 
-#: ../yum/plugins.py:226
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr ""
 
-#: ../yum/plugins.py:253
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr ""
 
-#: ../yum/plugins.py:260
+#: ../yum/plugins.py:271
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
 msgstr ""
 
-#: ../yum/plugins.py:280
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr ""
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:283
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr ""
 
-#: ../yum/plugins.py:437
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr ""
 
@@ -1885,6 +1945,18 @@ msgid "Error opening rpm %s - error %s"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚ %s - Ð¾ÑˆÐ¸Ð±ÐºÐ° %s"
 
 #, fuzzy
+#~ msgid "%s conflicts: %s"
+#~ msgstr "Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸: Ð¿Ð°ÐºÐµÑ‚ %s ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚ÑƒÐµÑ‚ Ñ %s"
+
+#, fuzzy
+#~ msgid "%s conflicts with %s"
+#~ msgstr "Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸: Ð¿Ð°ÐºÐµÑ‚ %s ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚ÑƒÐµÑ‚ Ñ %s"
+
+#, fuzzy
+#~ msgid "Package %s conflicts with %s."
+#~ msgstr "Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸: Ð¿Ð°ÐºÐµÑ‚ %s ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚ÑƒÐµÑ‚ Ñ %s"
+
+#, fuzzy
 #~ msgid ""
 #~ "Description:\n"
 #~ "%s"
@@ -2277,9 +2349,6 @@ msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚ %s - Ð¾ÑˆÐ¸Ð±ÐºÐ° %s"
 #~ msgid "ERROR: Url Return no Content-Length  - something is wrong"
 #~ msgstr "ÐžÐ¨Ð˜Ð‘ÐšÐ: URL Ð½Ðµ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ð°ÐµÑ‚ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ Content-Length  - Ñ‡Ñ‚Ð¾-Ñ‚Ð¾ Ð½Ðµ Ñ‚Ð°Ðº"
 
-#~ msgid "Erase: No matches for %s"
-#~ msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ: ÐÐµÑ‚ ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹ Ñ %s"
-
 #~ msgid "From %s updating %s"
 #~ msgstr "Ð˜Ð· %s Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ %s"
 
diff --git a/po/yum.pot b/po/yum.pot
index 324584d..8eb471e 100644
--- a/po/yum.pot
+++ b/po/yum.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-08 10:16+0100\n"
+"POT-Creation-Date: 2008-03-25 11:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../callback.py:48 ../output.py:487
+#: ../callback.py:48 ../output.py:512
 msgid "Updating"
 msgstr ""
 
@@ -24,7 +24,7 @@ msgstr ""
 msgid "Erasing"
 msgstr ""
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:486
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
 msgid "Installing"
 msgstr ""
 
@@ -32,7 +32,7 @@ msgstr ""
 msgid "Obsoleted"
 msgstr ""
 
-#: ../callback.py:54 ../output.py:533
+#: ../callback.py:54 ../output.py:558
 msgid "Updated"
 msgstr ""
 
@@ -40,7 +40,7 @@ msgstr ""
 msgid "Erased"
 msgstr ""
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:531
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
 msgid "Installed"
 msgstr ""
 
@@ -62,7 +62,7 @@ msgstr ""
 msgid "Erased: %s"
 msgstr ""
 
-#: ../callback.py:217 ../output.py:488
+#: ../callback.py:217 ../output.py:513
 msgid "Removing"
 msgstr ""
 
@@ -83,12 +83,12 @@ msgstr ""
 msgid "Reading repository metadata in from local files"
 msgstr ""
 
-#: ../cli.py:183 ../utils.py:57
+#: ../cli.py:183 ../utils.py:72
 #, python-format
 msgid "Config Error: %s"
 msgstr ""
 
-#: ../cli.py:186 ../cli.py:1040 ../utils.py:60
+#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
 #, python-format
 msgid "Options Error: %s"
 msgstr ""
@@ -130,265 +130,278 @@ msgstr ""
 msgid "Error Downloading Packages:\n"
 msgstr ""
 
-#: ../cli.py:369 ../yum/__init__.py:2689
+#: ../cli.py:370 ../yum/__init__.py:2746
 msgid "Running rpm_check_debug"
 msgstr ""
 
-#: ../cli.py:372 ../yum/__init__.py:2692
+#: ../cli.py:373 ../yum/__init__.py:2749
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr ""
 
-#: ../cli.py:376 ../yum/__init__.py:2694
+#: ../cli.py:377 ../yum/__init__.py:2751
 msgid "Please report this error in bugzilla"
 msgstr ""
 
-#: ../cli.py:380
+#: ../cli.py:383
 msgid "Running Transaction Test"
 msgstr ""
 
-#: ../cli.py:396
+#: ../cli.py:399
 msgid "Finished Transaction Test"
 msgstr ""
 
-#: ../cli.py:398
+#: ../cli.py:401
 msgid "Transaction Check Error:\n"
 msgstr ""
 
-#: ../cli.py:405
+#: ../cli.py:408
 msgid "Transaction Test Succeeded"
 msgstr ""
 
-#: ../cli.py:423
+#: ../cli.py:429
 msgid "Running Transaction"
 msgstr ""
 
-#: ../cli.py:452
+#: ../cli.py:459
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
 msgstr ""
 
-#: ../cli.py:484
+#: ../cli.py:491
 msgid "Parsing package install arguments"
 msgstr ""
 
-#: ../cli.py:494
+#: ../cli.py:501
 #, python-format
 msgid "No package %s available."
 msgstr ""
 
-#: ../cli.py:498 ../cli.py:616 ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
 msgid "Package(s) to install"
 msgstr ""
 
-#: ../cli.py:499 ../cli.py:617 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
 msgid "Nothing to do"
 msgstr ""
 
-#: ../cli.py:529 ../yum/__init__.py:2192 ../yum/__init__.py:2271
-#: ../yum/__init__.py:2283
+#: ../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 ""
 
-#: ../cli.py:561
+#: ../cli.py:568
 #, python-format
 msgid "Could not find update match for %s"
 msgstr ""
 
-#: ../cli.py:573
+#: ../cli.py:580
 #, python-format
 msgid "%d packages marked for Update"
 msgstr ""
 
-#: ../cli.py:576
+#: ../cli.py:583
 msgid "No Packages marked for Update"
 msgstr ""
 
-#: ../cli.py:592
+#: ../cli.py:599
 #, python-format
 msgid "%d packages marked for removal"
 msgstr ""
 
-#: ../cli.py:595
+#: ../cli.py:602
 msgid "No Packages marked for removal"
 msgstr ""
 
-#: ../cli.py:607
+#: ../cli.py:614
 msgid "No Packages Provided"
 msgstr ""
 
-#: ../cli.py:647
+#: ../cli.py:654
 msgid "Matching packages for package list to user args"
 msgstr ""
 
-#: ../cli.py:685
+#: ../cli.py:701
+#, python-format
+msgid "Warning: No matches found for: %s"
+msgstr ""
+
+#: ../cli.py:704
 msgid "No Matches found"
 msgstr ""
 
-#: ../cli.py:722
+#: ../cli.py:745
 #, python-format
 msgid "No Package Found for %s"
 msgstr ""
 
-#: ../cli.py:734
+#: ../cli.py:757
 msgid "Cleaning up Everything"
 msgstr ""
 
-#: ../cli.py:748
+#: ../cli.py:771
 msgid "Cleaning up Headers"
 msgstr ""
 
-#: ../cli.py:751
+#: ../cli.py:774
 msgid "Cleaning up Packages"
 msgstr ""
 
-#: ../cli.py:754
+#: ../cli.py:777
 msgid "Cleaning up xml metadata"
 msgstr ""
 
-#: ../cli.py:757
+#: ../cli.py:780
 msgid "Cleaning up database cache"
 msgstr ""
 
-#: ../cli.py:760
+#: ../cli.py:783
+msgid "Cleaning up expire-cache metadata"
+msgstr ""
+
+#: ../cli.py:786
 msgid "Cleaning up plugins"
 msgstr ""
 
-#: ../cli.py:782
+#: ../cli.py:807
 msgid "Installed Groups:"
 msgstr ""
 
-#: ../cli.py:789
+#: ../cli.py:814
 msgid "Available Groups:"
 msgstr ""
 
-#: ../cli.py:795
+#: ../cli.py:820
 msgid "Done"
 msgstr ""
 
-#: ../cli.py:804 ../cli.py:816 ../cli.py:822
+#: ../cli.py:829 ../cli.py:841 ../cli.py:847
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr ""
 
-#: ../cli.py:828
+#: ../cli.py:853
 msgid "No packages in any requested group available to install or update"
 msgstr ""
 
-#: ../cli.py:830
+#: ../cli.py:855
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr ""
 
-#: ../cli.py:840
+#: ../cli.py:865
 #, python-format
 msgid "No group named %s exists"
 msgstr ""
 
-#: ../cli.py:846
+#: ../cli.py:871
 msgid "No packages to remove from groups"
 msgstr ""
 
-#: ../cli.py:848
+#: ../cli.py:873
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr ""
 
-#: ../cli.py:890
+#: ../cli.py:915
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr ""
 
-#: ../cli.py:901
+#: ../cli.py:926
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr ""
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:927
+#: ../cli.py:952
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
 msgstr ""
 
-#: ../cli.py:946
+#: ../cli.py:971
 #, python-format
 msgid "Command line error: %s"
 msgstr ""
 
-#: ../cli.py:1073
+#: ../cli.py:1101
 msgid "be tolerant of errors"
 msgstr ""
 
-#: ../cli.py:1075
+#: ../cli.py:1103
 msgid "run entirely from cache, don't update cache"
 msgstr ""
 
-#: ../cli.py:1077
+#: ../cli.py:1105
 msgid "config file location"
 msgstr ""
 
-#: ../cli.py:1079
+#: ../cli.py:1107
 msgid "maximum command wait time"
 msgstr ""
 
-#: ../cli.py:1081
+#: ../cli.py:1109
 msgid "debugging output level"
 msgstr ""
 
-#: ../cli.py:1084
+#: ../cli.py:1113
+msgid "show duplicates, in repos, in list/search commands"
+msgstr ""
+
+#: ../cli.py:1115
 msgid "error output level"
 msgstr ""
 
-#: ../cli.py:1087
+#: ../cli.py:1118
 msgid "quiet operation"
 msgstr ""
 
-#: ../cli.py:1091
+#: ../cli.py:1122
 msgid "answer yes for all questions"
 msgstr ""
 
-#: ../cli.py:1093
+#: ../cli.py:1124
 msgid "show Yum version and exit"
 msgstr ""
 
-#: ../cli.py:1094
+#: ../cli.py:1125
 msgid "set install root"
 msgstr ""
 
-#: ../cli.py:1098
+#: ../cli.py:1129
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr ""
 
-#: ../cli.py:1102
+#: ../cli.py:1133
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr ""
 
-#: ../cli.py:1105
+#: ../cli.py:1136
 msgid "exclude package(s) by name or glob"
 msgstr ""
 
-#: ../cli.py:1107
+#: ../cli.py:1138
 msgid "disable exclude from main, for a repo or for everything"
 msgstr ""
 
-#: ../cli.py:1110
+#: ../cli.py:1141
 msgid "enable obsoletes processing during updates"
 msgstr ""
 
-#: ../cli.py:1112
+#: ../cli.py:1143
 msgid "disable Yum plugins"
 msgstr ""
 
-#: ../cli.py:1114
+#: ../cli.py:1145
 msgid "disable gpg signature checking"
 msgstr ""
 
-#: ../cli.py:1116
+#: ../cli.py:1147
 msgid "disable plugins by name"
 msgstr ""
 
-#: ../cli.py:1119
+#: ../cli.py:1150
 msgid "skip packages with depsolving problems"
 msgstr ""
 
@@ -444,172 +457,188 @@ msgstr ""
 msgid "Trying other mirror."
 msgstr ""
 
-#: ../output.py:273
+#: ../output.py:293
 #, python-format
 msgid "Name       : %s"
 msgstr ""
 
-#: ../output.py:274
+#: ../output.py:294
 #, python-format
 msgid "Arch       : %s"
 msgstr ""
 
-#: ../output.py:276
+#: ../output.py:296
 #, python-format
 msgid "Epoch      : %s"
 msgstr ""
 
-#: ../output.py:277
+#: ../output.py:297
 #, python-format
 msgid "Version    : %s"
 msgstr ""
 
-#: ../output.py:278
+#: ../output.py:298
 #, python-format
 msgid "Release    : %s"
 msgstr ""
 
-#: ../output.py:279
+#: ../output.py:299
 #, python-format
 msgid "Size       : %s"
 msgstr ""
 
-#: ../output.py:280
+#: ../output.py:300
 #, python-format
 msgid "Repo       : %s"
 msgstr ""
 
-#: ../output.py:282
+#: ../output.py:302
 #, python-format
 msgid "Committer  : %s"
 msgstr ""
 
-#: ../output.py:283
+#: ../output.py:303
 msgid "Summary    : "
 msgstr ""
 
-#: ../output.py:285
+#: ../output.py:305
 #, python-format
 msgid "URL        : %s"
 msgstr ""
 
-#: ../output.py:286
+#: ../output.py:306
 #, python-format
 msgid "License    : %s"
 msgstr ""
 
-#: ../output.py:287
+#: ../output.py:307
 msgid "Description: "
 msgstr ""
 
-#: ../output.py:331
+#: ../output.py:351
 msgid "Is this ok [y/N]: "
 msgstr ""
 
-#: ../output.py:345
+#: ../output.py:357 ../output.py:360
+msgid "y"
+msgstr ""
+
+#: ../output.py:357
+msgid "n"
+msgstr ""
+
+#: ../output.py:357 ../output.py:360
+msgid "yes"
+msgstr ""
+
+#: ../output.py:357
+msgid "no"
+msgstr ""
+
+#: ../output.py:367
 #, python-format
 msgid ""
 "\n"
 "Group: %s"
 msgstr ""
 
-#: ../output.py:347
+#: ../output.py:369
 #, python-format
 msgid " Description: %s"
 msgstr ""
 
-#: ../output.py:349
+#: ../output.py:371
 msgid " Mandatory Packages:"
 msgstr ""
 
-#: ../output.py:354
+#: ../output.py:376
 msgid " Default Packages:"
 msgstr ""
 
-#: ../output.py:359
+#: ../output.py:381
 msgid " Optional Packages:"
 msgstr ""
 
-#: ../output.py:364
+#: ../output.py:386
 msgid " Conditional Packages:"
 msgstr ""
 
-#: ../output.py:372
+#: ../output.py:394
 #, python-format
 msgid "package: %s"
 msgstr ""
 
-#: ../output.py:374
+#: ../output.py:396
 msgid "  No dependencies for this package"
 msgstr ""
 
-#: ../output.py:379
+#: ../output.py:401
 #, python-format
 msgid "  dependency: %s"
 msgstr ""
 
-#: ../output.py:381
+#: ../output.py:403
 msgid "   Unsatisfied dependency"
 msgstr ""
 
-#: ../output.py:436
+#: ../output.py:461
 msgid "Matched from:"
 msgstr ""
 
-#: ../output.py:462
+#: ../output.py:487
 msgid "There was an error calculating total download size"
 msgstr ""
 
-#: ../output.py:467
+#: ../output.py:492
 #, python-format
 msgid "Total size: %s"
 msgstr ""
 
-#: ../output.py:470
+#: ../output.py:495
 #, python-format
 msgid "Total download size: %s"
 msgstr ""
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Package"
 msgstr ""
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Arch"
 msgstr ""
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Version"
 msgstr ""
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Repository"
 msgstr ""
 
-#: ../output.py:482
+#: ../output.py:507
 msgid "Size"
 msgstr ""
 
-#: ../output.py:489
+#: ../output.py:514
 msgid "Installing for dependencies"
 msgstr ""
 
-#: ../output.py:490
+#: ../output.py:515
 msgid "Updating for dependencies"
 msgstr ""
 
-#: ../output.py:491
+#: ../output.py:516
 msgid "Removing for dependencies"
 msgstr ""
 
-#: ../output.py:503
+#: ../output.py:528
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
 "\n"
 msgstr ""
 
-#: ../output.py:511
+#: ../output.py:536
 #, python-format
 msgid ""
 "\n"
@@ -620,27 +649,27 @@ msgid ""
 "Remove   %5.5s Package(s)         \n"
 msgstr ""
 
-#: ../output.py:529
+#: ../output.py:554
 msgid "Removed"
 msgstr ""
 
-#: ../output.py:530
+#: ../output.py:555
 msgid "Dependency Removed"
 msgstr ""
 
-#: ../output.py:532
+#: ../output.py:557
 msgid "Dependency Installed"
 msgstr ""
 
-#: ../output.py:534
+#: ../output.py:559
 msgid "Dependency Updated"
 msgstr ""
 
-#: ../output.py:535
+#: ../output.py:560
 msgid "Replaced"
 msgstr ""
 
-#: ../output.py:593
+#: ../output.py:618
 #, python-format
 msgid ""
 "\n"
@@ -648,63 +677,63 @@ msgid ""
 "seconds to exit.\n"
 msgstr ""
 
-#: ../output.py:603
+#: ../output.py:628
 msgid "user interrupt"
 msgstr ""
 
-#: ../output.py:614
+#: ../output.py:639
 msgid "installed"
 msgstr ""
 
-#: ../output.py:615
+#: ../output.py:640
 msgid "updated"
 msgstr ""
 
-#: ../output.py:616
+#: ../output.py:641
 msgid "obsoleted"
 msgstr ""
 
-#: ../output.py:617
+#: ../output.py:642
 msgid "erased"
 msgstr ""
 
-#: ../output.py:621
+#: ../output.py:646
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr ""
 
-#: ../output.py:628
+#: ../output.py:653
 msgid "--> Running transaction check"
 msgstr ""
 
-#: ../output.py:633
+#: ../output.py:658
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr ""
 
-#: ../output.py:638
+#: ../output.py:663
 msgid "--> Finished Dependency Resolution"
 msgstr ""
 
-#: ../output.py:643
+#: ../output.py:668
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr ""
 
-#: ../output.py:648
+#: ../output.py:673
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr ""
 
-#: ../output.py:654
+#: ../output.py:679
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr ""
 
-#: ../output.py:657
+#: ../output.py:682
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr ""
 
-#: ../output.py:661
+#: ../output.py:686
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr ""
@@ -1035,656 +1064,696 @@ msgid ""
 "Dependencies Resolved"
 msgstr ""
 
-#: ../yummain.py:199
+#: ../yummain.py:198
 msgid "Complete!"
 msgstr ""
 
-#: ../yummain.py:246
+#: ../yummain.py:245
 msgid ""
 "\n"
 "\n"
 "Exiting on user cancel."
 msgstr ""
 
-#: ../yum/depsolve.py:70
+#: ../yum/depsolve.py:82
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:95
 msgid "Setting up TransactionSets before config class is up"
 msgstr ""
 
-#: ../yum/depsolve.py:123
+#: ../yum/depsolve.py:136
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:134
+#: ../yum/depsolve.py:147
 #, python-format
 msgid "Searching pkgSack for dep: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:163
+#: ../yum/depsolve.py:170
 #, python-format
 msgid "Potential match for %s from %s"
 msgstr ""
 
-#: ../yum/depsolve.py:171
+#: ../yum/depsolve.py:178
 #, python-format
 msgid "Matched %s to require for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:212
+#: ../yum/depsolve.py:219
 #, python-format
 msgid "Member: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:226 ../yum/depsolve.py:788
+#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
 #, python-format
 msgid "%s converted to install"
 msgstr ""
 
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:240
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr ""
 
-#: ../yum/depsolve.py:243
+#: ../yum/depsolve.py:250
 #, python-format
 msgid "Removing Package %s"
 msgstr ""
 
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:261
 #, python-format
 msgid "%s requires: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:300
+#: ../yum/depsolve.py:312
 msgid "Needed Require has already been looked up, cheating"
 msgstr ""
 
-#: ../yum/depsolve.py:310
+#: ../yum/depsolve.py:322
 #, python-format
 msgid "Needed Require is not a package name. Looking up: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:317
+#: ../yum/depsolve.py:329
 #, python-format
 msgid "Potential Provider: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:340
+#: ../yum/depsolve.py:352
 #, python-format
 msgid "Mode is %s for provider of %s: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:344
+#: ../yum/depsolve.py:356
 #, python-format
 msgid "Mode for pkg providing %s: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:348
+#: ../yum/depsolve.py:360
 #, python-format
 msgid "TSINFO: %s package requiring %s marked as erase"
 msgstr ""
 
-#: ../yum/depsolve.py:361
-#, python-format
-msgid "Looking for Obsoletes for %s"
-msgstr ""
-
-#: ../yum/depsolve.py:373
+#: ../yum/depsolve.py:372
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr ""
 
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:375
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr ""
 
-#. if there's no update then pass this over to requringFromTransaction()
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:378
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:420
+#: ../yum/depsolve.py:388
 #, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr ""
 
 #. is it already installed?
-#: ../yum/depsolve.py:466
+#: ../yum/depsolve.py:434
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr ""
 
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:449
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr ""
 
-#: ../yum/depsolve.py:492
+#: ../yum/depsolve.py:460
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr ""
 
-#: ../yum/depsolve.py:500 ../yum/depsolve.py:568
+#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr ""
 
-#: ../yum/depsolve.py:513
+#: ../yum/depsolve.py:481
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr ""
 
-#: ../yum/depsolve.py:578
+#: ../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 ""
 
-#: ../yum/depsolve.py:585
+#: ../yum/depsolve.py:544
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:647 ../yum/depsolve.py:654
+#: ../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 ""
+
+#: ../yum/depsolve.py:702
+msgid "Dependency Process ending"
+msgstr ""
+
+#: ../yum/depsolve.py:708
 #, python-format
-msgid "unable to find newer package for %s"
+msgid "%s from %s has depsolving problems"
+msgstr ""
+
+#: ../yum/depsolve.py:715
+msgid "Success - deps resolved"
 msgstr ""
 
-#: ../yum/depsolve.py:661
+#: ../yum/depsolve.py:729
 #, python-format
-msgid "TSINFO: Updating %s to resolve conflict."
+msgid "Checking deps for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:671
+#: ../yum/depsolve.py:782
 #, python-format
-msgid "%s conflicts: %s"
+msgid "looking for %s as a requirement of %s"
 msgstr ""
 
-#: ../yum/depsolve.py:681
+#: ../yum/depsolve.py:933
 #, python-format
-msgid "%s conflicts with %s"
+msgid "Comparing best: %s to po: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:720 ../yum/depsolve.py:806
-msgid "Success - empty transaction"
+#: ../yum/depsolve.py:937
+#, python-format
+msgid "Same: best %s == po: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:765 ../yum/depsolve.py:778
-msgid "Restarting Loop"
+#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
+#, python-format
+msgid "best %s obsoletes po: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:794
-msgid "Dependency Process ending"
+#: ../yum/depsolve.py:955
+#, python-format
+msgid "po %s obsoletes best: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:800
+#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
 #, python-format
-msgid "%s from %s has depsolving problems"
+msgid "better arch in po %s"
 msgstr ""
 
-#: ../yum/depsolve.py:807
-msgid "Success - deps resolved"
+#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#, python-format
+msgid "po %s shares a sourcerpm with %s"
 msgstr ""
 
-#: ../yum/depsolve.py:824
+#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
 #, python-format
-msgid "Checking deps for %s"
+msgid "best %s shares a sourcerpm with %s"
 msgstr ""
 
-#: ../yum/depsolve.py:880
+#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
 #, python-format
-msgid "looking for %s as a requirement of %s"
+msgid "po %s shares more of the name prefix with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#, python-format
+msgid "po %s has a shorter name than best %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1025
+#, python-format
+msgid "bestpkg %s shares more of the name prefix with %s"
 msgstr ""
 
 #: ../yum/__init__.py:119
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:311
+#: ../yum/__init__.py:296
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr ""
 
-#: ../yum/__init__.py:347
+#: ../yum/__init__.py:332
 msgid "plugins already initialised"
 msgstr ""
 
-#: ../yum/__init__.py:354
+#: ../yum/__init__.py:339
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:363
+#: ../yum/__init__.py:349
 msgid "Reading Local RPMDB"
 msgstr ""
 
-#: ../yum/__init__.py:381
+#: ../yum/__init__.py:367
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:399
+#: ../yum/__init__.py:387
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:416
+#: ../yum/__init__.py:404
 msgid "Setting up Package Sacks"
 msgstr ""
 
-#: ../yum/__init__.py:458
+#: ../yum/__init__.py:447
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr ""
 
-#: ../yum/__init__.py:459
+#: ../yum/__init__.py:448
 msgid "therefore this repo cannot be reset.\n"
 msgstr ""
 
-#: ../yum/__init__.py:464
+#: ../yum/__init__.py:453
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:476
+#: ../yum/__init__.py:465
 msgid "Building updates object"
 msgstr ""
 
-#: ../yum/__init__.py:499
+#: ../yum/__init__.py:496
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:520
 msgid "Getting group metadata"
 msgstr ""
 
-#: ../yum/__init__.py:548
+#: ../yum/__init__.py:546
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr ""
 
-#: ../yum/__init__.py:557
+#: ../yum/__init__.py:555
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr ""
 
-#: ../yum/__init__.py:563
+#: ../yum/__init__.py:561
 msgid "No Groups Available in any repository"
 msgstr ""
 
-#: ../yum/__init__.py:614
+#: ../yum/__init__.py:611
 msgid "Importing additional filelist information"
 msgstr ""
 
-#: ../yum/__init__.py:646
+#: ../yum/__init__.py:657
 #, python-format
 msgid "Skip-broken round %i"
 msgstr ""
 
-#: ../yum/__init__.py:674
+#: ../yum/__init__.py:680
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr ""
 
-#: ../yum/__init__.py:675
+#: ../yum/__init__.py:681
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
 msgstr ""
 
-#: ../yum/__init__.py:679
+#: ../yum/__init__.py:685
 #, python-format
 msgid "    %s from %s"
 msgstr ""
 
-#: ../yum/__init__.py:767
+#: ../yum/__init__.py:774
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr ""
 
-#: ../yum/__init__.py:807
+#: ../yum/__init__.py:814
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr ""
 
-#: ../yum/__init__.py:838
+#: ../yum/__init__.py:845
 msgid "Excluding Packages in global exclude list"
 msgstr ""
 
-#: ../yum/__init__.py:840
+#: ../yum/__init__.py:847
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr ""
 
-#: ../yum/__init__.py:867
+#: ../yum/__init__.py:875
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr ""
 
-#: ../yum/__init__.py:872
+#: ../yum/__init__.py:880
 #, python-format
 msgid "Keeping included package %s"
 msgstr ""
 
-#: ../yum/__init__.py:878
+#: ../yum/__init__.py:886
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr ""
 
-#: ../yum/__init__.py:881
+#: ../yum/__init__.py:889
 msgid "Finished"
 msgstr ""
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:911
+#: ../yum/__init__.py:919
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr ""
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:915
+#: ../yum/__init__.py:923
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr ""
 
-#: ../yum/__init__.py:962 ../yum/__init__.py:969
+#: ../yum/__init__.py:970 ../yum/__init__.py:977
 msgid "Package does not match intended download"
 msgstr ""
 
-#: ../yum/__init__.py:983
+#: ../yum/__init__.py:991
 msgid "Could not perform checksum"
 msgstr ""
 
-#: ../yum/__init__.py:986
+#: ../yum/__init__.py:994
 msgid "Package does not match checksum"
 msgstr ""
 
-#: ../yum/__init__.py:1028
+#: ../yum/__init__.py:1036
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr ""
 
-#: ../yum/__init__.py:1034
+#: ../yum/__init__.py:1042
 #, python-format
 msgid "using local copy of %s"
 msgstr ""
 
-#: ../yum/__init__.py:1053
+#: ../yum/__init__.py:1061
 #, python-format
 msgid "Insufficient space in download directory %s to download"
 msgstr ""
 
-#: ../yum/__init__.py:1086
+#: ../yum/__init__.py:1094
 msgid "Header is not complete."
 msgstr ""
 
-#: ../yum/__init__.py:1126
+#: ../yum/__init__.py:1134
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
 msgstr ""
 
-#: ../yum/__init__.py:1181
+#: ../yum/__init__.py:1189
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr ""
 
-#: ../yum/__init__.py:1185
+#: ../yum/__init__.py:1193
 #, python-format
 msgid "Problem opening package %s"
 msgstr ""
 
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1201
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr ""
 
-#: ../yum/__init__.py:1197
+#: ../yum/__init__.py:1205
 #, python-format
 msgid "Package %s is not signed"
 msgstr ""
 
-#: ../yum/__init__.py:1235
+#: ../yum/__init__.py:1243
 #, python-format
 msgid "Cannot remove %s"
 msgstr ""
 
-#: ../yum/__init__.py:1239
+#: ../yum/__init__.py:1247
 #, python-format
 msgid "%s removed"
 msgstr ""
 
-#: ../yum/__init__.py:1271
+#: ../yum/__init__.py:1283
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr ""
 
-#: ../yum/__init__.py:1275
+#: ../yum/__init__.py:1287
 #, python-format
 msgid "%s file %s removed"
 msgstr ""
 
-#: ../yum/__init__.py:1277
+#: ../yum/__init__.py:1289
 #, python-format
 msgid "%d %s files removed"
 msgstr ""
 
-#: ../yum/__init__.py:1317
+#: ../yum/__init__.py:1329
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr ""
 
-#: ../yum/__init__.py:1323
+#: ../yum/__init__.py:1335
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr ""
 
-#: ../yum/__init__.py:1513
+#: ../yum/__init__.py:1543
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
 msgstr ""
 
-#: ../yum/__init__.py:1550
+#: ../yum/__init__.py:1580
 #, python-format
 msgid "Searching %d packages"
 msgstr ""
 
-#: ../yum/__init__.py:1554
+#: ../yum/__init__.py:1584
 #, python-format
 msgid "searching package %s"
 msgstr ""
 
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1596
 msgid "searching in file entries"
 msgstr ""
 
-#: ../yum/__init__.py:1569
+#: ../yum/__init__.py:1603
 msgid "searching in provides entries"
 msgstr ""
 
-#: ../yum/__init__.py:1599
+#: ../yum/__init__.py:1633
 #, python-format
 msgid "Provides-match: %s"
 msgstr ""
 
-#: ../yum/__init__.py:1668 ../yum/__init__.py:1686 ../yum/__init__.py:1714
-#: ../yum/__init__.py:1719 ../yum/__init__.py:1774 ../yum/__init__.py:1778
+#: ../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 ""
 
-#: ../yum/__init__.py:1697 ../yum/__init__.py:1790
+#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr ""
 
-#: ../yum/__init__.py:1736
+#: ../yum/__init__.py:1770
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr ""
 
-#: ../yum/__init__.py:1740
+#: ../yum/__init__.py:1774
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr ""
 
-#: ../yum/__init__.py:1815
+#: ../yum/__init__.py:1849
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr ""
 
-#: ../yum/__init__.py:1883 ../yum/__init__.py:1926
+#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr ""
 
-#: ../yum/__init__.py:1885 ../yum/__init__.py:1928
+#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
 msgid "Invalid version flag"
 msgstr ""
 
-#: ../yum/__init__.py:1900 ../yum/__init__.py:1904
+#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
 #, python-format
 msgid "No Package found for %s"
 msgstr ""
 
-#: ../yum/__init__.py:2034
+#: ../yum/__init__.py:2066
 msgid "Package Object was not a package object instance"
 msgstr ""
 
-#: ../yum/__init__.py:2038
+#: ../yum/__init__.py:2070
 msgid "Nothing specified to install"
 msgstr ""
 
 #. only one in there
-#: ../yum/__init__.py:2051
+#: ../yum/__init__.py:2085
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr ""
 
-#: ../yum/__init__.py:2057 ../yum/__init__.py:2323
+#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
 #, python-format
 msgid "No Match for argument: %s"
 msgstr ""
 
 #. FIXME - this is where we could check to see if it already installed
 #. for returning better errors
-#: ../yum/__init__.py:2114
+#: ../yum/__init__.py:2146
 msgid "No package(s) available to install"
 msgstr ""
 
-#: ../yum/__init__.py:2126
+#: ../yum/__init__.py:2158
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr ""
 
-#: ../yum/__init__.py:2139
+#: ../yum/__init__.py:2171
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr ""
 
+#: ../yum/__init__.py:2178
+#, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr ""
+
 #. update everything (the easy case)
-#: ../yum/__init__.py:2180
+#: ../yum/__init__.py:2220
 msgid "Updating Everything"
 msgstr ""
 
-#: ../yum/__init__.py:2264
+#: ../yum/__init__.py:2304
 #, python-format
 msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr ""
 
-#: ../yum/__init__.py:2320
+#: ../yum/__init__.py:2377
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../yum/__init__.py:2335
+#: ../yum/__init__.py:2392
 msgid "No package matched to remove"
 msgstr ""
 
-#: ../yum/__init__.py:2369
+#: ../yum/__init__.py:2426
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr ""
 
-#: ../yum/__init__.py:2372
+#: ../yum/__init__.py:2429
 #, python-format
 msgid "Examining %s: %s"
 msgstr ""
 
-#: ../yum/__init__.py:2379
+#: ../yum/__init__.py:2436
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
 "instead."
 msgstr ""
 
-#: ../yum/__init__.py:2411
+#: ../yum/__init__.py:2468
 #, python-format
 msgid "Excluding %s"
 msgstr ""
 
-#: ../yum/__init__.py:2416
+#: ../yum/__init__.py:2473
 #, python-format
 msgid "Marking %s to be installed"
 msgstr ""
 
-#: ../yum/__init__.py:2422
+#: ../yum/__init__.py:2479
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr ""
 
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:2486
 #, python-format
 msgid "%s: does not update installed package."
 msgstr ""
 
-#: ../yum/__init__.py:2447
+#: ../yum/__init__.py:2504
 msgid "Problem in reinstall: no package matched to remove"
 msgstr ""
 
-#: ../yum/__init__.py:2456
+#: ../yum/__init__.py:2515
+#, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr ""
+
+#: ../yum/__init__.py:2522
 msgid "Problem in reinstall: no package matched to install"
 msgstr ""
 
-#: ../yum/__init__.py:2514
+#: ../yum/__init__.py:2570
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr ""
 
-#: ../yum/__init__.py:2520
+#: ../yum/__init__.py:2576
 msgid "GPG key retrieval failed: "
 msgstr ""
 
-#: ../yum/__init__.py:2533
+#: ../yum/__init__.py:2589
 msgid "GPG key parsing failed: "
 msgstr ""
 
-#: ../yum/__init__.py:2537
+#: ../yum/__init__.py:2593
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr ""
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2542
+#: ../yum/__init__.py:2598
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr ""
 
-#: ../yum/__init__.py:2554
+#: ../yum/__init__.py:2610
 msgid "Not installing key"
 msgstr ""
 
-#: ../yum/__init__.py:2560
+#: ../yum/__init__.py:2616
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr ""
 
-#: ../yum/__init__.py:2563
+#: ../yum/__init__.py:2619
 msgid "Key imported successfully"
 msgstr ""
 
-#: ../yum/__init__.py:2568
+#: ../yum/__init__.py:2624
 #, python-format
 msgid ""
 "The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1692,81 +1761,71 @@ msgid ""
 "Check that the correct key URLs are configured for this repository."
 msgstr ""
 
-#: ../yum/__init__.py:2577
+#: ../yum/__init__.py:2633
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr ""
 
-#: ../yum/__init__.py:2651
+#: ../yum/__init__.py:2707
 msgid "Unable to find a suitable mirror."
 msgstr ""
 
-#: ../yum/__init__.py:2653
+#: ../yum/__init__.py:2709
 msgid "Errors were encountered while downloading packages."
 msgstr ""
 
-#: ../yum/__init__.py:2717
+#: ../yum/__init__.py:2774
 msgid "Test Transaction Errors: "
 msgstr ""
 
-#: ../yum/__init__.py:2752
-#, python-format
-msgid "Package %s needs %s, this is not available."
-msgstr ""
-
-#: ../yum/__init__.py:2757
-#, python-format
-msgid "Package %s conflicts with %s."
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:195
+msgid "Loaded plugins: "
 msgstr ""
 
-#: ../yum/plugins.py:168
+#: ../yum/plugins.py:206
 #, python-format
-msgid "Running \"%s\" handler for \"%s\" plugin"
-msgstr ""
-
-#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:193
-msgid "Loaded plugins: "
+msgid "No plugin match for: %s"
 msgstr ""
 
-#: ../yum/plugins.py:210
+#: ../yum/plugins.py:219
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr ""
 
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:231
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr ""
 
-#: ../yum/plugins.py:226
+#: ../yum/plugins.py:235
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr ""
 
-#: ../yum/plugins.py:253
+#: ../yum/plugins.py:264
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr ""
 
-#: ../yum/plugins.py:260
+#: ../yum/plugins.py:271
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
 msgstr ""
 
-#: ../yum/plugins.py:280
+#: ../yum/plugins.py:291
 #, python-format
 msgid "Configuration file %s not found"
 msgstr ""
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:283
+#: ../yum/plugins.py:294
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr ""
 
-#: ../yum/plugins.py:437
+#: ../yum/plugins.py:448
 msgid "registration of commands not supported"
 msgstr ""
 

